Skip to content

Commit 8100d12

Browse files
authored
Allow PHPUnit 6 (#6)
* Allow PHPunit 6 * Require some higher versions * Test on SF4 * Minor
1 parent 588b756 commit 8100d12

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,16 @@ env:
1717
global:
1818
- TEST_COMMAND="composer test"
1919
matrix:
20-
- SYMFONY_VERSION=3.2.*
20+
- SYMFONY_VERSION=3.3.*
2121
- SYMFONY_VERSION=2.3.*
2222

2323
matrix:
2424
fast_finish: true
2525
include:
2626
- php: 5.5
2727
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.3.*
28+
- php: 7.1
29+
env: SYMFONY_VERSION=4.0.*
2830

2931
install:
3032
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"php": "^5.5 || ^7.0"
1414
},
1515
"require-dev": {
16-
"phpunit/phpunit": "^4.5 || ^5.4",
17-
"symfony/symfony": "^2.3 || ^3.0"
16+
"phpunit/phpunit": "^4.8.36 || ^5.5 || ^6.2",
17+
"symfony/symfony": "^2.3 || ^3.0 || ^4.0"
1818
},
1919
"autoload": {
2020
"psr-4": { "Nyholm\\BundleTest\\": "src/" }
@@ -25,5 +25,7 @@
2525
"scripts": {
2626
"test": "vendor/bin/phpunit",
2727
"test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
28-
}
28+
},
29+
"minimum-stability": "dev",
30+
"prefer-stable": true
2931
}

src/BaseBundleTestCase.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
namespace Nyholm\BundleTest;
44

5+
use PHPUnit\Framework\TestCase;
56
use Symfony\Component\DependencyInjection\ResettableContainerInterface;
67
use Symfony\Component\HttpKernel\Kernel;
78

89
/**
910
* @author Tobias Nyholm <[email protected]>
1011
*/
11-
abstract class BaseBundleTestCase extends \PHPUnit_Framework_TestCase
12+
abstract class BaseBundleTestCase extends TestCase
1213
{
1314
/**
1415
* @var AppKernel

0 commit comments

Comments
 (0)