From 48c738779b51f4cb1367859659ab34c8d1e4e927 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 11 Aug 2014 13:22:09 +0200
Subject: php-phpunit-PHPUnit: 4.2.0

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

(limited to 'phpunit-rpm.patch')

diff --git a/phpunit-rpm.patch b/phpunit-rpm.patch
index 4279352..6c71e99 100644
--- a/phpunit-rpm.patch
+++ b/phpunit-rpm.patch
@@ -1,13 +1,13 @@
 diff -up ./phpunit.rpm ./phpunit
---- ./phpunit.rpm	2014-05-02 09:13:40.000000000 +0200
-+++ ./phpunit	2014-05-06 15:37:05.557950817 +0200
+--- ./phpunit.rpm	2014-08-08 07:13:30.000000000 +0200
++++ ./phpunit	2014-08-11 11:12:26.435360930 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env php
 +#!/usr/bin/php
  <?php
  /* PHPUnit
   *
-@@ -35,21 +35,7 @@
+@@ -35,20 +35,7 @@
   * POSSIBILITY OF SUCH DAMAGE.
   */
  
@@ -19,11 +19,10 @@ diff -up ./phpunit.rpm ./phpunit
 -}
 -
 -if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
--    die(
--        'You need to set up the project dependencies using the following commands:' . PHP_EOL .
+-    echo '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
--    );
+-        'php composer.phar install' . PHP_EOL;
+-    die(1);
 -}
 -
 +define ('PHPUNIT_COMPOSER_INSTALL', stream_resolve_include_path('PHPUnit/Autoload.php'));
@@ -31,8 +30,8 @@ diff -up ./phpunit.rpm ./phpunit
  
  PHPUnit_TextUI_Command::main();
 diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
---- ./tests/bootstrap.php.rpm	2014-06-07 11:26:13.357779078 +0200
-+++ ./tests/bootstrap.php	2014-06-07 11:25:17.659035072 +0200
+--- ./tests/bootstrap.php.rpm	2014-08-08 07:13:30.000000000 +0200
++++ ./tests/bootstrap.php	2014-08-11 11:08:14.835209501 +0200
 @@ -1,5 +1,8 @@
  <?php
 -require __DIR__ . '/../vendor/autoload.php';
-- 
cgit