diff options
| -rw-r--r-- | composer.json | 25 | ||||
| -rw-r--r-- | php-cs-fixer.spec | 17 |
2 files changed, 21 insertions, 21 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" + ] } diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 9410f44..0c8f274 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit f67918efb38a186c6c731e46e52eab4fee329a49 +%global gh_commit 12f95d20d7c8f6c2ee68d00a0fad74179ca75339 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner FriendsOfPHP @@ -15,7 +15,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-cs-fixer -Version: 2.2.16 +Version: 2.2.17 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style @@ -38,8 +38,6 @@ BuildRequires: php-composer(composer/semver) < 2 BuildRequires: php-composer(composer/semver) >= 1.4 BuildRequires: php-composer(doctrine/annotations) < 2 BuildRequires: php-composer(doctrine/annotations) >= 1.2 -BuildRequires: php-composer(gecko-packages/gecko-php-unit) < 3 -BuildRequires: php-composer(gecko-packages/gecko-php-unit) >= 2.0 BuildRequires: php-symfony-console BuildRequires: php-symfony-event-dispatcher BuildRequires: php-symfony-filesystem @@ -91,7 +89,6 @@ BuildRequires: php-fedora-autoloader-devel # "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", # "symfony/event-dispatcher": "^2.1 || ^3.0 || ^4.0", @@ -112,8 +109,6 @@ Requires: php-composer(composer/semver) < 2 Requires: php-composer(composer/semver) >= 1.4 Requires: php-composer(doctrine/annotations) < 2 Requires: php-composer(doctrine/annotations) >= 1.2 -Requires: php-composer(gecko-packages/gecko-php-unit) < 3 -Requires: php-composer(gecko-packages/gecko-php-unit) >= 2.0 Requires: php-composer(sebastian/diff) < 2 Requires: php-composer(sebastian/diff) >= 1.4 Requires: php-symfony-console @@ -166,6 +161,7 @@ TESTS=" 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 @@ -190,7 +186,6 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::required([ '%{php_home}/Composer/Semver/autoload.php', '%{php_home}/Doctrine/Common/Annotations/autoload.php', - '%{php_home}/GeckoPackages/PHPUnit/autoload.php', '%{php_home}/Symfony/Component/autoload.php', '%{php_home}/SebastianBergmann/Diff/autoload.php', '%{php_home}/Symfony/Polyfill/autoload.php', @@ -243,7 +238,7 @@ if php -r 'exit (version_compare(PHP_VERSION, "5.6", "<") ? 0 : 1);'; then export SKIP_LINT_TEST_CASES=1 fi -%{_bindir}/phpunit -d memory_limit=1G --verbose +%{_bindir}/phpunit -d memory_limit=2G --verbose %else : Test suite disabled %endif @@ -259,6 +254,10 @@ fi %changelog +* Fri Feb 23 2018 Remi Collet <remi@remirepo.net> - 2.2.17-1 +- Update to 2.2.17 +- drop dependency on gecko-packages/gecko-php-unit + * Tue Feb 6 2018 Remi Collet <remi@remirepo.net> - 2.2.16-1 - Update to 2.2.16 |