From adb3af29f2fc435b193338a80d873689cac82a1d Mon Sep 17 00:00:00 2001
From: Arnoud Beekman <arnoud.beekman@mediact.nl>
Date: Sun, 26 Aug 2018 20:41:13 +0200
Subject: [PATCH 01/33] Optimize code to remove phpmd suppress warnings

By making the order of some checks more efficient the suppress warnings
in these two files about CyclomaticComplexity and NPathComplexity.
---
 .../Magento/Customer/Model/Metadata/Form/Text.php   | 11 +++++------
 app/code/Magento/Eav/Model/Attribute/Data/Text.php  | 13 ++++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Text.php b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
index c8b9a1e46a12..dcd3bc93569a 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Text.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
@@ -52,8 +52,6 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
 
     /**
      * @inheritdoc
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function validateValue($value)
     {
@@ -66,12 +64,12 @@ public function validateValue($value)
             $value = $this->_value;
         }
 
-        if ($attribute->isRequired() && empty($value) && $value !== '0') {
-            $errors[] = __('"%1" is a required value.', $label);
+        if (!$attribute->isRequired() && empty($value)) {
+            return true;
         }
 
-        if (!$errors && !$attribute->isRequired() && empty($value)) {
-            return true;
+        if (empty($value) && $value !== '0') {
+            $errors[] = __('"%1" is a required value.', $label);
         }
 
         $errors = $this->validateLength($value, $attribute, $errors);
@@ -80,6 +78,7 @@ public function validateValue($value)
         if ($result !== true) {
             $errors = array_merge($errors, $result);
         }
+
         if (count($errors) == 0) {
             return true;
         }
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
index f81fb2affd3b..a26a92df385f 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
@@ -55,8 +55,7 @@ public function extractValue(RequestInterface $request)
      *
      * @param array|string $value
      * @return bool|array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function validateValue($value)
     {
@@ -68,13 +67,13 @@ public function validateValue($value)
             $value = $this->getEntity()->getDataUsingMethod($attribute->getAttributeCode());
         }
 
-        if ($attribute->getIsRequired() && empty($value) && $value !== '0') {
-            $label = __($attribute->getStoreLabel());
-            $errors[] = __('"%1" is a required value.', $label);
+        if (!$attribute->isRequired() && empty($value)) {
+            return true;
         }
 
-        if (!$errors && !$attribute->getIsRequired() && empty($value)) {
-            return true;
+        if (empty($value) && $value !== '0') {
+            $label = __($attribute->getStoreLabel());
+            $errors[] = __('"%1" is a required value.', $label);
         }
 
         $result = $this->validateLength($attribute, $value);

From e210b7044a7bfd503082249a72a95a6c0ae03eb5 Mon Sep 17 00:00:00 2001
From: Joseph Maxwell <joseph@swiftotter.com>
Date: Wed, 6 Jun 2018 10:40:48 -0500
Subject: [PATCH 02/33] Bundle checkboxes now are checked when item edited from
 cart

---
 .../Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 5d326e7c01d1..ed6a4d1ad720 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -167,7 +167,9 @@ protected function _getSelectedOptions()
      */
     protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
     {
-        if ($selectionId && $option->getSelectionById($selectionId)) {
+        if (is_array($selectionId)) {
+            $this->_selectedOptions = $selectionId;
+        } else if ($selectionId && $option->getSelectionById($selectionId)) {
             $this->_selectedOptions = $selectionId;
         } elseif (!$option->getRequired()) {
             $this->_selectedOptions = 'None';

From 53f59424c0b049e2f275c50bbced1fc9b42a6916 Mon Sep 17 00:00:00 2001
From: Joseph Maxwell <joseph@swiftotter.com>
Date: Wed, 6 Jun 2018 10:44:38 -0500
Subject: [PATCH 03/33] #4942: bundled products now retain customer selections
 when editing from cart

---
 .../Block/Catalog/Product/View/Type/Bundle.php       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index 62a2fa1c47e1..cab923da4921 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -193,6 +193,18 @@ public function getJsonConfig()
                         $options[$optionId]['selections'][$configValue]['qty'] = $configQty;
                     }
                 }
+                
+                
+                $preConfiguredQtys = $preConfiguredValues->getData("bundle_option_qty/${optionId}") ?? [];
+                $selections = $options[$optionId]['selections'];
+                array_walk($selections, function(&$selection, $selectionId) use ($preConfiguredQtys) {
+                    if (is_array($preConfiguredQtys) && isset($preConfiguredQtys[$selectionId])) {
+                        $selection['qty'] = $preConfiguredQtys[$selectionId];
+                    } else if ((int)$preConfiguredQtys > 0) {
+                        $selection['qty'] = $preConfiguredQtys;
+                    }
+                });
+                $options[$optionId]['selections'] = $selections;
             }
             $position++;
         }

From 8050d5014037c9ae845be1fd1338b4f4ce7b8d19 Mon Sep 17 00:00:00 2001
From: David Manners <dmanners87@gmail.com>
Date: Tue, 18 Sep 2018 09:05:00 +0000
Subject: [PATCH 04/33] magento/magento2#4942: fix code styles in the
 app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php file

---
 .../Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index cab923da4921..1cd0c41abb52 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -194,10 +194,9 @@ public function getJsonConfig()
                     }
                 }
                 
-                
                 $preConfiguredQtys = $preConfiguredValues->getData("bundle_option_qty/${optionId}") ?? [];
                 $selections = $options[$optionId]['selections'];
-                array_walk($selections, function(&$selection, $selectionId) use ($preConfiguredQtys) {
+                array_walk($selections, function (&$selection, $selectionId) use ($preConfiguredQtys) {
                     if (is_array($preConfiguredQtys) && isset($preConfiguredQtys[$selectionId])) {
                         $selection['qty'] = $preConfiguredQtys[$selectionId];
                     } else if ((int)$preConfiguredQtys > 0) {

From 0bd75c823e506e8099cfa4dbb5877be5662bcebb Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 4 Oct 2018 16:16:01 +0300
Subject: [PATCH 05/33] =?UTF-8?q?NGCOM-2997:=20#4942=20and=20bundle=20chec?=
 =?UTF-8?q?kbox=20bug=20#15905.=20Fix=20functional=20and=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Catalog/Product/View/Type/Bundle.php      | 43 +++++++++++++------
 .../Test/StorefrontEditBundleProductTest.xml  |  5 +--
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index 1cd0c41abb52..fa488b073f51 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -7,6 +7,7 @@
 
 use Magento\Bundle\Model\Option;
 use Magento\Catalog\Model\Product;
+use Magento\Framework\DataObject;
 
 /**
  * Catalog bundle product info block
@@ -170,7 +171,7 @@ public function getJsonConfig()
 
         $defaultValues = [];
         $preConfiguredFlag = $currentProduct->hasPreconfiguredValues();
-        /** @var \Magento\Framework\DataObject|null $preConfiguredValues */
+        /** @var DataObject|null $preConfiguredValues */
         $preConfiguredValues = $preConfiguredFlag ? $currentProduct->getPreconfiguredValues() : null;
 
         $position = 0;
@@ -193,23 +194,13 @@ public function getJsonConfig()
                         $options[$optionId]['selections'][$configValue]['qty'] = $configQty;
                     }
                 }
-                
-                $preConfiguredQtys = $preConfiguredValues->getData("bundle_option_qty/${optionId}") ?? [];
-                $selections = $options[$optionId]['selections'];
-                array_walk($selections, function (&$selection, $selectionId) use ($preConfiguredQtys) {
-                    if (is_array($preConfiguredQtys) && isset($preConfiguredQtys[$selectionId])) {
-                        $selection['qty'] = $preConfiguredQtys[$selectionId];
-                    } else if ((int)$preConfiguredQtys > 0) {
-                        $selection['qty'] = $preConfiguredQtys;
-                    }
-                });
-                $options[$optionId]['selections'] = $selections;
+                $options = $this->processOptions($optionId, $options, $preConfiguredValues);
             }
             $position++;
         }
         $config = $this->getConfigData($currentProduct, $options);
 
-        $configObj = new \Magento\Framework\DataObject(
+        $configObj = new DataObject(
             [
                 'config' => $config,
             ]
@@ -414,4 +405,30 @@ private function getConfigData(Product $product, array $options)
         ];
         return $config;
     }
+
+    /**
+     * Set preconfigured quantities and selections to options.
+     *
+     * @param string $optionId
+     * @param array $options
+     * @param DataObject $preConfiguredValues
+     * @return array
+     */
+    private function processOptions(string $optionId, array $options, DataObject $preConfiguredValues)
+    {
+        $preConfiguredQtys = $preConfiguredValues->getData("bundle_option_qty/${optionId}") ?? [];
+        $selections = $options[$optionId]['selections'];
+        array_walk($selections, function (&$selection, $selectionId) use ($preConfiguredQtys) {
+            if (is_array($preConfiguredQtys) && isset($preConfiguredQtys[$selectionId])) {
+                $selection['qty'] = $preConfiguredQtys[$selectionId];
+            } else {
+                if ((int)$preConfiguredQtys > 0) {
+                    $selection['qty'] = $preConfiguredQtys;
+                }
+            }
+        });
+        $options[$optionId]['selections'] = $selections;
+
+        return $options;
+    }
 }
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
index f94cd83f4e7d..4945308c26c4 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
@@ -94,9 +94,8 @@
         <click stepKey="clickEdit" selector="{{CheckoutCartProductSection.nthEditButton('1')}}"/>
         <waitForPageLoad stepKey="waitForStorefront2"/>
 
-        <!-- Choose both of the options on the storefront -->
-        <click stepKey="selectFirstBundleOption2" selector="{{StorefrontBundledSection.nthBundledOption('1','1')}}"/>
-        <click stepKey="selectSecondBundleOption2" selector="{{StorefrontBundledSection.nthBundledOption('1','2')}}"/>
+        <!-- Check second one option to choose both of the options on the storefront -->
+        <click selector="{{StorefrontBundledSection.bundleOption('1','2')}}" stepKey="selectSecondBundleOption2"/>
 
         <waitForPageLoad stepKey="waitForPriceUpdate3"/>
         <see stepKey="seeDoublePrice" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="2,460.00"/>

From 4e382cc735a883c9dcd8eaeeedc185d7faa06a7f Mon Sep 17 00:00:00 2001
From: hiren pandya <infinitehdp@gmail.com>
Date: Sat, 13 Oct 2018 11:52:27 +0530
Subject: [PATCH 06/33] Special price date from issue resolve

---
 .../Controller/Adminhtml/Product/Initialization/Helper.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index d82f4a04fb25..e14916f731ed 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -463,6 +463,7 @@ private function fillProductOptions(Product $product, array $productOptions)
     private function convertSpecialFromDateStringToObject($productData)
     {
         if (isset($productData['special_from_date']) && $productData['special_from_date'] != '') {
+            $productData['special_from_date'] =  $this->dateFilter->filter($productData['special_from_date']);
             $productData['special_from_date'] = new \DateTime($productData['special_from_date']);
         }
 

From fd8a5a90b32431fbdd275000624723b106c81841 Mon Sep 17 00:00:00 2001
From: hiren pandya <hiren.pandya@krishtechnolabs.com>
Date: Sat, 13 Oct 2018 13:00:58 +0530
Subject: [PATCH 07/33] Revert "Special price date from issue resolve"

This reverts commit 4e382cc735a883c9dcd8eaeeedc185d7faa06a7f.
---
 .../Controller/Adminhtml/Product/Initialization/Helper.php       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index e14916f731ed..d82f4a04fb25 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -463,7 +463,6 @@ private function fillProductOptions(Product $product, array $productOptions)
     private function convertSpecialFromDateStringToObject($productData)
     {
         if (isset($productData['special_from_date']) && $productData['special_from_date'] != '') {
-            $productData['special_from_date'] =  $this->dateFilter->filter($productData['special_from_date']);
             $productData['special_from_date'] = new \DateTime($productData['special_from_date']);
         }
 

From 88592facd5d34872ac2f2051dda246703091cacc Mon Sep 17 00:00:00 2001
From: hiren pandya <hiren.pandya@krishtechnolabs.com>
Date: Sat, 13 Oct 2018 13:03:07 +0530
Subject: [PATCH 08/33] Special price date from issue resolve

---
 .../Controller/Adminhtml/Product/Initialization/Helper.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index d82f4a04fb25..8999b03b647a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -463,6 +463,7 @@ private function fillProductOptions(Product $product, array $productOptions)
     private function convertSpecialFromDateStringToObject($productData)
     {
         if (isset($productData['special_from_date']) && $productData['special_from_date'] != '') {
+            $productData['special_from_date'] = $this->dateFilter->filter($productData['special_from_date']);
             $productData['special_from_date'] = new \DateTime($productData['special_from_date']);
         }
 

From f5b496c2a033b48e8669db81b421f16240c359d0 Mon Sep 17 00:00:00 2001
From: Arnoud Beekman <arnoud.beekman@mediact.nl>
Date: Sat, 13 Oct 2018 15:05:44 +0200
Subject: [PATCH 09/33] Use the correct method to validate if attribute is
 required

---
 app/code/Magento/Eav/Model/Attribute/Data/Text.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
index a26a92df385f..a919a54cf628 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
@@ -67,7 +67,7 @@ public function validateValue($value)
             $value = $this->getEntity()->getDataUsingMethod($attribute->getAttributeCode());
         }
 
-        if (!$attribute->isRequired() && empty($value)) {
+        if (!$attribute->getIsRequired() && empty($value)) {
             return true;
         }
 

From 78accc5569841afc37788f45847f11b52c0526c7 Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh@Maheshs-MacBook-Air.local>
Date: Mon, 22 Oct 2018 23:36:21 +0530
Subject: [PATCH 10/33] issue #18655 fixed

---
 app/code/Magento/Integration/etc/adminhtml/system.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Integration/etc/adminhtml/system.xml b/app/code/Magento/Integration/etc/adminhtml/system.xml
index 5abec8efbfdd..fe80fe105493 100644
--- a/app/code/Magento/Integration/etc/adminhtml/system.xml
+++ b/app/code/Magento/Integration/etc/adminhtml/system.xml
@@ -54,7 +54,7 @@
                     <label>Maximum Login Failures to Lock Out Account</label>
                     <comment>Maximum Number of authentication failures to lock out account.</comment>
                 </field>
-                <field id="timeout" translate="label" type="text comment" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="timeout" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Lockout Time (seconds)</label>
                     <comment>Period of time in seconds after which account will be unlocked.</comment>
                 </field>

From 29ccdae0897db8ef212b67a8ecf92e985c8d2e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Ca=C3=A7ador?=
 <20863811+samuel27m@users.noreply.github.com>
Date: Tue, 23 Oct 2018 23:19:31 +0100
Subject: [PATCH 11/33] Remove unnecesary "header" block redeclaration

Remove unnecesary header block redeclaration on Magento Luma Theme, which made impossible to set the header template through custom modules.

Example:

- Create new module.
- Create new default.xml and try to use referenceBlock to set the template.
- Doesn't work, because Luma theme XML files are compiled after all modules and overrides the custom module modifications.

Removed because this block was already created in module Magento_Theme, so this redeclaration is just unnecesary
---
 .../Magento/luma/Magento_Customer/layout/default.xml         | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml b/app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml
index 1f8c162ef923..4b08bf28ece9 100644
--- a/app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml
+++ b/app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml
@@ -15,11 +15,6 @@
                 </arguments>
             </block>
         </referenceBlock>
-        <block class="Magento\Theme\Block\Html\Header" name="header" as="header">
-            <arguments>
-                <argument name="show_part" xsi:type="string">welcome</argument>
-            </arguments>
-        </block>
         <move element="header" destination="header.links" before="-"/>
         <move element="register-link" destination="header.links"/>
         <move element="top.links" destination="customer"/>

From 6a6079dcde8068dbac8173699ae4450079ed3201 Mon Sep 17 00:00:00 2001
From: Vladyslav Podorozhnyi <v.podorozhnyi@ism-ukraine.com>
Date: Thu, 25 Oct 2018 15:18:26 +0300
Subject: [PATCH 12/33] magento/magento2#18387: catalog:images:resize fails to
 process all images -> Possible underlying
 Magento/Framework/DB/Query/Generator issue - fix getCountAllProductImages
 select and cover class with unit tests.

---
 .../Model/ResourceModel/Product/Image.php     |   8 +-
 .../Model/ResourceModel/Product/ImageTest.php | 171 ++++++++++++++++++
 2 files changed, 178 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
index 123f358be40c..5a290d5141e8 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
@@ -77,7 +77,13 @@ public function getAllProductImages(): \Generator
      */
     public function getCountAllProductImages(): int
     {
-        $select = $this->getVisibleImagesSelect()->reset('columns')->columns('count(*)');
+        $select = $this->getVisibleImagesSelect()
+            ->reset('columns')
+            ->reset('distinct')
+            ->columns(
+                new \Zend_Db_Expr('count(distinct value)')
+            );
+
         return (int) $this->connection->fetchOne($select);
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
new file mode 100644
index 000000000000..16e245ba640c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Image;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Query\Generator;
+use Magento\Framework\DB\Select;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Catalog\Model\ResourceModel\Product\Gallery;
+
+class ImageTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var AdapterInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionMock;
+
+    /**
+     * @var Generator | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $generatorMock;
+
+    /**
+     * @var ResourceConnection | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resourceMock;
+
+    /**
+     * @var Image
+     */
+    protected $imageModel;
+
+    /**
+     * @var int
+     */
+    protected $imagesCount = 50;
+
+    /**
+     * @var int
+     */
+    protected $batchSize = 10;
+
+    protected function setUp(): void
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->connectionMock = $this->createMock(AdapterInterface::class);
+
+        $this->resourceMock = $this->createMock(ResourceConnection::class);
+        $this->resourceMock->method('getConnection')->willReturn($this->connectionMock);
+        $this->resourceMock->method('getTableName')->willReturnArgument(0);
+
+        $this->generatorMock = $this->createMock(Generator::class);
+
+        $this->imageModel = $objectManager->getObject(
+            Image::class,
+            [
+                'generator' => $this->generatorMock,
+                'resourceConnection' => $this->resourceMock,
+                'batchSize' => $this->batchSize
+            ]
+        );
+    }
+
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getVisibleImagesSelectMock(): \PHPUnit_Framework_MockObject_MockObject
+    {
+        $selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $selectMock->expects($this->once())
+            ->method('distinct')
+            ->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('from')
+            ->with(
+                ['images' => Gallery::GALLERY_TABLE],
+                'value as filepath'
+            )->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('where')
+            ->with('disabled = 0')
+            ->willReturnSelf();
+
+        return $selectMock;
+    }
+
+    public function testGetCountAllProductImages(): void
+    {
+        $selectMock = $this->getVisibleImagesSelectMock();
+        $selectMock->expects($this->exactly(2))
+            ->method('reset')
+            ->withConsecutive(
+                ['columns'],
+                ['distinct']
+            )->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('columns')
+            ->with(new \Zend_Db_Expr('count(distinct value)'))
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($selectMock);
+        $this->connectionMock->expects($this->once())
+            ->method('fetchOne')
+            ->with($selectMock)
+            ->willReturn($this->imagesCount);
+
+        $this->assertSame($this->imagesCount, $this->imageModel->getCountAllProductImages());
+    }
+
+    public function testGetAllProductImages(): void
+    {
+        $getBatchIteratorMock = function ($selectMock, $imagesCount, $batchSize): array {
+            $result = [];
+            $count = $imagesCount / $batchSize;
+            while ($count) {
+                $count--;
+                $result[$count] = $selectMock;
+            }
+
+            return $result;
+        };
+
+        $getAllProductImagesSelectFetchResults = function ($batchSize): array {
+            $result = [];
+            $count = $batchSize;
+            while ($count) {
+                $count--;
+                $result[$count] = $count;
+            }
+
+            return $result;
+        };
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->getVisibleImagesSelectMock());
+
+        $fetchResult = $getAllProductImagesSelectFetchResults($this->batchSize);
+        $this->connectionMock->expects($this->exactly($this->imagesCount / $this->batchSize))
+            ->method('fetchAll')
+            ->willReturn($fetchResult);
+
+        /** @var Select | \PHPUnit_Framework_MockObject_MockObject $selectMock */
+        $selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $batchIteratorMock = $getBatchIteratorMock($selectMock, $this->imagesCount, $this->batchSize);
+        $this->generatorMock->expects($this->once())
+            ->method('generate')
+            ->with(
+                'value_id',
+                $selectMock,
+                $this->batchSize,
+                \Magento\Framework\DB\Query\BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
+            )->willReturn($batchIteratorMock);
+
+        $this->assertCount($this->imagesCount, $this->imageModel->getAllProductImages());
+    }
+}

From 466daaa332e85eee15d3391d0ceead11855e90dd Mon Sep 17 00:00:00 2001
From: Vladyslav Podorozhnyi <v.podorozhnyi@ism-ukraine.com>
Date: Thu, 25 Oct 2018 18:15:55 +0300
Subject: [PATCH 13/33] magento/magento2#18387: catalog:images:resize fails to
 process all images -> Possible underlying
 Magento/Framework/DB/Query/Generator issue - fix code style;

---
 .../Test/Unit/Model/ResourceModel/Product/ImageTest.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
index 16e245ba640c..9c783e237ab2 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
@@ -131,7 +131,7 @@ public function testGetAllProductImages(): void
             return $result;
         };
 
-        $getAllProductImagesSelectFetchResults = function ($batchSize): array {
+        $getFetchResults = function ($batchSize): array {
             $result = [];
             $count = $batchSize;
             while ($count) {
@@ -146,7 +146,7 @@ public function testGetAllProductImages(): void
             ->method('select')
             ->willReturn($this->getVisibleImagesSelectMock());
 
-        $fetchResult = $getAllProductImagesSelectFetchResults($this->batchSize);
+        $fetchResult = $getFetchResults($this->batchSize);
         $this->connectionMock->expects($this->exactly($this->imagesCount / $this->batchSize))
             ->method('fetchAll')
             ->willReturn($fetchResult);

From a3dfdd34cbe4209285c8bc785c5255406353e684 Mon Sep 17 00:00:00 2001
From: Wiard van Rij <vanrij@redkiwi.nl>
Date: Fri, 26 Oct 2018 23:38:53 +0200
Subject: [PATCH 14/33] Updates php.ini sample

---
 php.ini.sample | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/php.ini.sample b/php.ini.sample
index 8a7d13cf42b4..17c8cb52abb7 100644
--- a/php.ini.sample
+++ b/php.ini.sample
@@ -1,32 +1,13 @@
 ; Copyright © Magento, Inc. All rights reserved.
 ; See COPYING.txt for license details.
-; This file is for CGI/FastCGI installations.
-; Try copying it to php5.ini, if it doesn't work
 
 ; adjust memory limit
+; Our detailed recommendations are:
 
-memory_limit = 64M
+;  Compiling code or deploying static assets, 756M
+;  Installing and updating Magento components from Magento Marketplace, 2G
+;  Testing, ~3-4G
 
-max_execution_time = 18000
+memory_limit = 2G
 
-; disable automatic session start
-; before autoload was initialized
-
-flag session.auto_start = off
-
-; enable resulting html compression
-
-zlib.output_compression = on
-
-; disable user agent verification to not break multiple image upload
-
-suhosin.session.cryptua = off
-
-; PHP for some reason ignores this setting in system php.ini
-; and disables mcrypt if this line is missing in local php.ini
-
-extension=mcrypt.so
-
-; Disable PHP errors, notices and warnings output in production mode to prevent exposing sensitive information.
-
-display_errors = Off
+; For further details refer to the technology stack requirements of your Magento installation
\ No newline at end of file

From e1a1c7b280bfbb6c8cbcaf205d0d7f7dbb882878 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <mankivsk@adobe.com>
Date: Fri, 26 Oct 2018 16:50:31 -0500
Subject: [PATCH 15/33] ENGCOM-3292 catalog:images:resize total images count
 calculates incorrectly #18387: #18807

---
 .../Magento/Catalog/Model/ResourceModel/Product/Image.php   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
index 5a290d5141e8..068580927b96 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
@@ -12,6 +12,9 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\App\ResourceConnection;
 
+/*
+ * Class for retrieval of all product images
+ */
 class Image
 {
     /**
@@ -73,6 +76,7 @@ public function getAllProductImages(): \Generator
 
     /**
      * Get the number of unique pictures of products
+     *
      * @return int
      */
     public function getCountAllProductImages(): int
@@ -88,6 +92,8 @@ public function getCountAllProductImages(): int
     }
 
     /**
+     * Return Select to fetch all products images
+     *
      * @return Select
      */
     private function getVisibleImagesSelect(): Select

From f6b0a2abfa0c95ce406a707a3ede42dbad5cfc22 Mon Sep 17 00:00:00 2001
From: Vladyslav Podorozhnyi <v.podorozhnyi@ism-ukraine.com>
Date: Sat, 27 Oct 2018 17:58:00 +0300
Subject: [PATCH 16/33] magento/magento2#18387: catalog:images:resize fails to
 process all images -> Possible underlying
 Magento/Framework/DB/Query/Generator issue - fix unit test - now it can test
 also not only full batches, but partial as well (139 images with batch size
 100);

---
 .../Model/ResourceModel/Product/ImageTest.php | 170 +++++++++++-------
 1 file changed, 109 insertions(+), 61 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
index 9c783e237ab2..1866138cf16b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
@@ -16,6 +16,11 @@
 
 class ImageTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    protected $objectManager;
+
     /**
      * @var AdapterInterface | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -31,41 +36,14 @@ class ImageTest extends \PHPUnit\Framework\TestCase
      */
     protected $resourceMock;
 
-    /**
-     * @var Image
-     */
-    protected $imageModel;
-
-    /**
-     * @var int
-     */
-    protected $imagesCount = 50;
-
-    /**
-     * @var int
-     */
-    protected $batchSize = 10;
-
     protected function setUp(): void
     {
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->connectionMock = $this->createMock(AdapterInterface::class);
-
         $this->resourceMock = $this->createMock(ResourceConnection::class);
         $this->resourceMock->method('getConnection')->willReturn($this->connectionMock);
         $this->resourceMock->method('getTableName')->willReturnArgument(0);
-
         $this->generatorMock = $this->createMock(Generator::class);
-
-        $this->imageModel = $objectManager->getObject(
-            Image::class,
-            [
-                'generator' => $this->generatorMock,
-                'resourceConnection' => $this->resourceMock,
-                'batchSize' => $this->batchSize
-            ]
-        );
     }
 
     /**
@@ -93,7 +71,11 @@ protected function getVisibleImagesSelectMock(): \PHPUnit_Framework_MockObject_M
         return $selectMock;
     }
 
-    public function testGetCountAllProductImages(): void
+    /**
+     * @param int $imagesCount
+     * @dataProvider dataProvider
+     */
+    public function testGetCountAllProductImages(int $imagesCount): void
     {
         $selectMock = $this->getVisibleImagesSelectMock();
         $selectMock->expects($this->exactly(2))
@@ -113,59 +95,125 @@ public function testGetCountAllProductImages(): void
         $this->connectionMock->expects($this->once())
             ->method('fetchOne')
             ->with($selectMock)
-            ->willReturn($this->imagesCount);
+            ->willReturn($imagesCount);
+
+        $imageModel = $this->objectManager->getObject(
+            Image::class,
+            [
+                'generator' => $this->generatorMock,
+                'resourceConnection' => $this->resourceMock
+            ]
+        );
 
-        $this->assertSame($this->imagesCount, $this->imageModel->getCountAllProductImages());
+        $this->assertSame($imagesCount, $imageModel->getCountAllProductImages());
     }
 
-    public function testGetAllProductImages(): void
+    /**
+     * @param int $imagesCount
+     * @param int $batchSize
+     * @dataProvider dataProvider
+     */
+    public function testGetAllProductImages(int $imagesCount, int $batchSize): void
     {
-        $getBatchIteratorMock = function ($selectMock, $imagesCount, $batchSize): array {
-            $result = [];
-            $count = $imagesCount / $batchSize;
-            while ($count) {
-                $count--;
-                $result[$count] = $selectMock;
-            }
-
-            return $result;
-        };
-
-        $getFetchResults = function ($batchSize): array {
-            $result = [];
-            $count = $batchSize;
-            while ($count) {
-                $count--;
-                $result[$count] = $count;
-            }
-
-            return $result;
-        };
-
         $this->connectionMock->expects($this->once())
             ->method('select')
             ->willReturn($this->getVisibleImagesSelectMock());
 
-        $fetchResult = $getFetchResults($this->batchSize);
-        $this->connectionMock->expects($this->exactly($this->imagesCount / $this->batchSize))
+        $batchCount = (int)ceil($imagesCount / $batchSize);
+        $fetchResultsCallback = $this->getFetchResultCallbackForBatches($imagesCount, $batchSize);
+        $this->connectionMock->expects($this->exactly($batchCount))
             ->method('fetchAll')
-            ->willReturn($fetchResult);
+            ->will($this->returnCallback($fetchResultsCallback));
 
         /** @var Select | \PHPUnit_Framework_MockObject_MockObject $selectMock */
         $selectMock = $this->getMockBuilder(Select::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $batchIteratorMock = $getBatchIteratorMock($selectMock, $this->imagesCount, $this->batchSize);
         $this->generatorMock->expects($this->once())
             ->method('generate')
             ->with(
                 'value_id',
                 $selectMock,
-                $this->batchSize,
+                $batchSize,
                 \Magento\Framework\DB\Query\BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
-            )->willReturn($batchIteratorMock);
+            )->will($this->returnCallback($this->getBatchIteratorCallback($selectMock, $batchCount)));
 
-        $this->assertCount($this->imagesCount, $this->imageModel->getAllProductImages());
+        $imageModel = $this->objectManager->getObject(
+            Image::class,
+            [
+                'generator' => $this->generatorMock,
+                'resourceConnection' => $this->resourceMock,
+                'batchSize' => $batchSize
+            ]
+        );
+
+        $this->assertCount($imagesCount, $imageModel->getAllProductImages());
+    }
+
+    /**
+     * @param int $imagesCount
+     * @param int $batchSize
+     * @return \Closure
+     */
+    protected function getFetchResultCallbackForBatches(int $imagesCount, int $batchSize): \Closure
+    {
+        $fetchResultsCallback = function () use (&$imagesCount, $batchSize) {
+            $batchSize = ($imagesCount >= $batchSize) ? $batchSize : $imagesCount;
+            $imagesCount -= $batchSize;
+
+            $getFetchResults = function ($batchSize): array {
+                $result = [];
+                $count = $batchSize;
+                while ($count) {
+                    $count--;
+                    $result[$count] = $count;
+                }
+
+                return $result;
+            };
+
+            return $getFetchResults($batchSize);
+        };
+
+        return $fetchResultsCallback;
+    }
+
+    /**
+     * @param Select | \PHPUnit_Framework_MockObject_MockObject $selectMock
+     * @param int $batchCount
+     * @return \Closure
+     */
+    protected function getBatchIteratorCallback(
+        \PHPUnit_Framework_MockObject_MockObject $selectMock,
+        int $batchCount
+    ): \Closure
+    {
+        $getBatchIteratorCallback = function () use ($batchCount, $selectMock): array {
+            $result = [];
+            $count = $batchCount;
+            while ($count) {
+                $count--;
+                $result[$count] = $selectMock;
+            }
+
+            return $result;
+        };
+
+        return $getBatchIteratorCallback;
+    }
+
+    /**
+     * Data Provider
+     * @return array
+     */
+    public function dataProvider(): array
+    {
+        return [
+            [300, 100],
+            [139, 100],
+            [67, 10],
+            [154, 47]
+        ];
     }
 }

From 546e7ce1c64fa8f0290eabd26070eac4837cb39e Mon Sep 17 00:00:00 2001
From: Vladyslav Podorozhnyi <v.podorozhnyi@ism-ukraine.com>
Date: Sat, 27 Oct 2018 17:59:22 +0300
Subject: [PATCH 17/33] magento/magento2#18387: catalog:images:resize fails to
 process all images -> Possible underlying
 Magento/Framework/DB/Query/Generator issue - fix unit test - now it can test
 also not only full batches, but partial as well (139 images with batch size
 100);

---
 .../Test/Unit/Model/ResourceModel/Product/ImageTest.php       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
index 1866138cf16b..1a1eebf30f7f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
@@ -210,10 +210,12 @@ protected function getBatchIteratorCallback(
     public function dataProvider(): array
     {
         return [
+            [300, 300],
             [300, 100],
             [139, 100],
             [67, 10],
-            [154, 47]
+            [154, 47],
+            [0, 100]
         ];
     }
 }

From 84a48b431c6bd250466fff9c28a4053987e23f9c Mon Sep 17 00:00:00 2001
From: Wiard van Rij <wiard@outlook.com>
Date: Sat, 27 Oct 2018 17:22:28 +0200
Subject: [PATCH 18/33] Removes php.ini.sample as its obsolete

---
 php.ini.sample | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 php.ini.sample

diff --git a/php.ini.sample b/php.ini.sample
deleted file mode 100644
index 17c8cb52abb7..000000000000
--- a/php.ini.sample
+++ /dev/null
@@ -1,13 +0,0 @@
-; Copyright © Magento, Inc. All rights reserved.
-; See COPYING.txt for license details.
-
-; adjust memory limit
-; Our detailed recommendations are:
-
-;  Compiling code or deploying static assets, 756M
-;  Installing and updating Magento components from Magento Marketplace, 2G
-;  Testing, ~3-4G
-
-memory_limit = 2G
-
-; For further details refer to the technology stack requirements of your Magento installation
\ No newline at end of file

From d2f691dc08f48e1620a096648c94344f8ef189b3 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Sat, 27 Oct 2018 23:06:25 +0300
Subject: [PATCH 19/33] Fix spelling

---
 CHANGELOG.md                                              | 8 ++++----
 .../Controller/Adminhtml/Bulk/Details.php                 | 2 +-
 app/code/Magento/Backend/App/Request/BackendValidator.php | 2 +-
 .../Backend/Block/Widget/Grid/Column/Filter/Theme.php     | 2 +-
 app/code/Magento/Backend/Block/Widget/Tabs.php            | 2 +-
 .../Backend/Console/Command/AbstractCacheCommand.php      | 2 +-
 .../Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php   | 2 +-
 app/code/Magento/Backend/etc/adminhtml/system.xml         | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc722b6d61b3..b86c7b79a0cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -157,7 +157,7 @@ To get detailed information about changes in Magento 2.1.0, please visit [Magent
     * Updated styles 
 * Sample Data:
     * Improved sample data installation UX
-    * Updated sample data with Product Heros, color swatches, MAP and rule based product relations
+    * Updated sample data with Product Heroes, color swatches, MAP and rule based product relations
     * Improved sample data upgrade flow
     * Added the ability to log errors and set the error flag during sample data installation
 * Various improvements:
@@ -2284,7 +2284,7 @@ Tests:
   * Fixed an issue where no results were found for Coupons reports
   * Fixed an issue with incremental Qty setting
   * Fixed an issue with allowing importing of negative weight values
-  * Fixed an issue with Inventory - Only X left Treshold being not dependent on Qty for Item's Status to Become Out of Stock
+  * Fixed an issue with Inventory - Only X left Threshold being not dependent on Qty for Item's Status to Become Out of Stock
   * Fixed an issue where the "Catalog Search Index index was rebuilt." message was displayed when reindexing the Catalog Search index
  * Search module:
   * Integrated the Search library to the advanced search functionality
@@ -2706,7 +2706,7 @@ Tests:
    * Ability to support extensible service data objects
    * No Code Duplication in Root Templates
  * Fixed bugs:
-   * Persistance session application. Loggin out the customer
+   * Persistence session application. Logging out the customer
    * Placing the order with two terms and conditions
    * Saving of custom option by service catalogProductCustomOptionsWriteServiceV1
    * Placing the order on frontend if enter in the street address line 1 and 2 255 symbols
@@ -2965,7 +2965,7 @@ Tests:
   * Fixed an issue with incorrect items label for the cases when there are more than one item in the category
   * Fixed an issue when configurable product was out of stock in Google Shopping while being in stock in the Magento backend
   * Fixed an issue when swipe gesture in menu widget was not supported on mobile
-  * Fixed an issue when it was impossible to enter alpha-numeric zip code on the stage of  estimating shipping and tax rates
+  * Fixed an issue when it was impossible to enter alphanumeric zip code on the stage of  estimating shipping and tax rates
   * Fixed an issue when custom price was not applied when editing an order
   * Fixed an issue when items were not returned to stock after unsuccessful order was placed
   * Fixed an issue when error message appeared "Cannot save the credit memo” while creating credit memo
diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
index 9e9dbd3dd67c..5571c20f526c 100644
--- a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
+++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
@@ -6,7 +6,7 @@
 namespace Magento\AsynchronousOperations\Controller\Adminhtml\Bulk;
 
 /**
- * Class View Opertion Details Controller
+ * Class View Operation Details Controller
  */
 class Details extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Backend/App/Request/BackendValidator.php b/app/code/Magento/Backend/App/Request/BackendValidator.php
index 878f9cb4dc4c..eed4fbb643d3 100644
--- a/app/code/Magento/Backend/App/Request/BackendValidator.php
+++ b/app/code/Magento/Backend/App/Request/BackendValidator.php
@@ -166,7 +166,7 @@ public function validate(
         ActionInterface $action
     ): void {
         if ($action instanceof AbstractAction) {
-            //Abstract Action has build-in validation.
+            //Abstract Action has built-in validation.
             if (!$action->_processUrlKeys()) {
                 throw new InvalidRequestException($action->getResponse());
             }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
index d49ad2941146..5db5dc59b4e5 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
@@ -54,7 +54,7 @@ public function getHtml()
     }
 
     /**
-     * Retrieve options setted in column.
+     * Retrieve options set in column.
      * Or load if options was not set.
      *
      * @return array
diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index 333904e398cf..b390e2fa7d15 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -468,7 +468,7 @@ public function getTabContent($tab)
     }
 
     /**
-     * Mark tabs as dependant of each other
+     * Mark tabs as dependent of each other
      * Arbitrary number of tabs can be specified, but at least two
      *
      * @param string $tabOneId
diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
index 70b01046f6af..ecea5716f653 100644
--- a/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
+++ b/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
@@ -17,7 +17,7 @@
 abstract class AbstractCacheCommand extends Command
 {
     /**
-     * Input option bootsrap
+     * Input option bootstrap
      */
     const INPUT_KEY_BOOTSTRAP = 'bootstrap';
 
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php b/app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php
index 260a38a481b3..2b5f644e3597 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php
@@ -168,6 +168,6 @@ public function testGetMenuGenericExceptionIsNotLogged()
         } catch (\Exception $e) {
             return;
         }
-        $this->fail("Generic \Exception was not throwed");
+        $this->fail("Generic \Exception was not thrown");
     }
 }
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index e061455acbe6..cc12e138826e 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -129,7 +129,7 @@
                         <field id="*/*/template_hints_storefront">1</field>
                         <field id="*/*/template_hints_storefront_show_with_parameter">1</field>
                     </depends>
-                    <comment>Add the following paramater to the URL to show template hints ?templatehints=[parameter_value]</comment>
+                    <comment>Add the following parameter to the URL to show template hints ?templatehints=[parameter_value]</comment>
                 </field>
                 <field id="template_hints_admin" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Enabled Template Path Hints for Admin</label>

From 0be96a84e22ae552f3aff29b5fab3df94a60c384 Mon Sep 17 00:00:00 2001
From: Denis Papec <denis.papec@gmail.com>
Date: Sun, 28 Oct 2018 20:50:05 +0000
Subject: [PATCH 20/33] Removed parameter from
 \Magento\ImportExport\Model\Source\Import\Behavior\Custom constructor

---
 .../Test/Unit/Model/Source/Import/Behavior/CustomTest.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php
index d073f3866bfe..73b4f10b3b0f 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php
@@ -32,7 +32,7 @@ class CustomTest extends \Magento\ImportExport\Test\Unit\Model\Source\Import\Abs
     protected function setUp()
     {
         parent::setUp();
-        $this->_model = new \Magento\ImportExport\Model\Source\Import\Behavior\Custom([]);
+        $this->_model = new \Magento\ImportExport\Model\Source\Import\Behavior\Custom();
     }
 
     /**

From 48446c63090fd2d20c24ba2dede135001e600515 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 29 Oct 2018 09:24:32 +0200
Subject: [PATCH 21/33] ENGCOM-3161: [Forwardport] #4942 and bundle checkbox
 bug #18520. Fix functional tests.

---
 .../Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
index 4945308c26c4..58806126aee3 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
@@ -95,7 +95,7 @@
         <waitForPageLoad stepKey="waitForStorefront2"/>
 
         <!-- Check second one option to choose both of the options on the storefront -->
-        <click selector="{{StorefrontBundledSection.bundleOption('1','2')}}" stepKey="selectSecondBundleOption2"/>
+        <click selector="{{StorefrontBundledSection.nthBundledOption('1','2')}}" stepKey="selectSecondBundleOption2"/>
 
         <waitForPageLoad stepKey="waitForPriceUpdate3"/>
         <see stepKey="seeDoublePrice" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="2,460.00"/>

From 7ca0246619db085938bc31e949c35124479e5c5e Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 29 Oct 2018 13:53:26 +0200
Subject: [PATCH 22/33] ENGCOM-3184: Fixed functional test.

---
 .../Controller/Adminhtml/Product/Initialization/Helper.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index 8999b03b647a..988d61986e3d 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -463,7 +463,7 @@ private function fillProductOptions(Product $product, array $productOptions)
     private function convertSpecialFromDateStringToObject($productData)
     {
         if (isset($productData['special_from_date']) && $productData['special_from_date'] != '') {
-            $productData['special_from_date'] = $this->dateFilter->filter($productData['special_from_date']);
+            $productData['special_from_date'] = $this->getDateTimeFilter()->filter($productData['special_from_date']);
             $productData['special_from_date'] = new \DateTime($productData['special_from_date']);
         }
 

From f38a4fc3e78208a8d63e545bffe81c444a1e09a8 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <mankivsk@adobe.com>
Date: Mon, 29 Oct 2018 12:58:56 -0500
Subject: [PATCH 23/33] ENGCOM-3292: catalog:images:resize total images count
 calculates incorrectly #18387: #18807

---
 app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
index 068580927b96..77f67480619e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
@@ -12,7 +12,7 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\App\ResourceConnection;
 
-/*
+/**
  * Class for retrieval of all product images
  */
 class Image

From 12f839644f71915e165a2804f505a727cd477cfc Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <mankivsk@adobe.com>
Date: Mon, 29 Oct 2018 12:59:37 -0500
Subject: [PATCH 24/33] ENGCOM-3292: catalog:images:resize total images count
 calculates incorrectly #18387: #18807

---
 .../Test/Unit/Model/ResourceModel/Product/ImageTest.php        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
index 1a1eebf30f7f..cf24998590ae 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
@@ -187,8 +187,7 @@ protected function getFetchResultCallbackForBatches(int $imagesCount, int $batch
     protected function getBatchIteratorCallback(
         \PHPUnit_Framework_MockObject_MockObject $selectMock,
         int $batchCount
-    ): \Closure
-    {
+    ): \Closure {
         $getBatchIteratorCallback = function () use ($batchCount, $selectMock): array {
             $result = [];
             $count = $batchCount;

From 0fe329b6c429e8fd4e84dc8653b66be40cb8296b Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 30 Oct 2018 09:45:23 +0200
Subject: [PATCH 25/33] ENGCOM-3161: [Forwardport] #4942 and bundle checkbox
 bug #18520. Fix static tests.

---
 .../Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index ed6a4d1ad720..7c63af0bd0e2 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -230,6 +230,8 @@ public function getProduct()
     }
 
     /**
+     * Get bundle option price title.
+     *
      * @param \Magento\Catalog\Model\Product $selection
      * @param bool $includeContainer
      * @return string

From b7513494fd58447c4418b4f3d29ea40944548ddb Mon Sep 17 00:00:00 2001
From: Kajal Solanki <kajal10395@gmail.com>
Date: Mon, 29 Oct 2018 14:21:45 +0530
Subject: [PATCH 26/33] fixed-Global-search icon misaligned-#18913

---
 .../web/css/source/module/header/actions-group/_search.less     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less
index 5e65faec60d4..ddc3cb455402 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less
@@ -153,7 +153,7 @@
     background-color: transparent;
     border: 1px solid transparent;
     font-size: @search-global-input__font-size;
-    height: @search-global-input__height;
+    height: @search-global-input__height + .2;
     padding: @search-global-input__padding-top @search-global-input__padding-side @search-global-input__padding-bottom;
     position: absolute;
     right: 0;

From fbca4dd480841013d112118e5417a8ed4c7e8a69 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 30 Oct 2018 11:03:02 +0100
Subject: [PATCH 27/33] Fixed annotations

- Magento\Catalog\Model\ResourceModel\Product\Collection::addAttributeToFilter()
- Magento\Quote\Model\QuoteAddress::setCollectShippingRates()
---
 .../Catalog/Model/ResourceModel/Product/Collection.php        | 2 +-
 app/code/Magento/Quote/Model/Quote/Address.php                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 5afac59b25db..14ae38667d87 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -1534,7 +1534,7 @@ public function addPriceData($customerGroupId = null, $websiteId = null)
     /**
      * Add attribute to filter
      *
-     * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|string $attribute
+     * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|string|array $attribute
      * @param array $condition
      * @param string $joinType
      * @return $this
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 3eb5d6888503..f34cfbbf5fd2 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -28,8 +28,8 @@
  * @method Address setAddressType(string $value)
  * @method int getFreeShipping()
  * @method Address setFreeShipping(int $value)
- * @method int getCollectShippingRates()
- * @method Address setCollectShippingRates(int $value)
+ * @method bool getCollectShippingRates()
+ * @method Address setCollectShippingRates(bool $value)
  * @method Address setShippingMethod(string $value)
  * @method string getShippingDescription()
  * @method Address setShippingDescription(string $value)

From 2f5fc9742ed261a0e3440db0ce87963f502644e5 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 30 Oct 2018 14:11:05 +0100
Subject: [PATCH 28/33] Fixed annotations

- Magento\Customer\Model\Address\AbstractAddress::getCountry()
- Magento\Customer\Model\Address\AbstractAddress::getCountryId()
---
 app/code/Magento/Customer/Model/Address/AbstractAddress.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index 6408276630c3..3ee284a705b1 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -23,7 +23,7 @@
  * @method string getFirstname()
  * @method string getMiddlename()
  * @method string getLastname()
- * @method int getCountryId()
+ * @method string getCountryId()
  * @method string getCity()
  * @method string getTelephone()
  * @method string getCompany()
@@ -425,7 +425,7 @@ public function getRegionId()
     }
 
     /**
-     * @return int
+     * @return string
      */
     public function getCountry()
     {

From c95ce3ca53529c1a1e38f2ec5b187c64f45029e6 Mon Sep 17 00:00:00 2001
From: Vladyslav Podorozhnyi <v.podorozhnyi@ism-ukraine.com>
Date: Mon, 11 Dec 2017 14:11:02 +0200
Subject: [PATCH 29/33] magento/magento2#18387: catalog:images:resize fails to
 process all images -> Possible underlying
 Magento/Framework/DB/Query/Generator issue - fix code style;

---
 .../Model/ResourceModel/Product/ImageTest.php | 62 ++++++++++++-------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
index 1a1eebf30f7f..4fce12dc2de8 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
@@ -13,6 +13,8 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Catalog\Model\ResourceModel\Product\Gallery;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Framework\DB\Query\BatchIteratorInterface;
 
 class ImageTest extends \PHPUnit\Framework\TestCase
 {
@@ -22,34 +24,37 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     protected $objectManager;
 
     /**
-     * @var AdapterInterface | \PHPUnit_Framework_MockObject_MockObject
+     * @var AdapterInterface | MockObject
      */
     protected $connectionMock;
 
     /**
-     * @var Generator | \PHPUnit_Framework_MockObject_MockObject
+     * @var Generator | MockObject
      */
     protected $generatorMock;
 
     /**
-     * @var ResourceConnection | \PHPUnit_Framework_MockObject_MockObject
+     * @var ResourceConnection | MockObject
      */
     protected $resourceMock;
 
     protected function setUp(): void
     {
-        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->objectManager =
+            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->connectionMock = $this->createMock(AdapterInterface::class);
         $this->resourceMock = $this->createMock(ResourceConnection::class);
-        $this->resourceMock->method('getConnection')->willReturn($this->connectionMock);
-        $this->resourceMock->method('getTableName')->willReturnArgument(0);
+        $this->resourceMock->method('getConnection')
+            ->willReturn($this->connectionMock);
+        $this->resourceMock->method('getTableName')
+            ->willReturnArgument(0);
         $this->generatorMock = $this->createMock(Generator::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
-    protected function getVisibleImagesSelectMock(): \PHPUnit_Framework_MockObject_MockObject
+    protected function getVisibleImagesSelectMock(): MockObject
     {
         $selectMock = $this->getMockBuilder(Select::class)
             ->disableOriginalConstructor()
@@ -105,7 +110,10 @@ public function testGetCountAllProductImages(int $imagesCount): void
             ]
         );
 
-        $this->assertSame($imagesCount, $imageModel->getCountAllProductImages());
+        $this->assertSame(
+            $imagesCount,
+            $imageModel->getCountAllProductImages()
+        );
     }
 
     /**
@@ -113,8 +121,10 @@ public function testGetCountAllProductImages(int $imagesCount): void
      * @param int $batchSize
      * @dataProvider dataProvider
      */
-    public function testGetAllProductImages(int $imagesCount, int $batchSize): void
-    {
+    public function testGetAllProductImages(
+        int $imagesCount,
+        int $batchSize
+    ): void {
         $this->connectionMock->expects($this->once())
             ->method('select')
             ->willReturn($this->getVisibleImagesSelectMock());
@@ -125,7 +135,7 @@ public function testGetAllProductImages(int $imagesCount, int $batchSize): void
             ->method('fetchAll')
             ->will($this->returnCallback($fetchResultsCallback));
 
-        /** @var Select | \PHPUnit_Framework_MockObject_MockObject $selectMock */
+        /** @var Select | MockObject $selectMock */
         $selectMock = $this->getMockBuilder(Select::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -136,8 +146,12 @@ public function testGetAllProductImages(int $imagesCount, int $batchSize): void
                 'value_id',
                 $selectMock,
                 $batchSize,
-                \Magento\Framework\DB\Query\BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
-            )->will($this->returnCallback($this->getBatchIteratorCallback($selectMock, $batchCount)));
+                BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
+            )->will(
+                $this->returnCallback(
+                    $this->getBatchIteratorCallback($selectMock, $batchCount)
+                )
+            );
 
         $imageModel = $this->objectManager->getObject(
             Image::class,
@@ -156,10 +170,13 @@ public function testGetAllProductImages(int $imagesCount, int $batchSize): void
      * @param int $batchSize
      * @return \Closure
      */
-    protected function getFetchResultCallbackForBatches(int $imagesCount, int $batchSize): \Closure
-    {
+    protected function getFetchResultCallbackForBatches(
+        int $imagesCount,
+        int $batchSize
+    ): \Closure {
         $fetchResultsCallback = function () use (&$imagesCount, $batchSize) {
-            $batchSize = ($imagesCount >= $batchSize) ? $batchSize : $imagesCount;
+            $batchSize =
+                ($imagesCount >= $batchSize) ? $batchSize : $imagesCount;
             $imagesCount -= $batchSize;
 
             $getFetchResults = function ($batchSize): array {
@@ -180,16 +197,15 @@ protected function getFetchResultCallbackForBatches(int $imagesCount, int $batch
     }
 
     /**
-     * @param Select | \PHPUnit_Framework_MockObject_MockObject $selectMock
+     * @param Select | MockObject $selectMock
      * @param int $batchCount
      * @return \Closure
      */
     protected function getBatchIteratorCallback(
-        \PHPUnit_Framework_MockObject_MockObject $selectMock,
+        MockObject $selectMock,
         int $batchCount
-    ): \Closure
-    {
-        $getBatchIteratorCallback = function () use ($batchCount, $selectMock): array {
+    ): \Closure {
+        $iteratorCallback = function () use ($batchCount, $selectMock): array {
             $result = [];
             $count = $batchCount;
             while ($count) {
@@ -200,7 +216,7 @@ protected function getBatchIteratorCallback(
             return $result;
         };
 
-        return $getBatchIteratorCallback;
+        return $iteratorCallback;
     }
 
     /**

From 3bfe826e29ea0d1a16416aa8c6bc164c562fb643 Mon Sep 17 00:00:00 2001
From: Peter Samoilov <samoilov@aheadworks.com>
Date: Wed, 31 Oct 2018 13:56:29 +0300
Subject: [PATCH 30/33] Added default value(y) for confirmation question

---
 setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
index 64b934061b6c..69c369f1ec9f 100644
--- a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
@@ -84,7 +84,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if (($currentValue !== null) && ($inputOptions[$option->getName()] !== null)) {
                 $dialog = $this->getHelperSet()->get('question');
                 $question = new Question(
-                    '<question>Overwrite the existing configuration for ' . $option->getName() . '?[Y/n]</question>'
+                    '<question>Overwrite the existing configuration for ' . $option->getName() . '?[Y/n]</question>',
+                    'y'
                 );
                 if (strtolower($dialog->ask($input, $output, $question)) !== 'y') {
                     $inputOptions[$option->getName()] = null;

From 9c53b7ca5cf096a21bb33c0ec496e74bba7a7fd0 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Thu, 1 Nov 2018 17:22:32 +0200
Subject: [PATCH 31/33] magento-engcom/magento2ce#2299: Code style fixes

---
 .../Controller/Adminhtml/Bulk/Details.php     |  2 +-
 .../Backend/App/Request/BackendValidator.php  |  4 +
 .../Block/Widget/Grid/Column/Filter/Theme.php |  4 +
 .../Magento/Backend/Block/Widget/Tabs.php     | 32 ++++++-
 .../Console/Command/AbstractCacheCommand.php  |  4 +-
 .../Product/Initialization/Helper.php         |  7 ++
 .../Product/Initialization/HelperTest.php     | 16 ++++
 .../Model/Address/AbstractAddress.php         | 20 ++++-
 .../Customer/Model/Metadata/Form/Text.php     |  3 +
 .../Magento/Eav/Model/Attribute/Data/Text.php |  1 +
 .../Magento/Quote/Model/Quote/Address.php     | 83 ++++++++++---------
 .../Console/Command/ConfigSetCommand.php      |  7 +-
 12 files changed, 135 insertions(+), 48 deletions(-)

diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
index 5571c20f526c..a450187dd094 100644
--- a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
+++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
@@ -8,7 +8,7 @@
 /**
  * Class View Operation Details Controller
  */
-class Details extends \Magento\Backend\App\Action
+class Details extends \Magento\Backend\App\Action implements \Magento\Framework\App\Action\HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Backend/App/Request/BackendValidator.php b/app/code/Magento/Backend/App/Request/BackendValidator.php
index eed4fbb643d3..4d04d2fed8eb 100644
--- a/app/code/Magento/Backend/App/Request/BackendValidator.php
+++ b/app/code/Magento/Backend/App/Request/BackendValidator.php
@@ -77,6 +77,8 @@ public function __construct(
     }
 
     /**
+     * Validate request
+     *
      * @param RequestInterface $request
      * @param ActionInterface $action
      *
@@ -115,6 +117,8 @@ private function validateRequest(
     }
 
     /**
+     * Create exception
+     *
      * @param RequestInterface $request
      * @param ActionInterface $action
      *
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
index 5db5dc59b4e5..a0907726ccc4 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
@@ -9,6 +9,9 @@
  */
 namespace Magento\Backend\Block\Widget\Grid\Column\Filter;
 
+/**
+ * Theme grid filter
+ */
 class Theme extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
     /**
@@ -55,6 +58,7 @@ public function getHtml()
 
     /**
      * Retrieve options set in column.
+     *
      * Or load if options was not set.
      *
      * @return array
diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index b390e2fa7d15..c7c1f93e8ca7 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -8,6 +8,8 @@
 use Magento\Backend\Block\Widget\Tab\TabInterface;
 
 /**
+ * Tabs widget
+ *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @since 100.0.2
@@ -178,6 +180,8 @@ protected function _addTabByName($tab, $tabId)
     }
 
     /**
+     * Get active tab id
+     *
      * @return string
      */
     public function getActiveTabId()
@@ -187,6 +191,7 @@ public function getActiveTabId()
 
     /**
      * Set Active Tab
+     *
      * Tab has to be not hidden and can show
      *
      * @param string $tabId
@@ -231,7 +236,7 @@ protected function _setActiveTab($tabId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _beforeToHtml()
     {
@@ -282,6 +287,8 @@ private function reorderTabs()
     }
 
     /**
+     * Apply tabs order
+     *
      * @param array $orderByPosition
      * @param array $orderByIdentity
      *
@@ -294,7 +301,7 @@ private function applyTabsCorrectOrder(array $orderByPosition, array $orderByIde
         /**
          * Rearrange the positions by using the after tag for each tab.
          *
-         * @var integer      $position
+         * @var int $position
          * @var TabInterface $tab
          */
         foreach ($orderByPosition as $position => $tab) {
@@ -338,6 +345,8 @@ private function finalTabsSortOrder(array $orderByPosition)
     }
     
     /**
+     * Get js object name
+     *
      * @return string
      */
     public function getJsObjectName()
@@ -346,6 +355,8 @@ public function getJsObjectName()
     }
 
     /**
+     * Get tabs ids
+     *
      * @return string[]
      */
     public function getTabsIds()
@@ -358,6 +369,8 @@ public function getTabsIds()
     }
 
     /**
+     * Get tab id
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @param bool $withPrefix
      * @return string
@@ -371,6 +384,8 @@ public function getTabId($tab, $withPrefix = true)
     }
 
     /**
+     * CVan show tab
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return bool
      */
@@ -383,6 +398,8 @@ public function canShowTab($tab)
     }
 
     /**
+     * Get tab is hidden
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
@@ -396,6 +413,8 @@ public function getTabIsHidden($tab)
     }
 
     /**
+     * Get tab url
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
      */
@@ -414,6 +433,8 @@ public function getTabUrl($tab)
     }
 
     /**
+     * Get tab title
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
      */
@@ -426,6 +447,8 @@ public function getTabTitle($tab)
     }
 
     /**
+     * Get tab class
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
      */
@@ -441,6 +464,8 @@ public function getTabClass($tab)
     }
 
     /**
+     * Get tab label
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
      */
@@ -453,6 +478,8 @@ public function getTabLabel($tab)
     }
 
     /**
+     * Get tab content
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
      */
@@ -469,6 +496,7 @@ public function getTabContent($tab)
 
     /**
      * Mark tabs as dependent of each other
+     *
      * Arbitrary number of tabs can be specified, but at least two
      *
      * @param string $tabOneId
diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
index ecea5716f653..11da740c4660 100644
--- a/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
+++ b/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
@@ -11,6 +11,8 @@
 use Symfony\Component\Console\Input\InputOption;
 
 /**
+ * Abstract cache command
+ *
  * @api
  * @since 100.0.2
  */
@@ -40,7 +42,7 @@ public function __construct(Manager $cacheManager)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index 988d61986e3d..f11d16755ef0 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -19,6 +19,8 @@
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
 
 /**
+ * Product helper
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
@@ -365,6 +367,8 @@ private function overwriteValue($optionId, $option, $overwriteOptions)
     }
 
     /**
+     * Get link resolver instance
+     *
      * @return LinkResolver
      * @deprecated 101.0.0
      */
@@ -377,6 +381,8 @@ private function getLinkResolver()
     }
 
     /**
+     * Get DateTimeFilter instance
+     *
      * @return \Magento\Framework\Stdlib\DateTime\Filter\DateTime
      * @deprecated 101.0.0
      */
@@ -391,6 +397,7 @@ private function getDateTimeFilter()
 
     /**
      * Remove ids of non selected websites from $websiteIds array and return filtered data
+     *
      * $websiteIds parameter expects array with website ids as keys and 1 (selected) or 0 (non selected) as values
      * Only one id (default website ID) will be set to $websiteIds array when the single store mode is turned on
      *
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
index ff44a91a6499..c889c58e3df3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
@@ -95,6 +95,11 @@ class HelperTest extends \PHPUnit\Framework\TestCase
      */
     protected $attributeFilterMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTimeFilterMock;
+
     /**
      * @inheritdoc
      */
@@ -170,6 +175,11 @@ protected function setUp()
         $resolverProperty = $helperReflection->getProperty('linkResolver');
         $resolverProperty->setAccessible(true);
         $resolverProperty->setValue($this->helper, $this->linkResolverMock);
+
+        $this->dateTimeFilterMock = $this->createMock(\Magento\Framework\Stdlib\DateTime\Filter\DateTime::class);
+        $dateTimeFilterProperty = $helperReflection->getProperty('dateTimeFilter');
+        $dateTimeFilterProperty->setAccessible(true);
+        $dateTimeFilterProperty->setValue($this->helper, $this->dateTimeFilterMock);
     }
 
     /**
@@ -211,6 +221,12 @@ public function testInitialize(
         if (!empty($tierPrice)) {
             $productData = array_merge($productData, ['tier_price' => $tierPrice]);
         }
+
+        $this->dateTimeFilterMock->expects($this->once())
+            ->method('filter')
+            ->with($specialFromDate)
+            ->willReturn($specialFromDate);
+
         $attributeNonDate = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index 3ee284a705b1..8848fabb9ea1 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -271,7 +271,7 @@ public function setStreet($street)
      * Enforce format of the street field or other multiline custom attributes
      *
      * @param array|string $key
-     * @param null $value
+     * @param mixed $value
      * @return \Magento\Framework\DataObject
      */
     public function setData($key, $value = null)
@@ -286,6 +286,7 @@ public function setData($key, $value = null)
 
     /**
      * Check that address can have multiline attribute by this code (as street or some custom attribute)
+     *
      * @param string $code
      * @return bool
      */
@@ -403,6 +404,8 @@ public function getRegionCode()
     }
 
     /**
+     * Get region id
+     *
      * @return int
      */
     public function getRegionId()
@@ -425,6 +428,8 @@ public function getRegionId()
     }
 
     /**
+     * Get country
+     *
      * @return string
      */
     public function getCountry()
@@ -502,6 +507,8 @@ public function getConfig()
     }
 
     /**
+     * Before save handler
+     *
      * @return $this
      */
     public function beforeSave()
@@ -591,6 +598,8 @@ public function validate()
     }
 
     /**
+     * Create region instance
+     *
      * @return \Magento\Directory\Model\Region
      */
     protected function _createRegionInstance()
@@ -599,6 +608,8 @@ protected function _createRegionInstance()
     }
 
     /**
+     * Create country instance
+     *
      * @return \Magento\Directory\Model\Country
      */
     protected function _createCountryInstance()
@@ -608,6 +619,7 @@ protected function _createCountryInstance()
 
     /**
      * Unset Region from address
+     *
      * @return $this
      * @since 100.2.0
      */
@@ -617,6 +629,8 @@ public function unsRegion()
     }
 
     /**
+     * Is company required
+     *
      * @return bool
      * @since 100.2.0
      */
@@ -626,6 +640,8 @@ protected function isCompanyRequired()
     }
 
     /**
+     * Is telephone required
+     *
      * @return bool
      * @since 100.2.0
      */
@@ -635,6 +651,8 @@ protected function isTelephoneRequired()
     }
 
     /**
+     * Is fax required
+     *
      * @return bool
      * @since 100.2.0
      */
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Text.php b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
index dcd3bc93569a..c639b607e279 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Text.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
@@ -11,6 +11,9 @@
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Framework\Api\ArrayObjectSearch;
 
+/**
+ * Form Text metadata
+ */
 class Text extends AbstractData
 {
     /**
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
index a919a54cf628..0a49e012690f 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
@@ -51,6 +51,7 @@ public function extractValue(RequestInterface $request)
 
     /**
      * Validate data
+     *
      * Return true or array of errors
      *
      * @param array|string $value
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index f34cfbbf5fd2..e311eb924dee 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -965,6 +965,7 @@ public function collectShippingRates()
 
     /**
      * Request shipping rates for entire address or specified address item
+     *
      * Returns true if current selected shipping method code corresponds to one of the found rates
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
@@ -1348,7 +1349,7 @@ public function getAllBaseTotalAmounts()
     /******************************* End Total Collector Interface *******************************************/
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -1356,7 +1357,7 @@ protected function _getValidationRulesBeforeSave()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCountryId()
     {
@@ -1364,7 +1365,7 @@ public function getCountryId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCountryId($countryId)
     {
@@ -1372,7 +1373,7 @@ public function setCountryId($countryId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getStreet()
     {
@@ -1381,7 +1382,7 @@ public function getStreet()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStreet($street)
     {
@@ -1389,7 +1390,7 @@ public function setStreet($street)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCompany()
     {
@@ -1397,7 +1398,7 @@ public function getCompany()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCompany($company)
     {
@@ -1405,7 +1406,7 @@ public function setCompany($company)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTelephone()
     {
@@ -1413,7 +1414,7 @@ public function getTelephone()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTelephone($telephone)
     {
@@ -1421,7 +1422,7 @@ public function setTelephone($telephone)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFax()
     {
@@ -1429,7 +1430,7 @@ public function getFax()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFax($fax)
     {
@@ -1437,7 +1438,7 @@ public function setFax($fax)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPostcode()
     {
@@ -1445,7 +1446,7 @@ public function getPostcode()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPostcode($postcode)
     {
@@ -1453,7 +1454,7 @@ public function setPostcode($postcode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCity()
     {
@@ -1461,7 +1462,7 @@ public function getCity()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCity($city)
     {
@@ -1469,7 +1470,7 @@ public function setCity($city)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFirstname()
     {
@@ -1477,7 +1478,7 @@ public function getFirstname()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFirstname($firstname)
     {
@@ -1485,7 +1486,7 @@ public function setFirstname($firstname)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLastname()
     {
@@ -1493,7 +1494,7 @@ public function getLastname()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setLastname($lastname)
     {
@@ -1501,7 +1502,7 @@ public function setLastname($lastname)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMiddlename()
     {
@@ -1509,7 +1510,7 @@ public function getMiddlename()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setMiddlename($middlename)
     {
@@ -1517,7 +1518,7 @@ public function setMiddlename($middlename)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPrefix()
     {
@@ -1525,7 +1526,7 @@ public function getPrefix()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPrefix($prefix)
     {
@@ -1533,7 +1534,7 @@ public function setPrefix($prefix)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSuffix()
     {
@@ -1541,7 +1542,7 @@ public function getSuffix()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSuffix($suffix)
     {
@@ -1549,7 +1550,7 @@ public function setSuffix($suffix)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getVatId()
     {
@@ -1557,7 +1558,7 @@ public function getVatId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatId($vatId)
     {
@@ -1565,7 +1566,7 @@ public function setVatId($vatId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerId()
     {
@@ -1573,7 +1574,7 @@ public function getCustomerId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerId($customerId)
     {
@@ -1581,7 +1582,7 @@ public function setCustomerId($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getEmail()
     {
@@ -1594,7 +1595,7 @@ public function getEmail()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEmail($email)
     {
@@ -1602,7 +1603,7 @@ public function setEmail($email)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegion($region)
     {
@@ -1610,7 +1611,7 @@ public function setRegion($region)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegionId($regionId)
     {
@@ -1618,7 +1619,7 @@ public function setRegionId($regionId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegionCode($regionCode)
     {
@@ -1626,7 +1627,7 @@ public function setRegionCode($regionCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSameAsBilling()
     {
@@ -1634,7 +1635,7 @@ public function getSameAsBilling()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSameAsBilling($sameAsBilling)
     {
@@ -1642,7 +1643,7 @@ public function setSameAsBilling($sameAsBilling)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerAddressId()
     {
@@ -1650,7 +1651,7 @@ public function getCustomerAddressId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerAddressId($customerAddressId)
     {
@@ -1681,7 +1682,7 @@ public function setSaveInAddressBook($saveInAddressBook)
     //@codeCoverageIgnoreEnd
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Quote\Api\Data\AddressExtensionInterface|null
      */
@@ -1691,7 +1692,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Quote\Api\Data\AddressExtensionInterface $extensionAttributes
      * @return $this
@@ -1712,7 +1713,7 @@ public function getShippingMethod()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getCustomAttributesCodes()
     {
diff --git a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
index 69c369f1ec9f..e8ff8f09c345 100644
--- a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
@@ -14,6 +14,9 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 
+/**
+ * Config Set Command
+ */
 class ConfigSetCommand extends AbstractSetupCommand
 {
     /**
@@ -68,7 +71,7 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -132,7 +135,7 @@ function ($value) {
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {

From 23ad12aee17c8d5f7c4a48ae76a85b458664b1fa Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Thu, 1 Nov 2018 19:24:16 +0100
Subject: [PATCH 32/33] Fixed annotations for setData()

setData() should return objects class - that inherits from
---
 app/code/Magento/Catalog/Model/AbstractModel.php            | 2 +-
 app/code/Magento/Customer/Model/Address/AbstractAddress.php | 2 +-
 app/code/Magento/Sales/Model/Order/Address.php              | 2 +-
 app/code/Magento/Widget/Block/BlockInterface.php            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
index 007635b12433..5faf6ccbcdef 100644
--- a/app/code/Magento/Catalog/Model/AbstractModel.php
+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
@@ -179,7 +179,7 @@ public function isLockedAttribute($attributeCode)
      *
      * @param string|array $key
      * @param mixed $value
-     * @return \Magento\Framework\DataObject
+     * @return $this
      */
     public function setData($key, $value = null)
     {
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index 3ee284a705b1..19f91953a074 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -272,7 +272,7 @@ public function setStreet($street)
      *
      * @param array|string $key
      * @param null $value
-     * @return \Magento\Framework\DataObject
+     * @return $this
      */
     public function setData($key, $value = null)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Address.php b/app/code/Magento/Sales/Model/Order/Address.php
index 77d8330a7255..8bc602c75db4 100644
--- a/app/code/Magento/Sales/Model/Order/Address.php
+++ b/app/code/Magento/Sales/Model/Order/Address.php
@@ -174,7 +174,7 @@ protected function implodeStreetValue($value)
      *
      * @param array|string $key
      * @param null $value
-     * @return \Magento\Framework\DataObject
+     * @return $this
      */
     public function setData($key, $value = null)
     {
diff --git a/app/code/Magento/Widget/Block/BlockInterface.php b/app/code/Magento/Widget/Block/BlockInterface.php
index ddf810f433f3..db101b5e81ad 100644
--- a/app/code/Magento/Widget/Block/BlockInterface.php
+++ b/app/code/Magento/Widget/Block/BlockInterface.php
@@ -35,7 +35,7 @@ public function addData(array $arr);
      *
      * @param string|array $key
      * @param mixed $value
-     * @return \Magento\Framework\DataObject
+     * @return $this
      */
     public function setData($key, $value = null);
 }

From a38250ec547c80e6558e571317f595673efeebb2 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Mon, 5 Nov 2018 10:51:53 +0200
Subject: [PATCH 33/33] magento-engcom/magento2ce#2299: Code style fixes

---
 .../Magento/Catalog/Model/AbstractModel.php   | 13 ++---
 .../Magento/Sales/Model/Order/Address.php     | 56 +++++++++----------
 .../Magento/Widget/Block/BlockInterface.php   |  1 +
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
index 5faf6ccbcdef..78a49cd1e8b1 100644
--- a/app/code/Magento/Catalog/Model/AbstractModel.php
+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
@@ -282,9 +282,9 @@ public function getWebsiteStoreIds()
      *
      * Default value existing is flag for using store value in data
      *
-     * @param   string $attributeCode
-     * @param   mixed  $value
-     * @return  $this
+     * @param string $attributeCode
+     * @param mixed $value
+     * @return $this
      *
      * @deprecated 101.0.0
      */
@@ -332,11 +332,10 @@ public function getAttributeDefaultValue($attributeCode)
     }
 
     /**
-     * Set attribute code flag if attribute has value in current store and does not use
-     * value of default store as value
+     * Set attribute code flag if attribute has value in current store and does not use value of default store as value
      *
-     * @param   string $attributeCode
-     * @return  $this
+     * @param string $attributeCode
+     * @return $this
      *
      * @deprecated 101.0.0
      */
diff --git a/app/code/Magento/Sales/Model/Order/Address.php b/app/code/Magento/Sales/Model/Order/Address.php
index 8bc602c75db4..083ec0089a5c 100644
--- a/app/code/Magento/Sales/Model/Order/Address.php
+++ b/app/code/Magento/Sales/Model/Order/Address.php
@@ -173,7 +173,7 @@ protected function implodeStreetValue($value)
      * Enforce format of the street field
      *
      * @param array|string $key
-     * @param null $value
+     * @param array|string $value
      * @return $this
      */
     public function setData($key, $value = null)
@@ -508,7 +508,7 @@ public function getVatRequestSuccess()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setParentId($id)
     {
@@ -516,7 +516,7 @@ public function setParentId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerAddressId($id)
     {
@@ -524,7 +524,7 @@ public function setCustomerAddressId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegionId($id)
     {
@@ -532,7 +532,7 @@ public function setRegionId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStreet($street)
     {
@@ -540,7 +540,7 @@ public function setStreet($street)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerId($id)
     {
@@ -548,7 +548,7 @@ public function setCustomerId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFax($fax)
     {
@@ -556,7 +556,7 @@ public function setFax($fax)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegion($region)
     {
@@ -564,7 +564,7 @@ public function setRegion($region)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPostcode($postcode)
     {
@@ -572,7 +572,7 @@ public function setPostcode($postcode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setLastname($lastname)
     {
@@ -580,7 +580,7 @@ public function setLastname($lastname)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCity($city)
     {
@@ -588,7 +588,7 @@ public function setCity($city)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEmail($email)
     {
@@ -596,7 +596,7 @@ public function setEmail($email)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTelephone($telephone)
     {
@@ -604,7 +604,7 @@ public function setTelephone($telephone)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCountryId($id)
     {
@@ -612,7 +612,7 @@ public function setCountryId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFirstname($firstname)
     {
@@ -620,7 +620,7 @@ public function setFirstname($firstname)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAddressType($addressType)
     {
@@ -628,7 +628,7 @@ public function setAddressType($addressType)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPrefix($prefix)
     {
@@ -636,7 +636,7 @@ public function setPrefix($prefix)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setMiddlename($middlename)
     {
@@ -644,7 +644,7 @@ public function setMiddlename($middlename)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSuffix($suffix)
     {
@@ -652,7 +652,7 @@ public function setSuffix($suffix)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCompany($company)
     {
@@ -660,7 +660,7 @@ public function setCompany($company)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatId($id)
     {
@@ -668,7 +668,7 @@ public function setVatId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatIsValid($vatIsValid)
     {
@@ -676,7 +676,7 @@ public function setVatIsValid($vatIsValid)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatRequestId($id)
     {
@@ -684,7 +684,7 @@ public function setVatRequestId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegionCode($regionCode)
     {
@@ -692,7 +692,7 @@ public function setRegionCode($regionCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatRequestDate($vatRequestDate)
     {
@@ -700,7 +700,7 @@ public function setVatRequestDate($vatRequestDate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatRequestSuccess($vatRequestSuccess)
     {
@@ -708,7 +708,7 @@ public function setVatRequestSuccess($vatRequestSuccess)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Sales\Api\Data\OrderAddressExtensionInterface|null
      */
@@ -718,7 +718,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Sales\Api\Data\OrderAddressExtensionInterface $extensionAttributes
      * @return $this
diff --git a/app/code/Magento/Widget/Block/BlockInterface.php b/app/code/Magento/Widget/Block/BlockInterface.php
index db101b5e81ad..4f795d949b8c 100644
--- a/app/code/Magento/Widget/Block/BlockInterface.php
+++ b/app/code/Magento/Widget/Block/BlockInterface.php
@@ -19,6 +19,7 @@ interface BlockInterface
 {
     /**
      * Add data to the widget.
+     *
      * Retains previous data in the widget.
      *
      * @param array $arr