summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-02-18 10:21:34 +0100
committerRemi Collet <remi@remirepo.net>2019-02-18 10:21:34 +0100
commit219f6284a2e77281ffedac0c3c0b3228c557a3bd (patch)
treeabb0ef2a0ec88bb8bd5a69f39e0c09cbb79e43ab
parentf5b6163bcf6f5452dc6f8989804a3617b299ba92 (diff)
v2.14.2 (no change)
-rw-r--r--composer.json3
-rw-r--r--php-cs-fixer.spec7
2 files changed, 5 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index 004d8bd..30e749c 100644
--- a/composer.json
+++ b/composer.json
@@ -31,9 +31,6 @@
"symfony/process": "^3.0 || ^4.0",
"symfony/stopwatch": "^3.0 || ^4.0"
},
- "conflict": {
- "hhvm": "*"
- },
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"justinrainbow/json-schema": "^5.0",
diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec
index 29d22e2..0a97c6a 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 2e82abd1322897eb8aacb861e5ff551af3888349
+%global gh_commit ff401e58261ffc5934a58f795b3f95b355e276cb
%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.14.1
+Version: 2.14.2
Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
Summary: A tool to automatically fix PHP code style
@@ -337,6 +337,9 @@ exit $ret
%changelog
+* Mon Feb 18 2019 Remi Collet <remi@remirepo.net> - 2.14.2-1
+- update to 2.14.2 (no change)
+
* Mon Feb 11 2019 Remi Collet <remi@remirepo.net> - 2.14.1-1
- update to 2.14.1