Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zendframework/zend-session
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: release-2.9.0
Choose a base ref
...
head repository: zendframework/zend-session
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release-2.9.1
Choose a head ref
  • 7 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 20, 2019

  1. Bumped to next dev version (2.9.1)

    @michalbundyra
    michalbundyra committed Sep 20, 2019
    Copy the full SHA
    222022d View commit details

Commits on Oct 18, 2019

  1. Properly merge arrays of allowed hash algorithms. 

    The `+` operator does not renumber array keys.
The keys that existed on the left side will replace fields from the
right hand side with the same keys.

On my installation, `md2` and `md4` would left out of the final result.

This was detected by static analysis. I don't have a personal use case
for md2/md4.
    @TysonAndre-tmg
    TysonAndre-tmg committed Oct 18, 2019
    Copy the full SHA
    fd7c9ad View commit details

Commits on Oct 28, 2019

  1. Merge pull request #123 from TysonAndre/fix-hash_algos-merge 

    Properly merge arrays of allowed hash algorithms.
    @michalbundyra
    michalbundyra committed Oct 28, 2019
    Copy the full SHA
    920cbc1 View commit details

  2. Update CHANGELOG entry for #123

    @michalbundyra
    michalbundyra committed Oct 28, 2019
    Copy the full SHA
    c0c6b30 View commit details

  3. Merge branch 'hotfix/123' 

    Close #123
    @michalbundyra
    michalbundyra committed Oct 28, 2019
    Copy the full SHA
    cce94a3 View commit details

  4. release: 2.9.1 readiness

    @michalbundyra
    michalbundyra committed Oct 28, 2019
    Copy the full SHA
    44a6471 View commit details

  5. Merge branch 'release/2.9.1'

    @michalbundyra
    michalbundyra committed Oct 28, 2019
    Copy the full SHA
    c289c4d View commit details
Showing with 27 additions and 4 deletions.
  1. +24 −1 CHANGELOG.md
  2. +1 −1 src/Config/SessionConfig.php
  3. +1 −1 test/Config/SessionConfigTest.php
  4. +1 −1 test/Config/StandardConfigTest.php
25 changes: 24 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,29 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 2.9.1 - 2019-10-28

### Added

- Nothing.

### Changed

- Nothing.

### Deprecated

- Nothing.

### Removed

- Nothing.

### Fixed

- [#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

### Added
@@ -108,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
2 changes: 1 addition & 1 deletion src/Config/SessionConfig.php
View file
Original file line number Diff line number Diff line change
@@ -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;
}
2 changes: 1 addition & 1 deletion test/Config/SessionConfigTest.php
View file
Original file line number Diff line number Diff line change
@@ -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];
2 changes: 1 addition & 1 deletion test/Config/StandardConfigTest.php
View file
Original file line number Diff line number Diff line change
@@ -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];