Merge remote-tracking branch 'falcon/MAGETWO-56675' into MAGETWO-60931

Author: oshmyheliuk

lib/internal/Magento/Framework/Interception/PluginList/PluginList.php

@@ -276,27 +276,26 @@ protected function _loadScopedData()
             $data = $this->_cache->load($cacheId);
             if ($data) {
                 list($this->_data, $this->_inherited, $this->_processed) = unserialize($data);
-                foreach ($this->_scopePriorityScheme as $scope) {
-                    $this->_loadedScopes[$scope] = true;
+                foreach ($this->_scopePriorityScheme as $scopeCode) {
+                    $this->_loadedScopes[$scopeCode] = true;
                 }
             } else {
                 $virtualTypes = [];
                 foreach ($this->_scopePriorityScheme as $scopeCode) {
                     if (false == isset($this->_loadedScopes[$scopeCode])) {
                         $data = $this->_reader->read($scopeCode);
                         unset($data['preferences']);
-                        if (!count($data)) {
-                            continue;
-                        }
-                        $this->_inherited = [];
-                        $this->_processed = [];
-                        $this->merge($data);
-                        $this->_loadedScopes[$scopeCode] = true;
-                        foreach ($data as $class => $config) {
-                            if (isset($config['type'])) {
-                                $virtualTypes[] = $class;
+                        if (count($data) > 0) {
+                            $this->_inherited = [];
+                            $this->_processed = [];
+                            $this->merge($data);
+                            foreach ($data as $class => $config) {
+                                if (isset($config['type'])) {
+                                    $virtualTypes[] = $class;
+                                }
                             }
                         }
+                        $this->_loadedScopes[$scopeCode] = true;
                     }
                     if ($this->isCurrentScope($scopeCode)) {
                         break;

lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php

@@ -256,4 +256,33 @@ public function testLoadScopedDataCached()
 
         $this->assertEquals(null, $this->_model->getNext('Type', 'method'));
     }
+
+    /**
+     * @covers \Magento\Framework\Interception\PluginList\PluginList::getNext
+     * @covers \Magento\Framework\Interception\PluginList\PluginList::_loadScopedData
+     */
+    public function testLoadScopeDataWithEmptyData()
+    {
+        $this->_objectManagerMock->expects($this->any())
+            ->method('get')
+            ->will($this->returnArgument(0));
+        $this->_configScopeMock->expects($this->any())
+            ->method('getCurrentScope')
+            ->will($this->returnValue('emptyscope'));
+
+        $this->assertEquals(
+            [4 => ['simple_plugin']],
+            $this->_model->getNext(
+                \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class,
+                'getName'
+            )
+        );
+        $this->assertEquals(
+            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Simple::class,
+            $this->_model->getPlugin(
+                \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class,
+                'simple_plugin'
+            )
+        );
+    }
 }

lib/internal/Magento/Framework/Interception/Test/Unit/_files/reader_mock_map.php

@@ -77,5 +77,11 @@
                 ],
             ]
         ]
+    ],
+    [
+        'emptyscope',
+        [
+
+        ]
     ]
 ];