-
Notifications
You must be signed in to change notification settings - Fork 9.4k
Remove forbidden @author tag from Magento_Catalog (part 3)
#36989
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.
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
Open
fredden
wants to merge
8
commits into
magento:2.4-develop
Choose a base branch
from
fredden:no-author/catalog-03
base: 2.4-develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
023e66c
Remove forbidden @author tag
fredden a274518
Merge remote-tracking branch 'upstream/2.4-develop' into no-author/ca…
fredden d5040e1
Fix static test failures
fredden ec4c523
Merge remote-tracking branch 'upstream/2.4-develop' into no-author/ca…
fredden f7f107c
Merge branch '2.4-develop' into no-author/catalog-03
engcom-Dash 9da27cc
36989: fix static failures
engcom-Dash 1af3e0a
Merge branch '2.4-develop' into no-author/catalog-03
engcom-Dash cf2755d
Merge remote-tracking branch 'upstream/2.4-develop' into no-author/ca…
fredden File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,12 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| * Copyright 2011 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
| namespace Magento\Catalog\Block\Product\View; | ||
|
|
||
| /** | ||
| * Simple product data view | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| class BaseImage extends \Magento\Catalog\Block\Product\View\AbstractView | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,16 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| * Copyright 2011 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
|
|
||
| /** | ||
| * Product description block | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Catalog\Block\Product\View; | ||
|
|
||
| use Magento\Catalog\Model\Product; | ||
|
|
||
| /** | ||
| * Product description block | ||
| * | ||
| * @api | ||
| * @since 100.0.2 | ||
| */ | ||
|
|
@@ -25,8 +22,6 @@ class Description extends \Magento\Framework\View\Element\Template | |
| protected $_product = null; | ||
|
|
||
| /** | ||
| * Core registry | ||
| * | ||
| * @var \Magento\Framework\Registry | ||
| */ | ||
| protected $_coreRegistry = null; | ||
|
|
@@ -46,6 +41,8 @@ public function __construct( | |
| } | ||
|
|
||
| /** | ||
| * Return the product | ||
| * | ||
| * @return Product | ||
| */ | ||
| public function getProduct() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,8 +6,6 @@ | |
|
|
||
| /** | ||
| * Product options abstract type block | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
|
|
||
| namespace Magento\Catalog\Block\Product\View\Options; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,11 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| * Copyright 2011 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
|
|
||
| /** | ||
| * Simple product data view | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Catalog\Block\Product\View\Type; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,11 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| * Copyright 2011 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
|
|
||
| /** | ||
| * Simple product data view | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Catalog\Block\Product\View\Type; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,29 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| * Copyright 2012 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
|
|
||
| namespace Magento\Catalog\Block\Product\Widget\Html; | ||
|
|
||
| /** | ||
| * New products widget pager block | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Catalog\Block\Product\Widget\Html; | ||
|
|
||
| class Pager extends \Magento\Theme\Block\Html\Pager | ||
| { | ||
| /** | ||
| * Collection size | ||
| * | ||
| * Size of collection which may has a manual limitation | ||
| * | ||
| * @var int | ||
| */ | ||
| protected $_collectionSize; | ||
|
|
||
| /** | ||
| * Current page | ||
| * | ||
| * @var int | ||
| */ | ||
| protected $_currentPage; | ||
|
|
||
| /** | ||
| * Last page | ||
| * | ||
| * @var int | ||
| */ | ||
| protected $_lastPage; | ||
|
|
@@ -206,6 +198,9 @@ public function getPages() | |
| } elseif ($this->getCurrentPage() > $this->getLastPageNum() - $half) { | ||
| $finish = $this->getLastPageNum(); | ||
| $start = $finish - $this->_displayPages + 1; | ||
| } else { | ||
| $start = 1; | ||
| $finish = $this->_displayPages; | ||
| } | ||
| $pages = range($start, $finish); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,14 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| * Copyright 2011 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
| namespace Magento\Catalog\Controller\Adminhtml\Category; | ||
|
|
||
| use Magento\Framework\View\Element\BlockInterface; | ||
|
|
||
| /** | ||
| * Catalog category widgets controller for CMS WYSIWYG | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| abstract class Widget extends \Magento\Backend\App\Action | ||
| { | ||
|
|
@@ -19,7 +17,7 @@ abstract class Widget extends \Magento\Backend\App\Action | |
| * | ||
| * @see _isAllowed() | ||
| */ | ||
| const ADMIN_RESOURCE = 'Magento_Catalog::categories'; | ||
| public const ADMIN_RESOURCE = 'Magento_Catalog::categories'; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\View\LayoutFactory | ||
|
|
@@ -39,6 +37,8 @@ public function __construct( | |
| } | ||
|
|
||
| /** | ||
| * Return the category tree block | ||
| * | ||
| * @return BlockInterface | ||
| */ | ||
| protected function _getCategoryTreeBlock() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,12 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| * Copyright 2011 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
| namespace Magento\Catalog\Controller\Adminhtml\Product; | ||
|
|
||
| /** | ||
| * Adminhtml entity sets controller | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| abstract class Set extends \Magento\Backend\App\Action | ||
| { | ||
|
|
@@ -17,11 +15,9 @@ abstract class Set extends \Magento\Backend\App\Action | |
| * | ||
| * @see _isAllowed() | ||
| */ | ||
| const ADMIN_RESOURCE = 'Magento_Catalog::sets'; | ||
| public const ADMIN_RESOURCE = 'Magento_Catalog::sets'; | ||
|
|
||
| /** | ||
| * Core registry | ||
| * | ||
| * @var \Magento\Framework\Registry | ||
| */ | ||
| protected $_coreRegistry; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,12 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| * Copyright 2011 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
| namespace Magento\Catalog\Helper; | ||
|
|
||
| /** | ||
| * Adminhtml Catalog helper | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| class Catalog extends \Magento\Framework\App\Helper\AbstractHelper | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| * Copyright 2013 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
| namespace Magento\Catalog\Helper\Product; | ||
|
|
||
|
|
@@ -18,23 +18,17 @@ | |
| * Adminhtml catalog product composite helper | ||
| * | ||
| * @api | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| * @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
| * @since 100.0.2 | ||
| */ | ||
| class Composite extends \Magento\Framework\App\Helper\AbstractHelper | ||
| { | ||
| /** | ||
| * Core registry | ||
| * | ||
| * @var Registry | ||
| */ | ||
| protected $_coreRegistry = null; | ||
|
|
||
| /** | ||
| * Catalog product | ||
| * | ||
| * @var Product | ||
| */ | ||
| protected $_catalogProduct = null; | ||
|
|
@@ -91,8 +85,9 @@ protected function _initUpdateResultLayout() | |
| } | ||
|
|
||
| /** | ||
| * Prepares and render result of composite product configuration update for a case | ||
| * when single configuration submitted | ||
| * Prepares and render result of composite product configuration update | ||
| * | ||
| * This is for a case when single configuration was submitted | ||
| * | ||
| * @param \Magento\Framework\DataObject $updateResult | ||
| * @return \Magento\Framework\View\Result\Layout | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,6 @@ | |
| * phpcs:disable Magento2.Classes.AbstractApi | ||
| * @api | ||
| * @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
| * @author Magento Core Team <[email protected]> | ||
| * @since 100.0.2 | ||
| */ | ||
| abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensibleModel | ||
|
|
@@ -46,8 +45,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible | |
| protected $_isDeleteable = true; | ||
|
|
||
| /** | ||
| * Is model readonly | ||
| * | ||
| * @var boolean | ||
| */ | ||
| protected $_isReadonly = false; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,24 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| * Copyright 2011 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
| namespace Magento\Catalog\Model\Attribute\Backend; | ||
|
|
||
| /** | ||
| * | ||
| * Special Start Date attribute backend | ||
| * | ||
| * @api | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| * @since 100.0.2 | ||
| */ | ||
| class Startdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Datetime | ||
| { | ||
| /** | ||
| * Date model | ||
| * | ||
| * @var \Magento\Framework\Stdlib\DateTime\DateTime | ||
| */ | ||
| protected $_date; | ||
|
|
||
| /** | ||
| * Constructor | ||
| * | ||
| * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate | ||
| * @param \Magento\Framework\Stdlib\DateTime\DateTime $date | ||
| */ | ||
|
|
@@ -53,6 +46,7 @@ protected function _getValueForSave($object) | |
|
|
||
| /** | ||
| * Before save hook. | ||
| * | ||
| * Prepare attribute value for save | ||
| * | ||
| * @param \Magento\Framework\DataObject $object | ||
|
|
@@ -72,6 +66,7 @@ public function beforeSave($object) | |
|
|
||
| /** | ||
| * Product from date attribute validate function. | ||
| * | ||
| * In case invalid data throws exception. | ||
| * | ||
| * @param \Magento\Framework\DataObject $object | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| * Copyright 2011 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
|
|
||
| namespace Magento\Catalog\Model\Category\Attribute\Backend; | ||
|
|
@@ -10,8 +10,6 @@ | |
| * Catalog Category Attribute Default and Available Sort By Backend Model | ||
| * | ||
| * @api | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| * @since 100.0.2 | ||
| */ | ||
| class Sortby extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@fredden This seems to be a change that was not written in the pr. It does seem logical that it was added, but it could influence the method.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Without this change, the linter complains that
$startand$finishare potentially undefined when callingrange($start, $finish);on the next line of code. This seems like a necessary change to ensure the code functions as expected. While technically out of scope for "remove a comment" (this pull request), this pull request also contains a lot of other out-of-scope changes (like updating the license holder(!) and defining class constant visibility). How should we proceed?