summaryrefslogtreecommitdiffstats
path: root/php-phpmd-PHP-PMD-rpm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'php-phpmd-PHP-PMD-rpm.patch')
-rw-r--r--php-phpmd-PHP-PMD-rpm.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/php-phpmd-PHP-PMD-rpm.patch b/php-phpmd-PHP-PMD-rpm.patch
index 7006ca4..9f02d99 100644
--- a/php-phpmd-PHP-PMD-rpm.patch
+++ b/php-phpmd-PHP-PMD-rpm.patch
@@ -1,8 +1,8 @@
-diff -up src/bin/phpmd.rpm src/bin/phpmd
---- src/bin/phpmd.rpm 2015-09-22 09:01:46.283971581 +0200
-+++ src/bin/phpmd 2015-09-22 09:02:14.155400697 +0200
-@@ -3,23 +3,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 @@
+ use Composer\XdebugHandler\XdebugHandler;
use PHPMD\TextUI\Command;
-if (file_exists(__DIR__ . '/../../../../autoload.php')) {
@@ -24,21 +24,21 @@ diff -up src/bin/phpmd.rpm src/bin/phpmd
-}
+require '/usr/share/php/PHPMD/autoload.php';
- if (!ini_get('date.timezone')) {
- date_default_timezone_set('UTC');
-diff -up src/main/php/PHPMD/RuleSetFactory.php.rpm src/main/php/PHPMD/RuleSetFactory.php
---- src/main/php/PHPMD/RuleSetFactory.php.rpm 2015-09-22 08:56:25.000000000 +0200
-+++ src/main/php/PHPMD/RuleSetFactory.php 2015-09-22 09:01:46.283971581 +0200
-@@ -79,12 +79,7 @@ class RuleSetFactory
+ // 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
*/
public function __construct()
{
- // PEAR installer workaround
- if (strpos($this->location, '@data_dir') === 0) {
- $this->location = __DIR__ . '/../../resources';
-- } else {
-- $this->location .= '/PHPMD/resources';
+- return;
- }
+- $this->location .= '/PHPMD/resources';
+ $this->location = __DIR__ . '/../../php-phpmd-PHP-PMD/resources';
}