MAGETWO-47009: Github #2674 Plugins/Interceptors Don't Work with Early Stage Single Instance Objects in Developer Mode

 - 2.0.1 release

Author: Dale Sikkema

lib/internal/Magento/Framework/App/ObjectManager/Environment/Developer.php

@@ -62,6 +62,7 @@ public function getObjectManagerConfigLoader()
      */
     public function configureObjectManager(ConfigInterface $diConfig, &$sharedInstances)
     {
+        $originalSharedInstances = $sharedInstances;
         $objectManager = ObjectManager::getInstance();
         $sharedInstances['Magento\Framework\ObjectManager\ConfigLoaderInterface'] = $objectManager
             ->get('Magento\Framework\App\ObjectManager\ConfigLoader');
@@ -80,5 +81,9 @@ public function configureObjectManager(ConfigInterface $diConfig, &$sharedInstan
         $diConfig->setInterceptionConfig(
             $objectManager->get('Magento\Framework\Interception\Config\Config')
         );
+        /** Reset the shared instances once interception config is set so classes can be intercepted if necessary */
+        $sharedInstances = $originalSharedInstances;
+        $sharedInstances['Magento\Framework\ObjectManager\ConfigLoaderInterface'] = $objectManager
+            ->get('Magento\Framework\App\ObjectManager\ConfigLoader');
     }
 }

lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/DeveloperTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\App\Test\Unit\ObjectManager\Environment;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ObjectManager\Environment\Developer;
 
 class DeveloperTest extends \PHPUnit_Framework_TestCase
@@ -29,4 +30,61 @@ public function testGetObjectManagerConfigLoader()
     {
         $this->assertNull($this->_developer->getObjectManagerConfigLoader());
     }
+
+    public function testConfigureObjectManager()
+    {
+        try {
+            $origObjectManager = ObjectManager::getInstance();
+        } catch (\Exception $e) {
+            $origObjectManager = null;
+        }
+
+
+        $objectManagerMock = $this->getMockBuilder('Magento\Framework\App\ObjectManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+        ObjectManager::setInstance($objectManagerMock);
+        $diConfigMock = $this->getMockBuilder('\Magento\Framework\Interception\ObjectManager\ConfigInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $configLoaderMock = $this->getMockBuilder('Magento\Framework\App\ObjectManager\ConfigLoader')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $configLoaderMock->expects($this->any())->method('load')->willReturn([]);
+        $omReturnMap = [
+            ['Magento\Framework\App\ObjectManager\ConfigLoader',  $configLoaderMock],
+            [
+                'Magento\Framework\Config\ScopeInterface',
+                $this->getMockBuilder('Magento\Framework\Config\ScopeInterface')
+                    ->disableOriginalConstructor()
+                    ->getMock()
+            ],
+            [
+                'Magento\Framework\App\ObjectManager\ConfigCache',
+                $this->getMockBuilder('Magento\Framework\App\ObjectManager\ConfigCache')
+                    ->disableOriginalConstructor()
+                    ->getMock()
+            ],
+            [
+                'Magento\Framework\Interception\Config\Config',
+                $this->getMockBuilder('Magento\Framework\Interception\Config\Config')
+                    ->disableOriginalConstructor()
+                    ->getMock()
+            ]
+        ];
+        $objectManagerMock->expects($this->any())->method('get')->willReturnMap($omReturnMap);
+
+        $sharedInstances = ['class_name' => 'shared_object'];
+        $this->_developer->configureObjectManager($diConfigMock, $sharedInstances);
+
+        $expectedSharedInstances = [
+            'class_name' => 'shared_object',
+            'Magento\Framework\ObjectManager\ConfigLoaderInterface' =>  $configLoaderMock
+        ];
+        $this->assertSame($expectedSharedInstances, $sharedInstances);
+        if (isset($origObjectManager)) {
+            ObjectManager::setInstance($origObjectManager);
+        }
+    }
 }