diff options
| -rw-r--r-- | composer.json | 10 | ||||
| -rw-r--r-- | php-cs-fixer.spec | 38 |
2 files changed, 29 insertions, 19 deletions
diff --git a/composer.json b/composer.json index 93c6fe9..babbe95 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "doctrine/annotations": "^1.2", "gecko-packages/gecko-php-unit": "^2.0", "sebastian/diff": "^1.4", - "symfony/console": "^3.0", + "symfony/console": "^3.2", "symfony/event-dispatcher": "^3.0", "symfony/filesystem": "^3.0", "symfony/finder": "^3.0", @@ -33,6 +33,7 @@ "require-dev": { "johnkary/phpunit-speedtrap": "^1.1", "justinrainbow/json-schema": "^5.0", + "php-cs-fixer/accessible-object": "^1.0", "phpunit/phpunit": "^4.8.35 || ^5.4.3", "satooshi/php-coveralls": "^1.0", "symfony/phpunit-bridge": "^3.2.2" @@ -61,10 +62,5 @@ "autoload-dev": { "psr-4": { "PhpCsFixer\\Tests\\": "tests/" } }, - "bin": ["php-cs-fixer"], - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - } + "bin": ["php-cs-fixer"] } diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 6afa4dd..a79adb8 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 63661f3add3609e90e4ab8115113e189ae547bb4 +%global gh_commit 63aad575ec2a29d50eb6c3b5cbc17430b28895b2 %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.4.0 +Version: 2.5.0 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style @@ -69,18 +69,22 @@ BuildRequires: php-spl BuildRequires: php-xml # Missing dependency for Console BuildRequires: php-composer(symfony/debug) < 4 -BuildRequires: php-composer(symfony/debug) >= 3.0 +BuildRequires: php-composer(symfony/debug) >= 3.2 # From composer.json, "require-dev": { # NOTICE: listener disabled during test suite # "johnkary/phpunit-speedtrap": "^1.1", # "justinrainbow/json-schema": "^5.0", +# "php-cs-fixer/accessible-object": "^1.0", # "phpunit/phpunit": "^4.8.35 || ^5.4.3", # "satooshi/php-coveralls": "^1.0", # "symfony/phpunit-bridge": "^3.2" BuildRequires: php-composer(justinrainbow/json-schema) < 6 -BuildRequires: php-composer(justinrainbow/json-schema) >= 5 +BuildRequires: php-composer(justinrainbow/json-schema) >= 5.0 +BuildRequires: php-composer(php-cs-fixer/accessible-object) < 2 +BuildRequires: php-composer(php-cs-fixer/accessible-object) >= 1.0 BuildRequires: php-composer(phpunit/phpunit) >= 4.5 -BuildRequires: php-composer(symfony/phpunit-bridge) +BuildRequires: php-composer(symfony/phpunit-bridge) < 4 +BuildRequires: php-composer(symfony/phpunit-bridge) >= 3.2 # Autoloader BuildRequires: php-fedora-autoloader-devel %endif @@ -92,7 +96,7 @@ BuildRequires: php-fedora-autoloader-devel # "doctrine/annotations": "^1.2", # "gecko-packages/gecko-php-unit": "^2.0", # "sebastian/diff": "^1.4", -# "symfony/console": "^3.0", +# "symfony/console": "^3.2", # "symfony/event-dispatcher": "^3.0", # "symfony/filesystem": "^3.0", # "symfony/finder": "^3.0", @@ -112,7 +116,7 @@ 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-composer(symfony/console) < 4 -Requires: php-composer(symfony/console) >= 3.0 +Requires: php-composer(symfony/console) >= 3.2 Requires: php-composer(symfony/event-dispatcher) < 4 Requires: php-composer(symfony/event-dispatcher) >= 3.0 Requires: php-composer(symfony/filesystem) < 4 @@ -178,6 +182,9 @@ for i in $TESTS; do cp -p $i src/$i done +# fix dev-tools path +sed -e 's:../../../dev-tools/::' -i src/Console/Command/HelpCommand.php +cp -pr dev-tools/ci-integration.sh src/Console/Command/ phpab --template fedora --output src/autoload.php src/tests @@ -219,11 +226,9 @@ mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php \Fedora\Autoloader\Dependencies::required([ - [ - '%{php_home}/Symfony3/Bridge/PhpUnit/autoload.php', - '%{php_home}/Symfony/Bridge/PhpUnit/autoload.php', - ], + '%{php_home}/Symfony3/Bridge/PhpUnit/autoload.php', '%{php_home}/JsonSchema5/autoload.php', + '%{php_home}/PhpCsFixer/AccessibleObject/autoload.php', '%{buildroot}%{php_home}/PhpCsFixer/autoload.php', ]); \Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\Tests\\', dirname(__DIR__) . '/tests'); @@ -232,14 +237,18 @@ EOF # Fix integration test sed -e "/README.rst/s:__DIR__.*':'$PWD/README.rst':" \ -i tests/Console/Command/ReadmeCommandTest.php +rm tests/CiIntegrationTest.php # Disable listener sed -e 's/listeners/nolistener/' phpunit.xml.dist >phpunit.xml +# Redirect to buildroot +sed -e 's:%{php_home}:%{buildroot}%{php_home}:' -i %{name} + ret=0 for cmd in php php56 php70 php71 php72; do if which $cmd; then - $cmd -d memory_limit=1G %{_bindir}/phpunit --verbose || ret=1 + $cmd -d memory_limit=1G %{_bindir}/phpunit || ret=1 fi done exit $ret @@ -258,6 +267,11 @@ exit $ret %changelog +* Wed Aug 23 2017 Remi Collet <remi@remirepo.net> - 2.5.0-1 +- Update to 2.5.0 +- add dependency on php-cs-fixer/accessible-object +- raise dependency on symfony 3.2 + * Thu Aug 3 2017 Remi Collet <remi@remirepo.net> - 2.4.0-1 - Update to 2.4.0 - add dependency on symfony/polyfill-php72 |