1 files changed, 63 insertions, 0 deletions
diff --git a/phpunit6-rpm.patch b/phpunit6-rpm.patch
new file mode 100644
index 0000000..09234ad
--- /dev/null
+++ b/phpunit6-rpm.patch
@@ -0,0 +1,63 @@
+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')) {
+     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 Composer:' . PHP_EOL . PHP_EOL .
+-        '    composer install' . PHP_EOL . PHP_EOL .
+-        'You can learn all about Composer on https://getcomposer.org/.' . 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('PHPUnit6/autoload.php'));
+ }
+ 
+ require PHPUNIT_COMPOSER_INSTALL;
+ 
+-PHPUnit\TextUI\Command::main();
++if (class_exists('PHPUnit_TextUI_Command')) {
++    PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older
++} else {
++    PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer
++}
+
+--- ./tests/bootstrap.php.rpm	2017-02-07 16:15:02.226336155 +0100
++++ ./tests/bootstrap.php	2017-02-07 16:15:06.656354953 +0100
+@@ -1,6 +1,9 @@
+ <?php
+ // Needed for isolated tests
+-require __DIR__ . '/../vendor/autoload.php';
++require_once '@PATH@/autoload.php';
++require_once __DIR__ . '/_files/CoveredFunction.php';
++require_once '@PATH@/Framework/Assert/Functions.php';
++require_once __DIR__ . '/autoload.php';
+ 
+ ini_set('precision', 14);
+ ini_set('serialize_precision', 14);