Merge branch 'hotfix/6576' into develop

Forward port #6576
zendframework · Aug 20, 2014 · 766fd11 · 766fd11
2 parents 93b57e1 + 9121935
commit 766fd11
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/library/Zend/Validator/Barcode.php b/library/Zend/Validator/Barcode.php
@@ -91,15 +91,20 @@ public function setAdapter($adapter, $options = null)
                 throw new Exception\InvalidArgumentException('Barcode adapter matching "' . $adapter . '" not found');
             }
 
-            $this->options['adapter'] = new $adapter($options);
+            $adapter = new $adapter($options);
         }
 
-        if (!$this->options['adapter'] instanceof Barcode\AdapterInterface) {
+        if (!$adapter instanceof Barcode\AdapterInterface) {
             throw new Exception\InvalidArgumentException(
-                "Adapter $adapter does not implement Zend\\Validate\\Barcode\\AdapterInterface"
+                sprintf(
+                    "Adapter %s does not implement Zend\\Validator\\Barcode\\AdapterInterface",
+                    (is_object($adapter) ? get_class($adapter) : gettype($adapter))
+                )
             );
         }
 
+        $this->options['adapter'] = $adapter;
+
         return $this;
     }
 

diff --git a/tests/ZendTest/Validator/BarcodeTest.php b/tests/ZendTest/Validator/BarcodeTest.php
@@ -33,6 +33,15 @@ public function testSetAdapter()
         $this->assertTrue($barcode->isValid('0075678164125'));
     }
 
+    public function testSetCustomAdapter()
+    {
+        $barcode = new Barcode(array(
+            'adapter' => $this->getMock('Zend\Validator\Barcode\AdapterInterface')
+        ));
+
+        $this->assertInstanceOf('Zend\Validator\Barcode\AdapterInterface', $barcode->getAdapter());
+    }
+
     /**
      * @ZF-4352
      */