🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - magento-engcom/magento2ce#1031: #8168: Configurable product on wishlist shows parent image instead variation image (by @RomaKis)
 - #12893: Improvement: Magento\Sales\Helper\Guest refactoring and bugfix (by @coderimus)
 - #14128: ISSUE-14109: Allow modification of cookies via extension (by @brideo)
 - #13653: Update Store getConfig() to respect valid false return value (by @JeroenVanLeusden)
 - #14091: Remove sjparkinson/static-review and other obsolete tools (by @orlangur)


Fixed GitHub Issues:
 - #8168: Configurable product on wishlist shows parent image instead variation image (reported by @anebi) has been fixed in magento-engcom/magento2ce#1031 by @RomaKis in 2.2-develop branch
   Related commits:
     1. 93a5c39

 - #14109: `MAX_NUM_COOKIES` doesn't follow the open-closed principle  (reported by @brideo) has been fixed in #14128 by @brideo in 2.2-develop branch
   Related commits:
     1. 9b34bf9

 - #14138: Outdated package after upgrade  sjparkinson/static-review is abandoned (reported by @woshka) has been fixed in #14091 by @orlangur in 2.2-develop branch
   Related commits:
     1. 9cd24a1

Author: magento-engcom-team

.php_cs.dist

@@ -4,10 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Pre-commit hook installation:
- * vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
- */
 $finder = PhpCsFixer\Finder::create()
     ->name('*.phtml')
     ->exclude('dev/tests/functional/generated')

app/code/Magento/Catalog/Block/Product/ImageBuilder.php

@@ -121,6 +121,14 @@ protected function getRatio(\Magento\Catalog\Helper\Image $helper)
      */
     public function create()
     {
+        /** @var \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface $simpleOption */
+        $simpleOption = $this->product->getCustomOption('simple_product');
+
+        if ($simpleOption !== null) {
+            $optionProduct = $simpleOption->getProduct();
+            $this->setProduct($optionProduct);
+        }
+
         /** @var \Magento\Catalog\Helper\Image $helper */
         $helper = $this->helperFactory->create()
             ->init($this->product, $this->imageId);

app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php

@@ -290,4 +290,64 @@ private function getTestDataWithAttributes(): array
             ],
         ];
     }
+
+    /**
+     * @param array $data
+     * @param array $expected
+     * @dataProvider createDataProvider
+     */
+    public function testCreateWithSimpleProduct($data, $expected)
+    {
+        $imageId = 'test_image_id';
+
+        $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+        $simpleOptionMock = $this->createMock(\Magento\Wishlist\Model\Item\Option::class);
+        $simpleProductMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+
+        $productMock->expects($this->once())->method('getCustomOption')
+            ->with('simple_product')->willReturn($simpleOptionMock);
+
+        $simpleOptionMock->expects($this->once())->method('getProduct')->willReturn($simpleProductMock);
+
+        $helperMock = $this->createMock(\Magento\Catalog\Helper\Image::class);
+        $helperMock->expects($this->once())
+            ->method('init')
+            ->with($simpleProductMock, $imageId)
+            ->willReturnSelf();
+        $helperMock->expects($this->once())
+            ->method('getFrame')
+            ->willReturn($data['frame']);
+        $helperMock->expects($this->once())
+            ->method('getUrl')
+            ->willReturn($data['url']);
+        $helperMock->expects($this->exactly(2))
+            ->method('getWidth')
+            ->willReturn($data['width']);
+        $helperMock->expects($this->exactly(2))
+            ->method('getHeight')
+            ->willReturn($data['height']);
+        $helperMock->expects($this->once())
+            ->method('getLabel')
+            ->willReturn($data['label']);
+        $helperMock->expects($this->once())
+            ->method('getResizedImageInfo')
+            ->willReturn($data['imagesize']);
+
+        $this->helperFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($helperMock);
+
+        $imageMock = $this->createMock(\Magento\Catalog\Block\Product\Image::class);
+
+        $this->imageFactory->expects($this->once())
+            ->method('create')
+            ->with($expected)
+            ->willReturn($imageMock);
+
+        $this->model->setProduct($productMock);
+        $this->model->setImageId($imageId);
+        $this->model->setAttributes($data['custom_attributes']);
+
+        $this->assertInstanceOf(\Magento\Catalog\Block\Product\Image::class, $this->model->create());
+    }
 }

app/code/Magento/Sales/Helper/Guest.php

@@ -83,7 +83,7 @@ class Guest extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
-    private $_storeManager;
+    private $storeManager;
 
     /**
      * @var string
@@ -119,7 +119,7 @@ public function __construct(
         \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteria = null
     ) {
         $this->coreRegistry = $coreRegistry;
-        $this->_storeManager = $storeManager;
+        $this->storeManager = $storeManager;
         $this->customerSession = $customerSession;
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
@@ -158,9 +158,10 @@ public function loadValidOrder(App\RequestInterface $request)
         // It is unique place in the class that process exception and only InputException. It is need because by
         // input data we found order and one more InputException could be throws deeper in stack trace
         try {
-            $order = (!empty($post) && isset($post['oar_order_id'], $post['oar_type']))
+            $order = (!empty($post)
+                && isset($post['oar_order_id'], $post['oar_type'])
+                && !$this->hasPostDataEmptyFields($post))
                 ? $this->loadFromPost($post) : $this->loadFromCookie($fromCookie);
-            $this->validateOrderStoreId($order->getStoreId());
             $this->coreRegistry->register('current_order', $order);
             return true;
         } catch (InputException $e) {
@@ -186,7 +187,7 @@ public function getBreadcrumbs(\Magento\Framework\View\Result\Page $resultPage)
             [
                 'label' => __('Home'),
                 'title' => __('Go to Home Page'),
-                'link' => $this->_storeManager->getStore()->getBaseUrl()
+                'link' => $this->storeManager->getStore()->getBaseUrl()
             ]
         );
         $breadcrumbs->addCrumb(
@@ -247,12 +248,9 @@ private function loadFromCookie($fromCookie)
      */
     private function loadFromPost(array $postData)
     {
-        if ($this->hasPostDataEmptyFields($postData)) {
-            throw new InputException();
-        }
         /** @var $order \Magento\Sales\Model\Order */
         $order = $this->getOrderRecord($postData['oar_order_id']);
-        if (!$this->compareSoredBillingDataWithInput($order, $postData)) {
+        if (!$this->compareStoredBillingDataWithInput($order, $postData)) {
             throw new InputException(__('You entered incorrect data. Please try again.'));
         }
         $toCookie = base64_encode($order->getProtectCode() . ':' . $postData['oar_order_id']);
@@ -267,7 +265,7 @@ private function loadFromPost(array $postData)
      * @param array $postData
      * @return bool
      */
-    private function compareSoredBillingDataWithInput(Order $order, array $postData)
+    private function compareStoredBillingDataWithInput(Order $order, array $postData)
     {
         $type = $postData['oar_type'];
         $email = $postData['oar_email'];
@@ -288,7 +286,7 @@ private function compareSoredBillingDataWithInput(Order $order, array $postData)
     private function hasPostDataEmptyFields(array $postData)
     {
         return empty($postData['oar_order_id']) || empty($postData['oar_billing_lastname']) ||
-            empty($postData['oar_type']) || empty($this->_storeManager->getStore()->getId()) ||
+            empty($postData['oar_type']) || empty($this->storeManager->getStore()->getId()) ||
             !in_array($postData['oar_type'], ['email', 'zip'], true) ||
             ('email' === $postData['oar_type'] && empty($postData['oar_email'])) ||
             ('zip' === $postData['oar_type'] && empty($postData['oar_zip']));
@@ -306,26 +304,15 @@ private function getOrderRecord($incrementId)
         $records = $this->orderRepository->getList(
             $this->searchCriteriaBuilder
                 ->addFilter('increment_id', $incrementId)
+                ->addFilter('store_id', $this->storeManager->getStore()->getId())
                 ->create()
         );
-        if ($records->getTotalCount() < 1) {
-            throw new InputException(__($this->inputExceptionMessage));
-        }
-        $items = $records->getItems();
-        return array_shift($items);
-    }
 
-    /**
-     * Check that store_id from order are equals with system
-     *
-     * @param int $orderStoreId
-     * @return void
-     * @throws InputException
-     */
-    private function validateOrderStoreId($orderStoreId)
-    {
-        if ($orderStoreId != $this->_storeManager->getStore()->getId()) {
+        $items = $records->getItems();
+        if (empty($items)) {
             throw new InputException(__($this->inputExceptionMessage));
         }
+
+        return array_shift($items);
     }
 }

app/code/Magento/Store/Model/Store.php

@@ -535,8 +535,8 @@ public function setName($name)
     public function getConfig($path)
     {
         $data = $this->_config->getValue($path, ScopeInterface::SCOPE_STORE, $this->getCode());
-        if (!$data) {
-            $data = $this->_config->getValue($path, ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+        if ($data === null) {
+            $data = $this->_config->getValue($path);
         }
         return $data === false ? null : $data;
     }

composer.json

@@ -70,7 +70,6 @@
         "ext-zip": "*",
         "ext-pdo_mysql": "*",
         "ext-soap": "*",
-        "sjparkinson/static-review": "~4.1",
         "ramsey/uuid": "~3.7.3"
     },
     "require-dev": {

composer.lock

@@ -1,6 +1,5 @@
 # Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
 * * /
-dev/tools/Magento
 dev/tests
 phpserver
 pub