From 9eb0598b3023a606e8cc1340c4b55c90165f02a9 Mon Sep 17 00:00:00 2001
From: Aapo Kiiso <aapo@lamia.fi>
Date: Mon, 28 Feb 2022 10:37:40 +0200
Subject: [PATCH 1/2] Remove short description reset from product review block

For unknown reasons, the product review block removes resets
the short description in product data. This seems to be a legacy
workaround all the way from Magento 1.
---
 app/code/Magento/Review/Block/Product/View.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Review/Block/Product/View.php b/app/code/Magento/Review/Block/Product/View.php
index c66e3e50b919b..a13a57728238a 100644
--- a/app/code/Magento/Review/Block/Product/View.php
+++ b/app/code/Magento/Review/Block/Product/View.php
@@ -88,8 +88,6 @@ protected function _toHtml()
             return '';
         }
 
-        $product->setShortDescription(null);
-
         return parent::_toHtml();
     }
 

From b1be1a2dc7945bb05da4020bc983ef3e56fe8dfb Mon Sep 17 00:00:00 2001
From: Aapo Kiiso <aapo@lamia.fi>
Date: Tue, 19 Apr 2022 20:44:10 +0300
Subject: [PATCH 2/2] Add strict typing to product review block

---
 app/code/Magento/Review/Block/Product/View.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Review/Block/Product/View.php b/app/code/Magento/Review/Block/Product/View.php
index a13a57728238a..9a721a83c0657 100644
--- a/app/code/Magento/Review/Block/Product/View.php
+++ b/app/code/Magento/Review/Block/Product/View.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Review\Block\Product;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -21,14 +24,14 @@ class View extends \Magento\Catalog\Block\Product\View
      *
      * @var ReviewCollection
      */
-    protected $_reviewsCollection;
+    protected ReviewCollection $_reviewsCollection;
 
     /**
      * Review resource model
      *
      * @var \Magento\Review\Model\ResourceModel\Review\CollectionFactory
      */
-    protected $_reviewsColFactory;
+    protected \Magento\Review\Model\ResourceModel\Review\CollectionFactory $_reviewsColFactory;
 
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
@@ -101,12 +104,13 @@ protected function _toHtml()
      * @param bool $displayIfNoReviews
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getReviewsSummaryHtml(
         \Magento\Catalog\Model\Product $product,
         $templateType = false,
         $displayIfNoReviews = false
-    ) {
+    ): string {
         return $this->getLayout()->createBlock(
             \Magento\Review\Block\Rating\Entity\Detailed::class
         )->setEntityId(
@@ -123,8 +127,9 @@ public function getReviewsSummaryHtml(
      * Get collection of reviews
      *
      * @return ReviewCollection
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function getReviewsCollection()
+    public function getReviewsCollection(): ReviewCollection
     {
         if (null === $this->_reviewsCollection) {
             $this->_reviewsCollection = $this->_reviewsColFactory->create()->addStoreFilter(
@@ -144,7 +149,7 @@ public function getReviewsCollection()
      *
      * @return bool
      */
-    public function hasOptions()
+    public function hasOptions(): bool
     {
         return false;
     }