Merge 67c9190 into b1e3326

fabiocarneiro · fabiocarneiro · commit dbabcd633c37 · 2014-08-14T20:52:06.000Z
diff --git a/library/Zend/Validator/Barcode.php b/library/Zend/Validator/Barcode.php
@@ -91,15 +91,17 @@ 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\\Validate\\Barcode\\AdapterInterface", get_class($adapter))
             );
         }
 
+        $this->options['adapter'] = $adapter;
+        
         return $this;
     }
 
diff --git a/tests/ZendTest/Validator/BarcodeTest.php b/tests/ZendTest/Validator/BarcodeTest.php
@@ -32,6 +32,15 @@ public function testSetAdapter()
         $barcode->setAdapter('ean13');
         $this->assertTrue($barcode->isValid('0075678164125'));
     }
+    
+    public function testSetCustomAdapter()
+    {
+        $barcode = new Barcode([
+            'adapter' => $this->getMock('Zend\Validator\Barcode\AdapterInterface')
+        ]);
+        
+        $this->assertInstanceOf('Zend\Validator\Barcode\AdapterInterface', $barcode->getAdapter());
+    }
 
     /**
      * @ZF-4352

Original file line number	Diff line number	Diff line change
`@@ -91,15 +91,17 @@ public function setAdapter($adapter, $options = null)`
`91`	`91`	`throw new Exception\InvalidArgumentException('Barcode adapter matching "' . $adapter . '" not found');`
`92`	`92`	`}`
`93`	`93`
`94`		`- $this->options['adapter'] = new $adapter($options);`
	`94`	`+ $adapter = new $adapter($options);`
`95`	`95`	`}`
`96`		`-`
`97`		`- if (!$this->options['adapter'] instanceof Barcode\AdapterInterface) {`
	`96`	`+`
	`97`	`+ if (!$adapter instanceof Barcode\AdapterInterface) {`
`98`	`98`	`throw new Exception\InvalidArgumentException(`
`99`		`- "Adapter $adapter does not implement Zend\\Validate\\Barcode\\AdapterInterface"`
	`99`	`+ sprintf("Adapter %s does not implement Zend\\Validate\\Barcode\\AdapterInterface", get_class($adapter))`
`100`	`100`	`);`
`101`	`101`	`}`
`102`	`102`
	`103`	`+ $this->options['adapter'] = $adapter;`
	`104`	`+`
`103`	`105`	`return $this;`
`104`	`106`	`}`
`105`	`107`