diff options
| -rw-r--r-- | composer.json | 7 | ||||
| -rw-r--r-- | php-cs-fixer.spec | 9 | 
2 files changed, 12 insertions, 4 deletions
| diff --git a/composer.json b/composer.json index 5df4718..fae5653 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@          }      ],      "require": { -        "php": "^5.6 || >=7.0 <7.3", +        "php": "^5.6 || ^7.0",          "ext-json": "*",          "ext-tokenizer": "*",          "composer/semver": "^1.4", @@ -56,6 +56,11 @@      "config": {          "sort-packages": true      }, +    "extra": { +        "branch-alias": { +            "dev-master": "2.14-dev" +        } +    },      "autoload": {          "psr-4": {              "PhpCsFixer\\": "src/" diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 0a31e62..f596a7e 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    ce6c4bbc24302f535c7bbf9ad35fbb0be4f5a4b2 +%global gh_commit    b788ea0af899cedc8114dca7db119c93b6685da2  %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.13.2 +Version:        2.14.0  Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}  Summary:        A tool to automatically fix PHP code style @@ -127,7 +127,7 @@ BuildRequires:  php-phpunit-PHPUnit             >= 5.7.23  BuildRequires:  php-fedora-autoloader-devel  # From composer.json,     "require": { -#        "php": "^5.6 || >=7.0 <7.3", +#        "php": "^5.6 || ^7.0",  #        "ext-json": "*",  #        "ext-tokenizer": "*",  #        "composer/semver": "^1.4", @@ -337,6 +337,9 @@ exit $ret  %changelog +* Sat Jan  5 2019 Remi Collet <remi@remirepo.net> - 2.14.0-1 +- update to 2.14.0 +  * Wed Jan  2 2019 Remi Collet <remi@remirepo.net> - 2.13.2-1  - update to 2.13.2 | 
