Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove forbidden @author tag #36981

Merged
merged 4 commits into from
Oct 5, 2023
Merged

Remove forbidden @author tag #36981

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ad651b
Remove forbidden @author tag
fredden Mar 6, 2023
1510781
Fix static test failures
fredden Mar 7, 2023
8ba1b79
Merge branch '2.4-develop' into no-author/url-user-variable-weee
engcom-Lima Mar 27, 2023
0a2fb74
Merge remote-tracking branch 'magento/2.4-develop' into no-author/url…
engcom-Delta Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

/**
* Categories tree block for URL rewrites editing process
*
* @author Magento Core Team <[email protected]>
*/
class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
{
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/UrlRewrite/Block/Catalog/Product/Grid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
/**
* Products grid for URL rewrites editing
*
* @author Magento Core Team <[email protected]>
* @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/UrlRewrite/Block/Cms/Page/Grid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
/**
* CMS pages grid for URL rewrites
*
* @author Magento Core Team <[email protected]>
* @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Cms\Block\Adminhtml\Page\Grid
Expand Down
5 changes: 4 additions & 1 deletion app/code/Magento/User/Block/Role.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Magento_User role block
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Role extends \Magento\Backend\Block\Widget\Grid\Container
Expand Down Expand Up @@ -37,6 +36,8 @@ protected function _construct()
}

/**
* Get a URL to create a role
*
* @return string
*/
public function getCreateUrl()
Expand All @@ -45,6 +46,8 @@ public function getCreateUrl()
}

/**
* Prepare the layout
*
* @return $this
*/
protected function _prepareLayout()
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/User/Block/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* User block
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class User extends \Magento\Backend\Block\Widget\Grid\Container
Expand Down
5 changes: 2 additions & 3 deletions app/code/Magento/User/Block/User/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,11 @@
* User edit page
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Edit extends \Magento\Backend\Block\Widget\Form\Container
{
/**
* Core registry
*
* @var \Magento\Framework\Registry
*/
protected $_coreRegistry = null;
Expand Down Expand Up @@ -121,6 +118,8 @@ public function getObjectId()
}

/**
* Get text to be used in the header
*
* @return \Magento\Framework\Phrase
*/
public function getHeaderText()
Expand Down
3 changes: 2 additions & 1 deletion app/code/Magento/User/Block/User/Edit/Tabs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* User page left menu
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Tabs extends \Magento\Backend\Block\Widget\Tabs
Expand All @@ -28,6 +27,8 @@ protected function _construct()
}

/**
* Add tabs to the HTML
*
* @return $this
*/
protected function _beforeToHtml()
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/User/Model/ResourceModel/Role/User/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Admin role users collection
*
* @author Magento Core Team <[email protected]>
*/
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/User/Model/ResourceModel/User/Locked/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Admin user collection
*
* @author Magento Core Team <[email protected]>
*/
class Collection extends \Magento\User\Model\ResourceModel\User\Collection
{
Expand All @@ -22,5 +20,7 @@ protected function _initSelect()
{
parent::_initSelect();
$this->addFieldToFilter('lock_expires', ['notnull' => true]);

return $this;
ihor-sviziev marked this conversation as resolved.
Show resolved Hide resolved
}
}
2 changes: 0 additions & 2 deletions app/code/Magento/Variable/Model/ResourceModel/Variable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

/**
* Custom variable resource model
*
* @author Magento Core Team <[email protected]>
*/
class Variable extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/Variable/Model/ResourceModel/Variable/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,10 @@

/**
* Custom variable collection
*
* @author Magento Core Team <[email protected]>
*/
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
/**
* Store Id
*
* @var int
*/
protected $_storeId = 0;
Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/Weee/Block/Item/Price/Renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace Magento\Weee\Block\Item\Price;

use Magento\Framework\Pricing\PriceCurrencyInterface;
use Magento\Sales\Model\Order\CreditMemo\Item as CreditMemoItem;
use Magento\Sales\Model\Order\Creditmemo\Item as CreditMemoItem;
ihor-sviziev marked this conversation as resolved.
Show resolved Hide resolved
use Magento\Sales\Model\Order\Invoice\Item as InvoiceItem;
use Magento\Sales\Model\Order\Item as OrderItem;
use Magento\Weee\Model\Tax as WeeeDisplayConfig;
Expand All @@ -15,7 +15,6 @@
* Item price render block
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Renderer extends \Magento\Tax\Block\Item\Price\Renderer
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Weee/Model/ResourceModel/Attribute/Backend/Weee/Tax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Catalog product WEEE tax backend attribute model
*
* @author Magento Core Team <[email protected]>
*/
class Tax extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
Expand Down