From 1566ff7eaaa356e4cc5264bb2544ca53d0341763 Mon Sep 17 00:00:00 2001 From: Shish Date: Sun, 17 Sep 2017 19:37:30 +0100 Subject: [PATCH] un-confuse phpunit --- core/_bootstrap.inc.php | 12 ++++++------ tests/test-deep.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/_bootstrap.inc.php b/core/_bootstrap.inc.php index e8d6559a..47be22aa 100644 --- a/core/_bootstrap.inc.php +++ b/core/_bootstrap.inc.php @@ -18,17 +18,17 @@ _sanitise_environment(); // load base files ctx_log_start("Opening files"); -$files = array_merge( +$_shm_files = array_merge( zglob("core/*.php"), zglob("ext/{".ENABLED_EXTS."}/main.php") ); -foreach($files as $filename) { - if(basename($filename)[0] != "_") { - require_once $filename; +foreach($_shm_files as $_shm_filename) { + if(basename($_shm_filename)[0] != "_") { + require_once $_shm_filename; } } -unset($files); -unset($filename); +unset($_shm_files); +unset($_shm_filename); ctx_log_endok(); // connect to the database diff --git a/tests/test-deep.sh b/tests/test-deep.sh index bc630357..d08c2012 100755 --- a/tests/test-deep.sh +++ b/tests/test-deep.sh @@ -1,9 +1,9 @@ #!/bin/sh php \ - -d extension.dir=/usr/lib/php/extensions/no-debug-non-zts-20121212/ \ - -d extension=xdebug.so \ -d xdebug.profiler_output_dir=./data/prof/ \ -d xdebug.profiler_enable=1 \ ./vendor/bin/phpunit \ --config tests/phpunit.xml \ --coverage-clover data/coverage.clover +# -d extension.dir=/usr/local/Cellar/php71-xdebug/2.5.5/ \ +# -d extension=xdebug.so \