DB\IO update with better error reporting and auto update for placeholders in queries

.phan/config.php

@@ -360,10 +360,7 @@ return [
 	'directory_list' => [
 		'src',
 		'vendor/egrajp/smarty-extended/src',
-		'vendor/phan/phan/src/Phan',
-		'vendor/phpunit/phpunit/src',
 		'vendor/psr/log/src',
-		'vendor/vimeo/psalm/src/Psalm',
 		'vendor/gullevek/dotenv',
 	],
 

.phive/phars.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phive xmlns="https://phar.io/phive">
+  <phar name="phpunit" version="^9.6" installed="9.6.13" location="./tools/phpunit" copy="false"/>
+  <phar name="phpcs" version="^3.7.2" installed="3.7.2" location="./tools/phpcs" copy="false"/>
+  <phar name="phpcbf" version="^3.7.2" installed="3.7.2" location="./tools/phpcbf" copy="false"/>
+  <phar name="psalm" version="^5.15.0" installed="5.15.0" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="^1.10.37" installed="1.10.37" location="./tools/phpstan" copy="false"/>
+  <phar name="phan" version="^5.4.2" installed="5.4.2" location="./tools/phan" copy="false"/>
+</phive>

ReadMe.md

@@ -23,3 +23,21 @@ Alternative setup composer local zip file repot:
 ## Install package
 
 `composer require egrajp/corelibs-composer-all:^8.0`
+
+## Tests
+
+All tests must be run from the base folder
+
+### phan
+
+`phan --progress-bar -C --analyze-twic`
+
+### phpstan
+
+`phpstan`
+
+### phpunit
+
+PHP unit is installed via "phiev"
+
+`tools/phpunit test/phpunit`

composer.json

@@ -20,11 +20,7 @@
         "psr/log": "^3.0@dev"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.10",
-        "phan/phan": "v5.x-dev",
-        "phpunit/phpunit": "^9",
         "egrajp/smarty-extended": "^4.3",
-        "vimeo/psalm": "^5.0@dev",
         "gullevek/dotenv": "dev-master"
     },
     "repositories": {

phpunit.xml

@@ -2,5 +2,6 @@
 	cacheResultFile="/tmp/phpunit-corelibs-composer.result.cache"
 	colors="true"
 	verbose="true"
+	bootstrap="test/phpunit/bootstrap.php"
 >
 </phpunit>

publish/last.published

@@ -1 +1 @@
-9.7.9
+9.8.3

src/Admin/EditBase.php

@@ -44,7 +44,7 @@ class EditBase
 	 * construct form generator
 	 *
 	 * phpcs:ignore
-	 * @param array{db_name:string,db_user:string,db_pass:string,db_host:string,db_port:int,db_schema:string,db_encoding:string,db_type:string,db_ssl:string,db_convert_type?:string[]} $db_config db config array, mandatory
+	 * @param array{db_name:string,db_user:string,db_pass:string,db_host:string,db_port:int,db_schema:string,db_encoding:string,db_type:string,db_ssl:string,db_convert_type?:string[],db_convert_placeholder?:bool,db_convert_placeholder_target?:string,db_debug_replace_placeholder?:bool} $db_config db config array, mandatory
 	 * @param \CoreLibs\Logging\Logging $log       Logging class, null auto set
 	 * @param \CoreLibs\Language\L10n $l10n      l10n language class, null auto set
 	 * @param \CoreLibs\ACL\Login     $login     login class for ACL settings

src/DB/Extended/ArrayIO.php

@@ -55,7 +55,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	 * primary key name automatically (from array)
 	 *
 	 * phpcs:ignore
-	 * @param array{db_name:string,db_user:string,db_pass:string,db_host:string,db_port:int,db_schema:string,db_encoding:string,db_type:string,db_ssl:string,db_convert_type?:string[]} $db_config db connection config
+	 * @param array{db_name:string,db_user:string,db_pass:string,db_host:string,db_port:int,db_schema:string,db_encoding:string,db_type:string,db_ssl:string,db_convert_type?:string[],db_convert_placeholder?:bool,db_convert_placeholder_target?:string,db_debug_replace_placeholder?:bool} $db_config db connection config
 	 * @param array<mixed> $table_array    table array config
 	 * @param string       $table_name     table name string
 	 * @param \CoreLibs\Logging\Logging $log Logging class

src/DB/Support/ConvertPlaceholder.php

@@ -0,0 +1,220 @@
+<?php
+
+/**
+ * AUTOR: Clemens Schwaighofer
+ * CREATED: 2023/10/10
+ * DESCRIPTION:
+ * Convert placeholders in query from PDO style ? or :named to \PG style $number
+ * pr the other way around
+*/
+
+declare(strict_types=1);
+
+namespace CoreLibs\DB\Support;
+
+class ConvertPlaceholder
+{
+	/**
+	 * Convert PDO type query with placeholders to \PG style and vica versa
+	 * For PDO to: ? and :named
+	 * For \PG to: $number
+	 *
+	 * If the query has a mix of ?, :named or $numbrer the \OutOfRangeException exception
+	 * will be thrown
+	 *
+	 * If the convert_to is either pg or pdo, nothing will be changed
+	 *
+	 * found has -1 if an error occoured in the preg_match_all call
+	 *
+	 * @param  string       $query      Query with placeholders to convert
+	 * @param  array<mixed> $params     The parameters that are used for the query, and will be updated
+	 * @param  string       $convert_to Either pdo or pg, will be converted to lower case for check
+	 * @return array{original:array{query:string,params:array<mixed>},type:''|'named'|'numbered'|'question_mark',found:int,matches:array<string>,params_lookup:array<mixed>,query:string,params:array<mixed>}
+	 * @throws \OutOfRangeException 200
+	 */
+	public static function convertPlaceholderInQuery(
+		string $query,
+		array $params,
+		string $convert_to = 'pg'
+	): array {
+		$convert_to = strtolower($convert_to);
+		$matches = [];
+		$pattern = '/'
+			// prefix string part, must match towards
+			. '(?:\'.*?\')?\s*(?:\?\?|[(=,])\s*'
+			// match for replace part
+			. '(?:'
+			// digit -> ignore
+			. '\d+|'
+			// other string -> ignore
+			. '(?:\'.*?\')|'
+			// :name named part (PDO)
+			. '(:\w+)|'
+			// ? question mark part (PDO)
+			. '(?:(?:\?\?)?\s*(\?{1}))|'
+			// $n numbered part (\PG php)
+			. '(\$[1-9]{1}(?:[0-9]{1,})?)'
+			// end match
+			. ')'
+			// single line -> add line break to matches in "."
+			. '/s';
+		// matches:
+		// 1: :named
+		// 2: ? question mark
+		// 3: $n numbered
+		$found = preg_match_all($pattern, $query, $matches, PREG_UNMATCHED_AS_NULL);
+		// if false or null set to -1
+		//  || $found === null
+		if ($found === false) {
+			$found = -1;
+		}
+		/** @var array<string> 1: named */
+		$named_matches = array_filter($matches[1]);
+		/** @var array<string> 2: open ? */
+		$qmark_matches = array_filter($matches[2]);
+		/** @var array<string> 3: $n matches */
+		$numbered_matches = array_filter($matches[3]);
+		// count matches
+		$count_named = count($named_matches);
+		$count_qmark = count($qmark_matches);
+		$count_numbered = count($numbered_matches);
+		// throw if mixed
+		if (
+			($count_named && $count_qmark) ||
+			($count_named && $count_numbered) ||
+			($count_qmark && $count_numbered)
+		) {
+			throw new \OutOfRangeException('Cannot have named, question mark and numbered in the same query', 200);
+		}
+		// rebuild
+		$matches_return = [];
+		$type = '';
+		$query_new = '';
+		$params_new = [];
+		$params_lookup = [];
+		if ($count_named && $convert_to == 'pg') {
+			$type = 'named';
+			$matches_return = $named_matches;
+			// only check for :named
+			$pattern_replace = '/((?:\'.*?\')?\s*(?:\?\?|[(=,])\s*)(\d+|(?:\'.*?\')|(:\w+))/s';
+			// 0: full
+			// 1: pre part
+			// 2: keep part UNLESS '3' is set
+			// 3: replace part :named
+			$pos = 0;
+			$query_new = preg_replace_callback(
+				$pattern_replace,
+				function ($matches) use (&$pos, &$params_new, &$params_lookup, $params) {
+					// only count up if $match[3] is not yet in lookup table
+					if (!empty($matches[3]) && empty($params_lookup[$matches[3]])) {
+						$pos++;
+						$params_lookup[$matches[3]] = '$' . $pos;
+						$params_new[] = $params[$matches[3]] ??
+							throw new \RuntimeException(
+								'Cannot lookup ' . $matches[3] . ' in params list',
+								210
+							);
+					}
+					// add the connectors back (1), and the data sets only if no replacement will be done
+					return $matches[1] . (
+						empty($matches[3]) ?
+							$matches[2] :
+							$params_lookup[$matches[3]] ??
+								throw new \RuntimeException(
+									'Cannot lookup ' . $matches[3] . ' in params lookup list',
+									211
+								)
+					);
+				},
+				$query
+			);
+		} elseif ($count_qmark && $convert_to == 'pg') {
+			$type = 'question_mark';
+			$matches_return = $qmark_matches;
+			// order and data stays the same
+			$params_new = $params;
+			// only check for ?
+			$pattern_replace = '/((?:\'.*?\')?\s*(?:\?\?|[(=,])\s*)(\d+|(?:\'.*?\')|(?:(?:\?\?)?\s*(\?{1})))/s';
+			// 0: full
+			// 1: pre part
+			// 2: keep part UNLESS '3' is set
+			// 3: replace part ?
+			$pos = 0;
+			$query_new = preg_replace_callback(
+				$pattern_replace,
+				function ($matches) use (&$pos, &$params_lookup) {
+					// only count pos up for actual replacements we will do
+					if (!empty($matches[3])) {
+						$pos++;
+						$params_lookup[] = '$' . $pos;
+					}
+					// add the connectors back (1), and the data sets only if no replacement will be done
+					return $matches[1] . (
+						empty($matches[3]) ?
+							$matches[2] :
+							'$' . $pos
+					);
+				},
+				$query
+			);
+			// for each ?:DTN: -> replace with $1 ... $n, any remaining :DTN: remove
+		} elseif ($count_numbered && $convert_to == 'pdo') {
+			// convert numbered to named
+			$type = 'numbered';
+			$matches_return = $numbered_matches;
+			// only check for $n
+			$pattern_replace = '/((?:\'.*?\')?\s*(?:\?\?|[(=,])\s*)(\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))/s';
+			// 0: full
+			// 1: pre part
+			// 2: keep part UNLESS '3' is set
+			// 3: replace part $numbered
+			$pos = 0;
+			$query_new = preg_replace_callback(
+				$pattern_replace,
+				function ($matches) use (&$pos, &$params_new, &$params_lookup, $params) {
+					// only count up if $match[3] is not yet in lookup table
+					if (!empty($matches[3]) && empty($params_lookup[$matches[3]])) {
+						$pos++;
+						$params_lookup[$matches[3]] = ':' . $pos . '_named';
+						$params_new[] = $params[($pos - 1)] ??
+							throw new \RuntimeException(
+								'Cannot lookup ' . ($pos - 1) . ' in params list',
+								220
+							);
+					}
+					// add the connectors back (1), and the data sets only if no replacement will be done
+					return $matches[1] . (
+						empty($matches[3]) ?
+							$matches[2] :
+							$params_lookup[$matches[3]] ??
+							throw new \RuntimeException(
+								'Cannot lookup ' . $matches[3] . ' in params lookup list',
+								221
+							)
+					);
+				},
+				$query
+			);
+		}
+		// return, old query is always set
+		return [
+			// original
+			'original' => [
+				'query' => $query,
+				'params' => $params,
+			],
+			// type found, empty if nothing was done
+			'type' => $type,
+			// int: found, not found; -1: problem (set from false)
+			'found' => (int)$found,
+			'matches' => $matches_return,
+			// old to new lookup check
+			'params_lookup' => $params_lookup,
+			// new
+			'query' => $query_new ?? '',
+			'params' => $params_new,
+		];
+	}
+}
+
+// __END__

src/Logging/ErrorMessage.php

@@ -17,8 +17,8 @@ class ErrorMessage
 {
 	/** @var array<int,array{id:string,level:string,str:string,target:string,target_style:string,highlight:string[]}> */
 	private array $error_str = [];
-	/** @var array<string,string> */
+	/** @var array<string,array{info:string,level:string}> */
-	private array $jump_targets;
+	private array $jump_targets = [];
 	/** @var \CoreLibs\Logging\Logging $log */
 	public \CoreLibs\Logging\Logging $log;
 
@@ -112,7 +112,7 @@ class ErrorMessage
 			'highlight' => $highlight,
 		];
 		// set a jump target
-		$this->setJumpTarget($jump_target['target'] ?? null, $jump_target['info'] ?? null);
+		$this->setJumpTarget($jump_target['target'] ?? null, $jump_target['info'] ?? null, $level);
 		// write to log for abort/crash
 		switch ($level) {
 			case 'notice':
@@ -202,15 +202,18 @@ class ErrorMessage
 	 *
 	 * @param  string|null $target
 	 * @param  string|null $info
+	 * @param  string      $level [='error']
 	 * @return void
 	 */
 	public function setJumpTarget(
 		?string $target,
 		?string $info,
+		string $level = 'error',
 	): void {
 		if (
 			empty($target) ||
-			!empty($this->jump_targets[$target])
+			array_key_exists($target, $this->jump_targets)
+			// !empty($this->jump_targets[$target])
 			// also check if this is an alphanumeric string? css id compatible?
 		) {
 			return;
@@ -218,7 +221,11 @@ class ErrorMessage
 		if (empty($info)) {
 			$info = 'Jump to: ' . $target;
 		}
-		$this->jump_targets[$target] = $info;
+		$level = MessageLevel::fromName($level)->name;
+		$this->jump_targets[$target] = [
+			'info' => $info,
+			'level' => $level,
+		];
 	}
 
 	// *********************************************************************
@@ -266,11 +273,21 @@ class ErrorMessage
 	/**
 	 * Return the jump target list
 	 *
-	 * @return array{}|array{string,string} List of jump targets with info text, or empty array if not set
+	 * @return array{}|array<int,array{target:string,info:string,level:string}> List of jump targets with info text,
+	 *                                                                          or empty array if not set
 	 */
 	public function getJumpTarget(): array
 	{
-		return $this->jump_targets ?? [];
+		$_jump_target = [];
+		foreach ($this->jump_targets as $target => $jump) {
+			$_jump_target[] = array_merge(
+				$jump,
+				[
+					'target' => $target,
+				]
+			);
+		}
+		return $_jump_target;
 	}
 
 	// *********************************************************************

src/Output/Form/Generate.php

@@ -310,7 +310,7 @@ class Generate
 	 * construct form generator
 	 *
 	 * phpcs:ignore
-	 * @param array{db_name:string,db_user:string,db_pass:string,db_host:string,db_port:int,db_schema:string,db_encoding:string,db_type:string,db_ssl:string,db_convert_type?:string[]} $db_config db config array, mandatory
+	 * @param array{db_name:string,db_user:string,db_pass:string,db_host:string,db_port:int,db_schema:string,db_encoding:string,db_type:string,db_ssl:string,db_convert_type?:string[],db_convert_placeholder?:bool,db_convert_placeholder_target?:string,db_debug_replace_placeholder?:bool} $db_config db config array, mandatory
 	 * @param \CoreLibs\Logging\Logging $log          Logging class
 	 * @param \CoreLibs\Language\L10n $l10n         l10n language class
 	 * @param array<string,mixed>     $login_acl	Login ACL array,

src/Output/Image.php

@@ -470,12 +470,20 @@ class Image
 	 *
 	 * @param  string $filename path + filename to rotate. This file must be writeable
 	 * @return void
+	 * @throws \RuntimeException if exit_read_data is not found
+	 * @throws \UnexpectedValueException if file name not writeable or file name not found
 	 */
 	public static function correctImageOrientation(string $filename): void
 	{
 		// function exists & file is writeable, else do nothing
-		if (!function_exists('exif_read_data') || !is_writeable($filename)) {
+		if (!function_exists('exif_read_data')) {
-			return;
+			throw new \RuntimeException('Function \'exit_read_data\' does not exist');
+		}
+		if (!file_exists($filename) || !is_file($filename)) {
+			throw new \UnexpectedValueException('Missing image file: ' . $filename);
+		}
+		if (!is_writeable($filename)) {
+			throw new \UnexpectedValueException('File name is not writeable: ' . $filename);
 		}
 		[$inc_width, $inc_height, $img_type] = getimagesize($filename) ?: [0, 0, null];
 		// add @ to avoid "file not supported error"

test/phpunit/DB/CoreLibsDBIOTest.php

@@ -232,7 +232,7 @@ final class CoreLibsDBIOTest extends TestCase
 		$this->assertEquals(
 			$error,
 			$last_error,
-			'Assert query warning'
+			'Assert query error'
 		);
 		return [$last_warning, $last_error];
 	}
@@ -251,8 +251,6 @@ final class CoreLibsDBIOTest extends TestCase
 	 */
 	public function testDbVersion(): void
 	{
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -276,8 +274,6 @@ final class CoreLibsDBIOTest extends TestCase
 	 */
 	public function testDbVersionNumeric(): void
 	{
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -306,8 +302,6 @@ final class CoreLibsDBIOTest extends TestCase
 	 */
 	public function testDbVersionInfoParameters(): void
 	{
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -365,8 +359,6 @@ final class CoreLibsDBIOTest extends TestCase
 	 */
 	public function testDbVersionInfo(string $parameter, string $expected): void
 	{
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -1592,8 +1584,6 @@ final class CoreLibsDBIOTest extends TestCase
 		string $error,
 		bool $run_many_times = false
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -1832,8 +1822,6 @@ final class CoreLibsDBIOTest extends TestCase
 		string $error,
 		string $insert_data
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -2002,8 +1990,6 @@ final class CoreLibsDBIOTest extends TestCase
 		string $error,
 		string $insert_data
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -3069,8 +3055,6 @@ final class CoreLibsDBIOTest extends TestCase
 		string $error,
 		string $insert_data
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -3465,7 +3449,7 @@ final class CoreLibsDBIOTest extends TestCase
 				$read_query,
 				null,
 				null,
-				//
+				// warning: 20
 				true, '20', '',
 				//
 				'result', '', '',
@@ -3482,6 +3466,31 @@ final class CoreLibsDBIOTest extends TestCase
 					'returning_id' => false,
 				],
 			],
+			// prepare with different statement name
+			'prepare query with same statement name, different query' => [
+				'double_error',
+				$read_query,
+				// primary key
+				null,
+				// arguments (none)
+				null,
+				// expected return false, warning: no, error: 26
+				false, '', '26',
+				// return expected, warning, error
+				'', '', '',
+				// dummy query for second prepare with wrong query
+				$read_query . ' WHERE uid = $3',
+				[],
+				//
+				$insert_query,
+				//
+				[
+					'pk_name' => '',
+					'count' => 0,
+					'query' => 'SELECT row_int, uid FROM table_with_primary_key',
+					'returning_id' => false,
+				],
+			],
 			// insert wrong data count compared to needed (execute 23)
 			'wrong parmeter count' => [
 				'wrong_param_count',
@@ -3554,8 +3563,6 @@ final class CoreLibsDBIOTest extends TestCase
 		string $insert_data,
 		array $prepare_cursor,
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -3575,6 +3582,9 @@ final class CoreLibsDBIOTest extends TestCase
 				$db->dbPrepare($stm_name, $query) :
 				$db->dbPrepare($stm_name, $query, $pk_name);
 		}
+		if ($error_prepare == '26') {
+			$prepare_result = $db->dbPrepare($stm_name, $expected_data_query);
+		}
 		// if result type, or if forced bool
 		if (is_string($expected_prepare) && $expected_prepare == 'result') {
 			// if PHP or newer, must be Object PgSql\Result
@@ -3597,66 +3607,68 @@ final class CoreLibsDBIOTest extends TestCase
 
 		// for non fail prepare test exec
 		// check test result
-		$execute_result = $query_data === null ?
+		if (!$error_prepare) {
-			$db->dbExecute($stm_name) :
+			$execute_result = $query_data === null ?
-			$db->dbExecute($stm_name, $query_data);
+				$db->dbExecute($stm_name) :
-		if ($expected_execute == 'result') {
+				$db->dbExecute($stm_name, $query_data);
-			// if PHP or newer, must be Object PgSql\Result
+			if ($expected_execute == 'result') {
-			$this->assertIsObject(
+				// if PHP or newer, must be Object PgSql\Result
-				$execute_result
+				$this->assertIsObject(
-			);
+					$execute_result
-			// also check that this is correct instance type
+				);
-			$this->assertInstanceOf(
+				// also check that this is correct instance type
-				'PgSql\Result',
+				$this->assertInstanceOf(
-				$execute_result
+					'PgSql\Result',
-			);
+					$execute_result
-			// if this is an select use dbFetchArray to get data and test
+				);
-		} else {
+				// if this is an select use dbFetchArray to get data and test
-			$this->assertEquals(
+			} else {
-				$expected_execute,
+				$this->assertEquals(
-				$execute_result
+					$expected_execute,
-			);
+					$execute_result
-		}
+				);
-		// error/warning check
+			}
-		$this->subAssertErrorTest($db, $warning_execute, $error_execute);
+			// error/warning check
-		// now check test result if expected return is result
+			$this->subAssertErrorTest($db, $warning_execute, $error_execute);
-		if (
+			// now check test result if expected return is result
-			$expected_execute == 'result' &&
+			if (
-			!empty($expected_data_query)
+				$expected_execute == 'result' &&
-		) {
+				!empty($expected_data_query)
-			// $expected_data_query
+			) {
-			// $expected_data
+				// $expected_data_query
-			$rows = $db->dbReturnArray($expected_data_query);
+				// $expected_data
-			$this->assertEquals(
+				$rows = $db->dbReturnArray($expected_data_query);
-				$expected_data,
+				$this->assertEquals(
-				$rows
+					$expected_data,
-			);
+					$rows
-		}
+				);
-		if (
+			}
-			$expected_execute == 'result' &&
+			if (
-			$execute_result !== false &&
+				$expected_execute == 'result' &&
-			empty($expected_data_query) &&
+				$execute_result !== false &&
-			count($expected_data)
+				empty($expected_data_query) &&
-		) {
+				count($expected_data)
-			// compare previously read data to compare data
+			) {
-			$compare_data = [];
+				// compare previously read data to compare data
-			// read in the query data
+				$compare_data = [];
-			while (is_array($row = $db->dbFetchArray($execute_result, true))) {
+				// read in the query data
-				$compare_data[] = $row;
+				while (is_array($row = $db->dbFetchArray($execute_result, true))) {
+					$compare_data[] = $row;
+				}
+				$this->assertEquals(
+					$expected_data,
+					$compare_data
+				);
 			}
-			$this->assertEquals(
-				$expected_data,
-				$compare_data
-			);
-		}
 
-		// check dbGetPrepareCursorValue
+			// check dbGetPrepareCursorValue
-		foreach (['pk_name', 'count', 'query', 'returning_id'] as $key) {
+			foreach (['pk_name', 'count', 'query', 'returning_id'] as $key) {
-			$this->assertEquals(
+				$this->assertEquals(
-				$prepare_cursor[$key],
+					$prepare_cursor[$key],
-				$db->dbGetPrepareCursorValue($stm_name, $key),
+					$db->dbGetPrepareCursorValue($stm_name, $key),
-				'Prepared cursor: ' . $key . ': failed assertion'
+					'Prepared cursor: ' . $key . ': failed assertion'
-			);
+				);
+			}
 		}
 
 		// reset all data
@@ -3844,8 +3856,6 @@ final class CoreLibsDBIOTest extends TestCase
 		string $expected_get_var,
 		string $expected_get_db
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config[$connection],
 			self::$log
@@ -3907,9 +3917,13 @@ final class CoreLibsDBIOTest extends TestCase
 					'id' => '51',
 					'error' => 'Max query call needs to be set to at least 1',
 					// run:: can be +1 if called in set and not direct
-					'source' => "/^include::main::run::run::run::run::run::run::(run::)?runBare::runTest::testDbErrorHandling::dbSetMaxQueryCall$/",
+					// 'main::run::run::run::run::run::run::run::runBare::runTest::testDbErrorHandling::dbSetMaxQueryCall
+					'source' => "/^(include::)?main::(run::)+runBare::runTest::testDbErrorHandling::dbSetMaxQueryCall$/",
 					'pg_error' => '',
-					'msg' => '',
+					'message' => '',
+					'context' => [
+						'max_calls' => 0
+					]
 				]
 			],
 			'trigger warning' => [
@@ -3942,8 +3956,6 @@ final class CoreLibsDBIOTest extends TestCase
 		string $error_id,
 		array $expected_history
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -3969,7 +3981,7 @@ final class CoreLibsDBIOTest extends TestCase
 		foreach ($expected_history as $key => $value) {
 			// check if starts with / because this is regex (timestamp)
 			// if (substr($expected_2, 0, 1) == '/) {
-			if (strpos($value, '/') === 0) {
+			if (!is_array($value) && strpos($value, '/') === 0) {
 				// this is regex
 				$this->assertMatchesRegularExpression(
 					$value,
@@ -4057,8 +4069,6 @@ final class CoreLibsDBIOTest extends TestCase
 		bool $expected_set_flag,
 		string $expected_get_encoding
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config[$connection],
 			self::$log
@@ -4140,8 +4150,6 @@ final class CoreLibsDBIOTest extends TestCase
 		?string $encoding_php,
 		string $text
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config[$connection],
 			self::$log
@@ -4271,8 +4279,6 @@ final class CoreLibsDBIOTest extends TestCase
 		string $table,
 		string $primary_key
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -4329,7 +4335,7 @@ final class CoreLibsDBIOTest extends TestCase
 		// NOTE if there are different INSERTS before the primary keys
 		// will not match anymore. Must be updated by hand
 		// IMPORTANT: if this is stand alone the primary key will not match and fail
-		$table_with_primary_key_id = 68;
+		$table_with_primary_key_id = 70;
 		// 0: query + returning
 		// 1: params
 		// 1: pk name for db exec
@@ -4529,8 +4535,6 @@ final class CoreLibsDBIOTest extends TestCase
 		array|string|int|null $expected_ret_ext,
 		array $expected_ret_arr
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -4874,8 +4878,6 @@ final class CoreLibsDBIOTest extends TestCase
 		array $expected_col_names,
 		array $expected_col_types
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -5029,6 +5031,147 @@ final class CoreLibsDBIOTest extends TestCase
 		$db->dbClose();
 	}
 
+	// query placeholder convert
+
+	public function queryPlaceholderReplaceProvider(): array
+	{
+		// 				WHERE row_varchar = $1
+		return [
+			'select, no change' => [
+				'query' => <<<SQL
+				SELECT row_varchar, row_varchar_literal, row_int, row_date
+				FROM table_with_primary_key
+				SQL,
+				'params' => [],
+				'found' => 0,
+				'expected_query' => '',
+				'expected_params' => [],
+			],
+			'select, params ?' => [
+				'query' => <<<SQL
+				SELECT row_varchar, row_varchar_literal, row_int, row_date
+				FROM table_with_primary_key
+				WHERE row_varchar = ?
+				SQL,
+				'params' => ['string a'],
+				'found' => 1,
+				'expected_query' => <<<SQL
+				SELECT row_varchar, row_varchar_literal, row_int, row_date
+				FROM table_with_primary_key
+				WHERE row_varchar = $1
+				SQL,
+				'expected_params' => ['string a'],
+			],
+			'select, params :' => [
+				'query' => <<<SQL
+				SELECT row_varchar, row_varchar_literal, row_int, row_date
+				FROM table_with_primary_key
+				WHERE row_varchar = :row_varchar
+				SQL,
+				'params' => [':row_varchar' => 'string a'],
+				'found' => 1,
+				'expected_query' => <<<SQL
+				SELECT row_varchar, row_varchar_literal, row_int, row_date
+				FROM table_with_primary_key
+				WHERE row_varchar = $1
+				SQL,
+				'expected_params' => ['string a'],
+			]
+		];
+	}
+
+	/**
+	 * test query string with placeholders convert
+	 *
+	 * @dataProvider queryPlaceholderReplaceProvider
+	 * @testdox Query replacement test [$_dataName]
+	 *
+	 * @param  string $query
+	 * @param  array  $params
+	 * @param  string $expected_query
+	 * @param  array  $expected_params
+	 * @return void
+	 */
+	public function testQueryPlaceholderReplace(
+		string $query,
+		array $params,
+		int $expected_found,
+		string $expected_query,
+		array $expected_params
+	): void {
+		$db = new \CoreLibs\DB\IO(
+			self::$db_config['valid'],
+			self::$log
+		);
+		$db->dbSetConvertPlaceholder(true);
+		//
+		if ($db->dbCheckQueryForSelect($query)) {
+			$res = $db->dbReturnRowParams($query, $params);
+			$converted = $db->dbGetPlaceholderConverted();
+		} else {
+			$db->dbExecParams($query, $params);
+			$converted = $db->dbGetPlaceholderConverted();
+		}
+		$this->assertEquals(
+			$expected_found,
+			$converted['found'],
+			'Found not equal'
+		);
+		$this->assertEquals(
+			$expected_query,
+			$converted['query'],
+			'Query not equal'
+		);
+		$this->assertEquals(
+			$expected_params,
+			$converted['params'],
+			'Params not equal'
+		);
+	}
+
+	/**
+	 * test exception for placeholder convert
+	 * -> internally converted to error
+	 *
+	 * @testdox Query Replace error tests
+	 *
+	 * @return void
+	 */
+	public function testQueryPlaceholderReplaceException(): void
+	{
+		$db = new \CoreLibs\DB\IO(
+			self::$db_config['valid'],
+			self::$log
+		);
+		$db->dbSetConvertPlaceholder(true);
+		$db->dbExecParams(
+			<<<SQL
+			SELECT foo FROM bar
+			WHERE a = ? and b = :bname
+			SQL,
+			['a', 'b']
+		);
+		$this->assertEquals(
+			200,
+			$db->dbGetLastError()
+		);
+
+		// catch unset, for :names
+		$db->dbExecParams(
+			<<<SQL
+			SELECT foo FROM bar
+			WHERE a = :aname and b = :bname
+			SQL,
+			[':foo' => 'a', ':bname' => 'b']
+		);
+		$this->assertEquals(
+			210,
+			$db->dbGetLastError()
+		);
+
+		// TODO: other way around for to pdo
+	}
+
 	// TODO implement below checks
 	// - complex write sets
 	//   dbWriteData, dbWriteDataExt
@@ -5157,8 +5300,6 @@ final class CoreLibsDBIOTest extends TestCase
 		string $warning_final,
 		string $error_final
 	): void {
-		// self::$log->setLogLevelAll('debug', true);
-		// self::$log->setLogLevelAll('print', true);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log

test/phpunit/Debug/CoreLibsDebugSupportTest.php

@@ -460,8 +460,8 @@ final class CoreLibsDebugSupportTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @cover ::getCallerFileLine
-	 * @testWith ["vendor/phpunit/phpunit/src/Framework/TestCase.php:"]
+	 * @testWith ["vendor/phpunit/phpunit/src/Framework/TestCase.php:6434","phar:///home/clemens/.phive/phars/phpunit-9.6.13.phar/phpunit/Framework/TestCase.php:6434"]
-	 * @testdox getCallerFileLine check based on regex /[\w\-\/]/vendor/phpunit/phpunit/src/Framework/TestCase.php:\d+ [$_dataName]
+	 * @testdox getCallerFileLine check based on regex .../Framework/TestCase.php:\d+ [$_dataName]
 	 *
 	 * @param  string $expected
 	 * @return void
@@ -469,7 +469,14 @@ final class CoreLibsDebugSupportTest extends TestCase
 	public function testGetCallerFileLine(): void
 	{
 		// regex prefix with path "/../" and then fixed vendor + \d+
-		$regex = "/^\/[\w\-\/]+\/vendor\/phpunit\/phpunit\/src\/Framework\/TestCase.php:\d+$/";
+		// or phar start if phiev installed
+		// phar:///home/clemens/.phive/phars/phpunit-9.6.13.phar/phpunit/Framework/TestCase.php
+		$regex = "/^("
+			. "\/.*\/vendor\/phpunit\/phpunit\/src"
+			. "|"
+			. "phar:\/\/\/.*\.phive\/phars\/phpunit-\d+\.\d+\.\d+\.phar\/phpunit"
+			. ")"
+			. "\/Framework\/TestCase.php:\d+$/";
 		$this->assertMatchesRegularExpression(
 			$regex,
 			Support::getCallerFileLine()
@@ -514,27 +521,30 @@ final class CoreLibsDebugSupportTest extends TestCase
 				// add nothing
 				$this->assertEquals(
 					$expected,
-					Support::getCallerMethodList(),
+					$compare,
 					'assert expected 10'
 				);
 				break;
 			case 11:
-				// add one "run" before "runBare"
+				if ($compare[0] == 'include') {
-				// array_splice(
+					// add include at first
-				// 	$expected,
+					array_splice(
-				// 	7,
+						$expected,
-				// 	0,
+						0,
-				// 	['run']
+						0,
-				// );
+						['include']
-				array_splice(
+					);
-					$expected,
+				} else {
-					0,
+					array_splice(
-					0,
+						$expected,
-					['include']
+						6,
-				);
+						0,
+						['run']
+					);
+				}
 				$this->assertEquals(
 					$expected,
-					Support::getCallerMethodList(),
+					$compare,
 					'assert expected 11'
 				);
 				break;
@@ -554,7 +564,7 @@ final class CoreLibsDebugSupportTest extends TestCase
 				);
 				$this->assertEquals(
 					$expected,
-					Support::getCallerMethodList(),
+					$compare,
 					'assert expected 12'
 				);
 				break;

test/phpunit/Get/CoreLibsGetSystemTest.php

@@ -99,7 +99,7 @@ final class CoreLibsGetSystemTest extends TestCase
 				1 => 'phpunit',
 				2 => 'phpunit',
 				// NOTE: this can change, so it is a regex check
-				3 => "/^(\/?.*\/?)?vendor\/bin\/phpunit$/",
+				3 => "/^(\/?.*\/?)?(vendor\/bin|tools)\/phpunit$/",
 			],
 			'some path with extension' => [
 				0 => '/some/path/to/file.txt',

test/phpunit/Logging/CoreLibsLoggingErrorMessagesTest.php

@@ -444,7 +444,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 		);
 		$this->assertEquals(
 			[
-				'target-f' => 'Target text'
+				['target' => 'target-f', 'info' => 'Target text', 'level' => 'error']
 			],
 			$em->getJumpTarget()
 		);
@@ -455,7 +455,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 		);
 		$this->assertEquals(
 			[
-				'target-f' => 'Target text'
+				['target' => 'target-f', 'info' => 'Target text', 'level' => 'error']
 			],
 			$em->getJumpTarget()
 		);
@@ -466,8 +466,8 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 		);
 		$this->assertEquals(
 			[
-				'target-f' => 'Target text',
+				['target' => 'target-f', 'info' => 'Target text', 'level' => 'error'],
-				'target-s' => 'More text'
+				['target' => 'target-s', 'info' => 'More text', 'level' => 'error'],
 			],
 			$em->getJumpTarget()
 		);
@@ -478,9 +478,23 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 		);
 		$this->assertEquals(
 			[
-				'target-f' => 'Target text',
+				['target' => 'target-f', 'info' => 'Target text', 'level' => 'error'],
-				'target-s' => 'More text',
+				['target' => 'target-s', 'info' => 'More text', 'level' => 'error'],
-				'target-e' => 'Jump to: target-e'
+				['target' => 'target-e', 'info' => 'Jump to: target-e', 'level' => 'error'],
+			],
+			$em->getJumpTarget()
+		);
+		// add through message
+		$em->setErrorMsg('E-101', 'abort', 'Abort message', jump_target:[
+			'target' => 'abort-target',
+			'info' => 'Abort error'
+		]);
+		$this->assertEquals(
+			[
+				['target' => 'target-f', 'info' => 'Target text', 'level' => 'error'],
+				['target' => 'target-s', 'info' => 'More text', 'level' => 'error'],
+				['target' => 'target-e', 'info' => 'Jump to: target-e', 'level' => 'error'],
+				['target' => 'abort-target', 'info' => 'Abort error', 'level' => 'abort'],
 			],
 			$em->getJumpTarget()
 		);

test/phpunit/Logging/CoreLibsLoggingLoggingTest.php

@@ -20,7 +20,7 @@ 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
+		. "\[(phar:\/\/)?[\w\-\.\/]+:\d+\]\s{1}" // folder/file [note phar:// is for phpunit]
 		. "\[\w+\]\s{1}" // run id
 		. "{[\w\\\\]+((::|->)\w+)?}\s{1}"; // class
 

test/phpunit/Output/CoreLibsOutputImageTest.php

@@ -16,17 +16,89 @@ final class CoreLibsOutputImageTest extends TestCase
 	/**
 	 * Undocumented function
 	 *
-	 * @testdox Output\Image Class tests
+	 * @covers ::createThumbnail
+	 * @testdox createThumbnail checks
 	 *
 	 * @return void
 	 */
-	public function testOutputImage()
+	public function testCreateThumbnail(): void
 	{
-		// $this->assertTrue(true, 'Output Image Tests not implemented');
+		// CONVERT does not exist
-		$this->markTestIncomplete(
+		$this->expectException(\RuntimeException::class);
-			'Output\Image Tests have not yet been implemented'
+		\CoreLibs\Output\Image::createThumbnail('do_not_exist.png', 200, 200);
+		// set convert
+		$paths = [
+			'/bin',
+			'/usr/bin',
+			'/usr/local/bin',
+		];
+		// find convert
+		foreach ($paths as $path) {
+			if (
+				file_exists($path . DIRECTORY_SEPARATOR . 'convert') &&
+				is_file($path . DIRECTORY_SEPARATOR . 'convert')
+			) {
+				// image magick convert location
+				define('CONVERT', $path . DIRECTORY_SEPARATOR . 'convert');
+				break;
+			}
+		}
+		unset($paths);
+		// cannot set dummy file
+		$this->expectException(\Exception::class);
+		\CoreLibs\Output\Image::createThumbnail('do_not_exist.png', 200, 200);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::createThumbnailSimple
+	 * @testdox createThumbnailSimple checks
+	 *
+	 * @return void
+	 */
+	public function testCreateThumbnailSimple(): void
+	{
+		// file does not exist
+		$this->expectException(\UnexpectedValueException::class);
+		\CoreLibs\Output\Image::createThumbnailSimple(
+			'do_not_exist.png',
+			200,
+			200,
+			cache_folder: '/tmp/',
+			web_folder: '/tmp/'
 		);
-		// $this->markTestSkipped('No implementation for Output\Image at the moment');
+		// cache folder is not dir
+		$this->expectException(\UnexpectedValueException::class);
+		\CoreLibs\Output\Image::createThumbnailSimple(
+			'do_not_exist.png',
+			200,
+			200,
+			cache_folder: '/foo/bar/',
+			web_folder: '/tmp/'
+		);
+		// target cache folder is not writeable
+
+		// RuntimeException: imagecreatetruecolor failed
+		// RuntimeException: imagecolorallocatealpha failed
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::correctImageOrientation
+	 * @testdox correctImageOrientation checks
+	 *
+	 * @return void
+	 */
+	public function testCorrectImageOrientation(): void
+	{
+		// test file does not exist
+		$this->expectException(\UnexpectedValueException::class);
+		\CoreLibs\Output\Image::correctImageOrientation('do_not_exist.png');
+		// test folder not writeable
+		// test exit_read_data not present (how)?
+		// test image rotate
 	}
 }
 

test/phpunit/bootstrap.php

@@ -0,0 +1,15 @@
+<?php
+
+$set = 0;
+foreach (['/../../www', '/../www', '/../..', '/..', '/../../src', '/../src'] as $src) {
+	if (is_file(dirname(__DIR__) . $src . '/vendor/autoload.php')) {
+		require dirname(__DIR__) . $src . '/vendor/autoload.php';
+		$set = 1;
+		break;
+	}
+}
+if (!$set) {
+	die("Cannot find /vendor/autoload.php in reference to: " . dirname(__DIR__));
+}
+
+// __END__

tools/phan

@@ -0,0 +1 @@
+/home/clemens/.phive/phars/phan-5.4.2.phar

tools/phpcbf

@@ -0,0 +1 @@
+/home/clemens/.phive/phars/phpcbf-3.7.2.phar

tools/phpcs

@@ -0,0 +1 @@
+/home/clemens/.phive/phars/phpcs-3.7.2.phar

tools/phpstan

@@ -0,0 +1 @@
+/home/clemens/.phive/phars/phpstan-1.10.37.phar

tools/phpunit

@@ -0,0 +1 @@
+/home/clemens/.phive/phars/phpunit-9.6.13.phar

tools/psalm

@@ -0,0 +1 @@
+/home/clemens/.phive/phars/psalm-5.15.0.phar