Merge branch 'hotfix/4285' into develop

Forward port zendframework/zendframework#4285
zendframework · Apr 22, 2013 · f0a44c8 · f0a44c8
commit f0a44c8
Show file tree

Hide file tree

Showing 18 changed files with 90 additions and 17 deletions.
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -58,6 +58,16 @@ class ServiceManager implements ServiceLocatorInterface
      */
     protected $pendingAbstractFactoryRequests = array();
 
+    /**
+     * @var string
+     */
+    protected $lastAbstractFactoryUsed = null;
+
+    /**
+     * @var string
+     */
+    protected $lastCanonicalNameUsed   = null;
+
     /**
      * @var array
      */
@@ -704,7 +714,18 @@ public function canCreateFromAbstractFactory($cName, $rName)
                 return false;
             }
 
+            $objectHash = spl_object_hash($abstractFactory);
+
+            if ($this->lastAbstractFactoryUsed === $objectHash && $this->lastCanonicalNameUsed === $cName) {
+                $this->lastAbstractFactoryUsed = $this->lastCanonicalNameUsed = null;
+                return false;
+            }
+
+            $this->lastAbstractFactoryUsed = $objectHash;
+            $this->lastCanonicalNameUsed   = $cName;
+
             if ($abstractFactory->canCreateServiceWithName($this, $cName, $rName)) {
+                $this->lastAbstractFactoryUsed = $this->lastCanonicalNameUsed = null;
                 return true;
             }
         }

diff --git a/test/Di/DiAbstractServiceFactoryTest.php b/test/Di/DiAbstractServiceFactoryTest.php
@@ -5,14 +5,16 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\Di;
 
 use Zend\ServiceManager\Di\DiAbstractServiceFactory;
 use Zend\ServiceManager\ServiceManager;
 
+/**
+ * @group Zend_ServiceManager
+ */
 class DiAbstractServiceFactoryTest extends \PHPUnit_Framework_TestCase
 {
 

diff --git a/test/Di/DiServiceFactoryTest.php b/test/Di/DiServiceFactoryTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\Di;
@@ -14,6 +13,9 @@
 use Zend\ServiceManager\Di\DiServiceFactory;
 use Zend\ServiceManager\ServiceManager;
 
+/**
+ * @group Zend_ServiceManager
+ */
 class DiServiceFactoryTest extends \PHPUnit_Framework_TestCase
 {
 

diff --git a/test/Di/DiServiceInitializerTest.php b/test/Di/DiServiceInitializerTest.php
@@ -5,14 +5,16 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\Di;
 
 use Zend\ServiceManager\Di\DiServiceInitializer;
 use Zend\ServiceManager\Di\DiInstanceManagerProxy;
 
+/**
+ * @group Zend_ServiceManager
+ */
 class DiServiceInitializerTest extends \PHPUnit_Framework_TestCase
 {
     /**

diff --git a/test/ServiceLocatorAwareTraitTest.php b/test/ServiceLocatorAwareTraitTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager;
@@ -15,6 +14,7 @@
 
 /**
  * @requires PHP 5.4
+ * @group    Zend_ServiceManager
  */
 class ServiceLocatorAwareTraitTest extends TestCase
 {

diff --git a/test/ServiceManagerTest.php b/test/ServiceManagerTest.php
@@ -5,11 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager;
 
+use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Di\Di;
 use Zend\Mvc\Service\DiFactory;
 use Zend\ServiceManager\Di\DiAbstractServiceFactory;
@@ -20,7 +20,10 @@
 use ZendTest\ServiceManager\TestAsset\FooCounterAbstractFactory;
 use ZendTest\ServiceManager\TestAsset\MockSelfReturningDelegatorFactory;
 
-class ServiceManagerTest extends \PHPUnit_Framework_TestCase
+/**
+ * @group Zend_ServiceManager
+ */
+class ServiceManagerTest extends TestCase
 {
 
     /**
@@ -549,6 +552,24 @@ public function testWillNotCreateCircularReferences()
         $this->assertSame($abstractFactory->expectedInstance, $foo);
     }
 
+    /**
+     * When failing, this test will trigger a fatal error: Allowed memory size of # bytes exhausted
+     */
+    public function testCallingANonExistingServiceFromAnAbstractServiceDoesNotMakeTheServerExhaustTheAllowedMemoryByCallingItselfForTheGivenService()
+    {
+        $abstractFactory = new TestAsset\TrollAbstractFactory;
+        $this->serviceManager->addAbstractFactory($abstractFactory);
+
+        $this->assertSame($abstractFactory->inexistingServiceCheckResult, null);
+
+        // By doing this the Service Manager will rely on the Abstract Service Factory
+        $service = $this->serviceManager->get('SomethingThatCanBeCreated');
+
+        $this->assertSame(false, $abstractFactory->inexistingServiceCheckResult);
+
+        $this->assertInstanceOf('stdClass', $service);
+    }
+
     public function testShouldAllowAddingInitializersAsClassNames()
     {
         $result = $this->serviceManager->addInitializer('ZendTest\ServiceManager\TestAsset\FooInitializer');

diff --git a/test/TestAsset/Bar.php b/test/TestAsset/Bar.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;

diff --git a/test/TestAsset/BarAbstractFactory.php b/test/TestAsset/BarAbstractFactory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;

diff --git a/test/TestAsset/CircularDependencyAbstractFactory.php b/test/TestAsset/CircularDependencyAbstractFactory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;

diff --git a/test/TestAsset/ExceptionThrowingFactory.php b/test/TestAsset/ExceptionThrowingFactory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;

diff --git a/test/TestAsset/Foo.php b/test/TestAsset/Foo.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;

diff --git a/test/TestAsset/FooAbstractFactory.php b/test/TestAsset/FooAbstractFactory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;

diff --git a/test/TestAsset/FooCounterAbstractFactory.php b/test/TestAsset/FooCounterAbstractFactory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;

diff --git a/test/TestAsset/FooException.php b/test/TestAsset/FooException.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;

diff --git a/test/TestAsset/FooFactory.php b/test/TestAsset/FooFactory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;

diff --git a/test/TestAsset/FooInitializer.php b/test/TestAsset/FooInitializer.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;

diff --git a/test/TestAsset/GlobIteratorService.php b/test/TestAsset/GlobIteratorService.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;

diff --git a/test/TestAsset/TrollAbstractFactory.php b/test/TestAsset/TrollAbstractFactory.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * 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)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\ServiceManager\TestAsset;
+
+use stdClass;
+use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class TrollAbstractFactory implements AbstractFactoryInterface
+{
+    public $inexistingServiceCheckResult = null;
+
+    public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
+    {
+        // Check if a non-existing service exists
+        $this->inexistingServiceCheckResult = $serviceLocator->has('NonExistingService');
+
+        if ($requestedName === 'SomethingThatCanBeCreated') {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
+    {
+        return new stdClass;
+    }
+}