summaryrefslogtreecommitdiffstats
path: root/phpunit7-rpm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'phpunit7-rpm.patch')
-rw-r--r--phpunit7-rpm.patch26
1 files changed, 9 insertions, 17 deletions
diff --git a/phpunit7-rpm.patch b/phpunit7-rpm.patch
index c03c25d..db9bdfe 100644
--- a/phpunit7-rpm.patch
+++ b/phpunit7-rpm.patch
@@ -1,7 +1,7 @@
diff -up ./phpunit.rpm ./phpunit
---- ./phpunit.rpm 2017-02-07 16:05:03.325668400 +0100
-+++ ./phpunit 2017-02-07 16:09:20.442818688 +0100
-@@ -27,27 +27,27 @@ if (!ini_get('date.timezone')) {
+--- ./phpunit.rpm 2018-02-02 06:04:08.000000000 +0100
++++ ./phpunit 2018-02-02 10:25:26.281085072 +0100
+@@ -27,27 +27,18 @@ if (!ini_get('date.timezone')) {
ini_set('date.timezone', 'UTC');
}
@@ -11,15 +11,8 @@ diff -up ./phpunit.rpm ./phpunit
-
- 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')) {
@@ -36,7 +29,7 @@ diff -up ./phpunit.rpm ./phpunit
+ 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('PHPUnit6/autoload.php'));
++ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit7/autoload.php');
}
require PHPUNIT_COMPOSER_INSTALL;
@@ -47,10 +40,9 @@ diff -up ./phpunit.rpm ./phpunit
+} else {
+ PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer
+}
-
-diff -up tests/bootstrap.php.rpm tests/bootstrap.php
---- tests/bootstrap.php.rpm 2017-03-15 19:45:42.004596546 +0100
-+++ tests/bootstrap.php 2017-03-15 19:47:16.561034373 +0100
+diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
+--- ./tests/bootstrap.php.rpm 2018-02-02 06:04:08.000000000 +0100
++++ ./tests/bootstrap.php 2018-02-02 10:24:37.643848378 +0100
@@ -6,7 +6,10 @@ if (!defined('TEST_FILES_PATH')) {
ini_set('precision', 14);
ini_set('serialize_precision', 14);