Merge 2.4-develop into 2.4.0-develop

dvoskoboinikov · web-flow · commit 614846d50299 · 2020-05-28T14:15:11.000-05:00
diff --git a/app/code/Magento/ReviewSampleData/Model/Review.php b/app/code/Magento/ReviewSampleData/Model/Review.php
@@ -212,7 +212,7 @@ protected function prepareReview($row)
     protected function getRating($rating)
     {
         $ratingCollection = $this->ratingFactory->create()->getResourceCollection();
-        if (!$this->ratings[$rating]) {
+        if (empty($this->ratings[$rating])) {
             $this->ratings[$rating] = $ratingCollection->addFieldToFilter('rating_code', $rating)->getFirstItem();
         }
         return $this->ratings[$rating];

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ protected function prepareReview($row)`
`212`	`212`	`protected function getRating($rating)`
`213`	`213`	`{`
`214`	`214`	`$ratingCollection = $this->ratingFactory->create()->getResourceCollection();`
`215`		`- if (!$this->ratings[$rating]) {`
	`215`	`+ if (empty($this->ratings[$rating])) {`
`216`	`216`	`$this->ratings[$rating] = $ratingCollection->addFieldToFilter('rating_code', $rating)->getFirstItem();`
`217`	`217`	`}`
`218`	`218`	`return $this->ratings[$rating];`