summaryrefslogtreecommitdiffstats
path: root/phpunit-rpm.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-11 13:22:09 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-11 13:22:09 +0200
commit48c738779b51f4cb1367859659ab34c8d1e4e927 (patch)
tree54bc4efecf61aad60140e316402b7b0d744d8354 /phpunit-rpm.patch
parentef903504bb23bd2afb71219d4e572db03b526e68 (diff)
php-phpunit-PHPUnit: 4.2.0
Diffstat (limited to 'phpunit-rpm.patch')
-rw-r--r--phpunit-rpm.patch17
1 files changed, 8 insertions, 9 deletions
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';