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
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
--- ./phpunit.rpm 2015-05-25 07:18:18.000000000 +0200
+++ ./phpunit 2015-05-26 19:43:34.101986869 +0200
@@ -13,22 +13,21 @@
ini_set('date.timezone', 'UTC');
}
-foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
- if (file_exists($file)) {
- define('PHPUNIT_COMPOSER_INSTALL', $file);
- 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);
-unset($file);
-
-if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
- fwrite(STDERR,
- 'You need to set up the project dependencies using the following commands:' . PHP_EOL .
- 'wget http://getcomposer.org/composer.phar' . PHP_EOL .
- 'php composer.phar install' . PHP_EOL
- );
- die(1);
+// Libraries PATH
+if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) {
+ echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n";
+ define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php'));
+} else {
+ define ('PHPUNIT_COMPOSER_INSTALL', stream_resolve_include_path('PHPUnit/Autoload.php'));
}
require PHPUNIT_COMPOSER_INSTALL;
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
--- ./tests/bootstrap.php.rpm 2015-01-17 12:24:41.000000000 +0100
+++ ./tests/bootstrap.php 2015-01-18 08:51:55.668966689 +0100
@@ -1,6 +1,9 @@
<?php
// Needed for isolated tests
-require __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/_files/CoveredFunction.php';
+require_once __DIR__ . '/../PHPUnit/Framework/Assert/Functions.php';
+require_once __DIR__ . '/../PHPUnit/Autoload.php';
+require_once __DIR__ . '/autoload.php';
ini_set('precision', 14);
ini_set('serialize_precision', 14);
|
