allow null in setAdapter

zendframework · Jan 17, 2016 · 5008575 · 5008575
1 parent 5925576
commit 5008575
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Barcode.php b/src/Barcode.php
@@ -48,10 +48,6 @@ class Barcode extends AbstractValidator
      */
     public function __construct($options = null)
     {
-        if ($options === null) {
-            $options['options']['adapter'] = $this->getAdapter();
-        }
-
         if (!is_array($options) && !($options instanceof Traversable)) {
             $options = ['adapter' => $options];
         }
@@ -80,13 +76,17 @@ public function getAdapter()
     /**
      * Sets a new barcode adapter
      *
-     * @param  string|Barcode\AbstractAdapter $adapter Barcode adapter to use
+     * @param  string|Barcode\AbstractAdapter|null $adapter Barcode adapter to use
      * @param  array  $options Options for this adapter
      * @return Barcode
      * @throws Exception\InvalidArgumentException
      */
-    public function setAdapter($adapter, $options = null)
+    public function setAdapter($adapter = null, $options = null)
     {
+        if ($adapter === null) {
+            $adapter = $this->getAdapter();
+        }
+
         if (is_string($adapter)) {
             $adapter = ucfirst(strtolower($adapter));
             $adapter = 'Zend\\Validator\\Barcode\\' . $adapter;