Merge remote-tracking branch 'origin/MAGETWO-30809-compiled-definitions' into develop

Author: Joan He

dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Definition/CompiledTest.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\ObjectManager\Definition;
+
+class CompiledTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetParametersWithUndefinedDefinition()
+    {
+        $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $undefinedDefinitionSignature = new \stdClass();
+        $className = 'undefinedDefinition';
+        $readerMock = $this->getMock(
+            '\Magento\Framework\Code\Reader\ClassReader',
+            ['getConstructor'],
+            [],
+            '',
+            false
+        );
+        $readerMock->expects($this->once())
+            ->method('getConstructor')
+            ->with($className)
+            ->willReturn($undefinedDefinitionSignature);
+        $model = $objectManager->getObject(
+            'Magento\Framework\ObjectManager\Definition\CompiledStub',
+            [
+                'definitions' => [[], []],
+                'reader' => $readerMock
+            ]
+        );
+        $this->assertEquals($undefinedDefinitionSignature, $model->getParameters($className));
+    }
+}
+
+/**
+ * Stub class for abstract Magento\Framework\ObjectManager\Definition
+ */
+class CompiledStub extends Compiled
+{
+
+    /**
+     * Unpack signature
+     *
+     * @param string $signature
+     * @return mixed
+     */
+    protected function _unpack($signature)
+    {
+        return unserialize($signature);
+    }
+}

lib/internal/Magento/Framework/ObjectManager/Definition/Compiled.php

@@ -17,12 +17,19 @@ abstract class Compiled implements \Magento\Framework\ObjectManager\DefinitionIn
      */
     protected $_definitions;
 
+    /**
+     * @var \Magento\Framework\Code\Reader\ClassReader
+     */
+    protected $reader ;
+
     /**
      * @param array $definitions
+     * @param \Magento\Framework\Code\Reader\ClassReader $reader
      */
-    public function __construct(array $definitions)
+    public function __construct(array $definitions, \Magento\Framework\Code\Reader\ClassReader $reader = null)
     {
         list($this->_signatures, $this->_definitions) = $definitions;
+        $this->reader = $reader ?: new \Magento\Framework\Code\Reader\ClassReader();
     }
 
     /**
@@ -51,6 +58,11 @@ abstract protected function _unpack($signature);
      */
     public function getParameters($className)
     {
+        // if the definition isn't found in the list gathered from the compiled file then  using reflection to find it
+        if (!array_key_exists($className, $this->_definitions)) {
+            return $this->reader->getConstructor($className);
+        }
+
         $definition = $this->_definitions[$className];
         if ($definition !== null) {
             if (is_string($this->_signatures[$definition])) {