From 24a5f7d8bf23dbdd713da4ee2eba0584cd4ff080 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 26 May 2015 09:04:04 +0200
Subject: php-phpunit-PHPUnit: detect and redirect to composer installed
 version #1157910

---
 phpunit-rpm.patch | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'phpunit-rpm.patch')

diff --git a/phpunit-rpm.patch b/phpunit-rpm.patch
index 03ace66..7392971 100644
--- a/phpunit-rpm.patch
+++ b/phpunit-rpm.patch
@@ -1,10 +1,10 @@
 diff -up ./phpunit.rpm ./phpunit
 --- ./phpunit.rpm	2015-01-17 12:24:41.000000000 +0100
 +++ ./phpunit	2015-01-18 08:52:50.896228541 +0100
-@@ -13,24 +13,7 @@ if (!ini_get('date.timezone')) {
+@@ -13,22 +13,11 @@
      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);
@@ -21,12 +21,14 @@ diff -up ./phpunit.rpm ./phpunit
 -        'php composer.phar install' . PHP_EOL
 -    );
 -    die(1);
--}
--
-+define ('PHPUNIT_COMPOSER_INSTALL', stream_resolve_include_path('PHPUnit/Autoload.php'));
++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;
- 
- PHPUnit_TextUI_Command::main();
 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
-- 
cgit