diff options
| -rw-r--r-- | php-cs-fixer.spec | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 28d53b2..f989ca6 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -27,7 +27,7 @@ Name: php-cs-fixer Version: 2.12.0 -Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} +Release: 2%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style License: MIT @@ -53,7 +53,7 @@ BuildRequires: (php-composer(doctrine/annotations) >= 1.2 with php-com 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) -# remirepo:6 +# remirepo:7 %else BuildRequires: php-composer-semver >= 1.4 BuildRequires: php-composer-xdebug-handler >= 1.0 @@ -110,7 +110,7 @@ BuildRequires: phpunit7 >= 7.1 %global phpunit %{_bindir}/phpunit6 BuildRequires: phpunit6 >= 6.5.8 %endif -# remirepo:7 +# remirepo:9 %else BuildRequires: php-justinrainbow-json-schema5 BuildRequires: php-mikey179-vfsstream >= 1.6 @@ -180,6 +180,12 @@ Requires: php-symfony3-debug # "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", # "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." Requires: php-mbstring +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Recommends: php-composer(php-cs-fixer/phpunit-constraint-isidenticalstring) +Recommends: php-composer(php-cs-fixer/phpunit-constraint-xmlmatchesxsd) +# remirepo:1 +%endif # From phpcompatinfo report for version 2.4.0 Requires: php-cli Requires: php-reflection @@ -243,7 +249,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/Semver/autoload.php', '%{php_home}/Composer/XdebugHandler/autoload.php', '%{php_home}/Doctrine/Common/Annotations/autoload.php', '%{php_home}/Symfony3/Component/Console/autoload.php', @@ -252,9 +258,13 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/Symfony3/Component/Finder/autoload.php', '%{php_home}/Symfony3/Component/OptionsResolver/autoload.php', '%{php_home}/Symfony3/Component/Process/autoload.php', - '%{php_home}/Symfony3/Component/Stopwatch//autoload.php', + '%{php_home}/Symfony3/Component/Stopwatch/autoload.php', '%{php_home}/Symfony/Polyfill/autoload.php', ]); +\Fedora\Autoloader\Dependencies::optional([ + '%{php_home}/PhpCsFixer/PhpunitConstraintIsIdenticalString/autoload.php', + '%{php_home}/PhpCsFixer/PhpunitConstraintXmlMatchesXsd/autoload.php', +]); EOF @@ -281,8 +291,6 @@ 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}/PhpCsFixer/PhpunitConstraintIsIdenticalString/autoload.php', - '%{php_home}/PhpCsFixer/PhpunitConstraintXmlMatchesXsd/autoload.php', '%{buildroot}%{php_home}/PhpCsFixer/autoload.php', ]); \Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\Tests\\', dirname(__DIR__) . '/tests'); @@ -327,6 +335,10 @@ exit $ret %changelog +* Tue Jun 5 2018 Remi Collet <remi@remirepo.net> - 2.12.0-2 +- add weak dependency on php-cs-fixer/phpunit-constraint-isidenticalstring +- add weak dependency on php-cs-fixer/phpunit-constraint-xmlmatchesxsd + * Mon Jun 4 2018 Remi Collet <remi@remirepo.net> - 2.12.0-1 - update to 2.12.0 - add dependency on composer/xdebug-handler |