From 5647be5b7511555521ca08be63530f2ac376862f Mon Sep 17 00:00:00 2001 From: Hari KT Date: Fri, 27 Jul 2018 23:15:34 +0530 Subject: [PATCH 1/4] Test sf4 as tested by builder --- .travis.yml | 12 +++++++++--- composer.json | 7 ++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index f824806..50fecc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,17 @@ php: - 5.4 - 5.5 - 5.6 + - 7.0 + - 7.1 + - 7.2 - hhvm - - 7 before_script: - - composer self-update - - composer install --prefer-source + - composer install ---no-interaction -prefer-source script: phpunit --coverage-text + +matrix: + allow_failures: + - php: hhvm + fast_finish: true diff --git a/composer.json b/composer.json index 4552d57..a613b5f 100644 --- a/composer.json +++ b/composer.json @@ -11,16 +11,13 @@ ], "require": { "php": ">=5.3.0", - "symfony/http-foundation": "~2.1|~3.0", - "symfony/http-kernel": "~2.1|~3.0" + "symfony/http-foundation": "~2.1|~3.0|~4.0", + "symfony/http-kernel": "~2.1|~3.0|~4.0" }, "autoload": { "psr-0": { "Stack": "src" } }, "extra": { "branch-alias": { "dev-master": "1.0-dev" } - }, - "require-dev": { - "phpunit/phpunit": "^5.2" } } From 77aa44791f699ea42fb1e2070f2550647c5d7993 Mon Sep 17 00:00:00 2001 From: Hari KT Date: Fri, 27 Jul 2018 23:18:47 +0530 Subject: [PATCH 2/4] use 2 hyphen not 3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 50fecc0..60c0e17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ php: - hhvm before_script: - - composer install ---no-interaction -prefer-source + - composer install --no-interaction -prefer-source script: phpunit --coverage-text From 243c05619059e4762031246783ca53d5f355b567 Mon Sep 17 00:00:00 2001 From: Hari KT Date: Fri, 27 Jul 2018 23:20:50 +0530 Subject: [PATCH 3/4] Accidental hypen missing again --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 60c0e17..8fc68a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ php: - hhvm before_script: - - composer install --no-interaction -prefer-source + - composer install --no-interaction --prefer-source script: phpunit --coverage-text From 2bf7e0b0b6ac733cb730157d44691df9134a8b65 Mon Sep 17 00:00:00 2001 From: Hari KT Date: Fri, 27 Jul 2018 23:49:00 +0530 Subject: [PATCH 4/4] install phpunit before script and execute --- .travis.yml | 4 +++- tests/functional/BasicTest.php | 2 +- tests/unit/Stack/CallableHttpKernelTest.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8fc68a6..160c926 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,10 @@ php: before_script: - composer install --no-interaction --prefer-source + - composer require --dev phpunit/phpunit -script: phpunit --coverage-text +script: + - ./vendor/bin/phpunit --coverage-text matrix: allow_failures: diff --git a/tests/functional/BasicTest.php b/tests/functional/BasicTest.php index 11afe1e..66673b4 100644 --- a/tests/functional/BasicTest.php +++ b/tests/functional/BasicTest.php @@ -6,7 +6,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -class BasicTest extends \PHPUnit_Framework_TestCase +class BasicTest extends \PHPUnit\Framework\TestCase { /** @dataProvider provideRequests */ public function testHelloWorld(Request $request) diff --git a/tests/unit/Stack/CallableHttpKernelTest.php b/tests/unit/Stack/CallableHttpKernelTest.php index 503afa9..ca54e2f 100644 --- a/tests/unit/Stack/CallableHttpKernelTest.php +++ b/tests/unit/Stack/CallableHttpKernelTest.php @@ -6,7 +6,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\HttpKernelInterface; -class CallableHttpKernelTest extends \PHPUnit_Framework_TestCase +class CallableHttpKernelTest extends \PHPUnit\Framework\TestCase { /** @test */ public function handleShouldDelegateToCallable()