diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-cs-fixer.spec | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/composer.json b/composer.json index 979b2f5..5fe7fae 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,7 @@ "php": "^5.3.6 || >=7.0 <7.2", "ext-json": "*", "ext-tokenizer": "*", + "composer/semver": "^1.4", "doctrine/annotations": "^1.2", "gecko-packages/gecko-php-unit": "^2.0", "sebastian/diff": "^1.4", @@ -47,6 +48,7 @@ "hhvm": "<3.18" }, "config": { + "optimize-autoloader": true, "sort-packages": true }, "autoload": { diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 4349238..04db9e5 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit c1cc52c242f17c4d52d9601159631da488fac7a4 +%global gh_commit b6202ccad4c00778887e7e8282d52f854802b59a %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.2.6 +Version: 2.2.7 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style @@ -34,6 +34,8 @@ BuildArch: noarch # For tests BuildRequires: php(language) >= 5.4 BuildRequires: php-tokenizer +BuildRequires: php-composer(composer/semver) < 2 +BuildRequires: php-composer(composer/semver) >= 1.4 BuildRequires: php-composer(doctrine/annotations) < 2 BuildRequires: php-composer(doctrine/annotations) >= 1.2 BuildRequires: php-composer(gecko-packages/gecko-php-unit) < 3 @@ -88,6 +90,7 @@ BuildRequires: php-fedora-autoloader-devel # "php": "^5.3.6 || >=7.0 <7.2", # "ext-json": "*", # "ext-tokenizer": "*", +# "composer/semver": "^1.4", # "doctrine/annotations": "^1.2", # "gecko-packages/gecko-php-unit": "^2.0", # "sebastian/diff": "^1.4", @@ -106,6 +109,8 @@ BuildRequires: php-fedora-autoloader-devel Requires: php(language) >= 5.4 Requires: php-json Requires: php-tokenizer +Requires: php-composer(composer/semver) < 2 +Requires: php-composer(composer/semver) >= 1.4 Requires: php-composer(doctrine/annotations) < 2 Requires: php-composer(doctrine/annotations) >= 1.2 Requires: php-composer(gecko-packages/gecko-php-unit) < 3 @@ -187,6 +192,7 @@ cat << 'EOF' | tee -a src/autoload.php require_once '%{php_home}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ + '%{php_home}//Composer/Semver/autoload.php', '%{php_home}/Doctrine/Common/Annotations/autoload.php', '%{php_home}/GeckoPackages/PHPUnit/autoload.php', '%{php_home}/Symfony/Component/autoload.php', @@ -257,6 +263,10 @@ fi %changelog +* Tue Sep 12 2017 Remi Collet <remi@remirepo.net> - 2.2.7-1 +- Update to 2.2.7 +- add dependency on composer/semver + * Wed Aug 23 2017 Remi Collet <remi@remirepo.net> - 2.2.6-1 - Update to 2.2.6 |