From 4e2ac2e47ffdfffadfa5674d55f6f96c5e1cae77 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 18 Oct 2013 12:05:50 +0100 Subject: add missing $_SERVER values for init.php when called from cli --- _test/bootstrap.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to '_test/bootstrap.php') diff --git a/_test/bootstrap.php b/_test/bootstrap.php index 732fef9ed..3f59db515 100644 --- a/_test/bootstrap.php +++ b/_test/bootstrap.php @@ -68,6 +68,13 @@ $default_server_vars = array( 'REQUEST_TIME' => time(), ); +// fixup for $_SERVER when run from CLI, +// some values should be mocked for use by inc/init.php which is called here +// [ $_SERVER is also mocked in TestRequest::execute() ] +if (php_sapi_name() == 'cli') { + $_SERVER = array_merge($default_server_vars, $_SERVER); +} + // create temp directories mkdir(TMP_DIR); -- cgit v1.2.3 From eb9dc16998a7eb887015ef72e4100eb20617e7b8 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 18 Oct 2013 12:27:17 +0100 Subject: set error level so it is propagated correctly to dokuwiki --- _test/bootstrap.php | 1 + 1 file changed, 1 insertion(+) (limited to '_test/bootstrap.php') diff --git a/_test/bootstrap.php b/_test/bootstrap.php index 732fef9ed..4cb6420bd 100644 --- a/_test/bootstrap.php +++ b/_test/bootstrap.php @@ -15,6 +15,7 @@ require_once DOKU_UNITTEST.'core/TestUtils.php'; define('SIMPLE_TEST', true); // basic behaviours +define('DOKU_E_LEVEL',E_ALL); error_reporting(E_ALL); set_time_limit(0); ini_set('memory_limit','2048M'); -- cgit v1.2.3 From 9aac3abfe47b9ff6977643d06caf0f9520cd55f1 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 18 Oct 2013 12:33:07 +0100 Subject: also use DOKU_E_LEVEL in bootstrap's call to error_reporting() --- _test/bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_test/bootstrap.php') diff --git a/_test/bootstrap.php b/_test/bootstrap.php index 4cb6420bd..c3eba048a 100644 --- a/_test/bootstrap.php +++ b/_test/bootstrap.php @@ -16,7 +16,7 @@ define('SIMPLE_TEST', true); // basic behaviours define('DOKU_E_LEVEL',E_ALL); -error_reporting(E_ALL); +error_reporting(DOKU_E_LEVEL); set_time_limit(0); ini_set('memory_limit','2048M'); -- cgit v1.2.3 From 03a4f627659f89d54c121b485ca89dfaa4a304c0 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 20 Oct 2013 19:36:56 +0100 Subject: change error level to ignore notices --- _test/bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_test/bootstrap.php') diff --git a/_test/bootstrap.php b/_test/bootstrap.php index c3eba048a..9f4bb5fbd 100644 --- a/_test/bootstrap.php +++ b/_test/bootstrap.php @@ -15,7 +15,7 @@ require_once DOKU_UNITTEST.'core/TestUtils.php'; define('SIMPLE_TEST', true); // basic behaviours -define('DOKU_E_LEVEL',E_ALL); +define('DOKU_E_LEVEL',E_ALL ^ E_NOTICE); error_reporting(DOKU_E_LEVEL); set_time_limit(0); ini_set('memory_limit','2048M'); -- cgit v1.2.3