diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-cs-fixer.spec | 29 |
2 files changed, 17 insertions, 14 deletions
diff --git a/composer.json b/composer.json index 11feda0..842ed80 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1", "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1", - "phpunitgoodpractices/traits": "^1.5", + "phpunitgoodpractices/traits": "^1.5.1", "symfony/phpunit-bridge": "^4.0" }, "suggest": { diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index dad07d0..f21c7e2 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 beef6cbe6dec7205edcd143842a49f9a691859a6 +%global gh_commit dcc87d5414e9d0bd316fce81a5bedb9ce720b183 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner FriendsOfPHP @@ -26,7 +26,7 @@ %global gh_diff_short %(c=%{gh_diff_commit}; echo ${c:0:7}) Name: php-cs-fixer -Version: 2.12.1 +Version: 2.12.2 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style @@ -91,18 +91,19 @@ BuildRequires: php-symfony3-debug # "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1", # "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1", # "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1", -# "phpunitgoodpractices/traits": "^1.5", +# "phpunitgoodpractices/traits": "^1.5.1", # "symfony/phpunit-bridge": "^4.0" # ignored as test using it fail strangely #BuildRequires: php-composer(keradus/cli-executor) < 2 #BuildRequires: php-composer(keradus/cli-executor) >= 1.0 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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.0 with php-composer(php-cs-fixer/phpunit-constraint-isidenticalstring) < 2) -BuildRequires: (php-composer(php-cs-fixer/phpunit-constraint-xmlmatchesxsd) >= 1.0 with php-composer(php-cs-fixer/phpunit-constraint-xmlmatchesxsd) < 2) +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.0 with php-composer(php-cs-fixer/phpunit-constraint-isidenticalstring) < 2) +BuildRequires: (php-composer(php-cs-fixer/phpunit-constraint-xmlmatchesxsd) >= 1.0 with php-composer(php-cs-fixer/phpunit-constraint-xmlmatchesxsd) < 2) +BuildRequires: (php-composer(phpunitgoodpractices/traits) >= 1.5.1 with php-composer(phpunitgoodpractices/traits) < 2) %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 %global phpunit %{_bindir}/phpunit7 BuildRequires: phpunit7 >= 7.1 @@ -110,19 +111,17 @@ BuildRequires: phpunit7 >= 7.1 %global phpunit %{_bindir}/phpunit6 BuildRequires: phpunit6 >= 6.5.8 %endif -# remirepo:9 +# remirepo:10 %else BuildRequires: php-justinrainbow-json-schema5 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 %endif -# ignored as not yet available and optional (see TestCase.php) -#BuildRequires: php-composer(phpunitgoodpractices/traits) < 2 -#BuildRequires: php-composer(phpunitgoodpractices/traits) >= 1.0 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -291,6 +290,7 @@ cat << 'EOF' | tee vendor/autoload.php '%{php_home}/org/bovigo/vfs/autoload.php', '%{php_home}/JsonSchema5/autoload.php', '%{php_home}/PhpCsFixer/AccessibleObject/autoload.php', + '%{php_home}/PHPUnitGoodPractices/Polyfill/autoload.php', '%{buildroot}%{php_home}/PhpCsFixer/autoload.php', ]); \Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\Tests\\', dirname(__DIR__) . '/tests'); @@ -313,7 +313,7 @@ sed -e '/<listeners>/,/<\/listeners>/d' phpunit.xml.dist >phpunit.xml sed -e 's:%{php_home}:%{buildroot}%{php_home}:' -i %{name} ret=0 -for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do +for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73; do if which $cmdarg; then set $cmdarg $1 -d memory_limit=2G ${2:-%{_bindir}/phpunit7} || ret=1 @@ -335,6 +335,9 @@ exit $ret %changelog +* Fri Jul 6 2018 Remi Collet <remi@remirepo.net> - 2.12.2-1 +- update to 2.12.2 + * Mon Jun 11 2018 Remi Collet <remi@remirepo.net> - 2.12.1-1 - update to 2.12.1 |