diff --git a/www/admin/class_test.config.direct.php b/www/admin/class_test.config.direct.php new file mode 100644 index 00000000..95d85624 --- /dev/null +++ b/www/admin/class_test.config.direct.php @@ -0,0 +1,44 @@ + BASE . LOG, + 'log_file_id' => $LOG_FILE_ID, + 'log_per_date' => true, +]); + +$PAGE_NAME = 'TEST CLASS: CONFIG DIRECT'; +print ""; +print "" . $PAGE_NAME . ""; +print ""; +print '
Class Test Master
'; +print '

' . $PAGE_NAME . '

'; + +print "DIR: " . DIR . "
"; +print "BASE: " . BASE . "
"; +print "ROOT: " . ROOT . "
"; +print "BASE NAME: " . BASE_NAME . "
"; +echo "Config path prefix: " . ($CONFIG_PATH_PREFIX ?? '') . "
"; +print "DB Name: " . DB_CONFIG_NAME . "
"; +print "DB Config: " . \CoreLibs\Debug\Support::printAr(DB_CONFIG) . "
"; + +print ""; + +// __END__ diff --git a/www/admin/class_test.logging.php b/www/admin/class_test.logging.php index 7ac13765..d93f8f01 100644 --- a/www/admin/class_test.logging.php +++ b/www/admin/class_test.logging.php @@ -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 . "
"; $log->setLogUniqueId(); print "LogUniqId: " . $log->getLogUniqueId() . "
"; -print "DUMP: " . $log->dV(['something' => 'error']) . "
"; +print "Is Debug (check): " . Support::printBool($log->getLoggingLevel()->includes( + Level::Debug +)) . "
"; +print "Is Debug (fk): " . Support::printBool($log->loggingLevelIsDebug()) . "
"; +$log->setLoggingLevel(Level::Notice); +print "Is Debug (check): " . Support::printBool($log->getLoggingLevel()->includes( + Level::Debug +)) . "
"; +print "Is Debug (fk): " . Support::printBool($log->loggingLevelIsDebug()) . "
"; +$log->setLoggingLevel(Level::Debug); + +print "DUMP: 
" . $log->dV(['something' => 'error']) . "

"; $log->debug('LEGACY', 'Some legacy shit here'); $log->debug('ARRAY', 'Dump some data: ' . $log->dV(['something' => 'error'])); diff --git a/www/admin/class_test.smarty.php b/www/admin/class_test.smarty.php index 0615f0d6..6eb54f06 100644 --- a/www/admin/class_test.smarty.php +++ b/www/admin/class_test.smarty.php @@ -52,7 +52,7 @@ print ""; print '
Class Test Master
'; print '

' . $PAGE_NAME . '

'; -$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'; diff --git a/www/composer.lock b/www/composer.lock index 8f67834a..4b4828cb 100644 --- a/www/composer.lock +++ b/www/composer.lock @@ -12,11 +12,11 @@ "dist": { "type": "path", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", - "reference": "24f7a903efb9bfd8b99c7aae9e1e77013c753cd9" + "reference": "2c2826ac24650efa8d741db53bf68d2bb18e9214" }, "require": { "php": ">=8.1", - "psr/log": "^2.0 || ^3.0" + "psr/log": "^3.0@dev" }, "require-dev": { "egrajp/smarty-extended": "^4.3", diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json index 81549d42..652c417f 100644 --- a/www/vendor/composer/installed.json +++ b/www/vendor/composer/installed.json @@ -7,11 +7,11 @@ "dist": { "type": "path", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", - "reference": "24f7a903efb9bfd8b99c7aae9e1e77013c753cd9" + "reference": "2c2826ac24650efa8d741db53bf68d2bb18e9214" }, "require": { "php": ">=8.1", - "psr/log": "^2.0 || ^3.0" + "psr/log": "^3.0@dev" }, "require-dev": { "egrajp/smarty-extended": "^4.3", diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php index ccd7d83c..8175027d 100644 --- a/www/vendor/composer/installed.php +++ b/www/vendor/composer/installed.php @@ -13,7 +13,7 @@ 'egrajp/corelibs-composer-all' => array( 'pretty_version' => 'dev-development', 'version' => 'dev-development', - 'reference' => '24f7a903efb9bfd8b99c7aae9e1e77013c753cd9', + 'reference' => '2c2826ac24650efa8d741db53bf68d2bb18e9214', 'type' => 'library', 'install_path' => __DIR__ . '/../egrajp/corelibs-composer-all', 'aliases' => array(), diff --git a/www/vendor/egrajp/corelibs-composer-all/.phan/config.php b/www/vendor/egrajp/corelibs-composer-all/.phan/config.php index cc0ea261..9b998621 100644 --- a/www/vendor/egrajp/corelibs-composer-all/.phan/config.php +++ b/www/vendor/egrajp/corelibs-composer-all/.phan/config.php @@ -109,7 +109,10 @@ return [ 'PhanWriteOnlyPublicProperty', 'PhanUnreferencedConstant', 'PhanWriteOnlyPublicProperty', - 'PhanReadOnlyPublicProperty' + 'PhanReadOnlyPublicProperty', + // start ignore annotations + 'PhanUnextractableAnnotationElementName', + 'PhanUnextractableAnnotationSuffix', ], // Override to hardcode existence and types of (non-builtin) globals in the global scope. diff --git a/www/vendor/egrajp/corelibs-composer-all/composer.json b/www/vendor/egrajp/corelibs-composer-all/composer.json index 5e2f42d4..b688dfdf 100644 --- a/www/vendor/egrajp/corelibs-composer-all/composer.json +++ b/www/vendor/egrajp/corelibs-composer-all/composer.json @@ -17,7 +17,7 @@ "minimum-stability": "dev", "require": { "php": ">=8.1", - "psr/log": "^2.0 || ^3.0" + "psr/log": "^3.0@dev" }, "require-dev": { "phpstan/phpstan": "^1.10", diff --git a/www/vendor/egrajp/corelibs-composer-all/publish/last.published b/www/vendor/egrajp/corelibs-composer-all/publish/last.published index 6d289079..3beeadd4 100644 --- a/www/vendor/egrajp/corelibs-composer-all/publish/last.published +++ b/www/vendor/egrajp/corelibs-composer-all/publish/last.published @@ -1 +1 @@ -8.5.0 +9.0.2 diff --git a/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php b/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php index 29b0b19b..a3837104 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php @@ -395,12 +395,10 @@ class IO * main DB concstructor with auto connection to DB and failure set on failed connection * @param array $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 .= '[' . $id . '] '; + $prefix .= '[' . $id . '] '; } if ($type) { - $prefix .= '{' . $type . '} '; + $prefix .= '{' . $type . '} '; } switch ($id) { case 'DB_ERROR': - $prefix .= 'DB-Error:'; + $prefix .= 'DB-Error:'; break; case 'DB_WARNING': - $prefix .= 'DB-Warning:'; + $prefix .= 'DB-Warning:'; break; } if ($prefix) { $prefix .= '- '; } if ($error_data !== []) { - $error_string .= '
[' + $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 $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; @@ -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 diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Debug/Support.php b/www/vendor/egrajp/corelibs-composer-all/src/Debug/Support.php index ef492c02..15cdb7af 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Debug/Support.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Debug/Support.php @@ -177,7 +177,6 @@ class Support $caller_level = 1; $caller_list = self::getCallerMethodList(); if ($caller_list[0] == 'dV') { - echo "Raise caller level
: " . $caller_list[0] . "
"; $caller_level = 2; } // we need to strip the string in 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) diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/DB/CoreLibsDBIOTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/DB/CoreLibsDBIOTest.php index b60d4549..bd145ffb 100644 --- a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/DB/CoreLibsDBIOTest.php +++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/DB/CoreLibsDBIOTest.php @@ -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 ) { diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/CoreLibsLoggingLoggingTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/CoreLibsLoggingLoggingTest.php index fd75ebdd..177545bc 100644 --- a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/CoreLibsLoggingLoggingTest.php +++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/CoreLibsLoggingLoggingTest.php @@ -217,14 +217,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 +242,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 +254,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 +269,7 @@ final class CoreLibsLoggingLoggingTest extends TestCase $log->getLoggingLevel() ); $this->assertTrue( - $log->getJsDebug() + $log->loggingLevelIsDebug() ); // set valid, then change $log = new \CoreLibs\Logging\Logging([