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

Commit

Permalink
Merge d451183 into dc682ca
Browse files Browse the repository at this point in the history
  • Loading branch information
michalbundyra committed Dec 6, 2017
2 parents dc682ca + d451183 commit eb0a3c3
Show file tree
Hide file tree
Showing 6 changed files with 292 additions and 219 deletions.
3 changes: 2 additions & 1 deletion .docheader
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* @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
19 changes: 13 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,22 @@
"slack": "https://zendframework-slack.herokuapp.com",
"forum": "https://discourse.zendframework.com/c/questions/expressive"
},
"repositories": [
{
"type": "git",
"url": "https://github.com/webimpress/zend-expressive-router.git"
}
],
"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 || ^3.0.0-dev || ^3.0.0"
"zendframework/zend-expressive-router": "dev-feature/php-7.1"
},
"require-dev": {
"malukenho/docheader": "^0.1.5",
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
"malukenho/docheader": "^0.1.6",
"phpunit/phpunit": "^6.5.2",
"zendframework/zend-coding-standard": "~1.0.0"
},
"autoload": {
Expand All @@ -48,7 +54,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 eb0a3c3

Please sign in to comment.