Merge branch '2.2-develop' into keep-maintenance-enabled

Author: jokeputs

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js

@@ -61,7 +61,7 @@ define([
         },
 
         /**
-         * @returns {Bool}
+         * @returns {Boolean}
          */
         isVaultEnabled: function () {
             return this.vaultEnabler.isVaultEnabled();
@@ -144,10 +144,19 @@ define([
         },
 
         /**
-         * Trigger order placing
+         * Returns state of place order button
+         * @returns {Boolean}
+         */
+        isButtonActive: function () {
+            return this.isActive() && this.isPlaceOrderActionAllowed();
+        },
+
+        /**
+         * Triggers order placing
          */
         placeOrderClick: function () {
             if (this.validateCardType()) {
+                this.isPlaceOrderActionAllowed(false);
                 $(this.getSelector('submit')).trigger('click');
             }
         },

app/code/Magento/Braintree/view/frontend/web/template/payment/form.html

@@ -141,8 +141,7 @@
                         data-bind="
                             click: placeOrderClick,
                             attr: {title: $t('Place Order')},
-                            css: {disabled: !isPlaceOrderActionAllowed()},
-                            enable: isActive()
+                            enable: isButtonActive()
                         "
                         disabled>
                     <span data-bind="i18n: 'Place Order'"></span>

app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php

@@ -13,7 +13,7 @@
 
 /**
  * Cron operation is responsible for deleting all product prices on WEBSITE level
- * in case 'Catalog Price Scope' configuratoin parameter is set to GLOBAL.
+ * in case 'Catalog Price Scope' configuration parameter is set to GLOBAL.
  */
 class DeleteOutdatedPriceValues
 {
@@ -48,27 +48,46 @@ public function __construct(
     }
 
     /**
-     * Delete all price values for non-admin stores if PRICE_SCOPE is global
+     * Delete all price values for non-admin stores if PRICE_SCOPE is set to global.
      *
      * @return void
      */
     public function execute()
     {
-        $priceScope = $this->scopeConfig->getValue(Store::XML_PATH_PRICE_SCOPE);
-        if ($priceScope == Store::PRICE_SCOPE_GLOBAL) {
-            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $priceAttribute */
-            $priceAttribute = $this->attributeRepository
-                ->get(ProductAttributeInterface::ENTITY_TYPE_CODE, ProductAttributeInterface::CODE_PRICE);
-            $connection = $this->resource->getConnection();
-            $conditions = [
-                $connection->quoteInto('attribute_id = ?', $priceAttribute->getId()),
-                $connection->quoteInto('store_id != ?', Store::DEFAULT_STORE_ID),
-            ];
+        if ($this->isPriceScopeSetToGlobal() === false) {
+            return;
+        }
+
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $priceAttribute */
+        $priceAttribute = $this->attributeRepository
+            ->get(ProductAttributeInterface::ENTITY_TYPE_CODE, ProductAttributeInterface::CODE_PRICE);
+        $connection = $this->resource->getConnection();
+        $conditions = [
+            $connection->quoteInto('attribute_id = ?', $priceAttribute->getId()),
+            $connection->quoteInto('store_id != ?', Store::DEFAULT_STORE_ID),
+        ];
 
-            $connection->delete(
-                $priceAttribute->getBackend()->getTable(),
-                $conditions
-            );
+        $connection->delete(
+            $priceAttribute->getBackend()->getTable(),
+            $conditions
+        );
+    }
+
+    /**
+     * Checks if price scope config option explicitly equal to global value.
+     *
+     * Such strict comparision is required to prevent price deleting when
+     * price scope config option is null for some reason.
+     *
+     * @return bool
+     */
+    private function isPriceScopeSetToGlobal()
+    {
+        $priceScope = $this->scopeConfig->getValue(Store::XML_PATH_PRICE_SCOPE);
+        if ($priceScope === null) {
+            return false;
         }
+
+        return (int)$priceScope === Store::PRICE_SCOPE_GLOBAL;
     }
 }

app/code/Magento/Catalog/Model/Category.php

@@ -1094,7 +1094,11 @@ public function reindex()
         if ($this->flatState->isFlatEnabled()) {
             $flatIndexer = $this->indexerRegistry->get(Indexer\Category\Flat\State::INDEXER_ID);
             if (!$flatIndexer->isScheduled()) {
-                $flatIndexer->reindexRow($this->getId());
+                $idsList = [$this->getId()];
+                if ($this->dataHasChangedFor('url_key')) {
+                    $idsList = array_merge($idsList, explode(',', $this->getAllChildren()));
+                }
+                $flatIndexer->reindexList($idsList);
             }
         }
         $productIndexer = $this->indexerRegistry->get(Indexer\Category\Product::INDEXER_ID);

app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php

@@ -318,7 +318,7 @@ public function testReindexFlatEnabled($flatScheduled, $productScheduled, $expec
             ->will($this->returnValue(true));
 
         $this->flatIndexer->expects($this->exactly(1))->method('isScheduled')->will($this->returnValue($flatScheduled));
-        $this->flatIndexer->expects($this->exactly($expectedFlatReindexCalls))->method('reindexRow')->with('123');
+        $this->flatIndexer->expects($this->exactly($expectedFlatReindexCalls))->method('reindexList')->with(['123']);
 
         $this->productIndexer->expects($this->exactly(1))->method('isScheduled')->will($this->returnValue($productScheduled));
         $this->productIndexer->expects($this->exactly($expectedProductReindexCall))->method('reindexList')->with($pathIds);

app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js

@@ -259,6 +259,29 @@ define([
 
             obj.inputFieldEmailValue = email;
             saveData(obj);
+        },
+
+        /**
+         * Pulling the checked email value from persistence storage
+         *
+         * @return {*}
+         */
+        getCheckedEmailValue: function () {
+            var obj = getData();
+
+            return obj.checkedEmailValue ? obj.checkedEmailValue : '';
+        },
+
+        /**
+         * Setting the checked email value pulled from persistence storage
+         *
+         * @param {String} email
+         */
+        setCheckedEmailValue: function (email) {
+            var obj = getData();
+
+            obj.checkedEmailValue = email;
+            saveData(obj);
         }
     };
 });

app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js

@@ -54,6 +54,15 @@ define([
             return this;
         },
 
+        /** @inheritdoc */
+        initConfig: function () {
+            this._super();
+
+            this.isPasswordVisible = this.resolveInitialPasswordVisibility();
+
+            return this;
+        },
+
         /**
          * Callback on changing email property
          */
@@ -81,20 +90,19 @@ define([
          * Check email existing.
          */
         checkEmailAvailability: function () {
-            var self = this;
-
             this.validateRequest();
             this.isEmailCheckComplete = $.Deferred();
             this.isLoading(true);
             this.checkRequest = checkEmailAvailability(this.isEmailCheckComplete, this.email());
 
             $.when(this.isEmailCheckComplete).done(function () {
-                self.isPasswordVisible(false);
-            }).fail(function () {
-                self.isPasswordVisible(true);
-            }).always(function () {
-                self.isLoading(false);
-            });
+                this.isPasswordVisible(false);
+            }.bind(this)).fail(function () {
+                this.isPasswordVisible(true);
+                checkoutData.setCheckedEmailValue(this.email());
+            }.bind(this)).always(function () {
+                this.isLoading(false);
+            }.bind(this));
         },
 
         /**
@@ -153,6 +161,19 @@ define([
                     fullScreenLoader.stopLoader();
                 });
             }
+        },
+
+        /**
+         * Resolves an initial sate of a login form.
+         *
+         * @returns {Boolean} - initial visibility state.
+         */
+        resolveInitialPasswordVisibility: function () {
+            if (checkoutData.getInputFieldEmailValue() !== '') {
+                return checkoutData.getInputFieldEmailValue() === checkoutData.getCheckedEmailValue();
+            }
+
+            return false;
         }
     });
 });

app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php

@@ -277,51 +277,4 @@ public function testSaveActionThrowsException()
 
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
-
-    /**
-     * Test for saving page after edit of it if page_id does not exists in the system
-     *
-     * @security-private
-     */
-    public function testSaveNotExistingPage()
-    {
-        $this->pageId = 1111111111111111111111111;
-        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn(['page_id' => $this->pageId]);
-        $this->requestMock->expects($this->atLeastOnce())
-          ->method('getParam')
-          ->willReturnMap(
-              [
-                  ['page_id', null, $this->pageId],
-                  ['back', null, true],
-              ]
-          );
-
-        $this->dataProcessorMock->expects($this->any())
-          ->method('filter')
-          ->willReturnArgument(0);
-        $page = $this->getMockBuilder(\Magento\Cms\Model\Page::class)
-          ->disableOriginalConstructor()
-          ->getMock();
-        $this->pageFactory->expects($this->atLeastOnce())
-          ->method('create')
-          ->willReturn($page);
-
-        $page->expects($this->any())
-          ->method('load')
-          ->willReturnSelf();
-        $page->expects($this->any())
-          ->method('getId')
-          ->willReturn(null);
-
-        $this->messageManagerMock->expects($this->once())
-          ->method('addErrorMessage')
-          ->with(__('This page no longer exists.'));
-
-        $this->resultRedirect->expects($this->atLeastOnce())
-          ->method('setPath')
-          ->with('*/*/')
-          ->willReturnSelf();
-
-        $this->assertSame($this->resultRedirect, $this->saveController->execute());
-    }
 }

app/code/Magento/Config/App/Config/Type/System.php

@@ -141,7 +141,7 @@ public function get($path = '')
         $pathParts = explode('/', $path);
         if (count($pathParts) === 1 && $pathParts[0] !== 'default') {
             if (!isset($this->data[$pathParts[0]])) {
-                $data = $this->reader->read();
+                $data = $this->readData();
                 $this->data = array_replace_recursive($data, $this->data);
             }
             return $this->data[$pathParts[0]];
@@ -171,7 +171,7 @@ private function loadAllData()
     {
         $cachedData = $this->cache->load($this->configType);
         if ($cachedData === false) {
-            $data = $this->reader->read();
+            $data = $this->readData();
         } else {
             $data = $this->serializer->unserialize($cachedData);
         }
@@ -188,7 +188,7 @@ private function loadDefaultScopeData($scopeType)
     {
         $cachedData = $this->cache->load($this->configType . '_' . $scopeType);
         if ($cachedData === false) {
-            $data = $this->reader->read();
+            $data = $this->readData();
             $this->cacheData($data);
         } else {
             $data = [$scopeType => $this->serializer->unserialize($cachedData)];
@@ -216,7 +216,7 @@ private function loadScopeData($scopeType, $scopeId)
             if (is_array($this->availableDataScopes) && !isset($this->availableDataScopes[$scopeType][$scopeId])) {
                 return [$scopeType => [$scopeId => []]];
             }
-            $data = $this->reader->read();
+            $data = $this->readData();
             $this->cacheData($data);
         } else {
             $data = [$scopeType => [$scopeId => $this->serializer->unserialize($cachedData)]];
@@ -282,6 +282,21 @@ private function getDataByPathParts($data, $pathParts)
         return $data;
     }
 
+    /**
+     * The freshly read data.
+     *
+     * @return array
+     */
+    private function readData(): array
+    {
+        $this->data = $this->reader->read();
+        $this->data = $this->postProcessor->process(
+            $this->data
+        );
+
+        return $this->data;
+    }
+
     /**
      * Clean cache and global variables cache
      *

app/code/Magento/Config/App/Config/Type/System/Reader.php

@@ -27,17 +27,13 @@ class Reader
      */
     private $preProcessor;
 
-    /**
-     * @var \Magento\Framework\App\Config\Spi\PostProcessorInterface
-     */
-    private $postProcessor;
-
     /**
      * Reader constructor.
      * @param \Magento\Framework\App\Config\ConfigSourceInterface $source
      * @param \Magento\Store\Model\Config\Processor\Fallback $fallback
      * @param \Magento\Framework\App\Config\Spi\PreProcessorInterface $preProcessor
      * @param \Magento\Framework\App\Config\Spi\PostProcessorInterface $postProcessor
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\App\Config\ConfigSourceInterface $source,
@@ -48,7 +44,6 @@ public function __construct(
         $this->source = $source;
         $this->fallback = $fallback;
         $this->preProcessor = $preProcessor;
-        $this->postProcessor = $postProcessor;
     }
 
     /**
@@ -60,11 +55,9 @@ public function __construct(
      */
     public function read()
     {
-        return $this->postProcessor->process(
-            $this->fallback->process(
-                $this->preProcessor->process(
-                    $this->source->get()
-                )
+        return $this->fallback->process(
+            $this->preProcessor->process(
+                $this->source->get()
             )
         );
     }

app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php

@@ -84,10 +84,6 @@ public function testGetCachedWithLoadDefaultScopeData()
             ->method('process')
             ->with($data)
             ->willReturn($data);
-        $this->postProcessor->expects($this->once())
-            ->method('process')
-            ->with($data)
-            ->willReturn($data);
         $this->assertEquals($data, $this->model->read());
     }
 }