summaryrefslogtreecommitdiffstats
path: root/bootstrap-autoload.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-01-22 10:00:26 +0100
committerRemi Collet <remi@remirepo.net>2018-01-22 10:00:26 +0100
commit621eeb7ca545dd727c10bfd50be78d4202d40575 (patch)
treede64fb5f84737aec6a49c9c899f2f8d284e981ed /bootstrap-autoload.patch
parentca32fba3bc98387f21efb37bf47a72789b084118 (diff)
Update to 2.0.0
rename to php-hamcrest2
Diffstat (limited to 'bootstrap-autoload.patch')
-rw-r--r--bootstrap-autoload.patch29
1 files changed, 18 insertions, 11 deletions
diff --git a/bootstrap-autoload.patch b/bootstrap-autoload.patch
index 49cad37..df475dd 100644
--- a/bootstrap-autoload.patch
+++ b/bootstrap-autoload.patch
@@ -1,18 +1,25 @@
-diff -up tests/bootstrap.php.rpm tests/bootstrap.php
---- tests/bootstrap.php.rpm 2015-01-05 13:27:31.069437796 +0100
-+++ tests/bootstrap.php 2015-01-05 13:27:40.291470405 +0100
-@@ -1,6 +1,7 @@
- <?php
+diff -up ./hamcrest/Hamcrest/Util.php.rpm ./hamcrest/Hamcrest/Util.php
+--- ./hamcrest/Hamcrest/Util.php.rpm 2018-01-22 09:48:17.689161741 +0100
++++ ./hamcrest/Hamcrest/Util.php 2018-01-22 09:48:24.644197714 +0100
+@@ -14,7 +14,7 @@ class Util
+ {
+ public static function registerGlobalFunctions()
+ {
+- require_once __DIR__.'/../Hamcrest.php';
++ require_once __DIR__.'/Hamcrest.php';
+ }
+
+ /**
+diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
+--- ./tests/bootstrap.php.rpm 2016-01-20 09:20:44.000000000 +0100
++++ ./tests/bootstrap.php 2018-01-22 09:46:19.525550567 +0100
+@@ -2,7 +2,8 @@
+
error_reporting(E_ALL | E_STRICT);
+
-require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../hamcrest/Hamcrest/autoload.php';
+require __DIR__ . '/autoload.php';
if (defined('E_DEPRECATED')) {
error_reporting(error_reporting() | E_DEPRECATED);
-@@ -14,5 +15,3 @@ set_include_path(implode(PATH_SEPARATOR,
- HAMCREST_BASE . '/hamcrest',
- get_include_path()
- )));
--
--require_once 'Hamcrest.php';