Merge branch 'hotfix/123'

Close #123

Author: michalbundyra

CHANGELOG.md

@@ -22,7 +22,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#123](https://github.com/zendframework/zend-session/pull/123) fixes a bug preventing two first hash functions from `hash_algos()`
+  (usually `md2` and `md4`) from being used in `SessionConfig::setHashFunction`.
 
 ## 2.9.0 - 2019-09-20
 
@@ -130,7 +131,7 @@ All notable changes to this project will be documented in this file, in reverse
 ### Fixed
 
 - [#108](https://github.com/zendframework/zend-session/pull/108) fixes a dependency
-  conflict in `composer.json` which prevented `phpunit/phpunit` 6.5 or newer from 
+  conflict in `composer.json` which prevented `phpunit/phpunit` 6.5 or newer from
   being installed together with `zendframework/zend-session`.
 
 ## 2.8.4 - 2018-01-31

src/Config/SessionConfig.php

@@ -360,7 +360,7 @@ protected function getHashFunctions()
              * "0" and "1" refer to MD5-128 and SHA1-160, respectively, and are
              * valid in addition to whatever is reported by hash_algos()
              */
-            $this->validHashFunctions = ['0', '1'] + hash_algos();
+            $this->validHashFunctions = array_merge(['0', '1'], hash_algos());
         }
         return $this->validHashFunctions;
     }

test/Config/SessionConfigTest.php

@@ -720,7 +720,7 @@ public function testUseTransSidAltersIniSetting()
 
     public function hashFunctions()
     {
-        $hashFunctions = [0, 1] + hash_algos();
+        $hashFunctions = array_merge([0, 1], hash_algos());
         $provider      = [];
         foreach ($hashFunctions as $function) {
             $provider[] = [$function];

test/Config/StandardConfigTest.php

@@ -432,7 +432,7 @@ public function testUseTransSidIsMutable()
 
     public function hashFunctions()
     {
-        $hashFunctions = [0, 1] + hash_algos();
+        $hashFunctions = array_merge([0, 1], hash_algos());
         $provider      = [];
         foreach ($hashFunctions as $function) {
             $provider[] = [$function];