diff options
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/composer.json b/composer.json index f0cef2e..e5ce162 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,6 @@ "ext-tokenizer": "*", "composer/semver": "^1.4", "doctrine/annotations": "^1.2", - "gecko-packages/gecko-php-unit": "^2.0", "sebastian/diff": "^1.4", "symfony/console": "^2.4 || ^3.0 || ^4.0", "symfony/event-dispatcher": "^2.1 || ^3.0 || ^4.0", @@ -33,6 +32,9 @@ "symfony/process": "^2.3 || ^3.0 || ^4.0", "symfony/stopwatch": "^2.5 || ^3.0 || ^4.0" }, + "conflict": { + "hhvm": "<3.18" + }, "require-dev": { "johnkary/phpunit-speedtrap": "^1.0.1", "justinrainbow/json-schema": "^5.0", @@ -46,19 +48,19 @@ "ext-mbstring": "For handling non-UTF8 characters in cache signature.", "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." }, - "conflict": { - "hhvm": "<3.18" - }, "config": { "optimize-autoloader": true, "sort-packages": true }, "autoload": { - "psr-4": { "PhpCsFixer\\": "src/" }, + "psr-4": { + "PhpCsFixer\\": "src/" + }, "classmap": [ "tests/Test/AbstractFixerTestCase.php", "tests/Test/AbstractIntegrationCaseFactory.php", "tests/Test/AbstractIntegrationTestCase.php", + "tests/Test/Constraint/SameStringsConstraint.php", "tests/Test/IntegrationCase.php", "tests/Test/IntegrationCaseFactory.php", "tests/Test/IntegrationCaseFactoryInterface.php", @@ -67,12 +69,11 @@ ] }, "autoload-dev": { - "psr-4": { "PhpCsFixer\\Tests\\": "tests/" } - }, - "bin": ["php-cs-fixer"], - "extra": { - "branch-alias": { - "dev-master": "2.2-dev" + "psr-4": { + "PhpCsFixer\\Tests\\": "tests/" } - } + }, + "bin": [ + "php-cs-fixer" + ] } |