AC-13672: Product reviews modification

Author: hemanthjadobe

app/code/Magento/Review/Controller/Product.php

@@ -1,11 +1,10 @@
 <?php
-
-declare(strict_types=1);
-
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
+declare(strict_types=1);
+
 namespace Magento\Review\Controller;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
@@ -245,16 +244,13 @@ protected function loadProduct($productId)
         if (!$productId) {
             return false;
         }
-
         try {
             $product = $this->productRepository->getById($productId);
 
-            if (!in_array($this->storeManager->getStore()->getWebsiteId(), $product->getWebsiteIds())) {
-                throw new NoSuchEntityException();
-            }
-
-            if (!$product->isVisibleInCatalog() || !$product->isVisibleInSiteVisibility()) {
-                throw new NoSuchEntityException();
+            if ((!in_array($this->storeManager->getStore()->getWebsiteId(), $product->getWebsiteIds()))
+                || (!$product->isVisibleInCatalog() || !$product->isVisibleInSiteVisibility())
+            ) {
+                    return false;
             }
         } catch (NoSuchEntityException $noEntityException) {
             return false;

app/code/Magento/Review/Controller/Product/Post.php

@@ -1,11 +1,10 @@
 <?php
-
-declare(strict_types=1);
-
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
+declare(strict_types=1);
+
 namespace Magento\Review\Controller\Product;
 
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
@@ -29,7 +28,7 @@ public function execute()
     {
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-        if (false === $this->reviewsConfig->isEnabled() || !$this->formKeyValidator->validate($this->getRequest())) {
+        if (!$this->formKeyValidator->validate($this->getRequest()) || false === $this->reviewsConfig->isEnabled()) {
             $resultRedirect->setUrl($this->_redirect->getRefererUrl());
             return $resultRedirect;
         }

app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -25,6 +25,7 @@
 use Magento\Review\Model\RatingFactory;
 use Magento\Review\Model\Review;
 use Magento\Review\Model\ReviewFactory;
+use Magento\Review\Model\Review\Config;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -121,6 +122,11 @@ class PostTest extends TestCase
      */
     protected $resultRedirectMock;
 
+    /**
+     * @var Config|MockObject
+     */
+    protected $reviewsConfig;
+
     /**
      * @inheritDoc
      *
@@ -135,6 +141,10 @@ protected function setUp(): void
             Validator::class,
             ['validate']
         );
+        $this->reviewsConfig = $this->createPartialMock(
+            Config::class,
+            ['isEnabled']
+        );
         $this->reviewSession = $this->getMockBuilder(Generic::class)
             ->addMethods(['getFormData', 'getRedirectUrl'])
             ->disableOriginalConstructor()
@@ -211,7 +221,8 @@ protected function setUp(): void
                 'customerSession' => $this->customerSession,
                 'ratingFactory' => $ratingFactory,
                 'storeManager' => $storeManager,
-                'context' => $this->context
+                'context' => $this->context,
+                'reviewsConfig' => $this->reviewsConfig
             ]
         );
     }
@@ -234,6 +245,8 @@ public function testExecute(): void
         $this->formKeyValidator->expects($this->any())->method('validate')
             ->with($this->request)
             ->willReturn(true);
+        $this->reviewsConfig->expects($this->any())->method('isEnabled')
+            ->willReturn(true);
         $this->reviewSession->expects($this->any())->method('getFormData')
             ->with(true)
             ->willReturn($reviewData);