blob: 9b21443b8791a6246532fb13b1075192cf067b14 (
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
33
34
35
36
|
diff -up Horde_Test-2.4.1/lib/Horde/Test/AllTests.php.rpm Horde_Test-2.4.1/lib/Horde/Test/AllTests.php
--- Horde_Test-2.4.1/lib/Horde/Test/AllTests.php.rpm 2014-05-06 08:42:59.000000000 +0200
+++ Horde_Test-2.4.1/lib/Horde/Test/AllTests.php 2014-05-06 14:15:13.780403549 +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.1/lib/Horde/Test/Autoload.php.rpm Horde_Test-2.4.1/lib/Horde/Test/Autoload.php
--- Horde_Test-2.4.1/lib/Horde/Test/Autoload.php.rpm 2014-05-06 14:15:13.781403553 +0200
+++ Horde_Test-2.4.1/lib/Horde/Test/Autoload.php 2014-05-06 14:16:25.522649055 +0200
@@ -41,11 +41,7 @@ class Horde_Test_Autoload
return;
}
- if (file_exists(__DIR__ . '/vendor/autoload.php')) {
- require __DIR__ . '/vendor/autoload.php';
- } else {
- require __DIR__ . '/../../../bundle/vendor/autoload.php';
- }
+ require_once 'PHPUnit/Autoload.php';
spl_autoload_register(
function($class) {
|
