summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-03-15 19:20:13 +0100
committerRemi Collet <fedora@famillecollet.com>2017-03-15 19:20:13 +0100
commitd831b76c2607760ced594bdfbf145d59245910ee (patch)
tree0a504a5d7c1426158b66e5a61192e7e9a2bb08a0
parent537beec1ed2d889b13e683c2e0f42018b75adf6b (diff)
php-cs-fixer: 2.1.2
-rw-r--r--composer.json2
-rw-r--r--php-cs-fixer.spec9
2 files changed, 7 insertions, 4 deletions
diff --git a/composer.json b/composer.json
index 7a57939..2908450 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
"require-dev": {
"gecko-packages/gecko-php-unit": "^2.0",
"justinrainbow/json-schema": "^5.0",
- "phpunit/phpunit": "^4.5|^5",
+ "phpunit/phpunit": "^4.5 || ^5.0",
"satooshi/php-coveralls": "^1.0",
"symfony/phpunit-bridge": "^3.2"
},
diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec
index ef31914..b0d8633 100644
--- a/php-cs-fixer.spec
+++ b/php-cs-fixer.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit e0e33ce4eaf59ba77ead9ce45256692aa29ecb38
+%global gh_commit c7de769d7b44f2c9de68e1f678b65efd8126f60b
%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.1.1
+Version: 2.1.2
Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
Summary: A tool to automatically fix PHP code style
@@ -54,7 +54,7 @@ BuildRequires: php-xml
# From composer.json, "require-dev": {
# "gecko-packages/gecko-php-unit": "^2.0",
# "justinrainbow/json-schema": "^5.0",
-# "phpunit/phpunit": "^4.5|^5",
+# "phpunit/phpunit": "^4.5 || ^5.0",
# "satooshi/php-coveralls": "^1.0",
# "symfony/phpunit-bridge": "^3.2"
BuildRequires: php-composer(gecko-packages/gecko-php-unit) >= 2.0
@@ -190,6 +190,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Mar 15 2017 Remi Collet <remi@remirepo.net> - 2.1.2-1
+- Update to 2.1.2
+
* Fri Mar 3 2017 Remi Collet <remi@remirepo.net> - 2.1.1-1
- Update to 2.1.1