Merge branch 'hotfix/52' into develop

Forward port #52

CHANGELOG.md

@@ -44,6 +44,9 @@ All notable changes to this project will be documented in this file, in reverse
   aliases for the i18n isfloat/isint validators.
 - Updates the hostname validator regexes per the canonical service on which they
   are based.
+- [#52](https://github.com/zendframework/zend-validator/pull/52) updates the
+  `Barcode` validator to cast empty options passed to the constructor to an
+  empty array, fixing type mismatch errors.
 
 ## 2.5.3 - 2015-09-03
 

src/Barcode.php

@@ -48,6 +48,10 @@ class Barcode extends AbstractValidator
      */
     public function __construct($options = null)
     {
+        if ($options === null) {
+            $options = [];
+        }
+
         if (!is_array($options) && !($options instanceof Traversable)) {
             $options = ['adapter' => $options];
         }

test/BarcodeTest.php

@@ -18,6 +18,22 @@
  */
 class BarcodeTest extends \PHPUnit_Framework_TestCase
 {
+    public function provideBarcodeConstructor()
+    {
+        return [
+            'null' => [null, Barcode\Ean13::class],
+            'empty-array' => [[], Barcode\Ean13::class],
+        ];
+    }
+    /**
+     * @dataProvider provideBarcodeConstructor
+     */
+    public function testBarcodeConstructor($options, $expectedInstance)
+    {
+        $barcode = new Barcode($options);
+        $this->assertInstanceOf($expectedInstance, $barcode->getAdapter());
+    }
+
     public function testNoneExisting()
     {
         $this->setExpectedException('Zend\Validator\Exception\InvalidArgumentException', 'not found');
@@ -466,14 +482,20 @@ public function testEan13ContainsOnlyNumeric()
     public function testEqualsMessageTemplates()
     {
         $validator = new Barcode('code25');
-        $this->assertAttributeEquals($validator->getOption('messageTemplates'),
-                                     'messageTemplates', $validator);
+        $this->assertAttributeEquals(
+            $validator->getOption('messageTemplates'),
+            'messageTemplates',
+            $validator
+        );
     }
 
     public function testEqualsMessageVariables()
     {
         $validator = new Barcode('code25');
-        $this->assertAttributeEquals($validator->getOption('messageVariables'),
-                                     'messageVariables', $validator);
+        $this->assertAttributeEquals(
+            $validator->getOption('messageVariables'),
+            'messageVariables',
+            $validator
+        );
     }
 }