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

Commit

Permalink
Merge branch 'feature/26-php-7.1-typehints' into release-3.0.0
Browse files Browse the repository at this point in the history
Close #26
  • Loading branch information
weierophinney committed Dec 6, 2017
2 parents f2104bd + 81dbd16 commit d0fe9de
Show file tree
Hide file tree
Showing 7 changed files with 300 additions and 221 deletions.
4 changes: 3 additions & 1 deletion .docheader
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/**
* @see https://github.com/zendframework/zend-expressive-aurarouter for the canonical source repository
* @copyright Copyright (c) %regexp:(20\d{2}-)?20\d{2}% Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) %regexp:(20\d{2}-)?20\d{2}% Zend Technologies USA Inc. (https://www.zend.com)
* @license https://github.com/zendframework/zend-expressive-aurarouter/blob/master/LICENSE.md New BSD License
*/

declare(strict_types=1);
23 changes: 1 addition & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,6 @@ env:

matrix:
include:
- php: 5.6
env:
- DEPS=lowest
- php: 5.6
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- php: 5.6
env:
- DEPS=latest
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- php: 7
env:
- DEPS=latest
- php: 7.1
env:
- DEPS=lowest
Expand All @@ -58,8 +38,7 @@ before_install:
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

install:
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
- travis_retry composer install $COMPOSER_ARGS
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,33 @@

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

## 3.0.0alpha1 - TBD

### Added

- [#26](https://github.com/zendframework/zend-expressive-aurarouter/pull/26) adds
support for the zend-expressive-router 3.0 series.

### Changed

- Nothing.

### Deprecated

- Nothing.

### Removed

- [#26](https://github.com/zendframework/zend-expressive-aurarouter/pull/26)
removes support for the zend-expressive-router 2.0 series.

- [#26](https://github.com/zendframework/zend-expressive-aurarouter/pull/26)
removes support for PHP 5.6 and PHP 7.0.

### Fixed

- Nothing.

## 2.2.0 - TBD

### Added
Expand Down
13 changes: 7 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
"forum": "https://discourse.zendframework.com/c/questions/expressive"
},
"require": {
"php": "^5.6 || ^7.0",
"aura/router": "^3.0.1",
"php": "^7.1",
"aura/router": "^3.1",
"fig/http-message-util": "^1.1.2",
"psr/http-message": "^1.0.1",
"zendframework/zend-expressive-router": "^2.1"
"zendframework/zend-expressive-router": "^3.0.0@dev"
},
"require-dev": {
"malukenho/docheader": "^0.1.5",
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
"malukenho/docheader": "^0.1.6",
"phpunit/phpunit": "^6.5.3",
"zendframework/zend-coding-standard": "~1.0.0"
},
"autoload": {
Expand All @@ -48,7 +48,8 @@
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev",
"dev-develop": "2.2.x-dev"
"dev-develop": "2.2.x-dev",
"dev-release-3.0.0": "3.0.x-dev"
}
},
"scripts": {
Expand Down
Loading

0 comments on commit d0fe9de

Please sign in to comment.