Array\n(\n" + . " [0] => a\n" + . " [1] => b\n" + . ")\n", + ], + 'an array, no html' => [ + ['a', 'b'], + true, + "##HTMLPRE##" + . "Array\n(\n" + . " [0] => a\n" + . " [1] => b\n" + . ")\n" + . "##/HTMLPRE##", + ], + // resource + 'a resource' => [ + tmpfile(), + null, + '/^Resource id #\d+$/', + ], + // object + 'an object' => [ + new \CoreLibs\Debug\Support(), + null, + 'CoreLibs\Debug\Support', + ] + ]; + } + /** * Undocumented function * @@ -119,7 +180,7 @@ final class CoreLibsDebugSupportTest extends TestCase * * @cover ::printAr * @dataProvider printArProvider - * @testdox printAr $input will be $expected[$_dataName] + * @testdox printAr $input will be $expected [$_dataName] * * @param array $input * @param string $expected @@ -133,6 +194,41 @@ final class CoreLibsDebugSupportTest extends TestCase ); } + /** + * Undocumented function + * + * @cover ::printToString + * @dataProvider printToStringProvider + * @testdox printToString $input with $flag will be $expected [$_dataName] + * + * @param mixed $input + * @param boolean|null $flag + * @param string $expected + * @return void + */ + public function testPrintToString($input, ?bool $flag, string $expected): void + { + if ($flag === null) { + // if expected starts with / and ends with / then this is a regex compare + if (substr($expected, 0, 1) == '/' && substr($expected, -1, 1) == '/') { + $this->assertMatchesRegularExpression( + $expected, + \CoreLibs\Debug\Support::printToString($input) + ); + } else { + $this->assertEquals( + $expected, + \CoreLibs\Debug\Support::printToString($input) + ); + } + } else { + $this->assertEquals( + $expected, + \CoreLibs\Debug\Support::printToString($input, $flag) + ); + } + } + /** * Undocumented function * diff --git a/www/admin/class_test.db.php b/www/admin/class_test.db.php index 154c55ef..7d2bb913 100644 --- a/www/admin/class_test.db.php +++ b/www/admin/class_test.db.php @@ -33,6 +33,7 @@ ob_end_flush(); use CoreLibs\Debug\Support as DgS; use CoreLibs\DB\IO as DbIo; +use CoreLibs\Debug\Support; $log = new CoreLibs\Debug\Logging([ 'log_folder' => BASE . LOG, @@ -46,6 +47,7 @@ $log = new CoreLibs\Debug\Logging([ ]); $basic = new CoreLibs\Basic($log); $db = new CoreLibs\Admin\Backend(DB_CONFIG, $log); +$db->log->debug('START', '=============================>'); // NEXT STEP // $basic = new CoreLibs\Basic(); @@ -89,7 +91,8 @@ $query = "TRUNCATE test_foobar"; $db->dbExec($query); $status = $db->dbExec("INSERT INTO test_foo (test) VALUES ('FOO TEST " . time() . "') RETURNING test"); -print "DIRECT INSERT STATUS: $status | " +print "DIRECT INSERT STATUS: " . Support::printToString($status) . "| " + . "DB OBJECT:
" . print_r($status, true) . "| " . "PRIMARY KEY: " . $db->dbGetInsertPK() . " | " . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | " . "RETURNING EXT[test]: " . print_r($db->dbGetReturningExt('test'), true) . " | " @@ -104,7 +107,7 @@ print "DIRECT INSERT PREVIOUS INSERTED: " // PREPARED INSERT $db->dbPrepare("ins_test_foo", "INSERT INTO test_foo (test) VALUES ($1) RETURNING test"); $status = $db->dbExecute("ins_test_foo", array('BAR TEST ' . time())); -print "PREPARE INSERT[ins_test_foo] STATUS: $status | " +print "PREPARE INSERT[ins_test_foo] STATUS: " . Support::printToString($status) . " | " . "PRIMARY KEY: " . $db->dbGetInsertPK() . " | " . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | " . "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) . "
tag added + * @param array$array any array + * @param bool $no_html set to true to use ##HTMLPRE## + * @return string formatted array for output with tag added */ - public static function printAr(array $array): string + public static function printAr(array $array, bool $no_html = false): string { - return "" . print_r($array, true) . ""; + if ($no_html === false) { + return "" . print_r($array, true) . ""; + } else { + return '##HTMLPRE##' . print_r($array, true) . '##/HTMLPRE##'; + } + } + + /** + * print out any data as string + * will convert boolean to TRUE/FALSE + * if object return get_class + * for array use printAr function, can be controlled with no_html for + * Debug\Logging compatible output + * @param mixed $mixed + * @param bool $no_html set to true to use ##HTMLPRE## + * @return string + */ + public static function printToString($mixed, bool $no_html = false): string + { + if (is_bool($mixed)) { + return $mixed ? 'TRUE' : 'FALSE'; + } elseif (is_resource($mixed)) { + return (string)$mixed; + } elseif (is_object($mixed)) { + return get_class($mixed); + } elseif (is_array($mixed)) { + // use the pre one OR debug one + return self::printAr($mixed, $no_html); + } else { + // should be int/float/string + return (string)$mixed; + } } /** diff --git a/www/lib/CoreLibs/Template/SmartyExtend.php b/www/lib/CoreLibs/Template/SmartyExtend.php index e8223245..fd363ca5 100644 --- a/www/lib/CoreLibs/Template/SmartyExtend.php +++ b/www/lib/CoreLibs/Template/SmartyExtend.php @@ -25,10 +25,14 @@ namespace CoreLibs\Template; // HARD CODED path: // __DIR__: lib/CoreLibs/Template/ // smarty located in lib/Smarty/ +// require_once(__DIR__ . '/../../Smarty/Smarty.class.php'); require_once(__DIR__ . '/../../Smarty/SmartyBC.class.php'); // So it doesn't start looking around in the wrong naemspace as smarty doesn't have one +// use Smarty; use SmartyBC; +// technically this can be Smarty +// class SmartyExtend extends Smarty class SmartyExtend extends SmartyBC { // internal translation engine @@ -170,8 +174,6 @@ class SmartyExtend extends SmartyBC $this->setLangEncoding(); // iinit lang $this->l10n = new \CoreLibs\Language\L10n($this->lang); - // variable variable register - // $this->register_modifier('getvar', [&$this, 'get_template_vars']); /** @phpstan-ignore-next-line */ $this->registerPlugin('modifier', 'getvar', [&$this, 'get_template_vars']);