Merge branch 'hotfix/3729' into develop

Forward port zendframework/zendframework#3729
zendframework · Feb 8, 2013 · 3e577bd · 3e577bd
commit 3e577bd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/ObjectPluginManager.php b/src/ObjectPluginManager.php
@@ -20,6 +20,11 @@
  */
 class ObjectPluginManager extends AbstractPluginManager
 {
+    /**
+     * @var bool Ensure services are not shared
+     */
+    protected $shareByDefault = false;
+
     /**
      * Default set of barcode parsers
      *

diff --git a/src/RendererPluginManager.php b/src/RendererPluginManager.php
@@ -20,6 +20,11 @@
  */
 class RendererPluginManager extends AbstractPluginManager
 {
+    /**
+     * @var bool Ensure services are not shared
+     */
+    protected $shareByDefault = false;
+
     /**
      * Default set of barcode renderers
      *

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -179,6 +179,9 @@ public function testBarcodeObjectFactoryWithBarcodeAsString()
     {
         $barcode = Barcode\Barcode::makeBarcode('code25');
         $this->assertTrue($barcode instanceof Object\Code25);
+
+        // ensure makeBarcode creates unique instances
+        $this->assertNotSame($barcode, Barcode\Barcode::makeBarcode('code25'));
     }
 
     public function testBarcodeObjectFactoryWithBarcodeAsStringAndConfigAsArray()
@@ -263,6 +266,9 @@ public function testBarcodeRendererFactoryWithBarcodeAsString()
         $this->checkGDRequirement();
         $renderer = Barcode\Barcode::makeRenderer('image');
         $this->assertTrue($renderer instanceof Renderer\Image);
+
+        // ensure unique instance is created
+        $this->assertNotSame($renderer, Barcode\Barcode::makeRenderer('image'));
     }
 
     public function testBarcodeRendererFactoryWithBarcodeAsStringAndConfigAsArray()