diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | php-cs-fixer.spec | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/composer.json b/composer.json index b6206c3..a14a658 100644 --- a/composer.json +++ b/composer.json @@ -34,14 +34,14 @@ "hhvm": "*" }, "require-dev": { - "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev", + "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0", "justinrainbow/json-schema": "^5.0", "keradus/cli-executor": "^1.0", "mikey179/vfsStream": "^1.6", "php-coveralls/php-coveralls": "^2.0", "php-cs-fixer/accessible-object": "^1.0", "phpunit/phpunit": "^5.7.23 || ^6.4.3", - "phpunitgoodpractices/traits": "^1.0", + "phpunitgoodpractices/traits": "^1.3.1", "symfony/phpunit-bridge": "^3.2.2 || ^4.0" }, "suggest": { diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 781aaad..8395588 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -6,7 +6,11 @@ # # Please, preserve the changelog entries # -%global gh_commit 1634a2c250bf4640f1c5c963f63b413c2d966c8a + +# For compatibility with SCL +%undefine __brp_mangle_shebangs + +%global gh_commit b2dce1dacff988b79c4aadf252e5dee31bc04e19 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner FriendsOfPHP @@ -15,13 +19,14 @@ %global with_tests 0%{!?_without_tests:1} # Bundled this fork which is not designed for use outside of php-cs-fixer +# https://github.com/PHP-CS-Fixer/diff/releases %global gh_diff_owner PHP-CS-Fixer %global gh_diff_version 1.3.0 %global gh_diff_commit 78bb099e9c16361126c86ce82ec4405ebab8e756 %global gh_diff_short %(c=%{gh_diff_commit}; echo ${c:0:7}) Name: php-cs-fixer -Version: 2.10.3 +Version: 2.10.4 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style @@ -75,14 +80,14 @@ BuildRequires: php-symfony3-debug BuildRequires: php-symfony3-debug # From composer.json, "require-dev": { # NOTICE: listener disabled during test suite -# "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev", +# "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0", # "keradus/cli-executor": "^1.0", # "justinrainbow/json-schema": "^5.0", # "mikey179/vfsStream": "^1.6", # "php-coveralls/php-coveralls": "^2.0", # "php-cs-fixer/accessible-object": "^1.0", # "phpunit/phpunit": "^5.7.23 || ^6.4.3", -# "phpunitgoodpractices/traits": "^1.0", +# "phpunitgoodpractices/traits": "^1.3.1", # "symfony/phpunit-bridge": "^3.2.2 || ^4.0" # ignored as test using it fail strangely #BuildRequires: php-composer(keradus/cli-executor) < 2 @@ -303,6 +308,9 @@ exit $ret %changelog +* Thu Mar 8 2018 Remi Collet <remi@remirepo.net> - 2.10.4-1 +- update to 2.10.4 + * 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 |