diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | composer.json | 16 | ||||
| -rw-r--r-- | php-cs-fixer.spec | 66 |
3 files changed, 42 insertions, 42 deletions
@@ -1,5 +1,7 @@ +clog package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc diff --git a/composer.json b/composer.json index 34a604e..6ff6822 100644 --- a/composer.json +++ b/composer.json @@ -14,14 +14,14 @@ } ], "require": { - "php": "^5.6 || ^7.0", + "php": "^7.1", "ext-json": "*", "ext-tokenizer": "*", - "composer/semver": "^1.4", + "composer/semver": "^1.4 || ^2.0 || ^3.0", "composer/xdebug-handler": "^1.2", "doctrine/annotations": "^1.2", "php-cs-fixer/diff": "^1.3", - "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0", + "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", "symfony/filesystem": "^3.0 || ^4.0 || ^5.0", "symfony/finder": "^3.0 || ^4.0 || ^5.0", @@ -34,14 +34,14 @@ "require-dev": { "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0", "justinrainbow/json-schema": "^5.0", - "keradus/cli-executor": "^1.2", + "keradus/cli-executor": "^1.4", "mikey179/vfsstream": "^1.6", - "php-coveralls/php-coveralls": "^2.1", + "php-coveralls/php-coveralls": "^2.4.1", "php-cs-fixer/accessible-object": "^1.0", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1", - "phpunitgoodpractices/traits": "^1.8", + "phpunitgoodpractices/traits": "^1.9.1", "symfony/phpunit-bridge": "^5.1", "symfony/yaml": "^3.0 || ^4.0 || ^5.0" }, diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index b58ca8d..0d7e16b 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 1023c3458137ab052f6ff1e09621a721bfdeca13 +%global gh_commit 4e35806a6d7d8510d6842ae932e8832363d22c87 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner FriendsOfPHP @@ -26,8 +26,8 @@ %global gh_diff_short %(c=%{gh_diff_commit}; echo ${c:0:7}) Name: php-cs-fixer -Version: 2.16.4 -Release: 3%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} +Version: 2.17.0 +Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style License: MIT @@ -47,13 +47,13 @@ BuildRequires: php(language) >= 7.2 BuildRequires: php-tokenizer # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 2) +BuildRequires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) BuildRequires: (php-composer(composer/xdebug-handler) >= 1.0 with php-composer(composer/xdebug-handler) < 2) BuildRequires: (php-composer(doctrine/annotations) >= 1.2 with php-composer(doctrine/annotations) < 2) BuildRequires: (php-composer(sebastian/diff) >= 1.4 with php-composer(sebastian/diff) < 2) # remirepo:6 %else -BuildRequires: php-composer-semver >= 1.4 +BuildRequires: php-composer-semver3 >= 3.0 BuildRequires: php-composer-xdebug-handler >= 1.0 BuildRequires: php-doctrine-annotations >= 1.2 BuildRequires: php-phpunit-diff >= 1.4 @@ -80,15 +80,15 @@ BuildRequires: php-symfony3-debug # From composer.json, "require-dev": { # NOTICE: listener disabled during test suite # "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0", -# "keradus/cli-executor": "^1.2", +# "keradus/cli-executor": "^1.4", # "justinrainbow/json-schema": "^5.0", # "mikey179/vfsstream": "^1.6", -# "php-coveralls/php-coveralls": "^2.1", +# "php-coveralls/php-coveralls": "^2.4.1", # "php-cs-fixer/accessible-object": "^1.0", -# "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1", -# "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1", +# "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", +# "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", # "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1", -# "phpunitgoodpractices/traits": "^1.8", +# "phpunitgoodpractices/traits": "^1.9.1", # "symfony/phpunit-bridge": "^5.1", # "symfony/yaml": "^3.0 || ^4.0 || ^5.0" # ignored as test using it fail strangely @@ -99,36 +99,33 @@ BuildRequires: php-symfony3-debug BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.0 with php-composer(justinrainbow/json-schema) < 6) BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6 with php-composer(mikey179/vfsstream) < 2) BuildRequires: (php-composer(php-cs-fixer/accessible-object) >= 1.0 with php-composer(php-cs-fixer/accessible-object) < 2) -BuildRequires: (php-composer(php-cs-fixer/phpunit-constraint-isidenticalstring) >= 1.1 with php-composer(php-cs-fixer/phpunit-constraint-isidenticalstring) < 2) -BuildRequires: (php-composer(php-cs-fixer/phpunit-constraint-xmlmatchesxsd) >= 1.1 with php-composer(php-cs-fixer/phpunit-constraint-xmlmatchesxsd) < 2) -BuildRequires: (php-composer(phpunitgoodpractices/traits) >= 1.8 with php-composer(phpunitgoodpractices/traits) < 2) -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 >= 7.1 -# remirepo:10 +BuildRequires: (php-composer(php-cs-fixer/phpunit-constraint-isidenticalstring) >= 1.2 with php-composer(php-cs-fixer/phpunit-constraint-isidenticalstring) < 2) +BuildRequires: (php-composer(php-cs-fixer/phpunit-constraint-xmlmatchesxsd) >= 1.2.1 with php-composer(php-cs-fixer/phpunit-constraint-xmlmatchesxsd) < 2) +BuildRequires: (php-composer(phpunitgoodpractices/traits) >= 1.9.1 with php-composer(phpunitgoodpractices/traits) < 2) +# remirepo:8 %else BuildRequires: php-justinrainbow-json-schema5 -BuildRequires: php-mikey179-vfsstream >= 1.6 +BuildRequires: php-mikey179-vfsstream >= 1.6 BuildRequires: php-cs-fixer-accessible-object -BuildRequires: php-cs-fixer-phpunit-constraint-isidenticalstring -BuildRequires: php-cs-fixer-phpunit-constraint-xmlmatchesxsd -BuildRequires: php-phpunitgoodpractices-traits >= 1.5.1 -%global phpunit %{_bindir}/phpunit -BuildRequires: php-phpunit-PHPUnit >= 5.7.23 +BuildRequires: php-cs-fixer-phpunit-constraint-isidenticalstring >= 1.2 +BuildRequires: php-cs-fixer-phpunit-constraint-xmlmatchesxsd >= 1.2.1 +BuildRequires: php-phpunitgoodpractices-traits >= 1.9.1 %endif +%global phpunit %{_bindir}/phpunit7 +BuildRequires: phpunit7 >= 7.1 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": "^5.6 || ^7.0", +# "php": "^7.1", # "ext-json": "*", # "ext-tokenizer": "*", -# "composer/semver": "^1.4", +# "composer/semver": "^1.4 || ^2.0 || ^3.0", # "composer/xdebug-handler": "^1.2", # "doctrine/annotations": "^1.2", -# Bundled # "php-cs-fixer/diff": "^1.3", -# "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0", +# "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", # "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", # "symfony/filesystem": "^3.0 || ^4.0 || ^5.0", # "symfony/finder": "^3.0 || ^4.0 || ^5.0", @@ -143,13 +140,13 @@ Requires: php-json Requires: php-tokenizer # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 2) +Requires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) Requires: (php-composer(composer/xdebug-handler) >= 1.2 with php-composer(composer/xdebug-handler) < 2) Requires: (php-composer(doctrine/annotations) >= 1.2 with php-composer(doctrine/annotations) < 2) Requires: (php-composer(sebastian/diff) >= 1.4 with php-composer(sebastian/diff) < 2) # remirepo:6 %else -Requires: php-composer-semver >= 1.4 +Requires: php-composer-semver3 >= 3.0 Requires: php-composer-xdebug-handler >= 1.2 Requires: php-doctrine-annotations >= 1.2 Requires: php-phpunit-diff >= 1.4 @@ -240,7 +237,7 @@ cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/Composer/Semver/autoload.php', + '%{php_home}/Composer/Semver3/autoload.php', '%{php_home}/Composer/XdebugHandler/autoload.php', '%{php_home}/Doctrine/Common/Annotations/autoload.php', '%{php_home}/Symfony3/Component/Console/autoload.php', @@ -287,9 +284,6 @@ cat << 'EOF' | tee vendor/autoload.php \Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\Tests\\', dirname(__DIR__) . '/tests'); EOF -# Fix integration test -sed -e "/README.rst/s:__DIR__.*':'$PWD/README.rst':" \ - -i tests/Console/Command/ReadmeCommandTest.php # test using keradus/cli-executor rm tests/Smoke/CiIntegrationTest.php rm tests/Smoke/StdinTest.php @@ -314,7 +308,7 @@ for cmdarg in "php %{phpunit}" php72 php73 php74; do if which $cmdarg; then set $cmdarg $1 -d memory_limit=2G ${2:-%{_bindir}/phpunit7} \ - --filter '^((?!(testFixerContainsAllPhpunitStaticMethodsInItsList|testFix74Deprecated|testFixersPriorityPairsHaveIntegrationTest)).)*$' \ + --filter '^((?!(testFixerContainsAllPhpunitStaticMethodsInItsList|testFix74Deprecated|testFixersPriorityPairsHaveIntegrationTest|testThereAreNoExtraFiles|testFixersDocumentationIndexFileIsUpToDate)).)*$' \ || ret=1 fi done @@ -329,12 +323,16 @@ exit $ret %{!?_licensedir:%global license %%doc} %license LICENSE %doc composer.json -%doc *.md *.rst +%doc *.md %{php_home}/PhpCsFixer %{_bindir}/%{name} %changelog +* Wed Oct 28 2020 Remi Collet <remi@remirepo.net> - 2.16.7-1 +- update to 2.16.7 +- raise dependency on composer/semver v3 + * Mon Oct 26 2020 Remi Collet <remi@remirepo.net> - 2.16.4-3 - raise dependency on PHP 7.2 - drop dependency on symfony-polyfill |