From e2aa8cd7f1fae8da9d9ee3504c84dbfdd2af154c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jan 2019 11:53:26 +0100 Subject: v7.5.1 --- phpunit7-rpm.patch | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'phpunit7-rpm.patch') diff --git a/phpunit7-rpm.patch b/phpunit7-rpm.patch index ac1ba36..bb75e19 100644 --- a/phpunit7-rpm.patch +++ b/phpunit7-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2018-10-05 07:24:04.878465790 +0200 -+++ ./phpunit 2018-10-05 07:28:13.403045771 +0200 +--- ./phpunit.rpm 2019-01-15 09:19:08.000000000 +0100 ++++ ./phpunit 2019-01-15 11:49:08.859885786 +0100 @@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { ini_set('date.timezone', 'UTC'); } @@ -44,8 +44,8 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer +} diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php ---- ./src/Util/Configuration.php.rpm 2018-10-05 06:05:24.000000000 +0200 -+++ ./src/Util/Configuration.php 2018-10-05 07:24:04.879465796 +0200 +--- ./src/Util/Configuration.php.rpm 2019-01-15 09:19:08.000000000 +0100 ++++ ./src/Util/Configuration.php 2019-01-15 11:49:08.859885786 +0100 @@ -1025,7 +1025,7 @@ final class Configuration private function validateConfigurationAgainstSchema(): void { @@ -56,9 +56,9 @@ diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php if (\defined('__PHPUNIT_PHAR_ROOT__')) { $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2018-10-05 06:05:24.000000000 +0200 -+++ ./tests/bootstrap.php 2018-10-05 07:24:04.878465790 +0200 -@@ -14,7 +14,12 @@ if (!\defined('TEST_FILES_PATH')) { +--- ./tests/bootstrap.php.rpm 2019-01-15 11:49:08.859885786 +0100 ++++ ./tests/bootstrap.php 2019-01-15 11:50:12.567276300 +0100 +@@ -14,4 +14,9 @@ if (!\defined('TEST_FILES_PATH')) { \ini_set('precision', 14); \ini_set('serialize_precision', 14); @@ -69,6 +69,3 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php +require_once __DIR__ . '/_files/NamespaceCoveredFunction.php'; +require_once '@PATH@/Framework/Assert/Functions.php'; +require_once __DIR__ . '/autoload.php'; - - // TODO: Figure out why these are required (the classes should be autoloaded instead) - require_once TEST_FILES_PATH . 'BeforeAndAfterTest.php'; -- cgit