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

Commit eb17893

Browse files
committed
Merge branch 'feature/115' into develop
Close #115
2 parents 24b0bc6 + 0ca4b20 commit eb17893

File tree

5 files changed

+565
-410
lines changed

5 files changed

+565
-410
lines changed

.travis.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
sudo: false
2-
31
language: php
42

53
cache:
@@ -60,6 +58,15 @@ matrix:
6058
- php: 7.2
6159
env:
6260
- DEPS=latest
61+
- php: 7.3
62+
env:
63+
- DEPS=lowest
64+
- php: 7.3
65+
env:
66+
- DEPS=locked
67+
- php: 7.3
68+
env:
69+
- DEPS=latest
6370

6471
before_install:
6572
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
@@ -72,7 +79,6 @@ before_install:
7279
install:
7380
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
7481
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update --with-dependencies $COMPOSER_ARGS $LEGACY_DEPS ; fi
75-
- if [[ $DEPS == 'lowest' && $TRAVIS_PHP_VERSION =~ ^7.2 ]]; then travis_retry composer require --dev --no-update phpunit/phpunit:^6.0.13 php-mock/php-mock-phpunit:^2.0; fi
7682
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
7783
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
7884
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file, in reverse
66

77
### Added
88

9-
- Nothing.
9+
- [#115](https://github.com/zendframework/zend-session/pull/115) adds support for PHP 7.3.
1010

1111
### Changed
1212

@@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file, in reverse
1818

1919
### Removed
2020

21-
- Nothing.
21+
- [#115](https://github.com/zendframework/zend-session/pull/115) removes support for zend-stdlib v2 releases.
2222

2323
### Fixed
2424

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
"require": {
1919
"php": "^5.6 || ^7.0",
2020
"zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
21-
"zendframework/zend-stdlib": "^2.7 || ^3.0"
21+
"zendframework/zend-stdlib": "^3.2.1"
2222
},
2323
"require-dev": {
2424
"container-interop/container-interop": "^1.1",
2525
"mongodb/mongodb": "^1.0.1",
2626
"php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
27-
"phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0",
27+
"phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16",
2828
"zendframework/zend-cache": "^2.6.1",
2929
"zendframework/zend-coding-standard": "~1.0.0",
3030
"zendframework/zend-db": "^2.7",

0 commit comments

Comments
 (0)