Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b022662dfc | ||
|
|
3039ebf913 | ||
|
|
e2e080c404 | ||
|
|
4671143d1c | ||
|
|
b492558cca | ||
|
|
64e76530d4 | ||
|
|
0b93f9f146 | ||
|
|
4c6fe1cd6c | ||
|
|
83ba48f598 | ||
|
|
62c6de8244 |
@@ -131,7 +131,7 @@ return [
|
||||
'PhanReadOnlyPublicProperty',
|
||||
// start ignore annotations
|
||||
'PhanUnextractableAnnotationElementName',
|
||||
'PhanUnextractableAnnotationSuffix'
|
||||
'PhanUnextractableAnnotationSuffix',
|
||||
],
|
||||
|
||||
// Override to hardcode existence and types of (non-builtin) globals in the global scope.
|
||||
|
||||
@@ -37,6 +37,7 @@ namespace tests;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use PHPUnit\Framework\MockObject\MockObject;
|
||||
use CoreLibs\Logging\Logger\Level;
|
||||
|
||||
/**
|
||||
* Test class for DB\IO + DB\SQL\PgSQL
|
||||
@@ -59,20 +60,6 @@ final class CoreLibsDBIOTest extends TestCase
|
||||
'db_type' => 'pgsql',
|
||||
'db_encoding' => '',
|
||||
'db_ssl' => 'allow', // allow, disable, require, prefer
|
||||
'db_debug' => true,
|
||||
],
|
||||
// same as valid, but db debug is off
|
||||
'valid_debug_false' => [
|
||||
'db_name' => 'corelibs_db_io_test',
|
||||
'db_user' => 'corelibs_db_io_test',
|
||||
'db_pass' => 'corelibs_db_io_test',
|
||||
'db_host' => 'localhost',
|
||||
'db_port' => 5432,
|
||||
'db_schema' => 'public',
|
||||
'db_type' => 'pgsql',
|
||||
'db_encoding' => '',
|
||||
'db_ssl' => 'allow', // allow, disable, require, prefer
|
||||
'db_debug' => false,
|
||||
],
|
||||
// same as valid, but encoding is set
|
||||
'valid_with_encoding_utf8' => [
|
||||
@@ -85,7 +72,6 @@ final class CoreLibsDBIOTest extends TestCase
|
||||
'db_type' => 'pgsql',
|
||||
'db_encoding' => 'UTF-8',
|
||||
'db_ssl' => 'allow', // allow, disable, require, prefer
|
||||
'db_debug' => true,
|
||||
],
|
||||
// valid with no schema set
|
||||
'valid_no_schema' => [
|
||||
@@ -98,7 +84,6 @@ final class CoreLibsDBIOTest extends TestCase
|
||||
'db_type' => 'pgsql',
|
||||
'db_encoding' => '',
|
||||
'db_ssl' => 'allow', // allow, disable, require, prefer
|
||||
'db_debug' => true,
|
||||
],
|
||||
// invalid (missing db name)
|
||||
'invalid' => [
|
||||
@@ -111,7 +96,6 @@ final class CoreLibsDBIOTest extends TestCase
|
||||
'db_type' => 'pgsql',
|
||||
'db_encoding' => '',
|
||||
'db_ssl' => 'allow', // allow, disable, require, prefer
|
||||
'db_debug' => true,
|
||||
],
|
||||
];
|
||||
private static $log;
|
||||
@@ -137,6 +121,7 @@ final class CoreLibsDBIOTest extends TestCase
|
||||
'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
|
||||
'log_file_id' => 'CoreLibs-DB-IO-Test',
|
||||
]);
|
||||
// will be true, default logging is true
|
||||
$db = new \CoreLibs\DB\IO(
|
||||
self::$db_config['valid'],
|
||||
self::$log
|
||||
@@ -534,6 +519,9 @@ final class CoreLibsDBIOTest extends TestCase
|
||||
*/
|
||||
public function debugSetProvider(): array
|
||||
{
|
||||
// 0: db connecdtion
|
||||
// 1: override log flag, null for default
|
||||
// 2: set flag
|
||||
return [
|
||||
'default debug set' => [
|
||||
// what base connection
|
||||
@@ -541,11 +529,6 @@ final class CoreLibsDBIOTest extends TestCase
|
||||
// actions (set)
|
||||
null,
|
||||
// set exepected
|
||||
self::$db_config['valid']['db_debug'],
|
||||
],
|
||||
'set debug to true' => [
|
||||
'valid_debug_false',
|
||||
true,
|
||||
true,
|
||||
],
|
||||
'set debug to false' => [
|
||||
@@ -556,99 +539,46 @@ final class CoreLibsDBIOTest extends TestCase
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* test set for toggleDEbug
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function debugToggleProvider(): array
|
||||
{
|
||||
return [
|
||||
'default debug set' => [
|
||||
// what base connection
|
||||
'valid',
|
||||
// actions
|
||||
null,
|
||||
// toggle is inverse
|
||||
self::$db_config['valid']['db_debug'] ? false : true,
|
||||
],
|
||||
'toggle debug to true' => [
|
||||
'valid_debug_false',
|
||||
true,
|
||||
true,
|
||||
],
|
||||
'toggle debug to false' => [
|
||||
'valid',
|
||||
false,
|
||||
false,
|
||||
]
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Test dbSetDbug, dbGetDebug
|
||||
*
|
||||
* @covers ::dbGetDbug
|
||||
* @covers ::dbSetDebug
|
||||
* @dataProvider debugSetProvider
|
||||
* @testdox Setting debug $set will be $expected [$_dataName]
|
||||
* @testdox Set and Get Debug flag
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDbSetDebug(
|
||||
string $connection,
|
||||
?bool $set,
|
||||
bool $expected
|
||||
): void {
|
||||
public function testDbSetDebug(): void
|
||||
{
|
||||
$connection = 'valid';
|
||||
// default set, expect true
|
||||
$db = new \CoreLibs\DB\IO(
|
||||
self::$db_config[$connection],
|
||||
self::$log
|
||||
);
|
||||
$this->assertEquals(
|
||||
$expected,
|
||||
$set === null ?
|
||||
$db->dbSetDebug() :
|
||||
$db->dbSetDebug($set)
|
||||
$this->assertTrue(
|
||||
$db->dbGetDebug()
|
||||
);
|
||||
// must always match
|
||||
$this->assertEquals(
|
||||
$expected,
|
||||
// switch off
|
||||
$db->dbSetDebug(false);
|
||||
$this->assertFalse(
|
||||
$db->dbGetDebug()
|
||||
);
|
||||
$db->dbClose();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test dbToggleDebug, dbGetDebug
|
||||
*
|
||||
* @covers ::dbGetDbug
|
||||
* @covers ::dbSetDebug
|
||||
* @dataProvider debugToggleProvider
|
||||
* @testdox Toggle debug $toggle will be $expected [$_dataName]
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDbToggleDebug(
|
||||
string $connection,
|
||||
?bool $toggle,
|
||||
bool $expected
|
||||
): void {
|
||||
// second conenction with log set NOT debug
|
||||
$log = new \CoreLibs\Logging\Logging([
|
||||
// 'log_folder' => __DIR__ . DIRECTORY_SEPARATOR . 'log',
|
||||
'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
|
||||
'log_file_id' => 'CoreLibs-DB-IO-Test',
|
||||
'log_level' => \CoreLibs\Logging\Logger\Level::Notice,
|
||||
]);
|
||||
$db = new \CoreLibs\DB\IO(
|
||||
self::$db_config[$connection],
|
||||
self::$log
|
||||
$log
|
||||
);
|
||||
$this->assertEquals(
|
||||
$expected,
|
||||
$toggle === null ?
|
||||
$db->dbToggleDebug() :
|
||||
$db->dbToggleDebug($toggle)
|
||||
);
|
||||
// must always match
|
||||
$this->assertEquals(
|
||||
$expected,
|
||||
$this->assertFalse(
|
||||
$db->dbGetDebug()
|
||||
);
|
||||
$db->dbClose();
|
||||
}
|
||||
|
||||
// - set max query call sets
|
||||
@@ -806,7 +736,6 @@ final class CoreLibsDBIOTest extends TestCase
|
||||
'host' => 'db_host',
|
||||
'port' => 'db_port',
|
||||
'ssl' => 'db_ssl',
|
||||
'debug' => 'db_debug',
|
||||
'password' => '***',
|
||||
] as $read => $compare
|
||||
) {
|
||||
|
||||
@@ -460,16 +460,18 @@ final class CoreLibsDebugSupportTest extends TestCase
|
||||
* Undocumented function
|
||||
*
|
||||
* @cover ::getCallerFileLine
|
||||
* @testWith ["/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/www/vendor/phpunit/phpunit/src/Framework/TestCase.php:1608"]
|
||||
* @testdox getCallerFileLine check if it returns $expected [$_dataName]
|
||||
* @testWith ["vendor/phpunit/phpunit/src/Framework/TestCase.php:"]
|
||||
* @testdox getCallerFileLine check based on regex /[\w\-\/]/vendor/phpunit/phpunit/src/Framework/TestCase.php:\d+ [$_dataName]
|
||||
*
|
||||
* @param string $expected
|
||||
* @return void
|
||||
*/
|
||||
public function testGetCallerFileLine(string $expected): void
|
||||
public function testGetCallerFileLine(): void
|
||||
{
|
||||
$this->assertEquals(
|
||||
$expected,
|
||||
// regex prefix with path "/../" and then fixed vendor + \d+
|
||||
$regex = "/^\/[\w\-\/]+\/vendor\/phpunit\/phpunit\/src\/Framework\/TestCase.php:\d+$/";
|
||||
$this->assertMatchesRegularExpression(
|
||||
$regex,
|
||||
Support::getCallerFileLine()
|
||||
);
|
||||
}
|
||||
@@ -518,11 +520,17 @@ final class CoreLibsDebugSupportTest extends TestCase
|
||||
break;
|
||||
case 11:
|
||||
// add one "run" before "runBare"
|
||||
// array_splice(
|
||||
// $expected,
|
||||
// 7,
|
||||
// 0,
|
||||
// ['run']
|
||||
// );
|
||||
array_splice(
|
||||
$expected,
|
||||
7,
|
||||
0,
|
||||
['run']
|
||||
0,
|
||||
['include']
|
||||
);
|
||||
$this->assertEquals(
|
||||
$expected,
|
||||
|
||||
@@ -20,10 +20,15 @@ final class CoreLibsLoggingLoggingTest extends TestCase
|
||||
private const LOG_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'log' . DIRECTORY_SEPARATOR;
|
||||
private const REGEX_BASE = "\[[\d\-\s\.:]+\]\s{1}" // date
|
||||
. "\[[\w\.]+(:\d+)?\]\s{1}" // host:port
|
||||
. "\[[\w+\.\/]+:\d+\]\s{1}" // folder/file
|
||||
. "\[[\w\-\.\/]+:\d+\]\s{1}" // folder/file
|
||||
. "\[\w+\]\s{1}" // run id
|
||||
. "{[\w\\\\]+(::\w+)?}\s{1}"; // class
|
||||
|
||||
public static function tearDownAfterClass(): void
|
||||
{
|
||||
array_map('unlink', glob(self::LOG_FOLDER . '*.log'));
|
||||
}
|
||||
|
||||
/**
|
||||
* test set for options BASIC
|
||||
*
|
||||
@@ -217,14 +222,14 @@ final class CoreLibsLoggingLoggingTest extends TestCase
|
||||
|
||||
// setLoggingLevel
|
||||
// getLoggingLevel
|
||||
// getJsDebug
|
||||
// loggingLevelIsDebug
|
||||
|
||||
/**
|
||||
* Undocumented function
|
||||
*
|
||||
* @covers ::setLoggingLevel
|
||||
* @covers ::getLoggingLevel
|
||||
* @covers ::getJsDebug
|
||||
* @covers ::loggingLevelIsDebug
|
||||
* @testdox setLoggingLevel set/get checks
|
||||
*
|
||||
* @return void
|
||||
@@ -242,7 +247,7 @@ final class CoreLibsLoggingLoggingTest extends TestCase
|
||||
$log->getLoggingLevel()
|
||||
);
|
||||
$this->assertFalse(
|
||||
$log->getJsDebug()
|
||||
$log->loggingLevelIsDebug()
|
||||
);
|
||||
// not set, should be debug]
|
||||
$log = new \CoreLibs\Logging\Logging([
|
||||
@@ -254,7 +259,7 @@ final class CoreLibsLoggingLoggingTest extends TestCase
|
||||
$log->getLoggingLevel()
|
||||
);
|
||||
$this->assertTrue(
|
||||
$log->getJsDebug()
|
||||
$log->loggingLevelIsDebug()
|
||||
);
|
||||
// invalid, should be debug, will throw excpetion too
|
||||
$this->expectException(\InvalidArgumentException::class);
|
||||
@@ -269,7 +274,7 @@ final class CoreLibsLoggingLoggingTest extends TestCase
|
||||
$log->getLoggingLevel()
|
||||
);
|
||||
$this->assertTrue(
|
||||
$log->getJsDebug()
|
||||
$log->loggingLevelIsDebug()
|
||||
);
|
||||
// set valid, then change
|
||||
$log = new \CoreLibs\Logging\Logging([
|
||||
|
||||
@@ -23,6 +23,8 @@ ob_end_flush();
|
||||
$ECHO_ALL = true;
|
||||
|
||||
// use CoreLibs\Debug\Support;
|
||||
|
||||
use CoreLibs\Debug\Support;
|
||||
use CoreLibs\Logging\Logger\Level;
|
||||
use CoreLibs\Logging\Logger\Flag;
|
||||
// use CoreLibs\Debug\Support;
|
||||
@@ -51,7 +53,18 @@ print "Flag: per_run ->value: " . Flag::per_class->value . "<br>";
|
||||
$log->setLogUniqueId();
|
||||
print "LogUniqId: " . $log->getLogUniqueId() . "<br>";
|
||||
|
||||
print "DUMP: " . $log->dV(['something' => 'error']) . "<br>";
|
||||
print "Is Debug (check): " . Support::printBool($log->getLoggingLevel()->includes(
|
||||
Level::Debug
|
||||
)) . "<br>";
|
||||
print "Is Debug (fk): " . Support::printBool($log->loggingLevelIsDebug()) . "<br>";
|
||||
$log->setLoggingLevel(Level::Notice);
|
||||
print "Is Debug (check): " . Support::printBool($log->getLoggingLevel()->includes(
|
||||
Level::Debug
|
||||
)) . "<br>";
|
||||
print "Is Debug (fk): " . Support::printBool($log->loggingLevelIsDebug()) . "<br>";
|
||||
$log->setLoggingLevel(Level::Debug);
|
||||
|
||||
print "DUMP: <pre>" . $log->dV(['something' => 'error']) . "</pre><br>";
|
||||
|
||||
$log->debug('LEGACY', 'Some legacy shit here');
|
||||
$log->debug('ARRAY', 'Dump some data: ' . $log->dV(['something' => 'error']));
|
||||
|
||||
@@ -52,7 +52,7 @@ print "<body>";
|
||||
print '<div><a href="class_test.php">Class Test Master</a></div>';
|
||||
print '<div><h1>' . $PAGE_NAME . '</h1></div>';
|
||||
|
||||
$smarty->DATA['JS_DEBUG'] = $log->getJsDebug();
|
||||
$smarty->DATA['JS_DEBUG'] = $log->loggingLevelIsDebug();
|
||||
$smarty->MASTER_TEMPLATE_NAME = 'main_body.tpl';
|
||||
$smarty->TEMPLATE_NAME = 'smarty_test.tpl';
|
||||
$smarty->CSS_SPECIAL_TEMPLATE_NAME = 'smart_test.css';
|
||||
|
||||
@@ -22,7 +22,6 @@ $DB_CONFIG = [
|
||||
'db_type' => 'pgsql',
|
||||
'db_encoding' => '',
|
||||
'db_ssl' => 'allow', // allow, disable, require, prefer
|
||||
'db_debug' => true, // turn on logging or not
|
||||
],
|
||||
// same as above, but uses pg bouncer
|
||||
'test_pgbouncer' => [
|
||||
@@ -35,7 +34,6 @@ $DB_CONFIG = [
|
||||
'db_type' => 'pgsql',
|
||||
'db_encoding' => '',
|
||||
'db_ssl' => 'allow', // allow, disable, require, prefer
|
||||
'db_debug' => true, // turn on logging or not
|
||||
],
|
||||
];
|
||||
|
||||
|
||||
@@ -121,6 +121,6 @@ if (!$login->loginActionRun()) {
|
||||
//------------------------------ logging end
|
||||
|
||||
// pass on DEBUG flag to JS via smarty variable
|
||||
$smarty->DATA['JS_DEBUG'] = $log->getJsDebug();
|
||||
$smarty->DATA['JS_DEBUG'] = $log->loggingLevelIsDebug();
|
||||
|
||||
// __END__
|
||||
|
||||
@@ -382,7 +382,7 @@ class IO
|
||||
/** @var array<mixed> */
|
||||
private array $pk_name_table = [];
|
||||
/** @var string internal primary key name, for cross calls in async */
|
||||
private string $pk_name;
|
||||
private string $pk_name = '';
|
||||
/** @var bool if we use RETURNING in the INSERT call */
|
||||
private bool $returning_id = false;
|
||||
/** @var string if a sync is running holds the hash key of the query */
|
||||
@@ -395,12 +395,10 @@ class IO
|
||||
* main DB concstructor with auto connection to DB and failure set on failed connection
|
||||
* @param array<mixed> $db_config DB configuration array
|
||||
* @param \CoreLibs\Logging\Logging $log Logging class
|
||||
* @param bool|null $db_debug_override Overrides debug settings in db_config
|
||||
*/
|
||||
public function __construct(
|
||||
array $db_config,
|
||||
\CoreLibs\Logging\Logging $log,
|
||||
?bool $db_debug_override = null
|
||||
\CoreLibs\Logging\Logging $log
|
||||
) {
|
||||
// attach logger
|
||||
$this->log = $log;
|
||||
@@ -417,15 +415,10 @@ class IO
|
||||
$this->db_ssl = !empty($db_config['db_ssl']) ? $db_config['db_ssl'] : 'allow';
|
||||
// set debug, either via global var, or from config, else set to false
|
||||
$this->dbSetDebug(
|
||||
// override
|
||||
$db_debug_override ??
|
||||
// from db config setting
|
||||
$db_config['db_debug'] ??
|
||||
// [DEPRECATED] should be handled from outside
|
||||
$_SESSION['DB_DEBUG'] ??
|
||||
// [DEPRECATED] globals should be deprecated
|
||||
$GLOBALS['DB_DEBUG'] ??
|
||||
false
|
||||
// set if logging level is Debug
|
||||
$this->log->getLoggingLevel()->includes(
|
||||
\CoreLibs\Logging\Logger\Level::Debug
|
||||
)
|
||||
);
|
||||
|
||||
// set loop protection max count
|
||||
@@ -664,6 +657,8 @@ class IO
|
||||
|
||||
/**
|
||||
* calls the basic class debug with strip command
|
||||
* for internal calls, will always create a message
|
||||
*
|
||||
* @param string $debug_id group id for debug
|
||||
* @param string $error_string error message or debug data
|
||||
* @param string $id db debug group
|
||||
@@ -672,7 +667,7 @@ class IO
|
||||
* Will be printed after main error string
|
||||
* @return void
|
||||
*/
|
||||
protected function __dbDebug(
|
||||
private function __dbDebugMessage(
|
||||
string $debug_id,
|
||||
string $error_string,
|
||||
string $id = '',
|
||||
@@ -682,24 +677,24 @@ class IO
|
||||
// NOTE prefix allows html for echo output, will be stripped on file print
|
||||
$prefix = '';
|
||||
if ($id) {
|
||||
$prefix .= '[<span style="color: #920069;">' . $id . '</span>] ';
|
||||
$prefix .= '[' . $id . '] ';
|
||||
}
|
||||
if ($type) {
|
||||
$prefix .= '{<span style="font-style: italic; color: #3f0092;">' . $type . '</span>} ';
|
||||
$prefix .= '{' . $type . '} ';
|
||||
}
|
||||
switch ($id) {
|
||||
case 'DB_ERROR':
|
||||
$prefix .= '<span style="color: red;"><b>DB-Error</b>:</span>';
|
||||
$prefix .= 'DB-Error:';
|
||||
break;
|
||||
case 'DB_WARNING':
|
||||
$prefix .= '<span style="color: orange;"><b>DB-Warning</b>:</span>';
|
||||
$prefix .= 'DB-Warning:';
|
||||
break;
|
||||
}
|
||||
if ($prefix) {
|
||||
$prefix .= '- ';
|
||||
}
|
||||
if ($error_data !== []) {
|
||||
$error_string .= '<br>['
|
||||
$error_string .= "\n" . '['
|
||||
. \CoreLibs\Debug\Support::prAr($error_data)
|
||||
. ']';
|
||||
}
|
||||
@@ -716,6 +711,30 @@ class IO
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* main call from anywhere in all classes for launching debug messages
|
||||
* will abort if dbDebug not set
|
||||
*
|
||||
* @param string $debug_id group id for debug
|
||||
* @param string $error_string error message or debug data
|
||||
* @param string $id db debug group
|
||||
* @param string $type query identifier (Q, I, etc)
|
||||
* @param array<mixed> $error_data Optional error data as array
|
||||
* @return void
|
||||
*/
|
||||
protected function __dbDebug(
|
||||
string $debug_id,
|
||||
string $error_string,
|
||||
string $id = '',
|
||||
string $type = '',
|
||||
array $error_data = []
|
||||
): void {
|
||||
if (!$this->dbGetDebug()) {
|
||||
return;
|
||||
}
|
||||
$this->__dbDebugMessage($debug_id, $error_string, $id, $type, $error_data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset warnings and errors before run
|
||||
* Is called on base queries to reset error before each run
|
||||
@@ -778,7 +797,7 @@ class IO
|
||||
$db_error_string = $db_prefix . ' ' . $db_error_string;
|
||||
}
|
||||
if ($db_error_string) {
|
||||
$this->__dbDebug('db', $db_error_string, 'DB_ERROR', $where_called);
|
||||
$this->__dbDebugMessage('db', $db_error_string, 'DB_ERROR', $where_called);
|
||||
}
|
||||
return [
|
||||
$where_called,
|
||||
@@ -835,7 +854,7 @@ class IO
|
||||
$error_id = (string)$error_id;
|
||||
[$where_called, $pg_error_string] = $this->__dbErrorPreprocessor($cursor);
|
||||
// write error msg ...
|
||||
$this->__dbDebug(
|
||||
$this->__dbDebugMessage(
|
||||
'db',
|
||||
$error_id . ': ' . ($this->error_string[$error_id] ?? '[UNKNOWN ERROR]')
|
||||
. ($msg ? ', ' . $msg : ''),
|
||||
@@ -861,7 +880,7 @@ class IO
|
||||
): void {
|
||||
$warning_id = (string)$warning_id;
|
||||
[$where_called, $pg_error_string] = $this->__dbErrorPreprocessor($cursor);
|
||||
$this->__dbDebug(
|
||||
$this->__dbDebugMessage(
|
||||
'db',
|
||||
$warning_id . ': ' . ($this->error_string[$warning_id] ?? '[UNKNOWN WARNING')
|
||||
. ($msg ? ', ' . $msg : ''),
|
||||
@@ -1166,17 +1185,15 @@ class IO
|
||||
}
|
||||
// $this->debug('DB IO', 'Q: '.$this->query.', RETURN: '.$this->returning_id);
|
||||
// for DEBUG, only on first time ;)
|
||||
if ($this->db_debug) {
|
||||
$this->__dbDebug(
|
||||
'db',
|
||||
$this->__dbDebugPrepare(
|
||||
$this->query,
|
||||
$this->params
|
||||
),
|
||||
'__dbPrepareExec',
|
||||
($this->params === [] ? 'Q' : 'Qp')
|
||||
);
|
||||
}
|
||||
$this->__dbDebug(
|
||||
'db',
|
||||
$this->__dbDebugPrepare(
|
||||
$this->query,
|
||||
$this->params
|
||||
),
|
||||
'__dbPrepareExec',
|
||||
($this->params === [] ? 'Q' : 'Qp')
|
||||
);
|
||||
// import protection, hash needed
|
||||
$query_hash = $this->dbGetQueryHash($this->query, $this->params);
|
||||
// if the array index does not exists set it 0
|
||||
@@ -1194,7 +1211,7 @@ class IO
|
||||
$this->query_called[$query_hash] > $this->MAX_QUERY_CALL
|
||||
) {
|
||||
$this->__dbError(30, false, $this->query);
|
||||
$this->__dbDebug(
|
||||
$this->__dbDebugMessage(
|
||||
'db',
|
||||
$this->__dbDebugPrepare(
|
||||
$this->query,
|
||||
@@ -1222,9 +1239,7 @@ class IO
|
||||
// if either the cursor is false
|
||||
if ($this->cursor === false || $this->db_functions->__dbLastErrorQuery()) {
|
||||
// printout Query if debug is turned on
|
||||
if ($this->db_debug) {
|
||||
$this->__dbDebug('db', $this->query, 'dbExec', 'Q[nc]');
|
||||
}
|
||||
$this->__dbDebug('db', $this->query, 'dbExec', 'Q[nc]');
|
||||
// internal error handling
|
||||
$this->__dbError(13, $this->cursor);
|
||||
return false;
|
||||
@@ -1252,7 +1267,7 @@ class IO
|
||||
// ONLY insert with set pk name
|
||||
($this->__checkQueryForInsert($this->query, true) && $this->pk_name != 'NULL') ||
|
||||
// insert or update with returning add
|
||||
($this->__checkQueryForInsert($this->query) && $this->returning_id)
|
||||
($this->__checkQueryForInsert($this->query) && $this->returning_id)
|
||||
) {
|
||||
$this->__dbSetInsertId(
|
||||
$this->returning_id,
|
||||
@@ -1460,10 +1475,11 @@ class IO
|
||||
$string .= 'at host {b}\'' . $this->db_host . '\'{/b} ';
|
||||
$string .= 'on port {b}\'' . $this->db_port . '\'{/b} ';
|
||||
$string .= 'with ssl mode {b}\'' . $this->db_ssl . '\'{/b}{br}';
|
||||
$string .= '{b}-DB-info->{/b} DB IO Class debug output: {b}' . ($this->db_debug ? 'Yes' : 'No') . '{/b}';
|
||||
$string .= '{b}-DB-info->{/b} DB IO Class debug output: {b}'
|
||||
. ($this->dbGetDebug() ? 'Yes' : 'No') . '{/b}';
|
||||
if ($log === true) {
|
||||
// if debug, remove / change b
|
||||
$this->__dbDebug('db', str_replace(
|
||||
$this->__dbDebugMessage('db', str_replace(
|
||||
$html_tags,
|
||||
$replace_text,
|
||||
$string
|
||||
@@ -1605,7 +1621,7 @@ class IO
|
||||
if (is_array($array)) {
|
||||
$this->nbsp = '';
|
||||
$string .= $this->__printArray($array);
|
||||
$this->__dbDebug('db', $string, 'dbDumpData');
|
||||
$this->__dbDebugMessage('db', $string, 'dbDumpData');
|
||||
}
|
||||
return $string;
|
||||
}
|
||||
@@ -1985,17 +2001,15 @@ class IO
|
||||
// checks if the params count given matches the expected count
|
||||
if ($this->__dbCheckQueryParams($query, count($params)) === false) {
|
||||
// in case we got an error print out query
|
||||
if ($this->db_debug) {
|
||||
$this->__dbDebug(
|
||||
'db',
|
||||
$this->__dbDebugPrepare(
|
||||
$this->query,
|
||||
$this->params
|
||||
),
|
||||
'dbReturn',
|
||||
($this->params === [] ? 'Q[e]' : 'Qp[e]')
|
||||
);
|
||||
}
|
||||
$this->__dbDebug(
|
||||
'db',
|
||||
$this->__dbDebugPrepare(
|
||||
$this->query,
|
||||
$this->params
|
||||
),
|
||||
'dbReturn',
|
||||
($this->params === [] ? 'Q[e]' : 'Qp[e]')
|
||||
);
|
||||
return false;
|
||||
}
|
||||
// set first call to false
|
||||
@@ -2018,17 +2032,15 @@ class IO
|
||||
if (!$this->cursor_ext[$query_hash]['cursor']) {
|
||||
$this->cursor_ext[$query_hash]['log'][] = 'No cursor';
|
||||
// for DEBUG, print out each query executed
|
||||
if ($this->db_debug) {
|
||||
$this->__dbDebug(
|
||||
'db',
|
||||
$this->__dbDebugPrepare(
|
||||
$this->cursor_ext[$query_hash]['query'],
|
||||
$this->cursor_ext[$query_hash]['params']
|
||||
),
|
||||
'dbReturn',
|
||||
($this->cursor_ext[$query_hash]['params'] === [] ? 'Q' : 'Qp'),
|
||||
);
|
||||
}
|
||||
$this->__dbDebug(
|
||||
'db',
|
||||
$this->__dbDebugPrepare(
|
||||
$this->cursor_ext[$query_hash]['query'],
|
||||
$this->cursor_ext[$query_hash]['params']
|
||||
),
|
||||
'dbReturn',
|
||||
($this->cursor_ext[$query_hash]['params'] === [] ? 'Q' : 'Qp'),
|
||||
);
|
||||
// if no DB Handler try to reconnect
|
||||
if (!$this->dbh) {
|
||||
// if reconnect fails drop out
|
||||
@@ -2055,17 +2067,15 @@ class IO
|
||||
}
|
||||
// if still no cursor ...
|
||||
if (!$this->cursor_ext[$query_hash]['cursor']) {
|
||||
if ($this->db_debug) {
|
||||
$this->__dbDebug(
|
||||
'db',
|
||||
$this->__dbDebugPrepare(
|
||||
$this->cursor_ext[$query_hash]['query'],
|
||||
$this->cursor_ext[$query_hash]['params']
|
||||
),
|
||||
'dbReturn',
|
||||
($this->cursor_ext[$query_hash]['params'] === [] ? 'Q[e]' : 'Qp[e]'),
|
||||
);
|
||||
}
|
||||
$this->__dbDebug(
|
||||
'db',
|
||||
$this->__dbDebugPrepare(
|
||||
$this->cursor_ext[$query_hash]['query'],
|
||||
$this->cursor_ext[$query_hash]['params']
|
||||
),
|
||||
'dbReturn',
|
||||
($this->cursor_ext[$query_hash]['params'] === [] ? 'Q[e]' : 'Qp[e]'),
|
||||
);
|
||||
// internal error handling
|
||||
$this->__dbError(13, $this->cursor_ext[$query_hash]['cursor']);
|
||||
return false;
|
||||
@@ -2720,17 +2730,15 @@ class IO
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if ($this->db_debug) {
|
||||
$this->__dbDebug(
|
||||
'db',
|
||||
$this->__dbDebugPrepare(
|
||||
$this->prepare_cursor[$stm_name]['query'],
|
||||
$data
|
||||
),
|
||||
'dbExecPrep',
|
||||
'Qpe'
|
||||
);
|
||||
}
|
||||
$this->__dbDebug(
|
||||
'db',
|
||||
$this->__dbDebugPrepare(
|
||||
$this->prepare_cursor[$stm_name]['query'],
|
||||
$data
|
||||
),
|
||||
'dbExecPrep',
|
||||
'Qpe'
|
||||
);
|
||||
// if the count does not match
|
||||
if ($this->prepare_cursor[$stm_name]['count'] != count($data)) {
|
||||
$this->__dbError(
|
||||
@@ -3115,16 +3123,13 @@ class IO
|
||||
|
||||
/**
|
||||
* switches the debug flag on or off
|
||||
* if none given, then return current set only
|
||||
* @param bool|null $debug true/false or null for just getting current set
|
||||
* @return bool Current debug flag as set
|
||||
*
|
||||
* @param bool $debug True/False to turn debugging in this calss on or off
|
||||
* @return void
|
||||
*/
|
||||
public function dbSetDebug(?bool $debug = null): bool
|
||||
public function dbSetDebug(bool $debug): void
|
||||
{
|
||||
if ($debug !== null) {
|
||||
$this->db_debug = $debug;
|
||||
}
|
||||
return $this->db_debug;
|
||||
$this->db_debug = $debug;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -3132,9 +3137,11 @@ class IO
|
||||
* OR
|
||||
* with the optional parameter fix sets debug
|
||||
* returns current set stats
|
||||
*
|
||||
* @param bool|null $debug Flag to turn debug on off or null for toggle
|
||||
* @return bool Current debug status
|
||||
* True for debug is on, False for off
|
||||
* @deprecated Use dbSetDebug and dbGetDebug
|
||||
*/
|
||||
public function dbToggleDebug(?bool $debug = null): bool
|
||||
{
|
||||
@@ -3148,6 +3155,7 @@ class IO
|
||||
|
||||
/**
|
||||
* Return current set db debug flag status
|
||||
*
|
||||
* @return bool Current debug status
|
||||
*/
|
||||
public function dbGetDebug(): bool
|
||||
|
||||
@@ -34,29 +34,29 @@ class Support
|
||||
}
|
||||
|
||||
/**
|
||||
* prints a html formatted (pre) array
|
||||
* prints a html formatted (pre) data
|
||||
*
|
||||
* @param array<mixed> $array any array
|
||||
* @param bool $no_html default add <pre>
|
||||
* @return string formatted array for output with <pre> tag added
|
||||
* @param mixed $data any data
|
||||
* @param bool $no_html default add <pre>
|
||||
* @return string formatted array for output with <pre> tag added
|
||||
*/
|
||||
public static function printAr(array $array, bool $no_html = false): string
|
||||
public static function printAr(mixed $data, bool $no_html = false): string
|
||||
{
|
||||
return $no_html ?
|
||||
print_r($array, true) :
|
||||
'<pre>' . print_r($array, true) . '</pre>';
|
||||
print_r($data, true) :
|
||||
'<pre>' . print_r($data, true) . '</pre>';
|
||||
}
|
||||
|
||||
/**
|
||||
* alternate name for printAr function
|
||||
*
|
||||
* @param array<mixed> $array any array
|
||||
* @param bool $no_html default add <pre>
|
||||
* @return string formatted array for output with <pre> tag added
|
||||
* @param mixed $data any array
|
||||
* @param bool $no_html default add <pre>
|
||||
* @return string formatted array for output with <pre> tag added
|
||||
*/
|
||||
public static function printArray(array $array, bool $no_html = false): string
|
||||
public static function printArray(mixed $data, bool $no_html = false): string
|
||||
{
|
||||
return self::printAr($array, $no_html);
|
||||
return self::printAr($data, $no_html);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -65,12 +65,12 @@ class Support
|
||||
* Do not use this without using it in a string in debug function
|
||||
* Note: for full data debug dumps use Support::dumpVar()
|
||||
*
|
||||
* @param array<mixed> $a Array to format
|
||||
* @return string print_r formated
|
||||
* @param mixed $data Data to print
|
||||
* @return string print_r formated
|
||||
*/
|
||||
public static function prAr(array $a): string
|
||||
public static function prAr(mixed $data): string
|
||||
{
|
||||
return self::printAr($a, true);
|
||||
return self::printAr($data, true);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -177,7 +177,6 @@ class Support
|
||||
$caller_level = 1;
|
||||
$caller_list = self::getCallerMethodList();
|
||||
if ($caller_list[0] == 'dV') {
|
||||
echo "Raise caller level<br>: " . $caller_list[0] . "<br>";
|
||||
$caller_level = 2;
|
||||
}
|
||||
// we need to strip the string in <small></small that is
|
||||
|
||||
@@ -213,7 +213,7 @@ class Logging
|
||||
$settings['mandatory'] && !isset($options[$name]) &&
|
||||
empty($settings['alias'])
|
||||
) {
|
||||
throw new \InvalidArgumentException(
|
||||
throw new InvalidArgumentException(
|
||||
'Missing mandatory option: "' . $name . '"',
|
||||
E_USER_WARNING
|
||||
);
|
||||
@@ -230,7 +230,7 @@ class Logging
|
||||
switch ($settings['type']) {
|
||||
case 'bool':
|
||||
if (!is_bool($this->options[$name])) {
|
||||
throw new \InvalidArgumentException(
|
||||
throw new InvalidArgumentException(
|
||||
'Option: "' . $name . '" is not of type bool',
|
||||
E_USER_ERROR
|
||||
);
|
||||
@@ -238,7 +238,7 @@ class Logging
|
||||
break;
|
||||
case 'string':
|
||||
if (!is_string($this->options[$name])) {
|
||||
throw new \InvalidArgumentException(
|
||||
throw new InvalidArgumentException(
|
||||
'Option: "' . $name . '" is not of type string',
|
||||
E_USER_ERROR
|
||||
);
|
||||
@@ -249,7 +249,7 @@ class Logging
|
||||
empty($settings['type_info']) ||
|
||||
!$this->options[$name] instanceof $settings['type_info']
|
||||
) {
|
||||
throw new \InvalidArgumentException(
|
||||
throw new InvalidArgumentException(
|
||||
'Option: "' . $name . '" is not of instance '
|
||||
. ($settings['type_info'] ?? 'NO INSTANCE DEFINED'),
|
||||
E_USER_ERROR
|
||||
@@ -675,9 +675,11 @@ class Logging
|
||||
*
|
||||
* @return bool True, we are at debug level
|
||||
*/
|
||||
public function getJsDebug(): bool
|
||||
public function loggingLevelIsDebug(): bool
|
||||
{
|
||||
return $this->log_level === Level::Debug ? true : false;
|
||||
return $this->getLoggingLevel()->includes(
|
||||
Level::Debug
|
||||
);
|
||||
}
|
||||
|
||||
// log file id set (file name prefix)
|
||||
@@ -1080,12 +1082,12 @@ class Logging
|
||||
* But this does not wrap it in <pre></pre>
|
||||
* Do not use this without using it in a string in debug function
|
||||
*
|
||||
* @param array<mixed> $a Array to format
|
||||
* @return string print_r formated
|
||||
* @param mixed $data Data to format
|
||||
* @return string print_r formated
|
||||
*/
|
||||
public function prAr(array $a): string
|
||||
public function prAr(mixed $data): string
|
||||
{
|
||||
return Support::printArray($a, true);
|
||||
return Support::printArray($data, true);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user