-
Notifications
You must be signed in to change notification settings - Fork 9.4k
Remove forbidden @author
tag from Magento_Review
#36977
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
Merged
magento-devops-reposync-svc
merged 8 commits into
magento:2.4-develop
from
fredden:no-author/review
Oct 5, 2023
Merged
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c40c686
Remove forbidden @author tag
fredden dda20f5
Fix static tests
fredden 414b090
Merge remote-tracking branch 'upstream/2.4-develop' into no-author/re…
fredden 7606dd0
Fix static test failures
fredden 0660e47
Merge branch '2.4-develop' into no-author/review
engcom-Lima 5b59ad3
PR:36977 fix for static test failures
engcom-Delta cfae994
fix for static test failure
engcom-Delta 2829610
Merge branch '2.4-develop' into no-author/review
engcom-Echo 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 |
---|---|---|
|
@@ -8,8 +8,6 @@ | |
|
||
/** | ||
* Adminhtml add Review main block | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Add extends \Magento\Backend\Block\Widget\Form\Container | ||
{ | ||
|
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 |
---|---|---|
|
@@ -10,14 +10,10 @@ | |
|
||
/** | ||
* Adminhtml add product review form | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Form extends \Magento\Backend\Block\Widget\Form\Generic | ||
{ | ||
/** | ||
* Review data | ||
* | ||
* @var \Magento\Review\Helper\Data | ||
*/ | ||
protected $_reviewData = null; | ||
|
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 |
---|---|---|
|
@@ -7,8 +7,6 @@ | |
|
||
/** | ||
* Adminhtml review grid filter by type | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Type extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select | ||
{ | ||
|
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 |
---|---|---|
|
@@ -7,8 +7,6 @@ | |
|
||
/** | ||
* Adminhtml review grid item renderer for item type | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer | ||
{ | ||
|
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 |
---|---|---|
|
@@ -8,7 +8,6 @@ | |
/** | ||
* Adminhtml product grid block | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
* @SuppressWarnings(PHPMD.DepthOfInheritance) | ||
*/ | ||
class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid | ||
|
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 |
---|---|---|
|
@@ -9,12 +9,13 @@ | |
* Ratings grid | ||
* | ||
* @api | ||
* @author Magento Core Team <[email protected]> | ||
* @since 100.0.2 | ||
*/ | ||
class Rating extends \Magento\Backend\Block\Widget\Grid\Container | ||
{ | ||
/** | ||
* Initialise the block | ||
* | ||
* @return void | ||
*/ | ||
protected function _construct() | ||
|
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 |
---|---|---|
|
@@ -7,12 +7,12 @@ | |
|
||
/** | ||
* Rating edit form block | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Form extends \Magento\Backend\Block\Widget\Form\Generic | ||
{ | ||
/** | ||
* Prepare the form | ||
* | ||
* @return $this | ||
*/ | ||
protected function _prepareForm() | ||
|
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 |
---|---|---|
|
@@ -7,12 +7,12 @@ | |
|
||
/** | ||
* Admin rating left menu | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Tabs extends \Magento\Backend\Block\Widget\Tabs | ||
{ | ||
/** | ||
* Initialise the block | ||
* | ||
* @return void | ||
*/ | ||
protected function _construct() | ||
|
@@ -24,6 +24,8 @@ protected function _construct() | |
} | ||
|
||
/** | ||
* Add rating information tab | ||
* | ||
* @return $this | ||
*/ | ||
protected function _beforeToHtml() | ||
|
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 |
---|---|---|
|
@@ -14,7 +14,6 @@ | |
* Customer Review detailed view block | ||
* | ||
* @api | ||
* @author Magento Core Team <[email protected]> | ||
* @since 100.0.2 | ||
*/ | ||
class View extends \Magento\Catalog\Block\Product\AbstractProduct | ||
|
@@ -183,11 +182,14 @@ public function getTotalReviews() | |
{ | ||
if (!$this->getTotalReviewsCache()) { | ||
$this->setTotalReviewsCache( | ||
$this->_reviewFactory->create()->getTotalReviews($this->getProductData()->getId()), | ||
false, | ||
$this->_storeManager->getStore()->getId() | ||
$this->_reviewFactory->create()->getTotalReviews( | ||
$this->getProductData()->getId(), | ||
false, | ||
$this->_storeManager->getStore()->getId() | ||
) | ||
); | ||
} | ||
|
||
return $this->getTotalReviewsCache(); | ||
} | ||
|
||
|
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 |
---|---|---|
|
@@ -14,15 +14,12 @@ | |
* Review form block | ||
* | ||
* @api | ||
* @author Magento Core Team <[email protected]> | ||
* @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
* @since 100.0.2 | ||
*/ | ||
class Form extends \Magento\Framework\View\Element\Template | ||
{ | ||
/** | ||
* Review data | ||
* | ||
* @var \Magento\Review\Helper\Data | ||
*/ | ||
protected $_reviewData = null; | ||
|
@@ -74,8 +71,6 @@ class Form extends \Magento\Framework\View\Element\Template | |
private $serializer; | ||
|
||
/** | ||
* Form constructor. | ||
* | ||
* @param \Magento\Framework\View\Element\Template\Context $context | ||
* @param \Magento\Framework\Url\EncoderInterface $urlEncoder | ||
* @param \Magento\Review\Helper\Data $reviewData | ||
|
@@ -143,6 +138,8 @@ protected function _construct() | |
} | ||
|
||
/** | ||
* Return JavaScript layout object | ||
* | ||
* @return string | ||
*/ | ||
public function getJsLayout() | ||
|
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 |
---|---|---|
|
@@ -9,7 +9,6 @@ | |
* Review form block | ||
* | ||
* @api | ||
* @author Magento Core Team <[email protected]> | ||
* @since 100.0.2 | ||
*/ | ||
class Configure extends \Magento\Review\Block\Form | ||
|
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 |
---|---|---|
|
@@ -12,14 +12,11 @@ | |
* Product Review Tab | ||
* | ||
* @api | ||
* @author Magento Core Team <[email protected]> | ||
* @since 100.0.2 | ||
*/ | ||
class Review extends Template implements IdentityInterface | ||
{ | ||
/** | ||
* 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 |
---|---|---|
|
@@ -11,7 +11,6 @@ | |
/** | ||
* Product Reviews Page | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
* @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
*/ | ||
class View extends \Magento\Catalog\Block\Product\View | ||
|
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 |
---|---|---|
|
@@ -7,8 +7,6 @@ | |
|
||
/** | ||
* Entity rating block | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Detailed extends \Magento\Framework\View\Element\Template | ||
{ | ||
|
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 |
---|---|---|
|
@@ -9,7 +9,6 @@ | |
* Review detailed view block | ||
* | ||
* @api | ||
* @author Magento Core Team <[email protected]> | ||
* @since 100.0.2 | ||
*/ | ||
class View extends \Magento\Catalog\Block\Product\AbstractProduct | ||
|
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 |
---|---|---|
|
@@ -17,19 +17,18 @@ | |
* @method \Magento\Review\Model\Rating setStores(array $value) | ||
* @method string getRatingCode() | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
* @since 100.0.2 | ||
*/ | ||
class Rating extends \Magento\Framework\Model\AbstractModel implements IdentityInterface | ||
{ | ||
/** | ||
* rating entity codes | ||
*/ | ||
const ENTITY_PRODUCT_CODE = 'product'; | ||
public const ENTITY_PRODUCT_CODE = 'product'; | ||
|
||
const ENTITY_PRODUCT_REVIEW_CODE = 'product_review'; | ||
public const ENTITY_PRODUCT_REVIEW_CODE = 'product_review'; | ||
|
||
const ENTITY_REVIEW_CODE = 'review'; | ||
public const ENTITY_REVIEW_CODE = 'review'; | ||
|
||
/** | ||
* @var \Magento\Review\Model\Rating\OptionFactory | ||
|
@@ -75,6 +74,8 @@ protected function _construct() | |
} | ||
|
||
/** | ||
* Add a vote to an option | ||
* | ||
* @param int $optionId | ||
* @param int $entityPkValue | ||
* @return $this | ||
|
@@ -94,6 +95,8 @@ public function addOptionVote($optionId, $entityPkValue) | |
} | ||
|
||
/** | ||
* Update a vote for an option | ||
* | ||
* @param int $optionId | ||
* @return $this | ||
*/ | ||
|
@@ -112,7 +115,7 @@ public function updateOptionVote($optionId) | |
} | ||
|
||
/** | ||
* retrieve rating options | ||
* Retrieve rating options | ||
* | ||
* @return array | ||
*/ | ||
|
@@ -143,6 +146,8 @@ public function getEntitySummary($entityPkValue, $onlyForCurrentStore = true) | |
} | ||
|
||
/** | ||
* Get summary of review | ||
* | ||
* @param int $reviewId | ||
* @param bool $onlyForCurrentStore | ||
* @return array | ||
|
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 |
---|---|---|
|
@@ -11,12 +11,13 @@ | |
* @method string getEntityCode() | ||
* @method \Magento\Review\Model\Rating\Entity setEntityCode(string $value) | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
* @codeCoverageIgnore | ||
*/ | ||
class Entity extends \Magento\Framework\Model\AbstractModel | ||
{ | ||
/** | ||
* Initialise the model | ||
* | ||
* @return void | ||
*/ | ||
protected function _construct() | ||
|
@@ -25,6 +26,8 @@ protected function _construct() | |
} | ||
|
||
/** | ||
* Return the ID for the specified code | ||
* | ||
* @param string $entityCode | ||
* @return int | ||
*/ | ||
|
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 |
---|---|---|
|
@@ -18,13 +18,14 @@ | |
* @method int getPosition() | ||
* @method \Magento\Review\Model\Rating\Option setPosition(int $value) | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
* @codeCoverageIgnore | ||
* @since 100.0.2 | ||
*/ | ||
class Option extends \Magento\Framework\Model\AbstractModel | ||
{ | ||
/** | ||
* Initialise the model | ||
* | ||
* @return void | ||
*/ | ||
protected function _construct() | ||
|
@@ -33,6 +34,8 @@ protected function _construct() | |
} | ||
|
||
/** | ||
* Add a vote | ||
* | ||
* @return $this | ||
*/ | ||
public function addVote() | ||
|
@@ -42,6 +45,8 @@ public function addVote() | |
} | ||
|
||
/** | ||
* Set the identifier | ||
* | ||
* @param mixed $id | ||
* @return $this | ||
*/ | ||
|
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 |
---|---|---|
|
@@ -9,14 +9,14 @@ | |
* Rating vote model | ||
* | ||
* @api | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
* @codeCoverageIgnore | ||
* @since 100.0.2 | ||
*/ | ||
class Vote extends \Magento\Framework\Model\AbstractModel | ||
{ | ||
/** | ||
* Initialise the class | ||
* | ||
* @return void | ||
*/ | ||
protected function _construct() | ||
|
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 |
---|---|---|
|
@@ -12,18 +12,14 @@ | |
* Rating resource model | ||
* | ||
* @api | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
* @since 100.0.2 | ||
* @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
*/ | ||
class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb | ||
{ | ||
const RATING_STATUS_APPROVED = 'Approved'; | ||
public const RATING_STATUS_APPROVED = 'Approved'; | ||
|
||
/** | ||
* Store manager | ||
* | ||
* @var \Magento\Store\Model\StoreManagerInterface | ||
*/ | ||
protected $_storeManager; | ||
|
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 |
---|---|---|
|
@@ -9,8 +9,6 @@ | |
* Rating collection resource model | ||
* | ||
* @api | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
* @since 100.0.2 | ||
*/ | ||
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection | ||
|
@@ -26,7 +24,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab | |
protected $_ratingCollectionF; | ||
|
||
/** | ||
* Add store data flag | ||
* @var bool | ||
*/ | ||
protected $_addStoreDataFlag = false; | ||
|
@@ -314,7 +311,9 @@ protected function _addStoreData() | |
if (is_array($data) && count($data) > 0) { | ||
foreach ($data as $row) { | ||
$item = $this->getItemById($row['rating_id']); | ||
$item->setStores(array_merge($item->getStores(), [$row['store_id']])); | ||
$stores = $item->getStores(); | ||
$stores[] = $row['store_id']; | ||
$item->setStores(array_unique($stores)); | ||
} | ||
} | ||
return $this; | ||
|
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 Like a good change maybe add it in the desciption of the pull request.