Merge pull request #1681 from magento-helix/MAGETWO-80568

[Helix] Prepare codebase for 2.2.2

Author: vzabaznov

CHANGELOG.md

@@ -13,7 +13,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -10,7 +10,7 @@
         "magento/framework": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.2.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Analytics/composer.json

@@ -24,7 +24,7 @@
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/composer.json

@@ -25,7 +25,7 @@
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "proprietary"
     ],

app/code/Magento/Braintree/composer.json

@@ -25,7 +25,7 @@
         "magento/module-bundle-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Bundle/composer.json

@@ -52,7 +52,6 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      * @param \Magento\Framework\Indexer\BatchSizeManagementInterface|null $batchSizeManagement
      * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
      * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
-     * @param \Magento\Indexer\Model\Indexer\StateFactory|null $stateFactory
      * @param int|null $batchRowsCount
      * @param ActiveTableSwitcher|null $activeTableSwitcher
      */
@@ -87,13 +86,28 @@ public function __construct(
         $this->activeTableSwitcher = $activeTableSwitcher ?: $objectManager->get(ActiveTableSwitcher::class);
     }
 
+    /**
+     * Clear the table we'll be writing de-normalized data into
+     * to prevent archived data getting in the way of actual data.
+     *
+     * @return void
+     */
+    private function clearCurrentTable()
+    {
+        $this->connection->delete(
+            $this->activeTableSwitcher
+                ->getAdditionalTableName($this->getMainTable())
+        );
+    }
+
     /**
      * Refresh entities index
      *
      * @return $this
      */
     public function execute()
     {
+        $this->clearCurrentTable();
         $this->reindex();
         $this->activeTableSwitcher->switchTable($this->connection, [$this->getMainTable()]);
         return $this;
@@ -103,6 +117,7 @@ public function execute()
      * Return select for remove unnecessary data
      *
      * @return \Magento\Framework\DB\Select
+     * @deprecated 102.0.1 Not needed anymore.
      */
     protected function getSelectUnnecessaryData()
     {
@@ -127,12 +142,15 @@ protected function getSelectUnnecessaryData()
      * Remove unnecessary data
      *
      * @return void
+     *
+     * @deprecated 102.0.1 Not needed anymore.
      */
     protected function removeUnnecessaryData()
     {
-        $this->connection->query(
-            $this->connection->deleteFromSelect($this->getSelectUnnecessaryData(), $this->getMainTable())
-        );
+        //Called for backwards compatibility.
+        $this->getSelectUnnecessaryData();
+        //This method is useless,
+        //left it here just in case somebody's using it in child classes.
     }
 
     /**

app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php

@@ -34,7 +34,7 @@
         "magento/module-catalog-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "102.0.0",
+    "version": "102.0.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Catalog/composer.json

@@ -7,7 +7,7 @@
         "magento/module-catalog": "101.1.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.2.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogAnalytics/composer.json

@@ -16,7 +16,7 @@
         "ext-ctype": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogImportExport/composer.json

@@ -13,7 +13,7 @@
         "magento/module-ui": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogInventory/composer.json

@@ -17,7 +17,7 @@
         "magento/module-catalog-rule-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "101.0.0",
+    "version": "101.0.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogRule/composer.json

@@ -15,7 +15,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogSearch/composer.json

@@ -14,7 +14,7 @@
         "magento/module-ui": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogUrlRewrite/composer.json

@@ -27,7 +27,7 @@
         "magento/module-cookie": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Checkout/composer.json

@@ -18,7 +18,7 @@
         "magento/module-cms-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "102.0.0",
+    "version": "102.0.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Cms/composer.json

@@ -8,6 +8,7 @@
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
 use Magento\Config\Model\Config\Structure\ElementVisibilityInterface;
+use Magento\Framework\App\Config\Data\ProcessorInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
@@ -429,6 +430,18 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
         if ($data === null) {
             $path = $field->getConfigPath() !== null ? $field->getConfigPath() : $path;
             $data = $this->getConfigValue($path);
+            if ($field->hasBackendModel()) {
+                $backendModel = $field->getBackendModel();
+                // Backend models which implement ProcessorInterface are processed by ScopeConfigInterface
+                if (!$backendModel instanceof ProcessorInterface) {
+                    $backendModel->setPath($path)
+                        ->setValue($data)
+                        ->setWebsite($this->getWebsiteCode())
+                        ->setStore($this->getStoreCode())
+                        ->afterLoad();
+                    $data = $backendModel->getValue();
+                }
+            }
         }
 
         return $data;

app/code/Magento/Config/Block/System/Config/Form.php

@@ -5,15 +5,14 @@
  */
 namespace Magento\Config\Model\Config\Backend;
 
-use Magento\Framework\App\Config\Data\ProcessorInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * @api
  * @since 100.0.2
  */
-class Serialized extends \Magento\Framework\App\Config\Value implements ProcessorInterface
+class Serialized extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var Json
@@ -68,12 +67,4 @@ public function beforeSave()
         parent::beforeSave();
         return $this;
     }
-
-    /**
-     * @inheritdoc
-     */
-    public function processValue($value)
-    {
-        return empty($value) ? '' : $this->serializer->unserialize($value);
-    }
 }

app/code/Magento/Config/Model/Config/Backend/Serialized.php

@@ -548,7 +548,7 @@ public function initFieldsDataProvider()
                 false,
                 'some_value',
                 null,
-                0,
+                1,
                 false,
                 false,
                 false
@@ -560,7 +560,7 @@ public function initFieldsDataProvider()
                 true,
                 'Config Value',
                 null,
-                0,
+                1,
                 true,
                 false,
                 true

app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php

@@ -13,7 +13,7 @@
         "magento/module-deploy": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "101.0.0",
+    "version": "101.0.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Config/composer.json

@@ -24,7 +24,7 @@
         "magento/module-product-links-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/ConfigurableProduct/composer.json

@@ -5,7 +5,9 @@
  */
 namespace Magento\Customer\Block\Address;
 
+use Magento\Customer\Model\AttributeChecker;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Customer address edit block
@@ -46,6 +48,11 @@ class Edit extends \Magento\Directory\Block\Data
      */
     protected $dataObjectHelper;
 
+    /**
+     * @var AttributeChecker
+     */
+    private $attributeChecker;
+
     /**
      * Constructor
      *
@@ -61,7 +68,7 @@ class Edit extends \Magento\Directory\Block\Data
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param array $data
-     *
+     * @param AttributeChecker $attributeChecker
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -76,13 +83,16 @@ public function __construct(
         \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory,
         \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
-        array $data = []
+        array $data = [],
+        AttributeChecker $attributeChecker = null
     ) {
         $this->_customerSession = $customerSession;
         $this->_addressRepository = $addressRepository;
         $this->addressDataFactory = $addressDataFactory;
         $this->currentCustomer = $currentCustomer;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->attributeChecker = $attributeChecker ?: ObjectManager::getInstance()->get(AttributeChecker::class);
+
         parent::__construct(
             $context,
             $directoryHelper,
@@ -352,4 +362,16 @@ public function getConfig($path)
     {
         return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
+
+    /**
+     * Checks whether it is allowed to show an attribute on the form.
+     *
+     * @param string $attributeCode
+     * @param string $formName
+     * @return bool
+     */
+    public function isAttributeAllowedOnForm($attributeCode, $formName)
+    {
+        return $this->attributeChecker->isAttributeAllowedOnForm($attributeCode, $formName);
+    }
 }