Fixed the CHANGELOG

zendframework · Dec 5, 2016 · c230d0b · c230d0b
2 parents f00ef93 + 5e392c4
commit c230d0b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
-All notable changes to this project will be documented in this file, in reverse chronological order by release.
+All notable changes to this project will be documented in this file, in reverse
+chronological order by release.
 
 ## 3.2.0 - TBD
 

diff --git a/composer.json b/composer.json
@@ -35,8 +35,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev",
-            "dev-develop": "3.1-dev"
+            "dev-master": "3.1-dev",
+            "dev-develop": "3.2-dev"
         }
     }
 }
diff --git a/src/Password/Bcrypt.php b/src/Password/Bcrypt.php
@@ -41,11 +41,14 @@ public function __construct($options = [])
         if (!empty($options)) {
             if ($options instanceof Traversable) {
                 $options = ArrayUtils::iteratorToArray($options);
-            } elseif (!is_array($options)) {
+            }
+
+            if (!is_array($options)) {
                 throw new Exception\InvalidArgumentException(
                     'The options parameter must be an array or a Traversable'
                 );
             }
+
             foreach ($options as $key => $value) {
                 switch (strtolower($key)) {
                     case 'salt':