Merge branch 'develop'

Promote develop to master, becoming the next stable release.
zendframework · Mar 12, 2014 · f89400a · f89400a
commit f89400a
Show file tree

Hide file tree

Showing 30 changed files with 326 additions and 124 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,13 @@
         }
     },
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=5.3.23"
+    },
+    "require-dev": {
+        "zendframework/zend-di": "self.version",
+        "fabpot/php-cs-fixer": "1.7.*",
+        "satooshi/php-coveralls": "dev-master",
+        "phpunit/PHPUnit": "~4.0"
     },
     "suggest": {
         "zendframework/zend-di": "Zend\\Di component"
@@ -28,10 +34,5 @@
         "psr-4": {
             "ZendTest\\ServiceManager\\": "test/"
         }
-    },
-    "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "satooshi/php-coveralls": "dev-master",
-        "phpunit/PHPUnit": "~4.0"
     }
 }
diff --git a/src/Proxy/LazyServiceFactoryFactory.php b/src/Proxy/LazyServiceFactoryFactory.php
@@ -43,6 +43,10 @@ public function createService(ServiceLocatorInterface $serviceLocator)
 
         $factoryConfig = new Configuration();
 
+        if (isset($lazyServices['proxies_namespace'])) {
+            $factoryConfig->setProxiesNamespace($lazyServices['proxies_namespace']);
+        }
+
         if (isset($lazyServices['proxies_target_dir'])) {
             $factoryConfig->setProxiesTargetDir($lazyServices['proxies_target_dir']);
         }
@@ -51,22 +55,7 @@ public function createService(ServiceLocatorInterface $serviceLocator)
             $factoryConfig->setGeneratorStrategy(new EvaluatingGeneratorStrategy());
         }
 
-        if (isset($lazyServices['auto_generate_proxies'])) {
-            $factoryConfig->setAutoGenerateProxies($lazyServices['auto_generate_proxies']);
-
-            // register the proxy autoloader if the proxies already exist
-            if (!$lazyServices['auto_generate_proxies']) {
-                spl_autoload_register($factoryConfig->getProxyAutoloader());
-
-                $factoryConfig->setGeneratorStrategy(new EvaluatingGeneratorStrategy());
-            }
-        }
-
-        //if (!isset($lazyServicesConfig['runtime_evaluate_proxies']))
-
-        if (isset($lazyServices['proxies_namespace'])) {
-            $factoryConfig->setProxiesNamespace($lazyServices['proxies_namespace']);
-        }
+        spl_autoload_register($factoryConfig->getProxyAutoloader());
 
         return new LazyServiceFactory(new LazyLoadingValueHolderFactory($factoryConfig), $lazyServices['class_map']);
     }

diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -59,14 +59,14 @@ class ServiceManager implements ServiceLocatorInterface
     protected $pendingAbstractFactoryRequests = array();
 
     /**
-     * @var string
+     * @var integer
      */
-    protected $lastAbstractFactoryUsed = null;
+    protected $nestedContextCounter = -1;
 
     /**
-     * @var string
+     * @var array
      */
-    protected $lastCanonicalNameUsed   = null;
+    protected $nestedContext = array();
 
     /**
      * @var array
@@ -494,6 +494,7 @@ public function get($name, $usePeeringServiceManagers = true)
         }
 
         if (!$instance) {
+            $this->checkNestedContextStart($cName);
             if (
                 isset($this->invokableClasses[$cName])
                 || isset($this->factories[$cName])
@@ -512,10 +513,12 @@ public function get($name, $usePeeringServiceManagers = true)
             } elseif ($usePeeringServiceManagers && !$this->retrieveFromPeeringManagerFirst) {
                 $instance = $this->retrieveFromPeeringManager($name);
             }
+            $this->checkNestedContextStop();
         }
 
         // Still no instance? raise an exception
         if ($instance === null) {
+            $this->checkNestedContextStop(true);
             if ($isAlias) {
                 throw new Exception\ServiceNotFoundException(sprintf(
                     'An alias "%s" was requested but no service could be found.',
@@ -612,12 +615,14 @@ public function doCreate($rName, $cName)
         if ($instance === null && isset($this->invokableClasses[$cName])) {
             $instance = $this->createFromInvokable($cName, $rName);
         }
-
+        $this->checkNestedContextStart($cName);
         if ($instance === null && $this->canCreateFromAbstractFactory($cName, $rName)) {
             $instance = $this->createFromAbstractFactory($cName, $rName);
         }
+        $this->checkNestedContextStop();
 
         if ($instance === null && $this->throwExceptionInCreate) {
+            $this->checkNestedContextStop(true);
             throw new Exception\ServiceNotFoundException(sprintf(
                 'No valid instance was found for %s%s',
                 $cName,
@@ -643,65 +648,57 @@ public function doCreate($rName, $cName)
 
     /**
      * Determine if we can create an instance.
+     * Proxies to has()
      *
      * @param  string|array $name
      * @param  bool         $checkAbstractFactories
      * @return bool
-     *
-     * @deprecated this method is being deprecated as of zendframework 2.2, and may be removed in future major versions
+     * @deprecated this method is being deprecated as of zendframework 2.3, and may be removed in future major versions
      */
     public function canCreate($name, $checkAbstractFactories = true)
     {
-        if (is_array($name)) {
-            list($cName, $rName) = $name;
-        } else {
-            $rName = $name;
-            $cName = $this->canonicalizeName($rName);
-        }
-
-        return (
-            isset($this->invokableClasses[$cName])
-            || isset($this->factories[$cName])
-            || isset($this->aliases[$cName])
-            || isset($this->instances[$cName])
-            || ($checkAbstractFactories && $this->canCreateFromAbstractFactory($cName, $rName))
-        );
+        trigger_error(sprintf('%s is deprecated; please use %s::has', __METHOD__, __CLASS__), E_USER_DEPRECATED);
+        return $this->has($name, $checkAbstractFactories, false);
     }
 
     /**
-     * @param  string|array  $name
+     * Determine if an instance exists.
+     *
+     * @param  string|array  $name  An array argument accepts exactly two values.
+     *                              Example: array('canonicalName', 'requestName')
      * @param  bool          $checkAbstractFactories
      * @param  bool          $usePeeringServiceManagers
      * @return bool
      */
     public function has($name, $checkAbstractFactories = true, $usePeeringServiceManagers = true)
     {
-        if (is_array($name)) {
-            list($cName, $rName) = $name;
-        } else {
+        if (is_string($name)) {
             $rName = $name;
 
             // inlined code from ServiceManager::canonicalizeName for performance
             if (isset($this->canonicalNames[$rName])) {
-                $cName = $this->canonicalNames[$name];
+                $cName = $this->canonicalNames[$rName];
             } else {
                 $cName = $this->canonicalizeName($name);
             }
+        } elseif (is_array($name) && count($name) >= 2) {
+            list($cName, $rName) = $name;
+        } else {
+            return false;
         }
 
-        if (
-            isset($this->invokableClasses[$cName])
+        if (isset($this->invokableClasses[$cName])
             || isset($this->factories[$cName])
             || isset($this->aliases[$cName])
             || isset($this->instances[$cName])
-            || ($checkAbstractFactories && $this->canCreateFromAbstractFactory($cName, $name))
+            || ($checkAbstractFactories && $this->canCreateFromAbstractFactory($cName, $rName))
         ) {
             return true;
         }
 
         if ($usePeeringServiceManagers) {
             foreach ($this->peeringServiceManagers as $peeringServiceManager) {
-                if ($peeringServiceManager->has($rName)) {
+                if ($peeringServiceManager->has($name)) {
                     return true;
                 }
             }
@@ -719,33 +716,33 @@ public function has($name, $checkAbstractFactories = true, $usePeeringServiceMan
      */
     public function canCreateFromAbstractFactory($cName, $rName)
     {
-        // check abstract factories
-        foreach ($this->abstractFactories as $abstractFactory) {
-            $factoryClass = get_class($abstractFactory);
-
-            if (
-                isset($this->pendingAbstractFactoryRequests[$factoryClass])
-                && $this->pendingAbstractFactoryRequests[$factoryClass] == $rName
-            ) {
+        if (array_key_exists($cName, $this->nestedContext)) {
+            $context = $this->nestedContext[$cName];
+            if ($context === false) {
                 return false;
+            } elseif (is_object($context)) {
+                return !isset($this->pendingAbstractFactoryRequests[get_class($context).$cName]);
             }
-
-            $objectHash = spl_object_hash($abstractFactory);
-
-            if ($this->lastAbstractFactoryUsed === $objectHash && $this->lastCanonicalNameUsed === $cName) {
-                $this->lastAbstractFactoryUsed = $this->lastCanonicalNameUsed = null;
-                return false;
+        }
+        $this->checkNestedContextStart($cName);
+        // check abstract factories
+        $result = false;
+        $this->nestedContext[$cName] = false;
+        foreach ($this->abstractFactories as $abstractFactory) {
+            $pendingKey = get_class($abstractFactory).$cName;
+            if (isset($this->pendingAbstractFactoryRequests[$pendingKey])) {
+                $result = false;
+                break;
             }
 
-            $this->lastAbstractFactoryUsed = $objectHash;
-            $this->lastCanonicalNameUsed   = $cName;
-
             if ($abstractFactory->canCreateServiceWithName($this, $cName, $rName)) {
-                $this->lastAbstractFactoryUsed = $this->lastCanonicalNameUsed = null;
-                return true;
+                $this->nestedContext[$cName] = $abstractFactory;
+                $result = true;
+                break;
             }
         }
-        return false;
+        $this->checkNestedContextStop();
+        return $result;
     }
 
     /**
@@ -1055,31 +1052,21 @@ protected function createFromFactory($canonicalName, $requestedName)
      */
     protected function createFromAbstractFactory($canonicalName, $requestedName)
     {
-        foreach ($this->abstractFactories as $index => $abstractFactory) {
-            // support factories as strings
-            if (is_string($abstractFactory) && class_exists($abstractFactory, true)) {
-                $this->abstractFactories[$index] = $abstractFactory = new $abstractFactory;
-            } elseif (!$abstractFactory instanceof AbstractFactoryInterface) {
-                throw new Exception\ServiceNotCreatedException(sprintf(
-                    'While attempting to create %s%s an abstract factory could not produce a valid instance.',
-                    $canonicalName,
-                    ($requestedName ? '(alias: ' . $requestedName . ')' : '')
-                ));
-            }
+        if (isset($this->nestedContext[$canonicalName])) {
+            $abstractFactory = $this->nestedContext[$canonicalName];
+            $pendingKey = get_class($abstractFactory).$canonicalName;
             try {
-                if ($abstractFactory->canCreateServiceWithName($this, $canonicalName, $requestedName)) {
-                    $this->pendingAbstractFactoryRequests[get_class($abstractFactory)] = $requestedName;
-                    $instance = $this->createServiceViaCallback(
-                        array($abstractFactory, 'createServiceWithName'),
-                        $canonicalName,
-                        $requestedName
-                    );
-                    unset($this->pendingAbstractFactoryRequests[get_class($abstractFactory)]);
-                } else {
-                    $instance = null;
-                }
+                $this->pendingAbstractFactoryRequests[$pendingKey] = true;
+                $instance = $this->createServiceViaCallback(
+                    array($abstractFactory, 'createServiceWithName'),
+                    $canonicalName,
+                    $requestedName
+                );
+                unset($this->pendingAbstractFactoryRequests[$pendingKey]);
+                return $instance;
             } catch (\Exception $e) {
-                unset($this->pendingAbstractFactoryRequests[get_class($abstractFactory)]);
+                unset($this->pendingAbstractFactoryRequests[$pendingKey]);
+                $this->checkNestedContextStop(true);
                 throw new Exception\ServiceNotCreatedException(
                     sprintf(
                         'An abstract factory could not create an instance of %s%s.',
@@ -1090,10 +1077,42 @@ protected function createFromAbstractFactory($canonicalName, $requestedName)
                     $e
                 );
             }
-            if ($instance !== null) {
-                return $instance;
-            }
         }
+        return null;
+    }
+
+    /**
+     *
+     * @param string $cName
+     * @return self
+     */
+    protected function checkNestedContextStart($cName)
+    {
+        if ($this->nestedContextCounter === -1 || !isset($this->nestedContext[$cName])) {
+            $this->nestedContext[$cName] = null;
+        }
+        $this->nestedContextCounter++;
+        return $this;
+    }
+
+    /**
+     *
+     * @param bool $force
+     * @return self
+     */
+    protected function checkNestedContextStop($force = false)
+    {
+        if ($force) {
+            $this->nestedContextCounter = -1;
+            $this->nestedContext = array();
+            return $this;
+        }
+
+        $this->nestedContextCounter--;
+        if ($this->nestedContextCounter === -1) {
+            $this->nestedContext = array();
+        }
+        return $this;
     }
 
     /**
@@ -1157,7 +1176,7 @@ protected static function isSubclassOf($className, $type)
         if (is_subclass_of($className, $type)) {
             return true;
         }
-        if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
+        if (PHP_VERSION_ID >= 50307) {
             return false;
         }
         if (!interface_exists($type)) {

diff --git a/test/AbstractPluginManagerTest.php b/test/AbstractPluginManagerTest.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/test/Di/DiAbstractServiceFactoryTest.php b/test/Di/DiAbstractServiceFactoryTest.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/test/Di/DiServiceFactoryTest.php b/test/Di/DiServiceFactoryTest.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/test/Di/DiServiceInitializerTest.php b/test/Di/DiServiceInitializerTest.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */