diff options
| author | Remi Collet <remi@remirepo.net> | 2020-09-02 15:38:53 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-09-02 15:38:53 +0200 |
| commit | 91d60edcc2e51c6fcb4964e91862a28465d5a60c (patch) | |
| tree | 54eccf884f1a193fa2694f03874139b15c7508c4 /php-phpmd-PHP-PMD-rpm.patch | |
| parent | c4e1ef5e75d3d31ebf9949d626ed8f94636cc6bb (diff) | |
update to 2.9.0
Diffstat (limited to 'php-phpmd-PHP-PMD-rpm.patch')
| -rw-r--r-- | php-phpmd-PHP-PMD-rpm.patch | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/php-phpmd-PHP-PMD-rpm.patch b/php-phpmd-PHP-PMD-rpm.patch index 9f02d99..aab3e64 100644 --- a/php-phpmd-PHP-PMD-rpm.patch +++ b/php-phpmd-PHP-PMD-rpm.patch @@ -1,7 +1,7 @@ diff -up ./src/bin/phpmd.rpm ./src/bin/phpmd ---- ./src/bin/phpmd.rpm 2020-01-07 08:21:19.905248145 +0100 -+++ ./src/bin/phpmd 2020-01-07 08:21:58.064003463 +0100 -@@ -19,23 +19,7 @@ +--- ./src/bin/phpmd.rpm 2020-09-02 15:30:24.934332729 +0200 ++++ ./src/bin/phpmd 2020-09-02 15:31:27.992170861 +0200 +@@ -19,12 +19,7 @@ use Composer\XdebugHandler\XdebugHandler; use PHPMD\TextUI\Command; @@ -10,35 +10,19 @@ diff -up ./src/bin/phpmd.rpm ./src/bin/phpmd - require_once __DIR__ . '/../../../../autoload.php'; -} else { - require_once __DIR__ . '/../../vendor/autoload.php'; -- -- // PEAR installation workaround -- if (strpos('@package_version@', '@package_version') === 0) { -- set_include_path( -- dirname(__FILE__) . '/../main/php' . -- PATH_SEPARATOR . -- dirname(__FILE__) . '/../../vendor/pdepend/pdepend/src/main/php' . -- PATH_SEPARATOR . -- '.' -- ); -- } -} +require '/usr/share/php/PHPMD/autoload.php'; // Restart if xdebug is loading, unless the environment variable PHPMD_ALLOW_XDEBUG is set. $xdebug = new XdebugHandler('PHPMD'); diff -up ./src/main/php/PHPMD/RuleSetFactory.php.rpm ./src/main/php/PHPMD/RuleSetFactory.php ---- ./src/main/php/PHPMD/RuleSetFactory.php.rpm 2020-01-07 08:21:19.905248145 +0100 -+++ ./src/main/php/PHPMD/RuleSetFactory.php 2020-01-07 08:23:37.062368597 +0100 -@@ -58,12 +58,7 @@ class RuleSetFactory +--- ./src/main/php/PHPMD/RuleSetFactory.php.rpm 2020-09-02 15:30:24.934332729 +0200 ++++ ./src/main/php/PHPMD/RuleSetFactory.php 2020-09-02 15:36:12.703445806 +0200 +@@ -57,7 +57,7 @@ class RuleSetFactory */ public function __construct() { -- // PEAR installer workaround -- if (strpos($this->location, '@data_dir') === 0) { -- $this->location = __DIR__ . '/../../resources'; -- return; -- } -- $this->location .= '/PHPMD/resources'; +- $this->location = __DIR__ . '/../../resources'; + $this->location = __DIR__ . '/../../php-phpmd-PHP-PMD/resources'; } |