Merge pull request magento#7971 from magento-l3/PR_MULTI_NOV_2022

L3 bugfix delivery

Author: danmooney2

app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Notification/Dismiss.php

@@ -8,12 +8,13 @@
 use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
 use Magento\Backend\App\Action\Context;
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Class Bulk Notification Dismiss Controller
  */
-class Dismiss extends Action
+class Dismiss extends Action implements HttpGetActionInterface
 {
     /**
      * @var BulkNotificationManagement
@@ -43,7 +44,7 @@ protected function _isAllowed()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function execute()
     {
@@ -55,7 +56,7 @@ public function execute()
         $isAcknowledged = $this->notificationManagement->acknowledgeBulks($bulkUuids);
 
         /** @var \Magento\Framework\Controller\Result\Json $result */
-        $result = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $result = $this->resultFactory->create(ResultFactory::TYPE_RAW);
         if (!$isAcknowledged) {
             $result->setHttpResponseCode(400);
         }

app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Notification/DismissTest.php

@@ -11,6 +11,7 @@
 use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\Raw;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -43,6 +44,11 @@ class DismissTest extends TestCase
      */
     private $jsonResultMock;
 
+    /**
+     * @var MockObject
+     */
+    private $rawResultMock;
+
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
@@ -78,10 +84,10 @@ public function testExecute()
 
         $this->resultFactoryMock->expects($this->once())
             ->method('create')
-            ->with(ResultFactory::TYPE_JSON, [])
-            ->willReturn($this->jsonResultMock);
+            ->with(ResultFactory::TYPE_RAW, [])
+            ->willReturn($this->rawResultMock);
 
-        $this->assertEquals($this->jsonResultMock, $this->model->execute());
+        $this->assertEquals($this->rawResultMock, $this->model->execute());
     }
 
     public function testExecuteSetsBadRequestResponseStatusIfBulkWasNotAcknowledgedCorrectly()
@@ -95,7 +101,7 @@ public function testExecuteSetsBadRequestResponseStatusIfBulkWasNotAcknowledgedC
 
         $this->resultFactoryMock->expects($this->once())
             ->method('create')
-            ->with(ResultFactory::TYPE_JSON, [])
+            ->with(ResultFactory::TYPE_RAW, [])
             ->willReturn($this->jsonResultMock);
 
         $this->notificationManagementMock->expects($this->once())

app/code/Magento/Catalog/Test/Fixture/Product.php

@@ -10,7 +10,10 @@
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Option as CustomOption;
+use Magento\Catalog\Model\Product\Option\Value as CustomOptionValue;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Framework\DataObject;
@@ -198,21 +201,57 @@ private function prepareOptions(array $data): array
     {
         $options = [];
         $default = [
-            'product_sku' => $data['sku'],
-            'title' => 'customoption%order%%uniqid%',
-            'type' => ProductCustomOptionInterface::OPTION_TYPE_FIELD,
-            'is_require' => true,
-            'price' => 10.0,
-            'price_type' => 'fixed',
-            'sku' => 'customoption%order%%uniqid%',
-            'max_characters' => null,
+            CustomOption::KEY_PRODUCT_SKU => $data['sku'],
+            CustomOption::KEY_TITLE => 'customoption%order%%uniqid%',
+            CustomOption::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FIELD,
+            CustomOption::KEY_IS_REQUIRE => true,
+            CustomOption::KEY_PRICE => 10.0,
+            CustomOption::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
+            CustomOption::KEY_SKU => 'customoption%order%%uniqid%',
+            CustomOption::KEY_MAX_CHARACTERS => null,
+            CustomOption::KEY_SORT_ORDER => 1,
             'values' => null,
         ];
+        $defaultValue = [
+            CustomOptionValue::KEY_TITLE => 'customoption%order%_%valueorder%%uniqid%',
+            CustomOptionValue::KEY_PRICE => 1,
+            CustomOptionValue::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
+            CustomOptionValue::KEY_SKU => 'customoption%order%_%valueorder%%uniqid%',
+            CustomOptionValue::KEY_SORT_ORDER => 1,
+        ];
         $sortOrder = 1;
         foreach ($data['options'] as $item) {
-            $option = $item + ['sort_order' => $sortOrder++] + $default;
-            $option['title'] = strtr($option['title'], ['%order%' => $option['sort_order']]);
-            $option['sku'] = strtr($option['sku'], ['%order%' => $option['sort_order']]);
+            $option = $item + [CustomOption::KEY_SORT_ORDER => $sortOrder++] + $default;
+            $option[CustomOption::KEY_TITLE] = strtr(
+                $option[CustomOption::KEY_TITLE],
+                ['%order%' => $option[CustomOption::KEY_SORT_ORDER]]
+            );
+            $option[CustomOption::KEY_SKU] = strtr(
+                $option[CustomOption::KEY_SKU],
+                ['%order%' => $option[CustomOption::KEY_SORT_ORDER]]
+            );
+            if (isset($item['values'])) {
+                $valueSortOrder = 1;
+                $option['values'] = [];
+                foreach ($item['values'] as $value) {
+                    $value += [CustomOptionValue::KEY_SORT_ORDER => $valueSortOrder++] + $defaultValue;
+                    $value[CustomOptionValue::KEY_TITLE] = strtr(
+                        $value[CustomOptionValue::KEY_TITLE],
+                        [
+                            '%order%' => $option[CustomOption::KEY_SORT_ORDER],
+                            '%valueorder%' => $value[CustomOptionValue::KEY_SORT_ORDER]
+                        ]
+                    );
+                    $value[CustomOptionValue::KEY_SKU] = strtr(
+                        $value[CustomOptionValue::KEY_SKU],
+                        [
+                            '%order%' => $option[CustomOption::KEY_SORT_ORDER],
+                            '%valueorder%' => $value[CustomOptionValue::KEY_SORT_ORDER]
+                        ]
+                    );
+                    $option['values'][] = $value;
+                }
+            }
             $options[] = $option;
         }