Simplify debug logging logic when running tests standalone

bjori · bjori · commit 4ddcd0ad6ac8 · 2015-03-03T10:24:03.000-08:00
diff --git a/tests/utils/basic.inc b/tests/utils/basic.inc
@@ -56,8 +56,11 @@ if (!is_dir(DEBUG_DIR)) {
     mkdir(DEBUG_DIR, 0777, true);
 }
 
-/* If we are running the .phpt directly, don't mess with the ini settings */
-if (substr($_SERVER["PHP_SELF"], -5) != ".phpt") {
+/* If the INI option hasn't been changed, then lets set it to the debug log */
+$ininame = "phongo.debug_log";
+$origin = ini_get($ininame);
+ini_restore($ininame);
+if ($ininame == $origin) {
     ini_set("phongo.debug_log", DEBUG_FILENAME);
     file_put_contents(DEBUG_FILENAME, sprintf("===> %s <=== %s\n", date(DATE_ISO8601), $_SERVER["SCRIPT_FILENAME"]), FILE_APPEND);
 }

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,11 @@ if (!is_dir(DEBUG_DIR)) {`
`56`	`56`	`mkdir(DEBUG_DIR, 0777, true);`
`57`	`57`	`}`
`58`	`58`
`59`		`-/* If we are running the .phpt directly, don't mess with the ini settings */`
`60`		`-if (substr($_SERVER["PHP_SELF"], -5) != ".phpt") {`
	`59`	`+/* If the INI option hasn't been changed, then lets set it to the debug log */`
	`60`	`+$ininame = "phongo.debug_log";`
	`61`	`+$origin = ini_get($ininame);`
	`62`	`+ini_restore($ininame);`
	`63`	`+if ($ininame == $origin) {`
`61`	`64`	`ini_set("phongo.debug_log", DEBUG_FILENAME);`
`62`	`65`	`file_put_contents(DEBUG_FILENAME, sprintf("===> %s <=== %s\n", date(DATE_ISO8601), $_SERVER["SCRIPT_FILENAME"]), FILE_APPEND);`
`63`	`66`	`}`