diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-05-26 19:19:57 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-05-26 19:19:57 +0200 |
| commit | d264b6c7f4d67819a7c2db0e485154361a9bf4b6 (patch) | |
| tree | 27c648e61f680f495b4cec400462139b4728d237 /phploc-rpm.patch | |
| parent | 83baf336a7f746e078c1c64bfb99e5a3f64d2b09 (diff) | |
php-phpunit-phploc: 2.1.2 + SCL compatibility
Diffstat (limited to 'phploc-rpm.patch')
| -rw-r--r-- | phploc-rpm.patch | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/phploc-rpm.patch b/phploc-rpm.patch index 62f5c6b..414b0f3 100644 --- a/phploc-rpm.patch +++ b/phploc-rpm.patch @@ -1,16 +1,10 @@ diff -up ./phploc.rpm ./phploc ---- ./phploc.rpm 2015-03-11 07:14:28.241134864 +0100 -+++ ./phploc 2015-03-11 07:16:29.647622059 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env php -+#!/usr/bin/php - <?php - /* - * This file is part of PHPLOC. -@@ -9,23 +9,7 @@ +--- ./phploc.rpm 2015-05-26 16:03:47.000000000 +0200 ++++ ./phploc 2015-05-26 19:14:44.687212792 +0200 +@@ -9,23 +9,16 @@ * file that was distributed with this source code. */ - + -$loaded = false; - -foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/vendor/autoload.php') as $file) { @@ -19,8 +13,15 @@ diff -up ./phploc.rpm ./phploc - $loaded = true; - break; - } --} -- ++// Ensure correct include_path for RHSCL ++$inc = get_include_path(); ++$dirs = explode(':', $inc); ++if (!in_array('/usr/share/php', $dirs)) { ++ $dirs[] = '/usr/share/php'; ++ set_include_path(implode(':', $dirs)); + } ++unset ($inc, $dirs); + -if (!$loaded) { - die( - 'You need to set up the project dependencies using the following commands:' . PHP_EOL . @@ -29,6 +30,6 @@ diff -up ./phploc.rpm ./phploc - ); -} +require 'SebastianBergmann/PHPLOC/autoload.php'; - + $application = new SebastianBergmann\PHPLOC\CLI\Application; $application->run(); |