diff options
| author | Remi Collet <remi@remirepo.net> | 2018-03-21 07:27:12 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-03-21 07:27:12 +0100 |
| commit | cf18add2b12532fc00b46ddea9b7c5323e5fd3f3 (patch) | |
| tree | 2695445e3515bca07e7e034c2277c926e185a3c7 /composer.json | |
| parent | 0fb796e3720f22b92d811c0a55bac03de889984e (diff) | |
v2.11.0
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/composer.json b/composer.json index a14a658..16eb3d8 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "ext-tokenizer": "*", "composer/semver": "^1.4", "doctrine/annotations": "^1.2", - "php-cs-fixer/diff": "^1.2", + "php-cs-fixer/diff": "^1.3", "symfony/console": "^3.2 || ^4.0", "symfony/event-dispatcher": "^3.0 || ^4.0", "symfony/filesystem": "^3.0 || ^4.0", @@ -40,7 +40,7 @@ "mikey179/vfsStream": "^1.6", "php-coveralls/php-coveralls": "^2.0", "php-cs-fixer/accessible-object": "^1.0", - "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", "phpunitgoodpractices/traits": "^1.3.1", "symfony/phpunit-bridge": "^3.2.2 || ^4.0" }, @@ -52,6 +52,11 @@ "optimize-autoloader": true, "sort-packages": true }, + "extra": { + "branch-alias": { + "dev-master": "2.11-dev" + } + }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -62,6 +67,8 @@ "tests/Test/AbstractIntegrationTestCase.php", "tests/Test/Assert/AssertTokensTrait.php", "tests/Test/Constraint/SameStringsConstraint.php", + "tests/Test/Constraint/SameStringsConstraintForV5.php", + "tests/Test/Constraint/SameStringsConstraintForV7.php", "tests/Test/IntegrationCase.php", "tests/Test/IntegrationCaseFactory.php", "tests/Test/IntegrationCaseFactoryInterface.php", |