summaryrefslogtreecommitdiffstats
path: root/Horde_Test-rpm.patch
blob: 543de271e3d98cfde7dd02dc104ab3186c41204a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
diff -up Horde_Test-2.4.0/lib/Horde/Test/AllTests.php.rpm Horde_Test-2.4.0/lib/Horde/Test/AllTests.php
--- Horde_Test-2.4.0/lib/Horde/Test/AllTests.php.rpm	2014-05-06 07:24:13.000000000 +0200
+++ Horde_Test-2.4.0/lib/Horde/Test/AllTests.php	2014-05-06 07:24:37.000000000 +0200
@@ -12,15 +12,7 @@
  * @link     http://www.horde.org/components/Horde_Test
  */
 
-if (!@include_once 'PHPUnit/Autoload.php') {
-    /* Try to load PHAR-based phpunit. */
-    set_include_path(get_include_path() . PATH_SEPARATOR . getenv('PATH'));
-    $GLOBALS['_SERVER']['SCRIPT_NAME'] = '-';
-    ob_start();
-    @include_once 'phpunit';
-    ob_end_clean();
-    restore_include_path();
-}
+require_once 'PHPUnit/Autoload.php';
 
 /**
  * Horde base test suite
diff -up Horde_Test-2.4.0/lib/Horde/Test/Autoload.php.rpm Horde_Test-2.4.0/lib/Horde/Test/Autoload.php
--- Horde_Test-2.4.0/lib/Horde/Test/Autoload.php.rpm	2014-05-06 07:23:59.000000000 +0200
+++ Horde_Test-2.4.0/lib/Horde/Test/Autoload.php	2014-05-06 07:24:50.000000000 +0200
@@ -41,7 +41,7 @@ class Horde_Test_Autoload
             return;
         }
 
-        require __DIR__ . '/../../../bundle/vendor/autoload.php';
+        require_once 'PHPUnit/Autoload.php';
 
         spl_autoload_register(
             function($class) {