diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-phpmd-PHP-PMD-autoload.php | 9 | ||||
| -rw-r--r-- | php-phpmd-PHP-PMD.spec | 18 |
3 files changed, 18 insertions, 11 deletions
diff --git a/composer.json b/composer.json index 184716d..96b9548 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "php": ">=5.3.9", "pdepend/pdepend": "^2.9.1", "ext-xml": "*", - "composer/xdebug-handler": "^1.0" + "composer/xdebug-handler": "^1.0 || ^2.0" }, "require-dev": { "phpunit/phpunit": "^4.8.36 || ^5.7.27", diff --git a/php-phpmd-PHP-PMD-autoload.php b/php-phpmd-PHP-PMD-autoload.php index 5f459ef..1f1c8ee 100644 --- a/php-phpmd-PHP-PMD-autoload.php +++ b/php-phpmd-PHP-PMD-autoload.php @@ -3,8 +3,11 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('PHPMD\\', __DIR__); -\Fedora\Autoloader\Dependencies::required(array( +\Fedora\Autoloader\Dependencies::required([ '/usr/share/php/PDepend/autoload.php', - '/usr/share/php/Composer/XdebugHandler/autoload.php', -)); + [ + '/usr/share/php/Composer/XdebugHandler2/autoload.php', + '/usr/share/php/Composer/XdebugHandler/autoload.php', + ], +]); diff --git a/php-phpmd-PHP-PMD.spec b/php-phpmd-PHP-PMD.spec index 0fd7d46..28165e5 100644 --- a/php-phpmd-PHP-PMD.spec +++ b/php-phpmd-PHP-PMD.spec @@ -7,7 +7,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 58ef9e746a1ab50ad3360d5d301e1229ed2612cb +%global gh_commit bd5ef43d1dcaf7272605027c959c1c5ff3761f7a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpmd %global gh_project phpmd @@ -18,7 +18,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-phpmd-PHP-PMD -Version: 2.10.0 +Version: 2.10.1 Release: 1%{?dist} Summary: PHPMD - PHP Mess Detector @@ -46,12 +46,12 @@ BuildRequires: php-composer(phpunit/phpunit) >= 4.8.36 BuildRequires: php(language) >= 5.3.9 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(pdepend/pdepend) >= 2.9.1 with php-composer(pdepend/pdepend) < 3) -BuildRequires: (php-composer(composer/xdebug-handler) >= 1.0 with php-composer(composer/xdebug-handler) < 2) +BuildRequires: (php-composer(composer/xdebug-handler) >= 1.0 with php-composer(composer/xdebug-handler) < 3) BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6.8 with php-composer(mikey179/vfsstream) < 2) %else BuildRequires: php-composer(pdepend/pdepend) < 3 BuildRequires: php-composer(pdepend/pdepend) >= 2.5 -BuildRequires: php-composer(composer/xdebug-handler) < 2 +BuildRequires: php-composer(composer/xdebug-handler) < 3 BuildRequires: php-composer(composer/xdebug-handler) >= 1.0 BuildRequires: php-composer(mikey179/vfsstream) < 2 BuildRequires: php-composer(mikey179/vfsstream) >= 1.6.8 @@ -71,15 +71,15 @@ BuildRequires: php-composer(fedora/autoloader) # "php": ">=5.3.9", # "pdepend/pdepend": "^2.9.1", # "ext-xml": "*", -# "composer/xdebug-handler": "^1.0" +# "composer/xdebug-handler": "^1.0 || ^2.0" Requires: php(language) >= 5.3.9 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(pdepend/pdepend) >= 2.9.1 with php-composer(pdepend/pdepend) < 3) -Requires: (php-composer(composer/xdebug-handler) >= 1.0 with php-composer(composer/xdebug-handler) < 2) +Requires: (php-composer(composer/xdebug-handler) >= 1.0 with php-composer(composer/xdebug-handler) < 3) %else Requires: php-composer(pdepend/pdepend) < 3 Requires: php-composer(pdepend/pdepend) >= 2.6 -Requires: php-composer(composer/xdebug-handler) < 2 +Requires: php-composer(composer/xdebug-handler) < 3 Requires: php-composer(composer/xdebug-handler) >= 1.0 %endif Requires: php-xml @@ -181,6 +181,10 @@ fi %changelog +* Wed May 12 2021 Remi Collet <remi@remirepo.net> - 2.10.1-1 +- update to 2.10.1 +- allow version 2.0 of the composer/xdebug-handler + * Thu Apr 29 2021 Remi Collet <remi@remirepo.net> - 2.10.0-1 - update to 2.10.0 - raise dependency on pdepend/pdepend version 2.9.1 |