From f59027bbaa4d260d4fdda82c9d4cca0e661e9a4a Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Thu, 27 Apr 2017 22:31:15 +0200 Subject: [PATCH 1/6] Move to phpunit test class --- test/FastRouteRouterTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/FastRouteRouterTest.php b/test/FastRouteRouterTest.php index dccac93..91bb972 100644 --- a/test/FastRouteRouterTest.php +++ b/test/FastRouteRouterTest.php @@ -9,7 +9,7 @@ use FastRoute\Dispatcher\GroupCountBased as Dispatcher; use FastRoute\RouteCollector; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\UriInterface; use Zend\Expressive\Router\Exception\InvalidArgumentException; From 1041224b9c7e63ee8e34e541f913835193cae012 Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Thu, 27 Apr 2017 22:46:08 +0200 Subject: [PATCH 2/6] Fix deprecated test method --- test/FastRouteRouterTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/FastRouteRouterTest.php b/test/FastRouteRouterTest.php index 91bb972..e14cc3b 100644 --- a/test/FastRouteRouterTest.php +++ b/test/FastRouteRouterTest.php @@ -430,7 +430,9 @@ public function testGenerateUriRaisesExceptionForIncompleteUriSubstitutions() $route = new Route('/foo[/{param}[/optional-{extra}]]', 'foo', ['GET'], 'foo'); $router->addRoute($route); - $this->setExpectedException(InvalidArgumentException::class, 'unsubstituted parameters'); + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage('unsubstituted parameters'); + $router->generateUri('foo', ['extra' => 'segment']); } From facd8242ffcc7b52de5d8d067f61e369a4e7996a Mon Sep 17 00:00:00 2001 From: Geert Eltink Date: Thu, 13 Jul 2017 10:57:35 +0200 Subject: [PATCH 3/6] Remove obsolete irc and slack notifications --- .travis.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31ffc9b..bcbb290 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,13 +79,3 @@ after_script: notifications: email: false - irc: - channels: - - "irc.freenode.org#zftalk.dev" - on_success: change - on_failure: always - slack: - rooms: - - secure: "l8X0mItCLRkp6qYq/sLdOzU8GN5ZEH1RKjGhlmt+c/IQHn85B5ALs5Xtwf25TNcWICL6Xl5Ivk2zXXqsZ0ewfKPjAaKA4DdV8nqOLe5l55mODZRIG4K3+GrR4pLaDdgPRKWU4zN0MfISGavffbBS9JUELYGmtIFPxH4ZrPQWgxYWMA61xpdwzNRe9AJ3xec1CSs8sFY+dt9ehGNSfOatmUBYf9oDMQm6BRhdSdKpT8ixgcGjaQG7xaku1gCW9SiGiEM6aoorbcR36NT+3S6awBjclmQSt3IiYscT9S0JVpEJI7O/WIFJf1cIvcl8wkQs5LPtXXBpHDW9RMh44phDDC2HGpr3k38dtdxGzYaJXJNVQUSl3mLXwTuNoii9Q/VmGPYo1fbWiLo8VUdV+k9A48V3Bvo4MRyEpWBGgTqBW5XiEYbyEvXi3/bGMcR6x94INKBHlEJjMUuIpW1WQ7oldL4xHuYA8YfSNnQPyM2RSvwZ95cHYPmAq3tsJqZdfD9iUd0tQ702De1y4NQ40KcTJLXutzJTZremHuTy1VHzbmvMAjTprBnd0xDfMDonLYkMHDf9VNT+euqEpo5izXsg6WGhUJEoHfBbmL6gsvmx1U4WhmwJ50HYo+yBMEnn6p682lDbhYFsDiO1FGVWarvXHzaDFQCyXvINzqXKKqRLRrs=" - on_success: change - on_failure: always From 4b44bc9cab65846a8594f06629efa13b94b12347 Mon Sep 17 00:00:00 2001 From: Geert Eltink Date: Thu, 13 Jul 2017 10:57:53 +0200 Subject: [PATCH 4/6] Remove hhmv and add nightly to build matrix --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bcbb290..1ade988 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,17 +45,17 @@ matrix: - php: 7.1 env: - DEPS=latest - - php: hhvm + - php: nightly env: - DEPS=lowest - - php: hhvm + - php: nightly env: - DEPS=locked - - php: hhvm + - php: nightly env: - DEPS=latest allow_failures: - - php: hhvm + - php: nightly before_install: - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi From 0bab5574db2e9ccae01f360d77fc158dd52f1456 Mon Sep 17 00:00:00 2001 From: Geert Eltink Date: Thu, 13 Jul 2017 11:16:24 +0200 Subject: [PATCH 5/6] Set terminal width and show the dependency versions --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1ade988..129e1d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,6 +67,8 @@ install: - 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 + - stty cols 120 + - export COLUMNS=120 - composer show script: From 380a0058935d000b419a49cfe5d47a1b6ba464b8 Mon Sep 17 00:00:00 2001 From: Geert Eltink Date: Fri, 11 Aug 2017 17:48:39 +0200 Subject: [PATCH 6/6] travis ci: update conform latest guidelines see https://github.com/zendframework/maintainers/blob/master/template/.travis.yml --- .travis.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 129e1d2..12cb253 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ language: php cache: directories: - $HOME/.composer/cache - - $HOME/.local - - vendor env: global: @@ -22,6 +20,7 @@ matrix: - php: 5.6 env: - DEPS=locked + - CS_CHECK=true - TEST_COVERAGE=true - php: 5.6 env: @@ -32,7 +31,6 @@ matrix: - php: 7 env: - DEPS=locked - - CS_CHECK=true - php: 7 env: - DEPS=latest @@ -45,17 +43,17 @@ matrix: - php: 7.1 env: - DEPS=latest - - php: nightly + - php: 7.2 env: - DEPS=lowest - - php: nightly + - php: 7.2 env: - DEPS=locked - - php: nightly + - php: 7.2 env: - DEPS=latest allow_failures: - - php: nightly + - php: 7.2 before_install: - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi @@ -67,9 +65,7 @@ install: - 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 - - stty cols 120 - - export COLUMNS=120 - - composer show + - stty cols 120 && composer show script: - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi