Merge pull request zendframework#29 from weierophinney/feature/di-sha…

…red-instance

Feature/di shared instance

tests/Zend/Di/DiTest.php

@@ -591,4 +591,23 @@ public function testInjectionForSetterInjectionWillConsultSupertypeDefinitionInC
         $this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\A', $c->a);
     }
 
+    /**
+     * @group SharedInstance
+     */
+    public function testMarkingClassAsNotSharedInjectsNewInstanceIntoAllRequestersButDependentsAreShared()
+    {
+        $di = new Di();
+        $di->configure(new Configuration(array(
+            'instance' => array(
+                'ZendTest\Di\TestAsset\SharedInstance\Lister' => array(
+                    'shared' => false
+                )
+            )
+        )));
+        $movie = $di->get('ZendTest\Di\TestAsset\SharedInstance\Movie');
+        $venue = $di->get('ZendTest\Di\TestAsset\SharedInstance\Venue');
+
+        $this->assertNotSame($movie->lister, $venue->lister);
+        $this->assertSame($movie->lister->sharedLister, $venue->lister->sharedLister);
+    }
 }

tests/Zend/Di/TestAsset/SharedInstance/Lister.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Di
+ * @subpackage UnitTest
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace ZendTest\Di\TestAsset\SharedInstance;
+
+class Lister
+{
+    public $sharedLister;
+
+    public function setSharedLister(SharedLister $lister)
+    {
+        $this->sharedLister = $lister;
+    }
+}

tests/Zend/Di/TestAsset/SharedInstance/Movie.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Di
+ * @subpackage UnitTest
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace ZendTest\Di\TestAsset\SharedInstance;
+
+class Movie
+{
+    public $lister;
+
+    public function __construct(Lister $lister)
+    {
+        $this->lister = $lister;
+    }
+}

tests/Zend/Di/TestAsset/SharedInstance/SharedLister.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Di
+ * @subpackage UnitTest
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace ZendTest\Di\TestAsset\SharedInstance;
+
+class SharedLister
+{
+}

tests/Zend/Di/TestAsset/SharedInstance/Venue.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Di
+ * @subpackage UnitTest
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace ZendTest\Di\TestAsset\SharedInstance;
+
+class Venue
+{
+    public $lister;
+
+    public function __construct(Lister $lister)
+    {
+        $this->lister = $lister;
+    }
+}