From 8a0432dee967c1634f2e60836f37909b1328e0d1 Mon Sep 17 00:00:00 2001
From: Valerij Ivashchenko <likemusic@yandex.ru>
Date: Fri, 4 May 2018 22:07:18 +0300
Subject: [PATCH 01/10] small optimisation in if-condition

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

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
index 237168282afae..4641e4fdd7f95 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -31,7 +31,7 @@ public function prepareProductAttributes(Product $product, array $productData, a
             $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
             if ($value === '' && $considerUseDefaultsAttribute) {
                 /** @var $product Product */
-                if ((bool)$product->getData($attribute) === (bool)$value) {
+                if ((bool)$product->getData($attribute) === false) {
                     unset($productData[$attribute]);
                 }
             }

From 8d3ff2202536a46cb5a283ef4ef5ef77c3891d95 Mon Sep 17 00:00:00 2001
From: Daniel Ruf <daniel@daniel-ruf.de>
Date: Sat, 5 May 2018 20:57:27 +0200
Subject: [PATCH 02/10] fix: set message-success in setup if we already have
 the latest version

---
 setup/pub/magento/setup/select-version.js     | 2 ++
 setup/view/magento/setup/select-version.phtml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup/pub/magento/setup/select-version.js b/setup/pub/magento/setup/select-version.js
index d9d4f7518ad1f..32210d29dcbfe 100644
--- a/setup/pub/magento/setup/select-version.js
+++ b/setup/pub/magento/setup/select-version.js
@@ -13,6 +13,7 @@ angular.module('select-version', ['ngStorage'])
         $scope.upgradeReadyForNext = false;
         $scope.upgradeProcessed = false;
         $scope.upgradeProcessError = false;
+        $scope.upgradeAlreadyLatestVersion = false;
         $scope.upgradeProcessErrorMessage = '';
         $scope.componentsReadyForNext = true;
         $scope.componentsProcessed = false;
@@ -39,6 +40,7 @@ angular.module('select-version', ['ngStorage'])
 
                     if ($scope.upgradeProcessError) {
                         $scope.upgradeProcessErrorMessage = "You're already using the latest version, there's nothing for us to do.";
+                        $scope.upgradeAlreadyLatestVersion = true;
                     } else {
                         $scope.selectedOption = [];
                         $scope.versions = [];
diff --git a/setup/view/magento/setup/select-version.phtml b/setup/view/magento/setup/select-version.phtml
index 4c61837d975a0..c78392bd495da 100644
--- a/setup/view/magento/setup/select-version.phtml
+++ b/setup/view/magento/setup/select-version.phtml
@@ -38,7 +38,7 @@
         </span>
         <span class="message-text">Checking for a new version...</span>
     </div>
-    <div class="message message-error" ng-show="upgradeProcessError">
+    <div class="message" ng-class="upgradeAlreadyLatestVersion ? 'message-success' : 'message-error'" ng-show="upgradeProcessError">
             <span class="message-text" ng-bind-html="upgradeProcessErrorMessage"></span>
     </div>
     <div class="message" ng-show="upgradeProcessed && !upgradeProcessError && currentVersion">

From ce123960c48fdca1d3ce743b9723c5f150611628 Mon Sep 17 00:00:00 2001
From: Daniel Ruf <daniel@daniel-ruf.de>
Date: Sat, 5 May 2018 21:31:42 +0200
Subject: [PATCH 03/10] fix: break line into multiple lines to fix PHPCS
 violation

---
 setup/view/magento/setup/select-version.phtml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup/view/magento/setup/select-version.phtml b/setup/view/magento/setup/select-version.phtml
index c78392bd495da..920ab86252514 100644
--- a/setup/view/magento/setup/select-version.phtml
+++ b/setup/view/magento/setup/select-version.phtml
@@ -38,7 +38,10 @@
         </span>
         <span class="message-text">Checking for a new version...</span>
     </div>
-    <div class="message" ng-class="upgradeAlreadyLatestVersion ? 'message-success' : 'message-error'" ng-show="upgradeProcessError">
+    <div
+        class="message"
+        ng-class="upgradeAlreadyLatestVersion ? 'message-success' : 'message-error'"
+        ng-show="upgradeProcessError">
             <span class="message-text" ng-bind-html="upgradeProcessErrorMessage"></span>
     </div>
     <div class="message" ng-show="upgradeProcessed && !upgradeProcessError && currentVersion">

From f278f9960da02151b13423b122be3191b0f7fb3c Mon Sep 17 00:00:00 2001
From: Daniel Ruf <daniel@daniel-ruf.de>
Date: Sat, 5 May 2018 22:11:25 +0200
Subject: [PATCH 04/10] chore: use random_int() in some places

---
 .../Backend/Block/Widget/Grid/Column/Renderer/Massaction.php  | 2 +-
 .../Catalog/Model/Indexer/Category/Product/AbstractAction.php | 2 +-
 app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php     | 4 ++--
 app/code/Magento/SalesRule/Model/Rule.php                     | 2 +-
 lib/internal/Magento/Framework/Encryption/Crypt.php           | 2 +-
 .../Magento/Framework/Setup/BackendFrontnameGenerator.php     | 2 +-
 lib/internal/Magento/Framework/Webapi/ErrorProcessor.php      | 2 +-
 pub/errors/processor.php                                      | 2 +-
 .../src/Magento/Setup/Model/Address/AddressDataGenerator.php  | 2 +-
 setup/src/Magento/Setup/Model/DataGenerator.php               | 4 ++--
 .../Magento/Setup/Model/Description/DescriptionGenerator.php  | 2 +-
 .../Setup/Model/Description/DescriptionParagraphGenerator.php | 2 +-
 .../Setup/Model/Description/DescriptionSentenceGenerator.php  | 2 +-
 setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php | 2 +-
 .../Model/Description/Mixin/Helper/RandomWordSelector.php     | 2 +-
 .../src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php | 2 +-
 setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php | 2 +-
 setup/src/Magento/Setup/Model/Dictionary.php                  | 2 +-
 18 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
index 320713f8b57c4..a611e91f32f00 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
@@ -65,7 +65,7 @@ public function render(\Magento\Framework\DataObject $row)
      */
     protected function _getCheckboxHtml($value, $checked)
     {
-        $id = 'id_' . rand(0, 999);
+        $id = 'id_' . random_int(0, 999);
         $html = '<label class="data-grid-checkbox-cell-inner" for="'. $id .'">';
         $html .= '<input type="checkbox" name="' . $this->getColumn()->getName() . '" ';
         $html .= 'id="' . $id . '" data-role="select-row"';
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index b69622fa9e884..5375faa9d9cd1 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -594,7 +594,7 @@ protected function getTemporaryTreeIndexTableName()
         if (empty($this->tempTreeIndexTableName)) {
             $this->tempTreeIndexTableName = $this->connection->getTableName('temp_catalog_category_tree_index')
                 . '_'
-                . substr(md5(time() . rand(0, 999999999)), 0, 8);
+                . substr(md5(time() . random_int(0, 999999999)), 0, 8);
         }
 
         return $this->tempTreeIndexTableName;
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php b/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php
index 1d86ec2b01b35..c89677f0e9097 100644
--- a/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php
+++ b/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php
@@ -38,7 +38,7 @@ public function generateCode()
         $length = $this->getActualLength();
         $code = '';
         for ($i = 0, $indexMax = strlen($alphabet) - 1; $i < $length; ++$i) {
-            $code .= substr($alphabet, mt_rand(0, $indexMax), 1);
+            $code .= substr($alphabet, random_int(0, $indexMax), 1);
         }
 
         return $code;
@@ -54,7 +54,7 @@ protected function getActualLength()
         $lengthMin = $this->getLengthMin() ? $this->getLengthMin() : static::DEFAULT_LENGTH_MIN;
         $lengthMax = $this->getLengthMax() ? $this->getLengthMax() : static::DEFAULT_LENGTH_MAX;
 
-        return $this->getLength() ? $this->getLength() : mt_rand($lengthMin, $lengthMax);
+        return $this->getLength() ? $this->getLength() : random_int($lengthMin, $lengthMax);
     }
 
     /**
diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
index f4469213bd96e..59efdf5eb3f6d 100644
--- a/app/code/Magento/SalesRule/Model/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Rule.php
@@ -521,7 +521,7 @@ public function acquireCoupon($saveNewlyCreated = true, $saveAttemptCount = 10)
                         $coupon->setCode(
                             $couponCode . self::getCouponCodeGenerator()->getDelimiter() . sprintf(
                                 '%04u',
-                                rand(0, 9999)
+                                random_int(0, 9999)
                             )
                         );
                         continue;
diff --git a/lib/internal/Magento/Framework/Encryption/Crypt.php b/lib/internal/Magento/Framework/Encryption/Crypt.php
index c304cdb23f85e..5f368f0d5b790 100644
--- a/lib/internal/Magento/Framework/Encryption/Crypt.php
+++ b/lib/internal/Magento/Framework/Encryption/Crypt.php
@@ -75,7 +75,7 @@ public function __construct(
                 $abc = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
                 $initVector = '';
                 for ($i = 0; $i < $initVectorSize; $i++) {
-                    $initVector .= $abc[rand(0, strlen($abc) - 1)];
+                    $initVector .= $abc[random_int(0, strlen($abc) - 1)];
                 }
             } elseif (false === $initVector) {
                 /* Set vector to zero bytes to not use it */
diff --git a/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php b/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
index ae123e15da23c..224f2024ba959 100644
--- a/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
+++ b/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
@@ -29,6 +29,6 @@ class BackendFrontnameGenerator
     public static function generate()
     {
         return self::ADMIN_AREA_PATH_PREFIX
-            . substr(base_convert(rand(0, PHP_INT_MAX), 10, 36), 0, self::ADMIN_AREA_PATH_RANDOM_PART_LENGTH);
+            . substr(base_convert(random_int(0, PHP_INT_MAX), 10, 36), 0, self::ADMIN_AREA_PATH_RANDOM_PART_LENGTH);
     }
 }
diff --git a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
index bb86c6b1bdc91..20bffff6495de 100644
--- a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
@@ -317,7 +317,7 @@ public function apiShutdownFunction()
     protected function _saveFatalErrorReport($reportData)
     {
         $this->directoryWrite->create('report/api');
-        $reportId = abs(intval(microtime(true) * rand(100, 1000)));
+        $reportId = abs(intval(microtime(true) * random_int(100, 1000)));
         $this->directoryWrite->writeFile('report/api/' . $reportId, $this->serializer->serialize($reportData));
         return $reportId;
     }
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
index 896538853485e..7240707f642c2 100644
--- a/pub/errors/processor.php
+++ b/pub/errors/processor.php
@@ -463,7 +463,7 @@ protected function _setReportData($reportData)
     public function saveReport($reportData)
     {
         $this->reportData = $reportData;
-        $this->reportId   = abs(intval(microtime(true) * rand(100, 1000)));
+        $this->reportId   = abs(intval(microtime(true) * random_int(100, 1000)));
         $this->_reportFile = $this->_reportDir . '/' . $this->reportId;
         $this->_setReportData($reportData);
 
diff --git a/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php b/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php
index 2d450a4374c5e..1bbd152f2ba4e 100644
--- a/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php
+++ b/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php
@@ -18,7 +18,7 @@ class AddressDataGenerator
     public function generateAddress()
     {
         return [
-            'postcode' => mt_rand(10000, 99999)
+            'postcode' => random_int(10000, 99999)
         ];
     }
 }
diff --git a/setup/src/Magento/Setup/Model/DataGenerator.php b/setup/src/Magento/Setup/Model/DataGenerator.php
index 7a039388180a1..540433e5aa3ec 100644
--- a/setup/src/Magento/Setup/Model/DataGenerator.php
+++ b/setup/src/Magento/Setup/Model/DataGenerator.php
@@ -67,12 +67,12 @@ protected function readData()
      */
     public function generate($minAmountOfWords, $maxAmountOfWords, $key = null)
     {
-        $numberOfWords = mt_rand($minAmountOfWords, $maxAmountOfWords);
+        $numberOfWords = random_int($minAmountOfWords, $maxAmountOfWords);
         $result = '';
 
         if ($key === null || !array_key_exists($key, $this->generatedValues)) {
             for ($i = 0; $i < $numberOfWords; $i++) {
-                $result .= ' ' . $this->dictionaryData[mt_rand(0, count($this->dictionaryData) - 1)];
+                $result .= ' ' . $this->dictionaryData[random_int(0, count($this->dictionaryData) - 1)];
             }
             $result = trim($result);
 
diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php
index 807e1fde7d90d..a790bfdbe608d 100644
--- a/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php
+++ b/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php
@@ -63,7 +63,7 @@ public function generate()
      */
     private function generateRawDescription()
     {
-        $paragraphsCount = mt_rand(
+        $paragraphsCount = random_int(
             $this->descriptionConfig['paragraphs']['count-min'],
             $this->descriptionConfig['paragraphs']['count-max']
         );
diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php
index 50544e6ea9726..57ece1f9558c3 100644
--- a/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php
+++ b/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php
@@ -39,7 +39,7 @@ public function __construct(
      */
     public function generate()
     {
-        $sentencesCount = mt_rand(
+        $sentencesCount = random_int(
             $this->paragraphConfig['sentences']['count-min'],
             $this->paragraphConfig['sentences']['count-max']
         );
diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php
index 299b4b50bed0f..10b07e7e1c7a2 100644
--- a/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php
+++ b/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php
@@ -39,7 +39,7 @@ public function __construct(
      */
     public function generate()
     {
-        $sentenceWordsCount = mt_rand(
+        $sentenceWordsCount = random_int(
             $this->sentenceConfig['words']['count-min'],
             $this->sentenceConfig['words']['count-max']
         );
diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php b/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php
index db208adc67de8..927759c4bfa7c 100644
--- a/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php
+++ b/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php
@@ -48,7 +48,7 @@ public function apply($text)
 
         return $this->wordWrapper->wrapWords(
             $text,
-            $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
+            $this->randomWordSelector->getRandomWords($rawText, random_int(5, 8)),
             '<b>%s</b>'
         );
     }
diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php b/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php
index 0598db218728f..c7efcc7f12e0f 100644
--- a/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php
+++ b/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php
@@ -27,7 +27,7 @@ public function getRandomWords($source, $count)
         $randWords = [];
         $wordsSize = count($words);
         while ($count) {
-            $randWords[] = $words[mt_rand(0, $wordsSize - 1)];
+            $randWords[] = $words[random_int(0, $wordsSize - 1)];
             $count--;
         }
 
diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php b/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php
index 87e033be330cf..7621bccf08773 100644
--- a/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php
+++ b/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php
@@ -48,7 +48,7 @@ public function apply($text)
 
         return $this->wordWrapper->wrapWords(
             $text,
-            $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
+            $this->randomWordSelector->getRandomWords($rawText, random_int(5, 8)),
             '<i>%s</i>'
         );
     }
diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php b/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php
index ed5a836129460..fe53ebef535a8 100644
--- a/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php
+++ b/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php
@@ -48,7 +48,7 @@ public function apply($text)
 
         return $this->wordWrapper->wrapWords(
             $text,
-            $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
+            $this->randomWordSelector->getRandomWords($rawText, random_int(5, 8)),
             '<span>%s</span>'
         );
     }
diff --git a/setup/src/Magento/Setup/Model/Dictionary.php b/setup/src/Magento/Setup/Model/Dictionary.php
index 630d35092d0fc..52f7cc1bb5148 100644
--- a/setup/src/Magento/Setup/Model/Dictionary.php
+++ b/setup/src/Magento/Setup/Model/Dictionary.php
@@ -40,7 +40,7 @@ public function getRandWord()
             $this->readDictionary();
         }
 
-        $randIndex = mt_rand(0, count($this->dictionary) - 1);
+        $randIndex = random_int(0, count($this->dictionary) - 1);
         return trim($this->dictionary[$randIndex]);
     }
 

From c57e933a43093dc59c455357d3df961a0eb4e706 Mon Sep 17 00:00:00 2001
From: Daniel Ruf <daniel@daniel-ruf.de>
Date: Sat, 5 May 2018 22:18:45 +0200
Subject: [PATCH 05/10] chore: checkout last 5 commits

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3265cc575cdca..0ddf7351535b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,8 @@ language: php
 php:
   - 7.0
   - 7.1
+git:
+  depth: 5
 env:
   global:
     - COMPOSER_BIN_DIR=~/bin

From 65e9395f5d17be412e92d6faa763803ad8555d28 Mon Sep 17 00:00:00 2001
From: Valerij Ivashchenko <likemusic@yandex.ru>
Date: Sun, 6 May 2018 00:10:09 +0300
Subject: [PATCH 06/10] optimize 2 nested if to one

---
 .../Product/Initialization/Helper/AttributeFilter.php      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
index 4641e4fdd7f95..0c13dd486e325 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -29,11 +29,8 @@ public function prepareProductAttributes(Product $product, array $productData, a
     {
         foreach ($productData as $attribute => $value) {
             $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
-            if ($value === '' && $considerUseDefaultsAttribute) {
-                /** @var $product Product */
-                if ((bool)$product->getData($attribute) === false) {
-                    unset($productData[$attribute]);
-                }
+            if ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute)) {
+                unset($productData[$attribute]);
             }
         }
         return $productData;

From bc0019c5434991166fda4dd688ab943c27f57124 Mon Sep 17 00:00:00 2001
From: Valerij Ivashchenko <likemusic@yandex.ru>
Date: Sun, 6 May 2018 00:24:21 +0300
Subject: [PATCH 07/10] change attributeShouldNotBeUpdated() visibility to
 protected

---
 .../Initialization/Helper/AttributeFilter.php   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
index 0c13dd486e325..4b503721f9400 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -28,11 +28,24 @@ class AttributeFilter
     public function prepareProductAttributes(Product $product, array $productData, array $useDefaults)
     {
         foreach ($productData as $attribute => $value) {
-            $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
-            if ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute)) {
+            if ($this->attributeShouldNotBeUpdated($product, $useDefaults, $attribute, $value)) {
                 unset($productData[$attribute]);
             }
         }
         return $productData;
     }
+
+	/**
+	 * @param $product
+	 * @param $useDefaults
+	 * @param $attribute
+	 * @param $value
+	 * @return bool
+	 */
+    protected function attributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value)
+    {
+	    $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
+
+	    return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute));
+    }
 }

From 6cb5482f7a38d8b41c651ff7f25f4f6724e639f1 Mon Sep 17 00:00:00 2001
From: Valerij Ivashchenko <likemusic@yandex.ru>
Date: Sun, 6 May 2018 00:28:25 +0300
Subject: [PATCH 08/10] replace tabs by spaces

---
 .../Initialization/Helper/AttributeFilter.php  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
index 4b503721f9400..52752a53e9646 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -35,17 +35,17 @@ public function prepareProductAttributes(Product $product, array $productData, a
         return $productData;
     }
 
-	/**
-	 * @param $product
-	 * @param $useDefaults
-	 * @param $attribute
-	 * @param $value
-	 * @return bool
-	 */
+    /**
+     * @param $product
+     * @param $useDefaults
+     * @param $attribute
+     * @param $value
+     * @return bool
+     */
     protected function attributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value)
     {
-	    $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
+        $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
 
-	    return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute));
+        return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute));
     }
 }

From 2483f6d5b92f09e87e1ab32542dd46c777e90965 Mon Sep 17 00:00:00 2001
From: Valerij Ivashchenko <likemusic@yandex.ru>
Date: Sun, 6 May 2018 00:30:34 +0300
Subject: [PATCH 09/10] add blank row before return statement

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

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
index 52752a53e9646..f084a6dfad68a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -32,6 +32,7 @@ public function prepareProductAttributes(Product $product, array $productData, a
                 unset($productData[$attribute]);
             }
         }
+        
         return $productData;
     }
 

From 7e93eed7892d939098b6bd1d9b758233fe0f2b8f Mon Sep 17 00:00:00 2001
From: Valerij Ivashchenko <likemusic@yandex.ru>
Date: Sun, 6 May 2018 17:18:36 +0300
Subject: [PATCH 10/10] rename attributeShouldNotBeUpdated() to
 isAttributeShouldNotBeUpdated()

---
 .../Product/Initialization/Helper/AttributeFilter.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
index f084a6dfad68a..1ab952a460cd3 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -28,22 +28,22 @@ class AttributeFilter
     public function prepareProductAttributes(Product $product, array $productData, array $useDefaults)
     {
         foreach ($productData as $attribute => $value) {
-            if ($this->attributeShouldNotBeUpdated($product, $useDefaults, $attribute, $value)) {
+            if ($this->isAttributeShouldNotBeUpdated($product, $useDefaults, $attribute, $value)) {
                 unset($productData[$attribute]);
             }
         }
-        
+
         return $productData;
     }
 
     /**
-     * @param $product
+     * @param Product $product
      * @param $useDefaults
      * @param $attribute
      * @param $value
      * @return bool
      */
-    protected function attributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value)
+    private function isAttributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value)
     {
         $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";