Merge branch 'develop' into MAGETWO-69004-upgrade_captcha-2.2

Author: Robert He

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -213,17 +213,14 @@ public function execute()
                 $category->save();
                 $this->messageManager->addSuccess(__('You saved the category.'));
             } catch (\Magento\Framework\Exception\AlreadyExistsException $e) {
-                var_dump($e->getMessage());
                 $this->messageManager->addError($e->getMessage());
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
                 $this->_getSession()->setCategoryData($categoryPostData);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                var_dump($e->getMessage());
                 $this->messageManager->addError($e->getMessage());
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
                 $this->_getSession()->setCategoryData($categoryPostData);
             } catch (\Exception $e) {
-                var_dump($e->getMessage());
                 $this->messageManager->addError(__('Something went wrong while saving the category.'));
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
                 $this->_getSession()->setCategoryData($categoryPostData);

app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

@@ -723,8 +723,7 @@ public function save($product)
     protected function _removeNotApplicableAttributes($product)
     {
         $entityType = $product->getResource()->getEntityType();
-        foreach ($this->_eavConfig->getEntityAttributeCodes($entityType, $product) as $attributeCode) {
-            $attribute = $this->_eavConfig->getAttribute($entityType, $attributeCode);
+        foreach ($this->_eavConfig->getEntityAttributes($entityType, $product) as $attribute) {
             $applyTo = $attribute->getApplyTo();
             if (is_array($applyTo) && count($applyTo) > 0 && !in_array($product->getTypeId(), $applyTo)) {
                 $product->unsetData($attribute->getAttributeCode());

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

@@ -564,6 +564,9 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
                 $this->resourceModel->getLinkField(),
                 $existingProduct->getData($this->resourceModel->getLinkField())
             );
+            if (!$product->hasData(Product::STATUS)) {
+                $product->setStatus($existingProduct->getStatus());
+            }
         } catch (NoSuchEntityException $e) {
             $existingProduct = null;
         }
@@ -679,9 +682,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         $collection = $this->collectionFactory->create();
         $this->extensionAttributesJoinProcessor->process($collection);
 
-        foreach ($this->metadataService->getList($this->searchCriteriaBuilder->create())->getItems() as $metadata) {
-            $collection->addAttributeToSelect($metadata->getAttributeCode());
-        }
+        $collection->addAttributeToSelect('*');
         $collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
         $collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
 

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

@@ -1011,7 +1011,16 @@ public function countVisible()
     public function load($object, $entityId, $attributes = [])
     {
         $this->_attributes = [];
-        $this->loadAttributesMetadata($attributes);
+        $select = $this->_getLoadRowSelect($object, $entityId);
+        $row = $this->getConnection()->fetchRow($select);
+
+        if (is_array($row)) {
+            $object->addData($row);
+        } else {
+            $object->isObjectNew(true);
+        }
+
+        $this->loadAttributesForObject($attributes, $object);
         $object = $this->getEntityManager()->load($object, $entityId);
         if (!$this->getEntityManager()->has($object)) {
             $object->isObjectNew(true);

app/code/Magento/Catalog/Model/ResourceModel/Product.php

@@ -577,7 +577,16 @@ public function validate($object)
      */
     public function load($object, $entityId, $attributes = [])
     {
-        $this->loadAttributesMetadata($attributes);
+        $select = $this->_getLoadRowSelect($object, $entityId);
+        $row = $this->getConnection()->fetchRow($select);
+
+        if (is_array($row)) {
+            $object->addData($row);
+        } else {
+            $object->isObjectNew(true);
+        }
+
+        $this->loadAttributesForObject($attributes, $object);
         $this->getEntityManager()->load($object, $entityId);
         return $this;
     }

app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/ProcessorTest.php

@@ -165,7 +165,7 @@ public function testValidate($value)
         $attributeCode = 'attr_code';
         $attribute = $this->getMock(
             \Magento\Eav\Model\Entity\Attribute::class,
-            ['getAttributeCode', 'getIsRequired', 'isValueEmpty', 'getIsUnique', 'getEntityType', '__wakeup'],
+            ['getAttributeCode', 'getIsRequired', 'isValueEmpty', 'getIsUnique', 'getEntity', '__wakeup'],
             [],
             '',
             false
@@ -178,7 +178,7 @@ public function testValidate($value)
         $attribute->expects($this->any())->method('getIsRequired')->will($this->returnValue(true));
         $attribute->expects($this->any())->method('isValueEmpty')->will($this->returnValue($value));
         $attribute->expects($this->any())->method('getIsUnique')->will($this->returnValue(true));
-        $attribute->expects($this->any())->method('getEntityType')->will($this->returnValue($attributeEntity));
+        $attribute->expects($this->any())->method('getEntity')->will($this->returnValue($attributeEntity));
         $attributeEntity->expects($this->any())->method('checkAttributeUniqueValue')->will($this->returnValue(true));
 
         $this->attributeRepository->expects($this->once())

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

@@ -707,36 +707,17 @@ public function testDeleteById()
     public function testGetList()
     {
         $searchCriteriaMock = $this->getMock(\Magento\Framework\Api\SearchCriteriaInterface::class, [], [], '', false);
-        $attributeCode = 'attribute_code';
         $collectionMock = $this->getMock(
             \Magento\Catalog\Model\ResourceModel\Product\Collection::class,
             [],
             [],
             '',
             false
         );
-        $extendedSearchCriteriaMock = $this->getMock(\Magento\Framework\Api\SearchCriteria::class, [], [], '', false);
-        $productAttributeSearchResultsMock = $this->getMockBuilder(ProductAttributeInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getItems'])
-            ->getMockForAbstractClass();
-        $productAttributeMock = $this->getMock(
-            \Magento\Catalog\Api\Data\ProductAttributeInterface::class,
-            [],
-            [],
-            '',
-            false
-        );
 
         $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($collectionMock);
-        $this->searchCriteriaBuilderMock->expects($this->once())->method('create')
-            ->willReturn($extendedSearchCriteriaMock);
-        $this->metadataServiceMock->expects($this->once())->method('getList')->with($extendedSearchCriteriaMock)
-            ->willReturn($productAttributeSearchResultsMock);
-        $productAttributeSearchResultsMock->expects($this->once())->method('getItems')
-            ->willReturn([$productAttributeMock]);
-        $productAttributeMock->expects($this->once())->method('getAttributeCode')->willReturn($attributeCode);
-        $collectionMock->expects($this->once())->method('addAttributeToSelect')->with($attributeCode);
+
+        $collectionMock->expects($this->once())->method('addAttributeToSelect')->with('*');
         $collectionMock->expects($this->exactly(2))->method('joinAttribute')->withConsecutive(
             ['status', 'catalog_product/status', 'entity_id', null, 'inner'],
             ['visibility', 'catalog_product/visibility', 'entity_id', null, 'inner']

app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

@@ -193,6 +193,7 @@
                         <item name="add_variables" xsi:type="boolean">false</item>
                         <item name="add_widgets" xsi:type="boolean">false</item>
                         <item name="add_images" xsi:type="boolean">false</item>
+                        <item name="add_directives" xsi:type="boolean">true</item>
                     </item>
                     <item name="source" xsi:type="string">category</item>
                 </item>

app/code/Magento/Config/Console/Command/ConfigSet/EmulatedProcessorFacade.php

@@ -6,10 +6,9 @@
 namespace Magento\Config\Console\Command;
 
 use Magento\Config\App\Config\Type\System;
-use Magento\Config\Console\Command\ConfigSet\EmulatedProcessorFacade;
+use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
 use Magento\Deploy\Model\DeploymentConfig\Hash;
-use Magento\Deploy\Model\DeploymentConfig\Validator;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
@@ -34,11 +33,11 @@ class ConfigSetCommand extends Command
     /**#@-*/
 
     /**
-     * The emulated processor facade.
+     * Emulator adminhtml area for CLI command.
      *
-     * @var EmulatedProcessorFacade
+     * @var EmulatedAdminhtmlAreaProcessor
      */
-    private $emulatedProcessorFacade;
+    private $emulatedAreaProcessor;
 
     /**
      * The config change detector.
@@ -55,18 +54,28 @@ class ConfigSetCommand extends Command
     private $hash;
 
     /**
-     * @param EmulatedProcessorFacade $emulatedProcessorFacade The emulated processor facade
+     * The factory for processor facade.
+     *
+     * @var ProcessorFacadeFactory
+     */
+    private $processorFacadeFactory;
+
+    /**
+     * @param EmulatedAdminhtmlAreaProcessor $emulatedAreaProcessor Emulator adminhtml area for CLI command
      * @param ChangeDetector $changeDetector The config change detector
      * @param Hash $hash The hash manager
+     * @param ProcessorFacadeFactory $processorFacadeFactory The factory for processor facade
      */
     public function __construct(
-        EmulatedProcessorFacade $emulatedProcessorFacade,
+        EmulatedAdminhtmlAreaProcessor $emulatedAreaProcessor,
         ChangeDetector $changeDetector,
-        Hash $hash
+        Hash $hash,
+        ProcessorFacadeFactory $processorFacadeFactory
     ) {
-        $this->emulatedProcessorFacade = $emulatedProcessorFacade;
+        $this->emulatedAreaProcessor = $emulatedAreaProcessor;
         $this->changeDetector = $changeDetector;
         $this->hash = $hash;
+        $this->processorFacadeFactory = $processorFacadeFactory;
 
         parent::__construct();
     }
@@ -128,13 +137,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         try {
-            $message = $this->emulatedProcessorFacade->process(
-                $input->getArgument(static::ARG_PATH),
-                $input->getArgument(static::ARG_VALUE),
-                $input->getOption(static::OPTION_SCOPE),
-                $input->getOption(static::OPTION_SCOPE_CODE),
-                $input->getOption(static::OPTION_LOCK)
-            );
+            $message = $this->emulatedAreaProcessor->process(function () use ($input) {
+                return $this->processorFacadeFactory->create()->process(
+                    $input->getArgument(static::ARG_PATH),
+                    $input->getArgument(static::ARG_VALUE),
+                    $input->getOption(static::OPTION_SCOPE),
+                    $input->getOption(static::OPTION_SCOPE_CODE),
+                    $input->getOption(static::OPTION_LOCK)
+                );
+            });
 
             $this->hash->regenerate(System::CONFIG_TYPE);
 

app/code/Magento/Config/Console/Command/ConfigSetCommand.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Console\Command;
+
+use Magento\Framework\App\Area;
+use Magento\Framework\App\State;
+use Magento\Framework\Config\ScopeInterface;
+
+/**
+ * Emulates callback inside adminhtml area code and adminhtml scope.
+ * It is used for CLI commands which should work with data available only in adminhtml scope.
+ */
+class EmulatedAdminhtmlAreaProcessor
+{
+    /**
+     * The application scope manager.
+     *
+     * @var ScopeInterface
+     */
+    private $scope;
+
+    /**
+     * The application state manager.
+     *
+     * @var State
+     */
+    private $state;
+
+    /**
+     * @param ScopeInterface $scope The application scope manager
+     * @param State $state The application state manager
+     */
+    public function __construct(ScopeInterface $scope, State $state)
+    {
+        $this->scope = $scope;
+        $this->state = $state;
+    }
+
+    /**
+     * Emulates callback inside adminhtml area code and adminhtml scope.
+     *
+     * Returns the return value of the callback.
+     *
+     * @param callable $callback The callable to be called
+     * @param array $params The parameters to be passed to the callback, as an indexed array
+     * @return bool|int|float|string|array|null - as the result of this method is the result of callback,
+     * you can use callback only with specified in this method return types
+     * @throws \Exception The exception is thrown if the parameter $callback throws an exception
+     */
+    public function process(callable $callback, array $params = [])
+    {
+        $currentScope = $this->scope->getCurrentScope();
+        try {
+            return $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($callback, $params) {
+                $this->scope->setCurrentScope(Area::AREA_ADMINHTML);
+                return call_user_func_array($callback, $params);
+            });
+        } catch (\Exception $exception) {
+            throw $exception;
+        } finally {
+            $this->scope->setCurrentScope($currentScope);
+        }
+    }
+}