diff options
| -rw-r--r-- | composer.json | 20 | ||||
| -rw-r--r-- | php-cs-fixer.spec | 24 |
2 files changed, 23 insertions, 21 deletions
diff --git a/composer.json b/composer.json index e390c12..b6206c3 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 || ^3.0", "php-cs-fixer/diff": "^1.2", "symfony/console": "^3.2 || ^4.0", "symfony/event-dispatcher": "^3.0 || ^4.0", @@ -31,6 +30,9 @@ "symfony/process": "^3.0 || ^4.0", "symfony/stopwatch": "^3.0 || ^4.0" }, + "conflict": { + "hhvm": "*" + }, "require-dev": { "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev", "justinrainbow/json-schema": "^5.0", @@ -46,20 +48,20 @@ "ext-mbstring": "For handling non-UTF8 characters in cache signature.", "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." }, - "conflict": { - "hhvm": "*" - }, "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/Assert/AssertTokensTrait.php", + "tests/Test/Constraint/SameStringsConstraint.php", "tests/Test/IntegrationCase.php", "tests/Test/IntegrationCaseFactory.php", "tests/Test/IntegrationCaseFactoryInterface.php", @@ -68,7 +70,11 @@ ] }, "autoload-dev": { - "psr-4": { "PhpCsFixer\\Tests\\": "tests/" } + "psr-4": { + "PhpCsFixer\\Tests\\": "tests/" + } }, - "bin": ["php-cs-fixer"] + "bin": [ + "php-cs-fixer" + ] } diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 54d3855..32b2a87 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 74e4682a4073bc8bc2d4ff2b30a4873ac76cc1f1 +%global gh_commit 1634a2c250bf4640f1c5c963f63b413c2d966c8a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner FriendsOfPHP @@ -21,7 +21,7 @@ %global gh_diff_short %(c=%{gh_diff_commit}; echo ${c:0:7}) Name: php-cs-fixer -Version: 2.10.2 +Version: 2.10.3 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style @@ -44,7 +44,6 @@ BuildRequires: php-tokenizer %if 0%{?fedora} >= 27 BuildRequires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 2) BuildRequires: (php-composer(doctrine/annotations) >= 1.2 with php-composer(doctrine/annotations) < 2) -BuildRequires: (php-composer(gecko-packages/gecko-php-unit) >= 3.0 with php-composer(gecko-packages/gecko-php-unit) < 4) BuildRequires: (php-composer(symfony/polyfill-php70) >= 1.0 with php-composer(symfony/polyfill-php70) < 2) BuildRequires: (php-composer(symfony/polyfill-php72) >= 1.4 with php-composer(symfony/polyfill-php72) < 2) BuildRequires: (php-composer(sebastian/diff) >= 1.4 with php-composer(sebastian/diff) < 2) @@ -52,7 +51,6 @@ BuildRequires: (php-composer(sebastian/diff) >= 1.4 with php-com %else BuildRequires: php-composer-semver >= 1.4 BuildRequires: php-doctrine-annotations >= 1.2 -BuildRequires: php-gecko-packages-gecko-php-unit BuildRequires: php-symfony-polyfill >= 1.4 BuildRequires: php-phpunit-diff >= 1.4 %endif @@ -118,7 +116,6 @@ BuildRequires: php-fedora-autoloader-devel # "ext-tokenizer": "*", # "composer/semver": "^1.4", # "doctrine/annotations": "^1.2", -# "gecko-packages/gecko-php-unit": "^2.0 || ^3.0", # Bundled # "php-cs-fixer/diff": "^1.2", # "symfony/console": "^3.2 || ^4.0", @@ -138,7 +135,6 @@ Requires: php-tokenizer %if 0%{?fedora} >= 27 Requires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 2) Requires: (php-composer(doctrine/annotations) >= 1.2 with php-composer(doctrine/annotations) < 2) -Requires: (php-composer(gecko-packages/gecko-php-unit) >= 3.0 with php-composer(gecko-packages/gecko-php-unit) < 4) Requires: (php-composer(symfony/polyfill-php70) >= 1.0 with php-composer(symfony/polyfill-php70) < 2) Requires: (php-composer(symfony/polyfill-php72) >= 1.4 with php-composer(symfony/polyfill-php72) < 2) Requires: (php-composer(sebastian/diff) >= 1.4 with php-composer(sebastian/diff) < 2) @@ -146,7 +142,6 @@ Requires: (php-composer(sebastian/diff) >= 1.4 with php-com %else Requires: php-composer-semver >= 1.4 Requires: php-doctrine-annotations >= 1.2 -Requires: php-gecko-packages-gecko-php-unit Requires: php-symfony-polyfill >= 1.4 Requires: php-phpunit-diff >= 1.4 %endif @@ -201,6 +196,7 @@ TESTS=" tests/Test/AbstractIntegrationCaseFactory.php tests/Test/AbstractIntegrationTestCase.php tests/Test/Assert/AssertTokensTrait.php + tests/Test/Constraint/SameStringsConstraint.php tests/Test/IntegrationCase.php tests/Test/IntegrationCaseFactory.php tests/Test/IntegrationCaseFactoryInterface.php @@ -225,14 +221,8 @@ phpab --template fedora \ cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\', __DIR__); -if (class_exists('PHPUnit\\Runner\\Version') && version_compare(PHPUnit\Runner\Version::id(), '6', '>')) { - $gecko = '%{php_home}/GeckoPackages/PHPUnit3/autoload.php'; -} else { - $gecko = '%{php_home}/GeckoPackages/PHPUnit/autoload.php'; -} \Fedora\Autoloader\Dependencies::required([ '%{php_home}//Composer/Semver/autoload.php', - $gecko, '%{php_home}/Doctrine/Common/Annotations/autoload.php', '%{php_home}/Symfony3/Component/Console/autoload.php', '%{php_home}/Symfony3/Component/EventDispatcher/autoload.php', @@ -281,6 +271,8 @@ sed -e "/README.rst/s:__DIR__.*':'$PWD/README.rst':" \ # test using keradus/cli-executor rm tests/Smoke/CiIntegrationTest.php rm tests/Smoke/StdinTest.php +# strange failure +rm tests/Fixtures/Integration/priority/combine_consecutive_issets,no_singleline_whitespace_before_semicolons.test # Disable listener sed -e 's/listeners/nolistener/' phpunit.xml.dist >phpunit.xml @@ -292,7 +284,7 @@ ret=0 for cmdarg in "php %{phpunit}" php70 php71 php72; do if which $cmdarg; then set $cmdarg - $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} || ret=1 + $1 -d memory_limit=2G ${2:-%{_bindir}/phpunit6} || ret=1 fi done exit $ret @@ -311,6 +303,10 @@ exit $ret %changelog +* Fri Feb 23 2018 Remi Collet <remi@remirepo.net> - 2.10.3-1 +- Update to 2.10.3 +- drop dependency on gecko-packages/gecko-php-unit + * Tue Feb 6 2018 Remi Collet <remi@remirepo.net> - 2.10.2-1 - Update to 2.10.2 - use range dependencies on F27+ |