Merge branch 'develop' into patch-5

Author: kassner

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

@@ -682,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/Config/App/Config/Type/System.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\App\Config\Type;
 
 use Magento\Framework\App\Config\ConfigTypeInterface;
@@ -23,7 +24,7 @@ class System implements ConfigTypeInterface
     private $source;
 
     /**
-     * @var DataObject[]
+     * @var DataObject
      */
     private $data;
 
@@ -64,6 +65,16 @@ class System implements ConfigTypeInterface
      */
     private $configType;
 
+    /**
+     * Key name for flag which displays whether configuration is cached or not.
+     *
+     * Once configuration is cached additional flag pushed to cache storage
+     * to be able check cache existence without data load.
+     *
+     * @var string
+     */
+    private $cacheExistenceKey;
+
     /**
      * @param \Magento\Framework\App\Config\ConfigSourceInterface $source
      * @param \Magento\Framework\App\Config\Spi\PostProcessorInterface $postProcessor
@@ -92,6 +103,7 @@ public function __construct(
         $this->fallback = $fallback;
         $this->serializer = $serializer;
         $this->configType = $configType;
+        $this->cacheExistenceKey = $this->configType . '_CACHE_EXISTS';
     }
 
     /**
@@ -102,23 +114,135 @@ public function get($path = '')
         if ($path === null) {
             $path = '';
         }
-        if (!$this->data) {
-            $data = $this->cache->load($this->configType);
-            if (!$data) {
-                $data = $this->preProcessor->process($this->source->get());
-                $this->data = new DataObject($data);
-                $data = $this->fallback->process($data);
-                $this->data = new DataObject($data);
-                //Placeholder processing need system config - so we need to save intermediate result
-                $data = $this->postProcessor->process($data);
-                $this->data = new DataObject($data);
+        if ($this->isConfigRead($path)) {
+            return $this->data->getData($path);
+        }
+
+        if (!empty($path) && $this->isCacheExists()) {
+            return $this->readFromCache($path);
+        }
+
+        $config = $this->loadConfig();
+        $this->cacheConfig($config);
+        $this->data = new DataObject($config);
+        return $this->data->getData($path);
+    }
+
+    /**
+     * Check whether configuration is cached
+     *
+     * In case configuration cache exists method 'load' returns
+     * value equal to $this->cacheExistenceKey
+     *
+     * @return bool
+     */
+    private function isCacheExists()
+    {
+        return $this->cache->load($this->cacheExistenceKey) !== false;
+    }
+
+    /**
+     * Explode path by '/'(forward slash) separator
+     *
+     * In case $path string contains forward slash symbol(/) the $path is exploded and parts array is returned
+     * In other case empty array is returned
+     *
+     * @param string $path
+     * @return array
+     */
+    private function getPathParts($path)
+    {
+        $pathParts = [];
+        if (strpos($path, '/') !== false) {
+            $pathParts = explode('/', $path);
+        }
+        return $pathParts;
+    }
+
+    /**
+     * Check whether requested configuration data is read to memory
+     *
+     * Because of configuration is cached partially each part can be loaded separately
+     * Method performs check if corresponding system configuration part is already loaded to memory
+     * and value can be retrieved directly without cache look up
+     *
+     *
+     * @param string $path
+     * @return bool
+     */
+    private function isConfigRead($path)
+    {
+        $pathParts = $this->getPathParts($path);
+        return !empty($pathParts) && isset($this->data[$pathParts[0]][$pathParts[1]]);
+    }
+
+    /**
+     * Load configuration from all the sources
+     *
+     * System configuration is loaded in 3 steps performing consecutive calls to
+     * Pre Processor, Fallback Processor, Post Processor accordingly
+     *
+     * @return array
+     */
+    private function loadConfig()
+    {
+        $data = $this->preProcessor->process($this->source->get());
+        $this->data = new DataObject($data);
+        $data = $this->fallback->process($data);
+        $this->data = new DataObject($data);
+
+        return $this->postProcessor->process($data);
+    }
+
+    /**
+     *
+     * Load configuration and caching it by parts.
+     *
+     * To be cached configuration is loaded first.
+     * Then it is cached by parts to minimize memory usage on load.
+     * Additional flag cached as well to give possibility check cache existence without data load.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function cacheConfig($data)
+    {
+        foreach ($data as $scope => $scopeData) {
+            foreach ($scopeData as $key => $config) {
                 $this->cache->save(
-                    $this->serializer->serialize($this->data->getData()),
-                    $this->configType,
+                    $this->serializer->serialize($config),
+                    $this->configType . '_' . $scope . $key,
                     [self::CACHE_TAG]
                 );
-            } else {
-                $this->data = new DataObject($this->serializer->unserialize($data));
+            }
+        }
+        $this->cache->save($this->cacheExistenceKey, $this->cacheExistenceKey, [self::CACHE_TAG]);
+    }
+
+    /**
+     * Read cached configuration
+     *
+     * Read section of system configuration corresponding to requested $path from cache
+     * Configuration stored to internal property right after load to prevent additional
+     * requests to cache storage
+     *
+     * @param string $path
+     * @return mixed
+     */
+    private function readFromCache($path)
+    {
+        if ($this->data === null) {
+            $this->data = new DataObject();
+        }
+
+        $result = null;
+        $pathParts = $this->getPathParts($path);
+        if (!empty($pathParts)) {
+            $result = $this->cache->load($this->configType . '_' . $pathParts[0] . $pathParts[1]);
+            if ($result !== false) {
+                $readData = $this->data->getData();
+                $readData[$pathParts[0]][$pathParts[1]] = $this->serializer->unserialize($result);
+                $this->data->setData($readData);
             }
         }
 
@@ -128,6 +252,10 @@ public function get($path = '')
     /**
      * Clean cache and global variables cache
      *
+     * Next items cleared:
+     * - Internal property intended to store already loaded configuration data
+     * - All records in cache storage tagged with CACHE_TAG
+     *
      * @return void
      */
     public function clean()