Merge remote-tracking branch 'origin/imported-magento-magento2-32259' into 2.4-develop-pr131

Author: zakdma

app/code/Magento/Review/Block/Adminhtml/Edit/Form.php

@@ -187,15 +187,14 @@ protected function _prepareForm()
                 \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element::class
             );
             $field->setRenderer($renderer);
-            $review->setSelectStores($review->getStores());
         } else {
             $fieldset->addField(
                 'select_stores',
                 'hidden',
-                ['name' => 'stores[]', 'value' => $this->_storeManager->getStore(true)->getId()]
+                ['name' => 'stores[]', 'value' => $review->getStores()]
             );
-            $review->setSelectStores($this->_storeManager->getStore(true)->getId());
         }
+        $review->setSelectStores($review->getStores());
 
         $fieldset->addField(
             'nickname',

dev/tests/integration/testsuite/Magento/Review/Block/Adminhtml/Edit/FormTest.php

@@ -6,23 +6,26 @@
 
 namespace Magento\Review\Block\Adminhtml\Edit;
 
-class FormTest extends \PHPUnit\Framework\TestCase
+use Magento\Customer\Model\Customer;
+use Magento\Framework\Escaper;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class FormTest extends TestCase
 {
     /**
      * @magentoDataFixture Magento/Review/_files/customer_review.php
      */
     public function testCustomerOnForm()
     {
-        /** @var \Magento\Customer\Model\Customer $customer */
-        $customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Customer\Model\Customer::class)
+        /** @var Customer $customer */
+        $customer = Bootstrap::getObjectManager()->create(Customer::class)
             ->setWebsiteId(1)
             ->loadByEmail('[email protected]');
-        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Review\Block\Adminhtml\Edit\Form::class);
-        /** @var \Magento\Framework\Escaper $escaper */
-        $escaper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->get(\Magento\Framework\Escaper::class);
+        $block = Bootstrap::getObjectManager()->create(Form::class);
+        /** @var Escaper $escaper */
+        $escaper = Bootstrap::getObjectManager()->get(Escaper::class);
         $this->assertStringMatchesFormat(
             '%A' . __(
                 '<a href="%1" onclick="this.target=\'blank\'">%2 %3</a> <a href="mailto:%4">(%4)</a>',
@@ -34,4 +37,24 @@ public function testCustomerOnForm()
             $block->toHtml()
         );
     }
+
+    /**
+     * Verify review form hidden input will contain all review stores.
+     *
+     * @magentoDataFixture Magento/Review/_files/customer_review.php
+     * @return void
+     */
+    public function testStoresOnForm(): void
+    {
+        $registry = Bootstrap::getObjectManager()->get(Registry::class);
+        $review = $registry->registry('review_data');
+        $block = Bootstrap::getObjectManager()->create(Form::class);
+        foreach ($review->getStores() as $storeId) {
+            $regex = sprintf('/input id="select_stores" (.*) value="%d" type="hidden"/', $storeId);
+            $this->assertMatchesRegularExpression(
+                $regex,
+                $block->toHtml()
+            );
+        }
+    }
 }