summaryrefslogtreecommitdiffstats
path: root/php-cs-fixer.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-cs-fixer.spec')
-rw-r--r--php-cs-fixer.spec20
1 files changed, 12 insertions, 8 deletions
diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec
index 8477600..b4850a6 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 e0f6d05c8b157f50029ca6c65c19ed2694f475bf
+%global gh_commit 5fed214993e7863cef88a08f214344891299b9e4
%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.18.5
+Version: 2.18.6
Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
Summary: A tool to automatically fix PHP code style
@@ -49,13 +49,13 @@ BuildRequires: php-tokenizer
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4)
-BuildRequires: (php-composer(composer/xdebug-handler) >= 1.0 with php-composer(composer/xdebug-handler) < 2)
+BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3)
BuildRequires: (php-composer(doctrine/annotations) >= 1.2 with php-composer(doctrine/annotations) < 2)
BuildRequires: (php-composer(sebastian/diff) >= 1.4 with php-composer(sebastian/diff) < 2)
# remirepo:6
%else
BuildRequires: php-composer-semver3 >= 3.0
-BuildRequires: php-composer-xdebug-handler >= 1.0
+BuildRequires: php-composer-xdebug-handler2 >= 2.0
BuildRequires: php-doctrine-annotations >= 1.2
BuildRequires: php-phpunit-diff >= 1.4
%endif
@@ -133,7 +133,7 @@ BuildRequires: php-fedora-autoloader-devel
# "ext-json": "*",
# "ext-tokenizer": "*",
# "composer/semver": "^1.4 || ^2.0 || ^3.0",
-# "composer/xdebug-handler": "^1.2",
+# "composer/xdebug-handler": "^1.2 || ^2.0",
# "doctrine/annotations": "^1.2",
# "php-cs-fixer/diff": "^1.3",
# "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0",
@@ -152,13 +152,13 @@ Requires: php-tokenizer
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4)
-Requires: (php-composer(composer/xdebug-handler) >= 1.2 with php-composer(composer/xdebug-handler) < 2)
+Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3)
Requires: (php-composer(doctrine/annotations) >= 1.2 with php-composer(doctrine/annotations) < 2)
Requires: (php-composer(sebastian/diff) >= 1.4 with php-composer(sebastian/diff) < 2)
# remirepo:6
%else
Requires: php-composer-semver3 >= 3.0
-Requires: php-composer-xdebug-handler >= 1.2
+Requires: php-composer-xdebug-handler2 >= 2.0
Requires: php-doctrine-annotations >= 1.2
Requires: php-phpunit-diff >= 1.4
%endif
@@ -253,7 +253,7 @@ cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\', __DIR__);
\Fedora\Autoloader\Dependencies::required([
'%{php_home}/Composer/Semver3/autoload.php',
- '%{php_home}/Composer/XdebugHandler/autoload.php',
+ '%{php_home}/Composer/XdebugHandler2/autoload.php',
'%{php_home}/Doctrine/Common/Annotations/autoload.php',
'%{php_home}/Symfony3/Component/Console/autoload.php',
'%{php_home}/Symfony3/Component/EventDispatcher/autoload.php',
@@ -349,6 +349,10 @@ exit $ret
%changelog
+* Tue Apr 20 2021 Remi Collet <remi@remirepo.net> - 2.18.6-1
+- update to 2.18.6
+- switch to composer/xdebug-handler version 2
+
* Wed Apr 7 2021 Remi Collet <remi@remirepo.net> - 2.18.5-1
- update to 2.18.5