Merge branch 'NewFeatures' into Features-DB_IO_SQLite

4dev/checking/phpunit.sh

@@ -36,7 +36,7 @@ if [ -n "${2}" ] && [ -z "${php_bin}" ]; then
 fi;
 
 # Note 4dev/tests/bootstrap.php has to be set as bootstrap file in phpunit.xml
-phpunit_call="${php_bin}${base}vendor/bin/phpunit ${opt_testdox} -c ${base}phpunit.xml ${base}4dev/tests/";
+phpunit_call="${php_bin}${base}tools/phpunit ${opt_testdox} -c ${base}phpunit.xml ${base}4dev/tests/";
 
 ${phpunit_call};
 

4dev/database/function/upgrade_serial_to_identity.sql

@@ -1,107 +0,0 @@
--- Upgrade serial to identity type
---
--- Original: https://www.enterprisedb.com/blog/postgresql-10-identity-columns-explained#section-6
---
--- @param reclass tbl The table where the column is located, prefix with 'schema.' if different schema
--- @param name col The column to be changed
--- @param varchar identity_type [default=a] Allowed a, d, assigned, default
--- @param varchar col_type [default=''] Allowed smallint, int, bigint, int2, int4, int8
--- @raises EXCEPTON on column not found, no linked sequence, more than one linked sequence found
---
-CREATE OR REPLACE FUNCTION upgrade_serial_to_identity(
-    tbl regclass,
-    col name,
-    identity_type varchar = 'a',
-    col_type varchar = ''
-)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-DECLARE
-colnum smallint;
-seqid oid;
-count int;
-col_type_oid int;
-col_type_len int;
-current_col_atttypid oid;
-current_col_attlen int;
-BEGIN
-    -- switch between always (default) or default identiy type
-    IF identity_type NOT IN ('a', 'd', 'assigned', 'default') THEN
-        identity_type := 'a';
-    ELSE
-        IF identity_type = 'default' THEN
-            identity_type := 'd';
-        ELSIF identity_type = 'assigned' THEN
-            identity_type := 'a';
-        END IF;
-    END IF;
-    -- find column number, attribute oid and attribute len
-    SELECT attnum, atttypid, attlen
-        INTO colnum, current_col_atttypid, current_col_attlen
-        FROM pg_attribute
-        WHERE attrelid = tbl AND attname = col;
-    IF NOT FOUND THEN
-        RAISE EXCEPTION 'column does not exist';
-    END IF;
-
-    -- find sequence
-    SELECT INTO seqid objid
-        FROM pg_depend
-        WHERE (refclassid, refobjid, refobjsubid) = ('pg_class'::regclass, tbl, colnum)
-            AND classid = 'pg_class'::regclass AND objsubid = 0
-            AND deptype = 'a';
-
-    GET DIAGNOSTICS count = ROW_COUNT;
-    IF count < 1 THEN
-        RAISE EXCEPTION 'no linked sequence found';
-    ELSIF count > 1 THEN
-        RAISE EXCEPTION 'more than one linked sequence found';
-    END IF;
-
-    -- drop the default
-    EXECUTE 'ALTER TABLE ' || tbl || ' ALTER COLUMN ' || quote_ident(col) || ' DROP DEFAULT';
-
-    -- change the dependency between column and sequence to internal
-    UPDATE pg_depend
-        SET deptype = 'i'
-        WHERE (classid, objid, objsubid) = ('pg_class'::regclass, seqid, 0)
-            AND deptype = 'a';
-
-    -- mark the column as identity column
-    UPDATE pg_attribute
-        -- set to 'd' for default
-        SET attidentity = identity_type
-        WHERE attrelid = tbl
-            AND attname = col;
-    RAISE NOTICE 'Update to identity for table "%" and columen "%" with type "%"', tbl, col, identity_type;
-
-    -- set type if requested and not empty
-    IF col_type <> '' THEN
-        IF col_type IN ('smallint', 'int', 'bigint', 'int2', 'int4', 'int8') THEN
-            -- rewrite smallint, int, bigint
-            IF col_type = 'smallint' THEN
-                col_type := 'int2';
-            ELSIF col_type = 'int' THEN
-                col_type := 'int4';
-            ELSIF col_type = 'bigint' THEN
-                col_type := 'int8';
-            END IF;
-            -- get the length and oid for selected
-            SELECT oid, typlen INTO col_type_oid, col_type_len FROM pg_type WHERE typname = col_type;
-            -- set only if diff or hight
-            IF current_col_atttypid <> col_type_oid AND col_type_len > current_col_attlen THEN
-                RAISE NOTICE 'Change col type: %', col_type;
-                -- update type
-                UPDATE pg_attribute
-                    SET
-                        atttypid = col_type_oid, attlen = col_type_len
-                    WHERE attrelid = tbl
-                        AND attname = col;
-            END IF;
-        ELSE
-            RAISE NOTICE 'Invalid col type: %', col_type;
-        END IF;
-    END IF;
-END;
-$$;

4dev/database/table/edit_access.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_access;
 CREATE TABLE edit_access (
-    edit_access_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_access_id SERIAL PRIMARY KEY,
     enabled SMALLINT NOT NULL DEFAULT 0,
     protected SMALLINT DEFAULT 0,
     deleted SMALLINT DEFAULT 0,

4dev/database/table/edit_access_data.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_access_data;
 CREATE TABLE edit_access_data (
-    edit_access_data_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_access_data_id SERIAL PRIMARY KEY,
     edit_access_id INT NOT NULL,
     FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
     enabled SMALLINT NOT NULL DEFAULT 0,

4dev/database/table/edit_access_right.sql

@@ -8,7 +8,7 @@
 
 -- DROP TABLE edit_access_right;
 CREATE TABLE edit_access_right (
-    edit_access_right_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_access_right_id SERIAL PRIMARY KEY,
     name VARCHAR,
     level SMALLINT,
     type VARCHAR,

4dev/database/table/edit_access_user.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_access_user;
 CREATE TABLE edit_access_user (
-    edit_access_user_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_access_user_id SERIAL PRIMARY KEY,
     edit_access_id INT NOT NULL,
     FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
     edit_user_id INT NOT NULL,

4dev/database/table/edit_group.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_group;
 CREATE TABLE edit_group (
-    edit_group_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_group_id SERIAL PRIMARY KEY,
     edit_scheme_id INT,
     FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
     edit_access_right_id INT NOT NULL,

4dev/database/table/edit_language.sql

@@ -8,7 +8,7 @@
 
 -- DROP TABLE edit_language;
 CREATE TABLE edit_language (
-    edit_language_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_language_id SERIAL PRIMARY KEY,
     enabled SMALLINT NOT NULL DEFAULT 0,
     lang_default SMALLINT NOT NULL DEFAULT 0,
     long_name VARCHAR,

4dev/database/table/edit_log.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_log;
 CREATE TABLE edit_log (
-    edit_log_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_log_id SERIAL PRIMARY KEY,
     euid INT, -- this is a foreign key, but I don't nedd to reference to it
     FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL,
     username VARCHAR,

4dev/database/table/edit_menu_group.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_menu_group;
 CREATE TABLE edit_menu_group (
-    edit_menu_group_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_menu_group_id SERIAL PRIMARY KEY,
     name VARCHAR,
     flag VARCHAR,
     order_number INT NOT NULL

4dev/database/table/edit_page.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_page;
 CREATE TABLE edit_page (
-    edit_page_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_page_id SERIAL PRIMARY KEY,
     content_alias_edit_page_id INT, -- alias for page content, if the page content is defined on a different page, ege for ajax backend pages
     FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
     filename VARCHAR,

4dev/database/table/edit_page_access.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_page_access;
 CREATE TABLE edit_page_access (
-    edit_page_access_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_page_access_id SERIAL PRIMARY KEY,
     edit_group_id INT NOT NULL,
     FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
     edit_page_id INT NOT NULL,

4dev/database/table/edit_page_content.sql

@@ -8,7 +8,7 @@
 
 -- DROP TABLE edit_page_content;
 CREATE TABLE edit_page_content (
-    edit_page_content_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_page_content_id SERIAL PRIMARY KEY,
     edit_page_id INT NOT NULL,
     FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
     edit_access_right_id INT NOT NULL,

4dev/database/table/edit_query_string.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_query_string;
 CREATE TABLE edit_query_string (
-    edit_query_string_id SERIAINT GENERATED ALWAYS AS IDENTITYL PRIMARY KEY,
+    edit_query_string_id SERIAL PRIMARY KEY,
     edit_page_id INT NOT NULL,
     FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
     enabled SMALLINT NOT NULL DEFAULT 0,

4dev/database/table/edit_scheme.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_scheme;
 CREATE TABLE edit_scheme (
-    edit_scheme_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_scheme_id SERIAL PRIMARY KEY,
     enabled SMALLINT NOT NULL DEFAULT 0,
     name VARCHAR,
     header_color VARCHAR,

4dev/database/table/edit_user.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_user;
 CREATE TABLE edit_user (
-    edit_user_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_user_id SERIAL PRIMARY KEY,
     connect_edit_user_id INT, -- possible reference to other user
     FOREIGN KEY (connect_edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
     edit_language_id INT NOT NULL,

4dev/database/table/edit_visible_group.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_visible_group;
 CREATE TABLE edit_visible_group (
-    edit_visible_group_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_visible_group_id SERIAL PRIMARY KEY,
     name VARCHAR,
     flag VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/tests/Convert/CoreLibsConvertMathTest.php

@@ -319,36 +319,6 @@ final class CoreLibsConvertMathTest extends TestCase
 					[6, 12, 18],
 				]
 			],
-			'inblanaced [2x2,3] x [3x2]' => [
-				'a' => [
-					[1, 2, 3],
-					[4, 5]
-				],
-				'b' => [
-					[6, 7],
-					[8, 9],
-					[10, 11]
-				],
-				'result' => [
-					[52, 58],
-					[64, 73],
-				]
-			],
-			'inblanaced [2x3] x [3x1,2]' => [
-				'a' => [
-					[1, 2, 3],
-					[4, 5, 7]
-				],
-				'b' => [
-					[7, 8],
-					[9, 10],
-					[11]
-				],
-				'result' => [
-					[58, 28],
-					[150, 82],
-				]
-			],
 		];
 	}
 

4dev/tests/Create/CoreLibsCreateUidsTest.php

@@ -121,7 +121,6 @@ final class CoreLibsCreateUidsTest extends TestCase
 	 * must match 7e78fe0d-59b8-4637-af7f-e88d221a7d1e
 	 *
 	 * @covers ::uuidv4
-	 * @covers ::validateUuidv4
 	 * @testdox uuidv4 check that return is matching regex [$_dataName]
 	 *
 	 * @return void
@@ -130,18 +129,13 @@ final class CoreLibsCreateUidsTest extends TestCase
 	{
 		$uuid = \CoreLibs\Create\Uids::uuidv4();
 		$this->assertMatchesRegularExpression(
-			'/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/',
-			$uuid,
-			'Failed regex check'
-		);
-		$this->assertTrue(
-			\CoreLibs\Create\Uids::validateUuuidv4($uuid),
-			'Failed validate regex method'
-		);
-		$this->assertFalse(
-			\CoreLibs\Create\Uids::validateUuuidv4('not-a-uuidv4'),
-			'Failed wrong uuid validated as true'
+			'/^[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}$/',
+			$uuid
 		);
+		// $this->assertStringMatchesFormat(
+		// 	'%4s%4s-%4s-%4s-%4s-%4s%4s%4s',
+		// 	$uuid
+		// );
 	}
 
 	/**

4dev/tests/DB/CoreLibsDBIOTest.php

@@ -37,9 +37,8 @@ namespace tests;
 
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
-use CoreLibs\Logging;
+use CoreLibs\Logging\Logger\Level;
 use CoreLibs\DB\Options\Convert;
-use CoreLibs\DB\Support\ConvertPlaceholder;
 
 /**
  * Test class for DB\IO + DB\SQL\PgSQL
@@ -118,7 +117,7 @@ final class CoreLibsDBIOTest extends TestCase
 			);
 		}
 		// define basic connection set valid and one invalid
-		self::$log = new Logging\Logging([
+		self::$log = new \CoreLibs\Logging\Logging([
 			// 'log_folder' => __DIR__ . DIRECTORY_SEPARATOR . 'log',
 			'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
 			'log_file_id' => 'CoreLibs-DB-IO-Test',
@@ -160,12 +159,15 @@ final class CoreLibsDBIOTest extends TestCase
 		// create the tables
 		$db->dbExec(
 			// primary key name is table + '_id'
-				// table_with_primary_key_id SERIAL PRIMARY KEY,
 			<<<SQL
 			CREATE TABLE table_with_primary_key (
-				table_with_primary_key_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+				table_with_primary_key_id SERIAL PRIMARY KEY,
 				$base_table
 			SQL
+			/* "CREATE TABLE table_with_primary_key ("
+			// primary key name is table + '_id'
+			. "table_with_primary_key_id SERIAL PRIMARY KEY, "
+			. $base_table */
 		);
 		$db->dbExec(
 			<<<SQL
@@ -568,11 +570,11 @@ final class CoreLibsDBIOTest extends TestCase
 		);
 		$db->dbClose();
 		// second conenction with log set NOT debug
-		$log = new Logging\Logging([
+		$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' => Logging\Logger\Level::Notice,
+			'log_level' => \CoreLibs\Logging\Logger\Level::Notice,
 		]);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config[$connection],
@@ -3291,7 +3293,6 @@ final class CoreLibsDBIOTest extends TestCase
 					'query' =>  'INSERT INTO table_with_primary_key (row_int, uid) '
 						. 'VALUES ($1, $2) RETURNING table_with_primary_key_id',
 					'returning_id' => true,
-					'placeholder_converted' => [],
 				],
 			],
 			// update
@@ -3326,7 +3327,6 @@ final class CoreLibsDBIOTest extends TestCase
 					'query' => 'UPDATE table_with_primary_key SET row_int = $1, '
 						. 'row_varchar = $2 WHERE uid = $3',
 					'returning_id' => false,
-					'placeholder_converted' => [],
 				],
 			],
 			// select
@@ -3356,7 +3356,6 @@ final class CoreLibsDBIOTest extends TestCase
 					'count' => 1,
 					'query' => 'SELECT row_int, uid FROM table_with_primary_key WHERE uid = $1',
 					'returning_id' => false,
-					'placeholder_converted' => [],
 				],
 			],
 			// any query but with no parameters
@@ -3389,7 +3388,6 @@ final class CoreLibsDBIOTest extends TestCase
 					'count' => 0,
 					'query' => 'SELECT row_int, uid FROM table_with_primary_key',
 					'returning_id' => false,
-					'placeholder_converted' => [],
 				],
 			],
 			// no statement name (25)
@@ -3413,7 +3411,6 @@ final class CoreLibsDBIOTest extends TestCase
 					'count' => 0,
 					'query' => '',
 					'returning_id' => false,
-					'placeholder_converted' => [],
 				],
 			],
 			// no query (prepare 11)
@@ -3438,7 +3435,6 @@ final class CoreLibsDBIOTest extends TestCase
 					'count' => 0,
 					'query' => '',
 					'returning_id' => false,
-					'placeholder_converted' => [],
 				],
 			],
 			// no db connection (prepare/execute 16)
@@ -3468,7 +3464,6 @@ final class CoreLibsDBIOTest extends TestCase
 					'count' => 0,
 					'query' => 'SELECT row_int, uid FROM table_with_primary_key',
 					'returning_id' => false,
-					'placeholder_converted' => [],
 				],
 			],
 			// prepare with different statement name
@@ -3494,7 +3489,6 @@ final class CoreLibsDBIOTest extends TestCase
 					'count' => 0,
 					'query' => 'SELECT row_int, uid FROM table_with_primary_key',
 					'returning_id' => false,
-					'placeholder_converted' => [],
 				],
 			],
 			// insert wrong data count compared to needed (execute 23)
@@ -3520,12 +3514,10 @@ final class CoreLibsDBIOTest extends TestCase
 					'query' => 'INSERT INTO table_with_primary_key (row_int, uid) VALUES '
 						. '($1, $2) RETURNING table_with_primary_key_id',
 					'returning_id' => true,
-					'placeholder_converted' => [],
 				],
 			],
 			// execute does not return a result (22)
 			// TODO execute does not return a result
-			// TODO prepared statement with placeholder params auto convert
 		];
 	}
 
@@ -3670,7 +3662,7 @@ final class CoreLibsDBIOTest extends TestCase
 			}
 
 			// check dbGetPrepareCursorValue
-			foreach (['pk_name', 'count', 'query', 'returning_id', 'placeholder_converted'] as $key) {
+			foreach (['pk_name', 'count', 'query', 'returning_id'] as $key) {
 				$this->assertEquals(
 					$prepare_cursor[$key],
 					$db->dbGetPrepareCursorValue($stm_name, $key),
@@ -5039,151 +5031,8 @@ final class CoreLibsDBIOTest extends TestCase
 		$db->dbClose();
 	}
 
-	// MARK: QUERY PLACEHOLDERS
+	// query placeholder convert
 
-	// test query placeholder detection for all possible sets
-	// ::dbPrepare
-
-	/**
-	 * placeholder sql
-	 *
-	 * @return array
-	 */
-	public function providerDbCountQueryParams(): array
-	{
-		return [
-			'one place holder' => [
-				'query' => 'SELECT row_varchar FROM table_with_primary_key WHERE row_varchar = $1',
-				'count' => 1,
-				'convert' => false,
-			],
-			'one place holder, json call' => [
-				'query' => "SELECT row_varchar FROM table_with_primary_key WHERE row_jsonb->>'data' = $1",
-				'count' => 1,
-				'convert' => false,
-			],
-			'one place holder, <> compare' => [
-				'query' => "SELECT row_varchar FROM table_with_primary_key WHERE row_varchar <> $1",
-				'count' => 1,
-				'convert' => false,
-			],
-			'one place holder, named' => [
-				'query' => "SELECT row_varchar FROM table_with_primary_key WHERE row_varchar <> :row_varchar",
-				'count' => 1,
-				'convert' => true,
-			],
-			'no replacement' => [
-				'query' => "SELECT row_varchar FROM table_with_primary_key WHERE row_varchar = '$1'",
-				'count' => 0,
-				'convert' => false,
-			],
-			'insert' => [
-				'query' => "INSERT INTO table_with_primary_key (row_varchar, row_jsonb, row_int) VALUES ($1, $2, $3)",
-				'count' => 3,
-				'convert' => false,
-			],
-			'update' => [
-				'query' => "UPDATE table_with_primary_key SET row_varchar = $1, row_jsonb = $2, row_int = $3 WHERE row_numeric = $4",
-				'count' => 4,
-				'convert' => false,
-			],
-			'multiple, multline' => [
-				'query' => <<<SQL
-				SELECT
-					row_varchar
-				FROM
-					table_with_primary_key
-				WHERE
-					row_varchar = $1 AND row_int = $2
-					AND row_numeric = ANY($3)
-				SQL,
-				'count' => 3,
-				'convert' => false,
-			],
-			'two digit numbers' => [
-				'query' => <<<SQL
-				INSERT INTO table_with_primary_key (
-					row_int, row_numeric, row_varchar, row_varchar_literal, row_json,
-					row_jsonb, row_bytea, row_timestamp, row_date, row_interval
-				) VALUES (
-					$1, $2, $3, $4, $5,
-					$6, $7, $8, $9, $10
-				)
-				SQL,
-				'count' => 10,
-				'convert' => false,
-			],
-			'things in brackets' => [
-				'query' => <<<SQL
-				SELECT row_varchar
-				FROM table_with_primary_key
-				WHERE
-					row_varchar = $1 AND
-					(row_int = ANY($2) OR row_int = $3)
-					AND row_varchar_literal = $4
-				SQL,
-				'count' => 4,
-				'convert' => false,
-			],
-			'number compare' => [
-				'query' => <<<SQL
-				SELECT row_varchar
-				FROM table_with_primary_key
-				WHERE
-					row_int >= $1 OR row_int <= $2 OR
-					row_int > $3 OR row_int < $4
-					OR row_int = $5 OR row_int <> $6
-				SQL,
-				'count' => 6,
-				'convert' => false,
-			]
-		];
-	}
-
-	/**
-	 * Placeholder check and convert tests
-	 *
-	 * @covers ::dbPrepare
-	 * @covers ::__dbCountQueryParams
-	 * @onvers ::convertPlaceholderInQuery
-	 * @dataProvider providerDbCountQueryParams
-	 * @testdox Query replacement count test [$_dataName]
-	 *
-	 * @param  string $query
-	 * @param  int    $count
-	 * @return void
-	 */
-	public function testDbCountQueryParams(string $query, int $count, bool $convert): void
-	{
-		$db = new \CoreLibs\DB\IO(
-			self::$db_config['valid'],
-			self::$log
-		);
-		$id = sha1($query);
-		$db->dbSetConvertPlaceholder($convert);
-		$db->dbPrepare($id, $query);
-		// print "\n**\n";
-		// print "PCount: " . $db->dbGetPrepareCursorValue($id, 'count') . "\n";
-		// print "\n**\n";
-		$this->assertEquals(
-			$count,
-			$db->dbGetPrepareCursorValue($id, 'count'),
-			'DB count params'
-		);
-		$placeholder = ConvertPlaceholder::convertPlaceholderInQuery($query, null, 'pg');
-		// print "RES: " . print_r($placeholder, true) . "\n";
-		$this->assertEquals(
-			$count,
-			$placeholder['needed'],
-			'convert params'
-		);
-	}
-
-	/**
-	 * query placeholder convert
-	 *
-	 * @return array
-	 */
 	public function queryPlaceholderReplaceProvider(): array
 	{
 		// 				WHERE row_varchar = $1
@@ -5227,9 +5076,7 @@ final class CoreLibsDBIOTest extends TestCase
 				WHERE row_varchar = $1
 				SQL,
 				'expected_params' => ['string a'],
-			],
-			// TODO: test with multiple entries
-			// TODO: test with same entry ($1, $1, :var, :var)
+			]
 		];
 	}
 
@@ -5331,8 +5178,6 @@ final class CoreLibsDBIOTest extends TestCase
 	// - data debug
 	//   dbDumpData
 
-	// MARK: ASYNC
-
 	// ASYNC at the end because it has 1s timeout
 	// - asynchronous executions
 	//   dbExecAsync, dbCheckAsync

4dev/tests/DB/CoreLibsDBSqLiteTest.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for DB\SqLite
+ * This will only test the SqLite parts
+ * @coversDefaultClass \CoreLibs\DB\SqLite
+ * @testdox \CoreLibs\SqLite method tests for extended DB interface
+ */
+final class CoreLibsDBESqLiteTest extends TestCase
+{
+	/**
+	 * Undocumented function
+	 *
+	 * @return void
+	 */
+	protected function setUp(): void
+	{
+		if (!extension_loaded('sqlite')) {
+			$this->markTestSkipped(
+				'The SqLite extension is not available.'
+			);
+		}
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @testdox DB\SqLite Class tests
+	 *
+	 * @return void
+	 */
+	public function testSqLite()
+	{
+		$this->markTestIncomplete(
+			'DB\SqLite Tests have not yet been implemented'
+		);
+	}
+}
+
+// __END__

composer.json

@@ -7,11 +7,11 @@
         "php": ">=8.3"
     },
     "require-dev": {
-        "phpstan/phpstan": "^2.0",
-        "phpstan/phpstan-deprecation-rules": "^2.0",
-        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^1.12",
         "phan/phan": "^5.4",
+        "phpstan/extension-installer": "^1.4",
         "phpunit/phpunit": "^9",
+        "phpstan/phpstan-deprecation-rules": "^1.2",
         "yamadashy/phpstan-friendly-formatter": "^1.1"
     },
     "config": {

phpstan.neon

@@ -2,7 +2,6 @@
 includes:
 	- phpstan-conditional.php
 	#- ./vendor/yamadashy/phpstan-friendly-formatter/extension.neon
-	# - phar://phpstan.phar/conf/bleedingEdge.neon
 parameters:
 	tmpDir: %currentWorkingDirectory%/tmp/phpstan-corelibs
 	#errorFormat: friendly

www/admin/class_test.array.php

@@ -115,6 +115,9 @@ print "ARRAYFLATFORKEY: " . DgS::printAr(ArrayHandler::arrayFlatForKey($test_arr
  */
 function rec(string $pre, string $cur, array $node = [])
 {
+	if (!is_array($node)) {
+		$node = [];
+	}
 	print "<div style='color: green;'>#### PRE: " . $pre . ", CUR: " . $cur . ", N-c: "
 		. count($node) . " [" . join('|', array_keys($node)) . "]</div>";
 	if (!$pre) {

www/admin/class_test.db.convert-placeholder.php

@@ -1,233 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-// turn on all error reporting
-error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', true);
-// sample config
-require 'config.php';
-// define log file id
-$LOG_FILE_ID = 'classTest-db-convert-placeholder';
-ob_end_flush();
-
-use CoreLibs\Debug\Support;
-use CoreLibs\DB\Support\ConvertPlaceholder;
-
-$log = new CoreLibs\Logging\Logging([
-	'log_folder' => BASE . LOG,
-	'log_file_id' => $LOG_FILE_ID,
-	'log_per_date' => true,
-]);
-
-
-$PAGE_NAME = 'TEST CLASS: DB CONVERT PLACEHOLDER';
-print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title></head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-print '<div><h1>' . $PAGE_NAME . '</h1></div>';
-
-print "LOGFILE NAME: " . $log->getLogFile() . "<br>";
-print "LOGFILE ID: " . $log->getLogFileId() . "<br>";
-
-print "Lookup Regex: <pre>" . ConvertPlaceholder::REGEX_LOOKUP_PLACEHOLDERS . "</pre>";
-print "Replace Named Regex: <pre>" . ConvertPlaceholder::REGEX_REPLACE_NAMED . "</pre>";
-print "Replace Named Regex: <pre>" . ConvertPlaceholder::REGEX_REPLACE_QUESTION_MARK . "</pre>";
-print "Replace Named Regex: <pre>" . ConvertPlaceholder::REGEX_REPLACE_NUMBERED . "</pre>";
-
-$uniqid = \CoreLibs\Create\Uids::uniqIdShort();
-// $binary_data = $db->dbEscapeBytea(file_get_contents('class_test.db.php') ?: '');
-// $binary_data = file_get_contents('class_test.db.php') ?: '';
-$binary_data = '';
-$params = [
-	$uniqid,
-	true,
-	'STRING A',
-	2,
-	2.5,
-	1,
-	date('H:m:s'),
-	date('Y-m-d H:i:s'),
-	json_encode(['a' => 'string', 'b' => 1, 'c' => 1.5, 'f' => true, 'g' => ['a', 1, 1.5]]),
-	null,
-	'{"a", "b"}',
-	'{1,2}',
-	'{"(array Text A, 5, 8.8)","(array Text B, 10, 15.2)"}',
-	'("Text", 4, 6.3)',
-	$binary_data
-];
-
-$query = <<<SQL
-INSERT INTO test_foo (
-	test, some_bool, string_a, number_a, number_a_numeric, smallint_a,
-	some_time, some_timestamp, json_string, null_var,
-	array_char_1, array_int_1,
-	array_composite,
-	composite_item,
-	some_binary
-) VALUES (
-	$1, $2, $3, $4, $5, $6,
-	$7, $8, $9, $10,
-	$11, $12,
-	$13,
-	$14,
-	$15
-)
-RETURNING
-	test_foo_id,
-	test, some_bool, string_a, number_a, number_a_numeric, smallint_a,
-	some_time, some_timestamp, json_string, null_var,
-	array_char_1, array_int_1,
-	array_composite,
-	composite_item,
-	some_binary
-SQL;
-
-print "[ALL] Convert: "
-	. Support::printAr(ConvertPlaceholder::convertPlaceholderInQuery($query, $params))
-	. "<br>";
-echo "<hr>";
-
-$query = "SELECT foo FROM bar WHERE baz = :baz AND buz = :baz AND biz = :biz AND boz = :bez";
-$params = [':baz' => 'SETBAZ', ':bez' => 'SETBEZ', ':biz' => 'SETBIZ'];
-print "[NO PARAMS] Convert: "
-	. Support::printAr(ConvertPlaceholder::convertPlaceholderInQuery($query, $params))
-	. "<br>";
-echo "<hr>";
-
-$query = "SELECT foo FROM bar WHERE baz = :baz AND buz = :baz AND biz = :biz AND boz = :bez";
-$params = null;
-print "[NO PARAMS] Convert: "
-	. Support::printAr(ConvertPlaceholder::convertPlaceholderInQuery($query, $params))
-	. "<br>";
-echo "<hr>";
-
-$query = "SELECT row_varchar FROM table_with_primary_key WHERE row_varchar <> :row_varchar";
-$params = null;
-print "[NO PARAMS] Convert: "
-	. Support::printAr(ConvertPlaceholder::convertPlaceholderInQuery($query, $params))
-	. "<br>";
-echo "<hr>";
-
-$query = "SELECT row_varchar, row_varchar_literal, row_int, row_date FROM table_with_primary_key";
-$params = null;
-print "[NO PARAMS] TEST: "
-	. Support::printAr(ConvertPlaceholder::convertPlaceholderInQuery($query, $params))
-	. "<br>";
-echo "<hr>";
-
-print "[P-CONV]: "
-	. Support::printAr(
-		ConvertPlaceholder::updateParamList([
-			'original' => [
-				'query' => 'SELECT foo FROM bar WHERE baz = :baz AND buz = :biz AND biz = :biz AND boz = :bez',
-				'params' => [':baz' => 'SETBAZ', ':bez' => 'SETBEZ', ':biz' => 'SETBIZ'],
-				'empty_params' => false,
-			],
-			'type' => 'named',
-			'found' => 3,
-			// 'matches' => [
-			// 	':baz'
-			// ],
-			// 'params_lookup' => [
-			// 	':baz' => '$1'
-			// ],
-			// 'query' => "SELECT foo FROM bar WHERE baz = $1",
-			// 'parms' => [
-			// 	'SETBAZ'
-			// ],
-		])
-	);
-
-echo "<hr>";
-
-// test connectors: = , <> () for query detection
-
-// convert placeholder tests
-// ? -> $n
-// :name -> $n
-
-// other way around (just visual)
-$test_queries = [
-	'skip' => [
-		'query' => <<<SQL
-SELECT test, string_a, number_a
-FROM test_foo
-SQL,
-		'params' => [],
-		'direction' => 'pg',
-	],
-	'numbers' => [
-		'query' => <<<SQL
-SELECT test, string_a, number_a
-FROM test_foo
-WHERE
-	foo = $1 AND bar = $1 AND foobar = $2
-SQL,
-		'params' => [\CoreLibs\Create\Uids::uniqIdShort(), 'string A-1', 1234],
-		'direction' => 'pdo',
-	],
-	'a?' => [
-		'query' => <<<SQL
-INSERT INTO test_foo (
-	test, string_a, number_a
-) VALUES (
-	?, ?, ?
-)
-SQL,
-		'params' => [\CoreLibs\Create\Uids::uniqIdShort(), 'string A-1', 1234],
-		'direction' => 'pg',
-	],
-	'b:' => [
-		'query' => <<<SQL
-INSERT INTO test_foo (
-	test, string_a, number_a
-) VALUES (
-	:test, :string_a, :number_a
-)
-SQL,
-		'params' => [
-			':test' => \CoreLibs\Create\Uids::uniqIdShort(),
-			':string_a' => 'string B-1',
-			':number_a' => 5678
-		],
-		'direction' => 'pg',
-	],
-	'select, compare $' => [
-		'query' => <<<SQL
-		SELECT row_varchar
-		FROM table_with_primary_key
-		WHERE
-			row_int >= $1 OR row_int <= $2 OR
-			row_int > $3 OR row_int < $4
-			OR row_int = $5 OR row_int <> $6
-		SQL,
-		'params' => null,
-		'direction' => 'pg'
-	]
-];
-
-
-foreach ($test_queries as $info => $data) {
-	$query = $data['query'];
-	$params = $data['params'];
-	$direction = $data['direction'];
-	print "[$info] Convert: "
-		. Support::printAr(ConvertPlaceholder::convertPlaceholderInQuery($query, $params, $direction))
-		. "<br>";
-	echo "<hr>";
-}
-
-print "</body></html>";
-$log->debug('DEBUGEND', '==================================== [END]');
-
-// __END__

www/admin/class_test.db.dbReturn.php

@@ -70,7 +70,8 @@ for ($i = 1; $i <= 6; $i++) {
 	print $i . ") " . $cache_flag . ": "
 		. "res: " . (is_bool($res) ?
 			"<b>Bool:</b> " . Support::prBl($res) :
-			"Array: Yes"
+			(is_array($res) ?
+				"Array: " . Support::prBl(is_array($res)) : '{-}')
 		) . ", "
 		. "cursor_ext: <pre>" . Support::printAr(
 			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))
@@ -88,7 +89,8 @@ for ($i = 1; $i <= 6; $i++) {
 	print $i . ") " . $cache_flag . ": "
 		. "res: " . (is_bool($res) ?
 			"<b>Bool:</b> " . Support::prBl($res) :
-			"Array: Yes"
+			(is_array($res) ?
+				"Array: " . Support::prBl(is_array($res)) : '{-}')
 		) . ", "
 		. "cursor_ext: <pre>" . Support::printAr(
 			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))
@@ -106,7 +108,8 @@ for ($i = 1; $i <= 6; $i++) {
 	print $i . ") " . $cache_flag . ": "
 		. "res: " . (is_bool($res) ?
 			"<b>Bool:</b> " . Support::prBl($res) :
-			"Array: Yes"
+			(is_array($res) ?
+				"Array: " . Support::prBl(is_array($res)) : '{-}')
 		) . ", "
 		. "cursor_ext: <pre>" . Support::printAr(
 			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))
@@ -124,7 +127,8 @@ for ($i = 1; $i <= 6; $i++) {
 	print $i . ") " . $cache_flag . ": "
 		. "res: " . (is_bool($res) ?
 			"<b>Bool:</b> " . Support::prBl($res) :
-			"Array: Yes"
+			(is_array($res) ?
+				"Array: " . Support::prBl(is_array($res)) : '{-}')
 		) . ", "
 		. "cursor_ext: <pre>" . Support::printAr(
 			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))
@@ -142,7 +146,8 @@ for ($i = 1; $i <= 6; $i++) {
 	print $i . ") " . $cache_flag . ": "
 		. "res: " . (is_bool($res) ?
 			"<b>Bool:</b> " . Support::prBl($res) :
-			"Array: Yes"
+			(is_array($res) ?
+				"Array: " . Support::prBl(is_array($res)) : '{-}')
 		) . ", "
 		. "cursor_ext: <pre>" . Support::printAr(
 			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))

www/admin/class_test.db.php

@@ -239,7 +239,7 @@ print "PREPARE INSERT PREVIOUS INSERTED: "
 
 print "PREPARE CURSOR RETURN:<br>";
 foreach (['pk_name', 'count', 'query', 'returning_id'] as $key) {
-	print "KEY: " . $key . ': ' . Support::prAr($db->dbGetPrepareCursorValue('ins_test_foo', $key)) . "<br>";
+	print "KEY: " . $key . ': ' . $db->dbGetPrepareCursorValue('ins_test_foo', $key) . "<br>";
 }
 
 $query = <<<SQL
@@ -316,8 +316,7 @@ print "EOM STRING EXEC RETURN TEST: " . print_r(
 	$db->dbReturnRowParams(
 		$query_select,
 		[$__last_insert_id]
-	),
-	true
+	)
 ) . "<br>";
 // B
 $status = $db->dbExecParams(
@@ -346,8 +345,7 @@ print "EOM STRING EXEC RETURN TEST: " . print_r(
 	$db->dbReturnRowParams(
 		$query_select,
 		[$__last_insert_id]
-	),
-	true
+	)
 ) . "<br>";
 // params > 10 for debug
 // error catcher
@@ -676,7 +674,7 @@ echo "<hr>";
 
 print "COMPOSITE ELEMENT READ<br>";
 $res = $db->dbReturnRow("SELECT item, count, (item).name, (item).price, (item).supplier_id FROM on_hand");
-print "ROW: <pre>" . print_r($res, true) . "</pre>";
+print "ROW: <pre>" . print_r($res) . "</pre>";
 var_dump($res);
 print "Field Name/Types: <pre>" . print_r($db->dbGetFieldNameTypes(), true) . "</pre>";
 echo "<hr>";

www/admin/class_test.db.sqlite.php

@@ -0,0 +1,157 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+// turn on all error reporting
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', true);
+define('DATABASE', 'sqlite' . DIRECTORY_SEPARATOR);
+// sample config
+require 'config.php';
+// define log file id
+$LOG_FILE_ID = 'classTest-db';
+ob_end_flush();
+
+$sql_file = BASE . MEDIA . DATABASE . "class_test.db.sqlite.sq3";
+
+use CoreLibs\DB\SqLite;
+use CoreLibs\Debug\Support;
+use CoreLibs\Convert\SetVarType;
+
+$log = new CoreLibs\Logging\Logging([
+	'log_folder' => BASE . LOG,
+	'log_file_id' => $LOG_FILE_ID,
+	'log_per_date' => true,
+]);
+// db connection and attach logger
+$db = new CoreLibs\DB\SqLite($log, "sqlite:" . $sql_file);
+$db->log->debug('START', '=============================>');
+
+$PAGE_NAME = 'TEST CLASS: DB: SqLite';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+print "<hr>";
+
+echo "Create Tables on demand<br>";
+
+$query = <<<SQL
+CREATE TABLE IF NOT EXISTS test (
+	test_id INTEGER PRIMARY KEY,
+	c_text TEXT,
+	c_integer INTEGER,
+	c_integer_default INTEGER DEFAULT -1,
+	c_bool BOOLEAN,
+	c_datetime TEXT,
+	c_datetime_microseconds TEXT,
+	c_datetime_default TEXT DEFAULT CURRENT_TIMESTAMP,
+	c_date TEXT,
+	c_julian REAL,
+	c_unixtime DATETIME,
+	c_unixtime_alt DATETIME,
+	c_numeric NUMERIC,
+	c_real REAL,
+	c_blob
+)
+SQL;
+$db->dbExec($query);
+// **********************
+$query = <<<SQL
+CREATE TABLE IF NOT EXISTS test_no_pk (
+	c_text TEXT,
+	c_integer INTEGER
+)
+SQL;
+$db->dbExec($query);
+
+print "<hr>";
+
+$table = 'test';
+echo "Table info for: " . $table . "<br>";
+
+if (($table_info = $db->dbShowTableMetaData($table)) === false) {
+	print "Read problem for: $table<br>";
+} else {
+	print "TABLE INFO: <pre>" . print_r($table_info, true) . "</pre><br>";
+}
+
+print "<hr>";
+
+echo "Insert into 'test'<br>";
+
+$query = <<<SQL
+INSERT INTO test (
+	c_text, c_integer, c_bool,
+	c_datetime, c_datetime_microseconds, c_date,
+	c_julian, c_unixtime, c_unixtime_alt,
+	c_numeric, c_real, c_blob
+) VALUES (
+	?, ?, ?,
+	?, ?, ?,
+	julianday(?), ?, unixepoch(?),
+	?, ?, ?
+)
+SQL;
+$db->dbExecParams($query, [
+	'test', rand(1, 100), true,
+	date('Y-m-d H:i:s'), date_format(date_create("now"), 'Y-m-d H:i:s.u'), date('Y-m-d'),
+	// julianday pass through
+	date('Y-m-d H:i:s'),
+	// use "U" if no unixepoch in query
+	date('U'), date('Y-m-d H:i:s'),
+	1.5, 10.5, 'Anything'
+]);
+
+print "<hr>";
+
+echo "Insert into 'test_no_pk'<br>";
+
+$query = <<<SQL
+INSERT INTO test_no_pk (
+	c_text, c_integer
+) VALUES (
+	?, ?
+)
+SQL;
+$db->dbExecParams($query, ['test no pk', rand(100, 200)]);
+
+print "<hr>";
+
+$query = <<<SQL
+SELECT test_id, c_text, c_integer, c_integer_default, c_datetime_default
+FROM test
+SQL;
+while (is_array($row = $db->dbReturnArray($query))) {
+	print "ROW: PK(test_id): " . $row["test_id"]
+		. ", Text: " . $row["c_text"] . ", Int: " . $row["c_integer"]
+		. ", Int Default: " . $row["c_integer_default"]
+		. ", Date Default: " . $row["c_datetime_default"]
+		. "<br>";
+}
+
+echo "<hr>";
+
+$query = <<<SQL
+SELECT rowid, c_text, c_integer
+FROM test_no_pk
+SQL;
+
+while (is_array($row = $db->dbReturnArray($query))) {
+	print "ROW[CURSOR]: PK(rowid): " . $row["rowid"]
+		. ", Text: " . $row["c_text"] . ", Int: " . $row["c_integer"]
+		. "<br>";
+}
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.php

@@ -73,7 +73,7 @@ $test_files = [
 	'class_test.db.query-placeholder.php' => 'Class Test: DB query placeholder convert',
 	'class_test.db.dbReturn.php' => 'Class Test: DB dbReturn',
 	'class_test.db.single.php' => 'Class Test: DB single query tests',
-	'class_test.db.convert-placeholder.php' => 'Class Test: DB convert placeholder',
+	'class_test.db.sqlite.php' => 'Class Test: DB: SqLite',
 	'class_test.convert.colors.php' => 'Class Test: CONVERT COLORS',
 	'class_test.check.colors.php' => 'Class Test: CHECK COLORS',
 	'class_test.mime.php' => 'Class Test: MIME',

www/admin/class_test.uids.php

@@ -52,14 +52,6 @@ print "S:UNIQID (512): " . Uids::uniqId(512) . "<br>";
 // uniq ids
 print "UNIQU ID SHORT : " . Uids::uniqIdShort() . "<br>";
 print "UNIQU ID LONG : " . Uids::uniqIdLong() . "<br>";
-// validate
-$uuidv4 = Uids::uuidv4();
-if (!Uids::validateUuuidv4($uuidv4)) {
-	print "Invalid UUIDv4: " . $uuidv4 . "<br>";
-}
-if (!Uids::validateUuuidv4("foobar")) {
-	print "Invalid UUIDv4: hard coded<Br>";
-}
 
 // DEPRECATED
 /* print "D/UUIDV4: ".$basic->uuidv4()."<br>";

www/includes/edit_base.php

@@ -24,7 +24,7 @@
 declare(strict_types=1);
 
 ob_start();
-require getcwd() . DIRECTORY_SEPARATOR . 'config.php';
+require 'config.php';
 
 // should be utf8
 header("Content-type: text/html; charset=" . DEFAULT_ENCODING);

www/lib/CoreLibs/ACL/Login.php

@@ -960,7 +960,10 @@ class Login
 					. "AND ear.edit_access_right_id = epa.edit_access_right_id "
 					. "AND epa.enabled = 1 AND epa.edit_group_id = " . $res["edit_group_id"] . " "
 					. "ORDER BY ep.order_number";
-				while (is_array($res = $this->db->dbReturn($q))) {
+				while ($res = $this->db->dbReturn($q)) {
+					if (!is_array($res)) {
+						break;
+					}
 					// page id array for sub data readout
 					$edit_page_ids[$res['edit_page_id']] = $res['cuid'];
 					// create the array for pages
@@ -1300,9 +1303,11 @@ class Login
 	{
 		$is_valid_password = true;
 		// check for valid in regex arrays in list
-		foreach ($this->password_valid_chars as $password_valid_chars) {
-			if (!preg_match("/$password_valid_chars/", $password)) {
-				$is_valid_password = false;
+		if (is_array($this->password_valid_chars)) {
+			foreach ($this->password_valid_chars as $password_valid_chars) {
+				if (!preg_match("/$password_valid_chars/", $password)) {
+					$is_valid_password = false;
+				}
 			}
 		}
 		// check for min length

www/lib/CoreLibs/Admin/Backend.php

@@ -425,7 +425,10 @@ class Backend
 		?string $set_content_path = null,
 		int $flag = 0,
 	): array {
-		if ($set_content_path === null) {
+		if (
+			$set_content_path === null ||
+			!is_string($set_content_path)
+		) {
 			/** @deprecated adbTopMenu missing set_content_path parameter */
 			trigger_error(
 				'Calling adbTopMenu without set_content_path parameter is deprecated',

www/lib/CoreLibs/Check/Colors.php

@@ -119,13 +119,6 @@ class Colors
 
 	/**
 	 * check if html/css color string is valid
-	 *
-	 * TODO: update check for correct validate values
-	 * - space instead of ","
-	 * - / opcatiy checks
-	 * - loose numeric values
-	 * - lab/lch,oklab/oklch validation too
-	 *
 	 * @param string $color A color string of any format
 	 * @param int $flags    defaults to ALL, else use | to combined from
 	 *                      HEX_RGB, HEX_RGBA, RGB, RGBA, HSL, HSLA
@@ -175,9 +168,9 @@ class Colors
 		if (preg_match("/$regex/", $color)) {
 			// if valid regex, we now need to check if the content is actually valid
 			// only for rgb/hsl type
-			/** @var int<0, max>|false */
+			/** @var int|false */
 			$rgb_flag = strpos($color, 'rgb');
-			/** @var int<0, max>|false */
+			/** @var int|false */
 			$hsl_flag = strpos($color, 'hsl');
 			// if both not match, return true
 			if (

www/lib/CoreLibs/Convert/Color/CieXyz.php

@@ -246,7 +246,7 @@ class CieXyz
 			self::convertArray(array_map(
 				fn ($k, $v) => $v * $d50[$k],
 				array_keys($xyz),
-				$xyz,
+				array_values($xyz),
 			)),
 			options: ["whitepoint" => 'D50']
 		);

www/lib/CoreLibs/Convert/Color/Coordinates/HSB.php

@@ -26,7 +26,7 @@ class HSB implements Interface\CoordinatesInterface
 	private float $B = 0.0;
 
 	/** @var string color space: either ok or cie */
-	private string $colorspace = ''; /** @phpstan-ignore-line */
+	private string $colorspace = '';
 
 	/**
 	 * HSB (HSV) color coordinates

www/lib/CoreLibs/Convert/Color/Coordinates/HSL.php

@@ -25,7 +25,7 @@ class HSL implements Interface\CoordinatesInterface
 	/** @var float lightness (luminance) */
 	private float $L = 0.0;
 
-	/** @var string color space: either sRGB */
+	/** @var string color space: either ok or cie */
 	private string $colorspace = '';
 
 	/**

www/lib/CoreLibs/Convert/Math.php

@@ -158,8 +158,6 @@ class Math
 	 *   [0, 0, 0] <- automatically added
 	 * ]
 	 *
-	 * The same is done for unbalanced entries, they are filled with 0
-	 *
 	 * @param  array<float|int|array<int|float>> $a m x n matrice
 	 * @param  array<float|int|array<int|float>> $b n x p matrice
 	 *
@@ -188,7 +186,7 @@ class Math
 		// so that we can multiply row by row
 		$bCols = array_map(
 			callback: fn ($k) => array_map(
-				(fn ($i) => is_array($i) ? $i[$k] ?? 0 : 0),
+				(fn ($i) => is_array($i) ? $i[$k] : 0),
 				$b,
 			),
 			array: array_keys($b[0]),

www/lib/CoreLibs/Create/Uids.php

@@ -38,7 +38,7 @@ class Uids
 			$uniqid_length++;
 		}
 		/** @var int<1,max> make sure that internal this is correct */
-		$random_bytes_length = (int)(($uniqid_length - ($uniqid_length % 2)) / 2);
+		$random_bytes_length = ($uniqid_length - ($uniqid_length % 2)) / 2;
 		$uniqid = bin2hex(random_bytes($random_bytes_length));
 		// if not forced shorten return next lower length
 		if (!$force_length) {
@@ -56,6 +56,26 @@ class Uids
 	 */
 	public static function uuidv4(): string
 	{
+		/* return sprintf(
+			'%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+			// 32 bits for "time_low"
+			mt_rand(0, 0xffff),
+			mt_rand(0, 0xffff),
+			// 16 bits for "time_mid"
+			mt_rand(0, 0xffff),
+			// 16 bits for "time_hi_and_version",
+			// four most significant bits holds version number 4
+			mt_rand(0, 0x0fff) | 0x4000,
+			// 16 bits, 8 bits for "clk_seq_hi_res",
+			// 8 bits for "clk_seq_low",
+			// two most significant bits holds zero and one for variant DCE1.1
+			mt_rand(0, 0x3fff) | 0x8000,
+			// 48 bits for "node"
+			mt_rand(0, 0xffff),
+			mt_rand(0, 0xffff),
+			mt_rand(0, 0xffff)
+		); */
+
 		$data = random_bytes(16);
 		assert(strlen($data) == 16);
 
@@ -73,20 +93,6 @@ class Uids
 		return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
 	}
 
-	/**
-	 * regex validate uuid v4
-	 *
-	 * @param  string $uuidv4
-	 * @return bool
-	 */
-	public static function validateUuuidv4(string $uuidv4): bool
-	{
-		if (!preg_match("/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/", $uuidv4)) {
-			return false;
-		}
-		return true;
-	}
-
 	/**
 	 * creates a uniq id based on lengths
 	 *

www/lib/CoreLibs/DB/Extended/ArrayIO.php

@@ -374,7 +374,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	public function dbDelete(array $table_array = [], bool $acl_limit = false): array
 	{
 		// is array and has values, override set and set new
-		if (count($table_array)) {
+		if (is_array($table_array) && count($table_array)) {
 			$this->table_array = $table_array;
 		}
 		if (!$this->dbCheckPkSet()) {
@@ -440,7 +440,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	public function dbRead(bool $edit = false, array $table_array = []): array
 	{
 		// if array give, overrules internal array
-		if (count($table_array)) {
+		if (is_array($table_array) && count($table_array)) {
 			$this->table_array = $table_array;
 		}
 		if (!$this->dbCheckPkSet()) {

www/lib/CoreLibs/DB/IO.php

@@ -284,8 +284,7 @@ class IO
 	public const ERROR_HASH_TYPE = 'adler32';
 	/** @var string regex to get returning with matches at position 1 */
 	public const REGEX_RETURNING = '/\s+returning\s+(.+\s*(?:.+\s*)+);?$/i';
-	/** @var array<string> allowed convert target for placeholder:
-	 * pg or pdo (currently not available) */
+	/** @var array<string> allowed convert target for placeholder: pg or pdo (currently not available) */
 	public const DB_CONVERT_PLACEHOLDER_TARGET = ['pg'];
 	// REGEX_SELECT
 	// REGEX_UPDATE
@@ -915,7 +914,7 @@ class IO
 		if ($cursor !== false) {
 			[$db_prefix, $db_error_string] = $this->db_functions->__dbPrintError($cursor);
 		}
-		if ($cursor === false && method_exists($this->db_functions, '__dbPrintError')) { /** @phpstan-ignore-line */
+		if ($cursor === false && method_exists($this->db_functions, '__dbPrintError')) {
 			[$db_prefix, $db_error_string] = $this->db_functions->__dbPrintError();
 		}
 		// prefix the master if not the same
@@ -1312,14 +1311,33 @@ class IO
 	}
 
 	/**
-	 * count placeholder entries in the query
+	 * count $ leading parameters only
 	 *
 	 * @param  string $query Query to check
 	 * @return int           Number of parameters found
 	 */
 	private function __dbCountQueryParams(string $query): int
 	{
-		return $this->db_functions->__dbCountQueryParams($query);
+		$match = [];
+		// regex for params: only stand alone $number allowed
+		// exclude all '' enclosed strings, ignore all numbers [note must start with digit]
+		// can have space/tab/new line
+		// must have <> = , ( [not equal, equal, comma, opening round bracket]
+		// can have space/tab/new line
+		// $ number with 1-9 for first and 0-9 for further digits
+		// /s for matching new line in . list
+		// [disabled, we don't used ^ or $] /m for multi line match
+		// Matches in 1:, must be array_filtered to remove empty, count with array_unique
+		$query_split = '[(=,?-]|->|->>|#>|#>>|@>|<@|\?\|\?\&|\|\||#-';
+		preg_match_all(
+			'/'
+			. '(?:\'.*?\')?\s*(?:\?\?|<>|' . $query_split . ')\s*'
+			. '(?:\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))'
+			. '/s',
+			$query,
+			$match
+		);
+		return count(array_unique(array_filter($match[1])));
 	}
 
 	/**
@@ -1719,7 +1737,7 @@ class IO
 	{
 		if (
 			!empty($this->dbh) &&
-			$this->dbh instanceof \PgSql\Connection /** @phpstan-ignore-line future could be other */
+			$this->dbh instanceof \PgSql\Connection
 		) {
 			// reset any client encodings set
 			$this->dbResetEncoding();
@@ -3142,8 +3160,7 @@ class IO
 				'count' => 0,
 				'query' => '',
 				'result' =>  null,
-				'returning_id' => false,
-				'placeholder_converted' => [],
+				'returning_id' => false
 			];
 			// if this is an insert query, check if we can add a return
 			if ($this->dbCheckQueryForInsert($query, true)) {
@@ -3183,39 +3200,6 @@ class IO
 					$this->prepare_cursor[$stm_name]['pk_name'] = $pk_name;
 				}
 			}
-			// QUERY PARAMS: run query params check and rewrite
-			if ($this->dbGetConvertPlaceholder() === true) {
-				try {
-					$this->placeholder_converted = ConvertPlaceholder::convertPlaceholderInQuery(
-						$query,
-						null,
-						$this->dbGetConvertPlaceholderTarget()
-					);
-					// write the new queries over the old
-					if (!empty($this->placeholder_converted['query'])) {
-						$query = $this->placeholder_converted['query'];
-					}
-					$this->prepare_cursor[$stm_name]['placeholder_converted'] = $this->placeholder_converted;
-				} catch (\OutOfRangeException $e) {
-					$this->__dbError($e->getCode(), context:[
-						'statement_name' => $stm_name,
-						'query' => $query,
-						'location' => 'dbPrepare',
-						'error' => 'OutOfRangeException',
-						'exception' => $e
-					]);
-					return false;
-				} catch (\RuntimeException $e) {
-					$this->__dbError($e->getCode(), context:[
-						'statement_name' => $stm_name,
-						'query' => $query,
-						'location' => 'dbPrepare',
-						'error' => 'RuntimeException',
-						'exception' => $e
-					]);
-					return false;
-				}
-			}
 			// check prepared curser parameter count
 			$this->prepare_cursor[$stm_name]['count'] = $this->__dbCountQueryParams($query);
 			$this->prepare_cursor[$stm_name]['query'] = $query;
@@ -3751,7 +3735,7 @@ class IO
 	}
 
 	/**
-	 * convert db values (set) to php matching types
+	 * convert db values (set)
 	 *
 	 * @param  Convert $convert
 	 * @return void
@@ -3762,7 +3746,7 @@ class IO
 	}
 
 	/**
-	 * unsert convert db values flag for converting db to php matching types
+	 * unsert convert db values flag
 	 *
 	 * @param  Convert $convert
 	 * @return void
@@ -3773,7 +3757,7 @@ class IO
 	}
 
 	/**
-	 * Reset to original config file set for converting db to php matching type
+	 * Reset to origincal config file set
 	 *
 	 * @return void
 	 */
@@ -3785,7 +3769,7 @@ class IO
 	}
 
 	/**
-	 * check if a convert flag is set for converting db to php matching type
+	 * check if a conert flag is set
 	 *
 	 * @param  Convert $convert
 	 * @return bool
@@ -3799,7 +3783,7 @@ class IO
 	}
 
 	/**
-	 * Set if we want to auto convert to PDO/\Pg placeholders
+	 * Set if we want to auto convert PDO/\Pg placeholders
 	 *
 	 * @param  bool $flag
 	 * @return void
@@ -4310,7 +4294,7 @@ class IO
 	 * @param string $stm_name  The name of the stored statement
 	 * @param string $key       Key field name in prepared cursor array
 	 *                          Allowed are: pk_name, count, query, returning_id
-	 * @return null|string|int|bool|array<string,mixed> Entry from each of the valid keys
+	 * @return null|string|int|bool Entry from each of the valid keys
 	 *                          Will return false on error
 	 *                          Not ethat returnin_id also can return false
 	 *                          but will not set an error entry
@@ -4318,7 +4302,7 @@ class IO
 	public function dbGetPrepareCursorValue(
 		string $stm_name,
 		string $key
-	): null|string|int|bool|array {
+	): null|string|int|bool {
 		// if no statement name
 		if (empty($stm_name)) {
 			$this->__dbError(
@@ -4329,7 +4313,7 @@ class IO
 			return false;
 		}
 		// if not a valid key
-		if (!in_array($key, ['pk_name', 'count', 'query', 'returning_id', 'placeholder_converted'])) {
+		if (!in_array($key, ['pk_name', 'count', 'query', 'returning_id'])) {
 			$this->__dbError(
 				102,
 				false,

www/lib/CoreLibs/DB/Interface/DatabaseInterface.php

@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * AUTHOR: Clemens Schwaighofer
+ * CREATED: Ymd
+ * DESCRIPTION:
+ * DescriptionHere
+*/
+
+declare(strict_types=1);
+
+namespace CoreLibs\DB\Interface;
+
+interface DatabaseInterface
+{
+	/**
+	 * Table meta data
+	 * Note that if columns have multi
+	 *
+	 * @param  string      $table
+	 * @return array<array<string,mixed>>|false
+	 */
+	public function dbShowTableMetaData(string $table): array|false;
+
+	/**
+	 * for reading or simple execution, no return data
+	 *
+	 * @param  string    $query
+	 * @return int|false
+	 */
+	public function dbExec(string $query): int|false;
+
+	/**
+	 * Run a simple query and return its statement
+	 *
+	 * @param  string              $query
+	 * @return \PDOStatement|false
+	 */
+	public function dbQuery(string $query): \PDOStatement|false;
+
+	/**
+	 * Execute one query with params
+	 *
+	 * @param  string       $query
+	 * @param  array<mixed> $params
+	 * @return \PDOStatement|false
+	 */
+	public function dbExecParams(string $query, array $params): \PDOStatement|false;
+
+	/**
+	 * Prepare query
+	 *
+	 * @param  string              $query
+	 * @return \PDOStatement|false
+	 */
+	public function dbPrepare(string $query): \PDOStatement|false;
+
+	/**
+	 * execute a cursor
+	 *
+	 * @param  \PDOStatement $cursor
+	 * @param  array<mixed>  $params
+	 * @return bool
+	 */
+	public function dbCursorExecute(\PDOStatement $cursor, array $params): bool;
+
+	/**
+	 * return array with data, when finshed return false
+	 * also returns false on error
+	 *
+	 * TODO: This is currently a one time run
+	 * if the same query needs to be run again, the cursor_ext must be reest
+	 * with dbCacheReset
+	 *
+	 * @param  string             $query
+	 * @param  array<mixed>       $params
+	 * @return array<mixed>|false
+	 */
+	public function dbReturnArray(string $query, array $params = []): array|false;
+
+	/**
+	 * get current db handler
+	 * this is for raw access
+	 *
+	 * @return \PDO
+	 */
+	public function getDbh(): \PDO;
+}
+
+// __END__

www/lib/CoreLibs/DB/SQL/Interface/SqlFunctions.php

@@ -285,22 +285,6 @@ interface SqlFunctions
 	 */
 	public function __dbConnectionBusySocketWait(int $timeout_seconds = 3): bool;
 
-	/**
-	 * Undocumented function
-	 *
-	 * @param  string $parameter
-	 * @param  bool   $strip
-	 * @return string
-	 */
-	public function __dbVersionInfo(string $parameter, bool $strip = true): string;
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array<mixed>
-	 */
-	public function __dbVersionInfoParameterList(): array;
-
 	/**
 	 * Undocumented function
 	 *
@@ -308,13 +292,6 @@ interface SqlFunctions
 	 */
 	public function __dbVersion(): string;
 
-	/**
-	 * Undocumented function
-	 *
-	 * @return int
-	 */
-	public function __dbVersionNumeric(): int;
-
 	/**
 	 * Undocumented function
 	 *
@@ -329,14 +306,6 @@ interface SqlFunctions
 		?int &$end = null
 	): ?array;
 
-	/**
-	 * Undocumented function
-	 *
-	 * @param  string      $parameter
-	 * @return string|bool
-	 */
-	public function __dbParameter(string $parameter): string|bool;
-
 	/**
 	 * Undocumented function
 	 *
@@ -374,14 +343,6 @@ interface SqlFunctions
 	 * @return string
 	 */
 	public function __dbGetEncoding(): string;
-
-	/**
-	 * Undocumented function
-	 *
-	 * @param  string $query
-	 * @return int
-	 */
-	public function __dbCountQueryParams(string $query): int;
 }
 
 // __END__

www/lib/CoreLibs/DB/SQL/PgSQL.php

@@ -51,8 +51,6 @@ declare(strict_types=1);
 
 namespace CoreLibs\DB\SQL;
 
-use CoreLibs\DB\Support\ConvertPlaceholder;
-
 // below no ignore is needed if we want to use PgSql interface checks with PHP 8.0
 // as main system. Currently all @var sets are written as object
 /** @#phan-file-suppress PhanUndeclaredTypeProperty,PhanUndeclaredTypeParameter,PhanUndeclaredTypeReturnType */
@@ -104,7 +102,7 @@ class PgSQL implements Interface\SqlFunctions
 	 * SELECT foo FROM bar WHERE foobar = $1
 	 *
 	 * @param  string       $query  Query string with placeholders $1, ..
-	 * @param  array<mixed> $params Matching parameters for each placeholder
+	 * @param  array<mixed> $params Matching parameters for each placerhold
 	 * @return \PgSql\Result|false Query result
 	 */
 	public function __dbQueryParams(string $query, array $params): \PgSql\Result|false
@@ -142,7 +140,7 @@ class PgSQL implements Interface\SqlFunctions
 	 * sends an async query to the server with params
 	 *
 	 * @param  string       $query  Query string with placeholders $1, ..
-	 * @param  array<mixed> $params Matching parameters for each placeholder
+	 * @param  array<mixed> $params Matching parameters for each placerhold
 	 * @return bool         true/false Query sent successful status
 	 */
 	public function __dbSendQueryParams(string $query, array $params): bool
@@ -407,13 +405,17 @@ class PgSQL implements Interface\SqlFunctions
 			}
 			// no PK name given at all
 			if (empty($pk_name)) {
+				// if name is plurar, make it singular
+				// if (preg_match("/.*s$/i", $table))
+				// 	$table = substr($table, 0, -1);
 				// set pk_name to "id"
 				$pk_name = $table . "_id";
 			}
-			$q = "SELECT CURRVAL(pg_get_serial_sequence($1, $2)) AS insert_id";
+			$seq = ($schema ? $schema . '.' : '') . $table . "_" . $pk_name . "_seq";
+			$q = "SELECT CURRVAL('$seq') AS insert_id";
 			// I have to do manually or I overwrite the original insert internal vars ...
-			if ($cursor = $this->__dbQueryParams($q, [$table, $pk_name])) {
-				if (is_array($res = $this->__dbFetchArray($cursor))) {
+			if ($q = $this->__dbQuery($q)) {
+				if (is_array($res = $this->__dbFetchArray($q))) {
 					list($id) = $res;
 				} else {
 					return false;
@@ -447,36 +449,26 @@ class PgSQL implements Interface\SqlFunctions
 					$table_prefix = $schema . '.';
 				}
 			}
-			$params = [$table_prefix . $table];
-			$replace = ['', ''];
 			// read from table the PK name
 			// faster primary key get
-			$q = <<<SQL
-			SELECT
-				pg_attribute.attname AS column_name,
-				format_type(pg_attribute.atttypid, pg_attribute.atttypmod) AS type
-			FROM pg_index, pg_class, pg_attribute{PG_NAMESPACE}
-			WHERE
-				-- regclass translates the OID to the name
-				pg_class.oid = $1::regclass AND
-				indrelid = pg_class.oid AND
-				pg_attribute.attrelid = pg_class.oid AND
-				pg_attribute.attnum = any(pg_index.indkey) AND
-				indisprimary
-				{NSPNAME}
-			SQL;
+			$q = "SELECT pg_attribute.attname AS column_name, "
+				. "format_type(pg_attribute.atttypid, pg_attribute.atttypmod) AS type "
+				. "FROM pg_index, pg_class, pg_attribute ";
 			if ($schema) {
-				$params[] = $schema;
-				$replace = [
-					", pg_namespace",
-					"AND pg_class.relnamespace = pg_namespace.oid AND nspname = $2"
-				];
+				$q .= ", pg_namespace ";
 			}
-			$cursor = $this->__dbQueryParams(str_replace(
-				['{PG_NAMESPACE}', '{NSPNAME}'],
-				$replace,
-				$q
-			), $params);
+			$q .= "WHERE "
+				// regclass translates the OID to the name
+				. "pg_class.oid = '" . $table_prefix . $table . "'::regclass AND "
+				. "indrelid = pg_class.oid AND ";
+			if ($schema) {
+				$q .= "nspname = '" . $schema . "' AND "
+					. "pg_class.relnamespace = pg_namespace.oid AND ";
+			}
+			$q .= "pg_attribute.attrelid = pg_class.oid AND "
+				. "pg_attribute.attnum = any(pg_index.indkey) "
+				. "AND indisprimary";
+			$cursor = $this->__dbQuery($q);
 			if ($cursor !== false) {
 				$__db_fetch_array = $this->__dbFetchArray($cursor);
 				if (!is_array($__db_fetch_array)) {
@@ -901,13 +893,11 @@ class PgSQL implements Interface\SqlFunctions
 	public function __dbSetSchema(string $db_schema): int
 	{
 		// check if schema actually exists
-		$query = <<<SQL
-		SELECT EXISTS (
-			SELECT 1 FROM information_schema.schemata
-			WHERE schema_name = $1
-		)
-		SQL;
-		$cursor = $this->__dbQueryParams($query, [$db_schema]);
+		$query = "SELECT EXISTS("
+			. "SELECT 1 FROM information_schema.schemata "
+			. "WHERE schema_name = " . $this->__dbEscapeLiteral($db_schema)
+			. ")";
+		$cursor = $this->__dbQuery($query);
 		// abort if execution fails
 		if ($cursor === false) {
 			return 1;
@@ -976,34 +966,6 @@ class PgSQL implements Interface\SqlFunctions
 	{
 		return $this->__dbShow('client_encoding');
 	}
-
-	/**
-	 * Count placeholder queries. $ only
-	 *
-	 * @param  string $query
-	 * @return int
-	 */
-	public function __dbCountQueryParams(string $query): int
-	{
-		$matches = [];
-		// regex for params: only stand alone $number allowed
-		// exclude all '' enclosed strings, ignore all numbers [note must start with digit]
-		// can have space/tab/new line
-		// must have <> = , ( [not equal, equal, comma, opening round bracket]
-		// can have space/tab/new line
-		// $ number with 1-9 for first and 0-9 for further digits
-		// Collects also PDO ? and :named, but they are ignored
-		// /s for matching new line in . list
-		// [disabled, we don't used ^ or $] /m for multi line match
-		// Matches in 1:, must be array_filtered to remove empty, count with array_unique
-		// Regex located in the ConvertPlaceholder class
-		preg_match_all(
-			ConvertPlaceholder::REGEX_LOOKUP_PLACEHOLDERS,
-			$query,
-			$matches
-		);
-		return count(array_unique(array_filter($matches[3])));
-	}
 }
 
 // __END__

www/lib/CoreLibs/DB/SqLite.php

@@ -0,0 +1,432 @@
+<?php
+
+/**
+ * AUTHOR: Clemens Schwaighofer
+ * CREATED: 2024/8/21
+ * DESCRIPTION:
+ * SQL Lite interface
+ * Note: This is a very simple library and in future should perhaps merge with the master
+ * CoreLibs SQL interface
+ *
+ * TODO: This should move to the CoreLibs\DB\IO class as a sub type for "sqlite" next to "pgsql"
+*/
+
+declare(strict_types=1);
+
+namespace CoreLibs\DB;
+
+use CoreLibs\Create\Hash;
+
+class SqLite implements Interface\DatabaseInterface
+{
+	/** @var \CoreLibs\Logging\Logging logging */
+	public \CoreLibs\Logging\Logging $log;
+
+	/** @var string database connection string */
+	private string $dsn;
+	/** @var \PDO database handler */
+	private \PDO $dbh;
+	/** @var PDOStatement|false one cursor, for internal handling */
+	// private \PDOStatement|false $cursor;
+	/** @var array<string,mixed> extended cursoers string index with content */
+	private array $cursor_ext = [];
+
+	/**
+	 * init database system
+	 *
+	 * @param  \CoreLibs\Logging\Logging $log
+	 * @param  string                    $dsn
+	 */
+	public function __construct(
+		\CoreLibs\Logging\Logging $log,
+		string $dsn
+	) {
+		$this->log = $log;
+		// open new connection
+		if ($this->__connectToDB($dsn) === false) {
+			throw new \ErrorException("Cannot load database: " . $dsn, 1);
+		}
+	}
+
+	// *********************************************************************
+	// MARK: PRIVATE METHODS
+	// *********************************************************************
+
+	/**
+	 * Get a cursor dump with all info
+	 *
+	 * @param  \PDOStatement $cursor
+	 * @return string|false
+	 */
+	private function __dbGetCursorDump(\PDOStatement $cursor): string|false
+	{
+		// get the cursor info
+		ob_start();
+		$cursor->debugDumpParams();
+		$cursor_dump = ob_get_contents();
+		ob_end_clean();
+		return $cursor_dump;
+	}
+
+	/**
+	 * fetch rows from a cursor (post execute)
+	 *
+	 * @param  \PDOStatement $cursor
+	 * @return array<mixed>|false
+	 */
+	private function __dbFetchArray(\PDOStatement $cursor): array|false
+	{
+		try {
+			// on empty array return false
+			// TODO make that more elegant?
+			return empty($row = $cursor->fetch(mode:\PDO::FETCH_NAMED)) ? false : $row;
+		} catch (\PDOException $e) {
+			$this->log->error(
+				"Cannot fetch from cursor",
+				[
+					"dsn" => $this->dsn,
+					"DumpParams" => $this->__dbGetCursorDump($cursor),
+					"PDOException" => $e
+				]
+			);
+			return false;
+		}
+	}
+
+	// MARK: open database
+
+	/**
+	 * Open database
+	 * reports errors for wrong DSN or failed connection
+	 *
+	 * @param  string $dsn
+	 * @return bool
+	 */
+	private function __connectToDB(string $dsn): bool
+	{
+		// check if dsn starts with ":"
+		if (!str_starts_with($dsn, "sqlite:")) {
+			$this->log->error(
+				"Invalid dsn string",
+				[
+					"dsn" => $dsn
+				]
+			);
+			return false;
+		}
+		// TODO: if not ":memory:" check if path to file is writeable by system
+		// avoid double open
+		if (!empty($this->dsn) && $dsn == $this->dsn && $this->dbh instanceof \PDO) {
+			$this->log->info(
+				"Connection already establisehd with this dsn",
+				[
+					"dsn" => $dsn,
+				]
+			);
+			return true;
+		}
+		// TODO: check that folder is writeable
+		// set DSN and open connection
+		$this->dsn = $dsn;
+		try {
+			$this->dbh = new \PDO($this->dsn);
+		} catch (\PDOException $e) {
+			$this->log->error(
+				"Cannot open database",
+				[
+					"dsn" => $this->dsn,
+					"PDOException" => $e
+				]
+			);
+			return false;
+		}
+		return true;
+	}
+
+	// *********************************************************************
+	// MARK: PUBLIC METHODS
+	// *********************************************************************
+
+	// MARK: db meta data (table info)
+
+	/**
+	 * Table meta data
+	 * Note that if columns have multi
+	 *
+	 * @param  string      $table
+	 * @return array<array<string,mixed>>|false
+	 */
+	public function dbShowTableMetaData(string $table): array|false
+	{
+		$table_info = [];
+		$query = <<<SQL
+		SELECT
+			ti.cid, ti.name, ti.type, ti.'notnull', ti.dflt_value, ti.pk,
+			il_ii.idx_name, il_ii.idx_unique, il_ii.idx_origin, il_ii.idx_partial
+		FROM
+			sqlite_schema AS m,
+			pragma_table_info(m.name) AS ti
+			LEFT JOIN (
+				SELECT
+					il.name AS idx_name, il.'unique' AS idx_unique, il.origin AS idx_origin, il.partial AS idx_partial,
+					ii.cid AS tbl_cid
+				FROM
+					sqlite_schema AS m,
+					pragma_index_list(m.name) AS il,
+					pragma_index_info(il.name) AS ii
+				WHERE m.name = ?1
+			) AS il_ii ON (ti.cid = il_ii.tbl_cid)
+		WHERE
+			m.name = ?1
+		SQL;
+		while (is_array($row = $this->dbReturnArray($query, [$table]))) {
+			$table_info[] = [
+				'cid' => $row['cid'],
+				'name' => $row['name'],
+				'type' => $row['type'],
+				'notnull' => $row['notnull'],
+				'dflt_value' => $row['dflt_value'],
+				'pk' => $row['pk'],
+				'idx_name' => $row['idx_name'],
+				'idx_unique' => $row['idx_unique'],
+				'idx_origin' => $row['idx_origin'],
+				'idx_partial' => $row['idx_partial'],
+			];
+		}
+
+		if (!$table_info) {
+			return false;
+		}
+		return $table_info;
+	}
+
+	// MARK: db exec
+
+	/**
+	 * for reading or simple execution, no return data
+	 *
+	 * @param  string    $query
+	 * @return int|false
+	 */
+	public function dbExec(string $query): int|false
+	{
+		try {
+			return $this->dbh->exec($query);
+		} catch (\PDOException $e) {
+			$this->log->error(
+				"Cannot execute query",
+				[
+					"dsn" => $this->dsn,
+					"query" => $query,
+					"PDOException" => $e
+				]
+			);
+			return false;
+		}
+	}
+
+	// MARK: db query
+
+	/**
+	 * Run a simple query and return its statement
+	 *
+	 * @param  string              $query
+	 * @return \PDOStatement|false
+	 */
+	public function dbQuery(string $query): \PDOStatement|false
+	{
+		try {
+			return $this->dbh->query($query, \PDO::FETCH_NAMED);
+		} catch (\PDOException $e) {
+			$this->log->error(
+				"Cannot run query",
+				[
+					"dsn" => $this->dsn,
+					"query" => $query,
+					"PDOException" => $e
+				]
+			);
+			return false;
+		}
+	}
+
+	// MARK: db prepare & execute calls
+
+	/**
+	 * Execute one query with params
+	 *
+	 * @param  string       $query
+	 * @param  array<mixed> $params
+	 * @return \PDOStatement|false
+	 */
+	public function dbExecParams(string $query, array $params): \PDOStatement|false
+	{
+		// prepare query
+		if (($cursor = $this->dbPrepare($query)) === false) {
+			return false;
+		}
+		// execute the query, on failure return false
+		if ($this->dbCursorExecute($cursor, $params) === false) {
+			return false;
+		}
+		return $cursor;
+	}
+
+	/**
+	 * Prepare query
+	 *
+	 * @param  string              $query
+	 * @return \PDOStatement|false
+	 */
+	public function dbPrepare(string $query): \PDOStatement|false
+	{
+		try {
+			// store query with cursor so we can reference?
+			return $this->dbh->prepare($query);
+		} catch (\PDOException $e) {
+			$this->log->error(
+				"Cannot open cursor",
+				[
+					"dsn" => $this->dsn,
+					"query" => $query,
+					"PDOException" => $e
+				]
+			);
+			return false;
+		}
+	}
+
+	/**
+	 * execute a cursor
+	 *
+	 * @param  \PDOStatement $cursor
+	 * @param  array<mixed>  $params
+	 * @return bool
+	 */
+	public function dbCursorExecute(\PDOStatement $cursor, array $params): bool
+	{
+		try {
+			return $cursor->execute($params);
+		} catch (\PDOException $e) {
+			// write error log
+			$this->log->error(
+				"Cannot execute prepared query",
+				[
+					"dsn" => $this->dsn,
+					"params" => $params,
+					"DumpParams" => $this->__dbGetCursorDump($cursor),
+					"PDOException" => $e
+				]
+			);
+			return false;
+		}
+	}
+
+	// MARK: db return array
+
+	/**
+	 * Returns hash for query
+	 * Hash is used in all internal storage systems for return data
+	 *
+	 * @param  string       $query  The query to create the hash from
+	 * @param  array<mixed> $params If the query is params type we need params
+	 *                              data to create a unique call one, optional
+	 * @return string               Hash, as set by hash long
+	 */
+	public function dbGetQueryHash(string $query, array $params = []): string
+	{
+		return Hash::__hashLong(
+			$query . (
+				$params !== [] ?
+					'#' . json_encode($params) : ''
+			)
+		);
+	}
+
+	/**
+	 * resets all data stored to this query
+	 * @param  string       $query  The Query whose cache should be cleaned
+	 * @param  array<mixed> $params If the query is params type we need params
+	 *                              data to create a unique call one, optional
+	 * @return bool                 False if query not found, true if success
+	 */
+	public function dbCacheReset(string $query, array $params = []): bool
+	{
+		$query_hash = $this->dbGetQueryHash($query, $params);
+		// clears cache for this query
+		if (empty($this->cursor_ext[$query_hash]['query'])) {
+			$this->log->error('Cannot reset cursor_ext with given query and params', [
+				"query" => $query,
+				"params" => $params,
+			]);
+			return false;
+		}
+		unset($this->cursor_ext[$query_hash]);
+		return true;
+	}
+
+	/**
+	 * return array with data, when finshed return false
+	 * also returns false on error
+	 *
+	 * TODO: This is currently a one time run
+	 * if the same query needs to be run again, the cursor_ext must be reest
+	 * with dbCacheReset
+	 *
+	 * @param  string             $query
+	 * @param  array<mixed>       $params
+	 * @return array<mixed>|false
+	 */
+	public function dbReturnArray(string $query, array $params = []): array|false
+	{
+		$query_hash = $this->dbGetQueryHash($query, $params);
+		if (!isset($this->cursor_ext[$query_hash])) {
+			$this->cursor_ext[$query_hash] = [
+				// cursor null: unset, if set \PDOStatement
+				'cursor' => null,
+				// the query used in this call
+				'query' => $query,
+				// parameter
+				'params' => $params,
+				// how many rows have been read from db
+				'read_rows' => 0,
+				// when fetch array or cache read returns false
+				// in loop read that means dbReturn retuns false without error
+				'finished' => false,
+			];
+			if (!empty($params)) {
+				if (($cursor = $this->dbExecParams($query, $params)) === false) {
+					return false;
+				}
+			} else {
+				if (($cursor = $this->dbQuery($query)) === false) {
+					return false;
+				}
+			}
+			$this->cursor_ext[$query_hash]['cursor'] = $cursor;
+		}
+		// flag finished if row is false
+		$row = $this->__dbFetchArray($this->cursor_ext[$query_hash]['cursor']);
+		if ($row === false) {
+			$this->cursor_ext[$query_hash]['finished'] = true;
+		} else {
+			$this->cursor_ext[$query_hash]['read_rows']++;
+		}
+		return $row;
+	}
+
+	// MARK other interface
+
+	/**
+	 * get current db handler
+	 * this is for raw access
+	 *
+	 * @return \PDO
+	 */
+	public function getDbh(): \PDO
+	{
+		return $this->dbh;
+	}
+}
+
+// __END__

www/lib/CoreLibs/DB/Support/ConvertPlaceholder.php

@@ -14,67 +14,6 @@ namespace CoreLibs\DB\Support;
 
 class ConvertPlaceholder
 {
-	/** @var string split regex */
-	private const PATTERN_QUERY_SPLIT = '[(<>=,?-]|->|->>|#>|#>>|@>|<@|\?\|\?\&|\|\||#-';
-	/** @var string the main regex including  the pattern query split */
-	private const PATTERN_ELEMENT = '(?:\'.*?\')?\s*(?:\?\?|' . self::PATTERN_QUERY_SPLIT . ')\s*';
-	/** @var string parts to ignore in the SQL */
-	private const PATTERN_IGNORE =
-		// digit -> ignore
-		'\d+|'
-		// other string -> ignore
-		. '(?:\'.*?\')|';
-	/** @var string named parameters */
-	private const PATTERN_NAMED = '(:\w+)';
-	/** @var string question mark parameters */
-	private const PATTERN_QUESTION_MARK = '(?:(?:\?\?)?\s*(\?{1}))';
-	/** @var string numbered parameters */
-	private const PATTERN_NUMBERED = '(\$[1-9]{1}(?:[0-9]{1,})?)';
-	// below here are full regex that will be used
-	/** @var string replace regex for named (:...) entries */
-	public const REGEX_REPLACE_NAMED = '/'
-		. '(' . self::PATTERN_ELEMENT . ')'
-		. '('
-		. self::PATTERN_IGNORE
-		. self::PATTERN_NAMED
-		. ')'
-		. '/s';
-	/** @var string replace regex for question mark (?) entries */
-	public const REGEX_REPLACE_QUESTION_MARK = '/'
-		. '(' . self::PATTERN_ELEMENT . ')'
-		. '('
-		. self::PATTERN_IGNORE
-		. self::PATTERN_QUESTION_MARK
-		. ')'
-		. '/s';
-	/** @var string replace regex for numbered ($n) entries */
-	public const REGEX_REPLACE_NUMBERED = '/'
-		. '(' . self::PATTERN_ELEMENT . ')'
-		. '('
-		. self::PATTERN_IGNORE
-		. self::PATTERN_NUMBERED
-		. ')'
-		. '/s';
-	/** @var string the main lookup query for all placeholders */
-	public const REGEX_LOOKUP_PLACEHOLDERS = '/'
-		// prefix string part, must match towards
-		// seperator for ( = , ? - [and json/jsonb in pg doc section 9.15]
-		. self::PATTERN_ELEMENT
-		// match for replace part
-		. '(?:'
-		// ignore parts
-		. self::PATTERN_IGNORE
-		// :name named part (PDO) [1]
-		. self::PATTERN_NAMED . '|'
-		// ? question mark part (PDO) [2]
-		. self::PATTERN_QUESTION_MARK . '|'
-		// $n numbered part (\PG php) [3]
-		. self::PATTERN_NUMBERED
-		// end match
-		. ')'
-		// single line -> add line break to matches in "."
-		. '/s';
-
 	/**
 	 * Convert PDO type query with placeholders to \PG style and vica versa
 	 * For PDO to: ? and :named
@@ -88,24 +27,44 @@ class ConvertPlaceholder
 	 * 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  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>,empty_params:bool},type:''|'named'|'numbered'|'question_mark',found:int,matches:array<string>,params_lookup:array<mixed>,query:string,params:array<mixed>}
-	 * @throws \OutOfRangeException 200 If mixed placeholder types
-	 * @throws \InvalidArgumentException 300 or 301 if wrong convert to with found placeholders
+	 * @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,
+		array $params,
 		string $convert_to = 'pg'
 	): array {
 		$convert_to = strtolower($convert_to);
 		$matches = [];
+		$query_split = '[(=,?-]|->|->>|#>|#>>|@>|<@|\?\|\?\&|\|\||#-';
+		$pattern = '/'
+			// prefix string part, must match towards
+			// seperator for ( = , ? - [and json/jsonb in pg doc section 9.15]
+			. '(?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\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(self::REGEX_LOOKUP_PLACEHOLDERS, $query, $matches, PREG_UNMATCHED_AS_NULL);
+		$found = preg_match_all($pattern, $query, $matches, PREG_UNMATCHED_AS_NULL);
 		// if false or null set to -1
 		//  || $found === null
 		if ($found === false) {
@@ -118,10 +77,10 @@ class ConvertPlaceholder
 		/** @var array<string> 3: $n matches */
 		$numbered_matches = array_filter($matches[3]);
 		// count matches
-		$count_named = count(array_unique($named_matches));
+		$count_named = count($named_matches);
 		$count_qmark = count($qmark_matches);
-		$count_numbered = count(array_unique($numbered_matches));
-		// throw exception if mixed found
+		$count_numbered = count($numbered_matches);
+		// throw if mixed
 		if (
 			($count_named && $count_qmark) ||
 			($count_named && $count_numbered) ||
@@ -129,195 +88,140 @@ class ConvertPlaceholder
 		) {
 			throw new \OutOfRangeException('Cannot have named, question mark and numbered in the same query', 200);
 		}
-		// // throw if invalid conversion
-		// if (($count_named || $count_qmark) && $convert_to != 'pg') {
-		// 	throw new \InvalidArgumentException('Cannot convert from named or question mark placeholders to PDO', 300);
-		// }
-		// if ($count_numbered && $convert_to != 'pdo') {
-		// 	throw new \InvalidArgumentException('Cannot convert from numbered placeholders to Pg', 301);
-		// }
-		// return array
-		$return_placeholders = [
-			// original
-			'original' => [
-					'query' => $query,
-					'params' => $params ?? [],
-					'empty_params' => $params === null ? true : false,
-				],
-				// type found, empty if nothing was done
-				'type' => '',
-				// int: found, not found; -1: problem (set from false)
-				'found' => (int)$found,
-				'matches' => [],
-				// old to new lookup check
-				'params_lookup' => [],
-				// this must match the count in params in new
-				'needed' => 0,
-				// new
-				'query' => '',
-				'params' => [],
-		];
-		// replace basic regex and name settings
-		if ($count_named) {
-			$return_placeholders['type'] = 'named';
-			$return_placeholders['matches'] = $named_matches;
-			$return_placeholders['needed'] = $count_named;
-		} elseif ($count_qmark) {
-			$return_placeholders['type'] = 'question_mark';
-			$return_placeholders['matches'] = $qmark_matches;
-			$return_placeholders['needed'] = $count_qmark;
-			// for each ?:DTN: -> replace with $1 ... $n, any remaining :DTN: remove
-		} elseif ($count_numbered) {
-			$return_placeholders['type'] = 'numbered';
-			$return_placeholders['matches'] = $numbered_matches;
-			$return_placeholders['needed'] = $count_numbered;
-		}
-		// run convert only if matching type and direction
-		if (
-			(($count_named || $count_qmark) && $convert_to == 'pg') ||
-			($count_numbered && $convert_to == 'pdo')
-		) {
-			$param_list = self::updateParamList($return_placeholders);
-			$return_placeholders['params_lookup'] = $param_list['params_lookup'];
-			$return_placeholders['query'] = $param_list['query'];
-			$return_placeholders['params'] = $param_list['params'];
-		}
-		// return data
-		return $return_placeholders;
-	}
-
-	/**
-	 * Updates the params list from one style to the other to match the query output
-	 * if original.empty_params is set to true, no params replacement is done
-	 * if param replacement has been done in a dbPrepare then this has to be run
-	 * with the return palceholders array with params in original filled and empty_params turned off
-	 *
-	 * phpcs:disable Generic.Files.LineLength
-	 * @param array{original:array{query:string,params:array<mixed>,empty_params:bool},type:''|'named'|'numbered'|'question_mark',found:int,matches?:array<string>,params_lookup?:array<mixed>,query?:string,params?:array<mixed>} $converted_placeholders
-	 * phpcs:enable Generic.Files.LineLength
-	 * @return array{params_lookup:array<mixed>,query:string,params:array<mixed>}
-	 */
-	public static function updateParamList(array $converted_placeholders): array
-	{
-		// skip if nothing set
-		if (!$converted_placeholders['found']) {
-			return [
-				'params_lookup' => [],
-				'query' => '',
-				'params' => []
-			];
-		}
+		// rebuild
+		$matches_return = [];
+		$type = '';
 		$query_new = '';
 		$params_new = [];
 		$params_lookup = [];
-		// set to null if params is empty
-		$params = $converted_placeholders['original']['params'];
-		$empty_params = $converted_placeholders['original']['empty_params'];
-		switch ($converted_placeholders['type']) {
-			case 'named':
-				// 0: full
-				// 0: full
-				// 1: pre part
-				// 2: keep part UNLESS '3' is set
-				// 3: replace part :named
-				$pos = 0;
-				$query_new = preg_replace_callback(
-					self::REGEX_REPLACE_NAMED,
-					function ($matches) use (&$pos, &$params_new, &$params_lookup, $params, $empty_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;
-							// skip params setup if param list is empty
-							if (!$empty_params) {
-								$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
-									)
-						);
-					},
-					$converted_placeholders['original']['query']
-				);
-				break;
-			case 'question_mark':
-				if (!$empty_params) {
-					// order and data stays the same
-					$params_new = $params ?? [];
-				}
-				// 0: full
-				// 1: pre part
-				// 2: keep part UNLESS '3' is set
-				// 3: replace part ?
-				$pos = 0;
-				$query_new = preg_replace_callback(
-					self::REGEX_REPLACE_QUESTION_MARK,
-					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
-						);
-					},
-					$converted_placeholders['original']['query']
-				);
-				break;
-			case 'numbered':
-				// 0: full
-				// 1: pre part
-				// 2: keep part UNLESS '3' is set
-				// 3: replace part $numbered
-				$pos = 0;
-				$query_new = preg_replace_callback(
-					self::REGEX_REPLACE_NUMBERED,
-					function ($matches) use (&$pos, &$params_new, &$params_lookup, $params, $empty_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';
-							// skip params setup if param list is empty
-							if (!$empty_params) {
-								$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]] ??
+		if ($count_named && $convert_to == 'pg') {
+			$type = 'named';
+			$matches_return = $named_matches;
+			// only check for :named
+			$pattern_replace = '/'
+				. '((?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\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',
-									221
+									211
 								)
-						);
-					},
-					$converted_placeholders['original']['query']
-				);
-				break;
+					);
+				},
+				$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*(?:\?\?|' . $query_split . ')\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*(?:\?\?|' . $query_split . ')\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,
 		];

www/lib/CoreLibs/Language/Core/GetTextReader.php

@@ -190,6 +190,7 @@ class GetTextReader
 	private function loadTables(): void
 	{
 		if (
+			is_array($this->cache_translations) &&
 			is_array($this->table_originals) &&
 			is_array($this->table_translations)
 		) {
@@ -317,7 +318,10 @@ class GetTextReader
 
 		if ($this->enable_cache) {
 			// Caching enabled, get translated string from cache
-			if (array_key_exists($string, $this->cache_translations)) {
+			if (
+				is_array($this->cache_translations) &&
+				array_key_exists($string, $this->cache_translations)
+			) {
 				return $this->cache_translations[$string];
 			} else {
 				return $string;
@@ -477,7 +481,7 @@ class GetTextReader
 		$key = $single . chr(0) . $plural;
 
 		if ($this->enable_cache) {
-			if (!array_key_exists($key, $this->cache_translations)) {
+			if (is_array($this->cache_translations) && !array_key_exists($key, $this->cache_translations)) {
 				return ($number != 1) ? $plural : $single;
 			} else {
 				$result = $this->cache_translations[$key];

www/lib/CoreLibs/Output/Form/Generate.php

@@ -474,7 +474,7 @@ class Generate
 					$page_name_camel_case
 			);
 		try {
-			/** @var TableArrays\Interface\TableArraysInterface $class */
+			/** @var TableArrays\Interface\TableArraysInterface|false $class */
 			$class = new $class_string($this);
 		} catch (\Throwable $t) {
 			$this->log->critical('CLASS LOADING: Failed loading: ' . $class_string . ' => ' . $t->getMessage());
@@ -1757,9 +1757,14 @@ class Generate
 				$this->dba->setTableArrayEntry($this->dba->getTableArray()[$key]['preset'], $key, 'value');
 			}
 		}
-		reset($this->reference_array);
-		foreach ($this->reference_array as $key => $value) {
-			unset($this->reference_array[$key]['selected']);
+		if (is_array($this->reference_array)) {
+			if (!is_array($this->reference_array)) {
+				$this->reference_array = [];
+			}
+			reset($this->reference_array);
+			foreach ($this->reference_array as $key => $value) {
+				unset($this->reference_array[$key]['selected']);
+			}
 		}
 		$this->warning = 1;
 		$this->msg = $this->l->__('Cleared for new Dataset!');
@@ -1782,15 +1787,20 @@ class Generate
 			$this->dba->unsetTableArrayEntry($key, 'input_value');
 		}
 
-		// load each reference_table
-		reset($this->reference_array);
-		foreach ($this->reference_array as $key => $value) {
-			unset($this->reference_array[$key]['selected']);
-			$q = 'SELECT ' . $this->reference_array[$key]['other_table_pk']
-				. ' FROM ' . $this->reference_array[$key]['table_name']
-				. ' WHERE ' . $this->int_pk_name . ' = ' . $this->dba->getTableArray()[$this->int_pk_name]['value'];
-			while (is_array($res = $this->dba->dbReturn($q))) {
-				$this->reference_array[$key]['selected'][] = $res[$this->reference_array[$key]['other_table_pk']];
+		if (is_array($this->reference_array)) {
+			// load each reference_table
+			if (!is_array($this->reference_array)) {
+				$this->reference_array = [];
+			}
+			reset($this->reference_array);
+			foreach ($this->reference_array as $key => $value) {
+				unset($this->reference_array[$key]['selected']);
+				$q = 'SELECT ' . $this->reference_array[$key]['other_table_pk']
+					. ' FROM ' . $this->reference_array[$key]['table_name']
+					. ' WHERE ' . $this->int_pk_name . ' = ' . $this->dba->getTableArray()[$this->int_pk_name]['value'];
+				while (is_array($res = $this->dba->dbReturn($q))) {
+					$this->reference_array[$key]['selected'][] = $res[$this->reference_array[$key]['other_table_pk']];
+				}
 			}
 		}
 		$this->warning = 1;
@@ -1969,19 +1979,24 @@ class Generate
 		// write the object
 		$this->dba->dbWrite($addslashes, [], true);
 		// write reference array (s) if necessary
-		reset($this->reference_array);
-		foreach ($this->reference_array as $reference_array) {
-			$q = 'DELETE FROM ' . $reference_array['table_name']
-				. ' WHERE ' . $this->int_pk_name . ' = ' . $this->dba->getTableArray()[$this->int_pk_name]['value'];
-			$this->dba->dbExec($q);
-			$q = 'INSERT INTO ' . $reference_array['table_name']
-				. ' (' . $reference_array['other_table_pk'] . ', ' . $this->int_pk_name . ') VALUES ';
-			for ($i = 0, $i_max = count($reference_array['selected']); $i < $i_max; $i++) {
-				$t_q = '(' . $reference_array['selected'][$i] . ', '
-					. $this->dba->getTableArray()[$this->int_pk_name]['value'] . ')';
-				$this->dba->dbExec($q . $t_q);
+		if (is_array($this->reference_array)) {
+			if (!is_array($this->reference_array)) {
+				$this->reference_array = [];
 			}
-		} // foreach reference arrays
+			reset($this->reference_array);
+			foreach ($this->reference_array as $reference_array) {
+				$q = 'DELETE FROM ' . $reference_array['table_name']
+					. ' WHERE ' . $this->int_pk_name . ' = ' . $this->dba->getTableArray()[$this->int_pk_name]['value'];
+				$this->dba->dbExec($q);
+				$q = 'INSERT INTO ' . $reference_array['table_name']
+					. ' (' . $reference_array['other_table_pk'] . ', ' . $this->int_pk_name . ') VALUES ';
+				for ($i = 0, $i_max = count($reference_array['selected']); $i < $i_max; $i++) {
+					$t_q = '(' . $reference_array['selected'][$i] . ', '
+						. $this->dba->getTableArray()[$this->int_pk_name]['value'] . ')';
+					$this->dba->dbExec($q . $t_q);
+				}
+			} // foreach reference arrays
+		} // if reference arrays
 		// write element list
 		if (!empty($this->element_list)) {
 			$type = [];
@@ -2215,11 +2230,16 @@ class Generate
 	public function formDeleteTableArray()
 	{
 		// remove any reference arrays
-		reset($this->reference_array);
-		foreach ($this->reference_array as $reference_array) {
-			$q = 'DELETE FROM ' . $reference_array['table_name']
-				. ' WHERE ' . $this->int_pk_name . ' = ' . $this->dba->getTableArray()[$this->int_pk_name]['value'];
-			$this->dba->dbExec($q);
+		if (is_array($this->reference_array)) {
+			if (!is_array($this->reference_array)) {
+				$this->reference_array = [];
+			}
+			reset($this->reference_array);
+			foreach ($this->reference_array as $reference_array) {
+				$q = 'DELETE FROM ' . $reference_array['table_name']
+					. ' WHERE ' . $this->int_pk_name . ' = ' . $this->dba->getTableArray()[$this->int_pk_name]['value'];
+				$this->dba->dbExec($q);
+			}
 		}
 		// remove any element list references
 		if (!empty($this->element_list)) {

www/lib/CoreLibs/Output/Image.php

@@ -256,8 +256,8 @@ class Image
 			}
 			// check resize parameters
 			if ($inc_width > $thumb_width || $inc_height > $thumb_height) {
-				$thumb_width_r = 1;
-				$thumb_height_r = 1;
+				$thumb_width_r = 0;
+				$thumb_height_r = 0;
 				// we need to keep the aspect ration on longest side
 				if (
 					($inc_height > $inc_width &&
@@ -288,12 +288,6 @@ class Image
 					!file_exists($thumbnail_write_path . $thumbnail)
 				) {
 					// image, copy source image, offset in image, source x/y, new size, source image size
-					if ($thumb_width_r < 1) {
-						$thumb_width_r = 1;
-					}
-					if ($thumb_height_r < 1) {
-						$thumb_height_r = 1;
-					}
 					$thumb = imagecreatetruecolor($thumb_width_r, $thumb_height_r);
 					if ($thumb === false) {
 						throw new \RuntimeException(
@@ -386,7 +380,9 @@ class Image
 				}
 			}
 			// add output path
-			$thumbnail = $thumbnail_web_path . $thumbnail;
+			if ($thumbnail !== false) {
+				$thumbnail = $thumbnail_web_path . $thumbnail;
+			}
 		} elseif ($create_dummy === true) {
 			// create dummy image in the thumbnail size
 			// if one side is missing, use the other side to create a square
@@ -403,10 +399,10 @@ class Image
 				!file_exists($thumbnail_write_path . $thumbnail)
 			) {
 				// if both are unset, set to 250
-				if ($thumb_height < 1) {
+				if ($thumb_height == 0) {
 					$thumb_height = 250;
 				}
-				if ($thumb_width < 1) {
+				if ($thumb_width == 0) {
 					$thumb_width = 250;
 				}
 				$thumb = imagecreatetruecolor($thumb_width, $thumb_height);

www/lib/CoreLibs/UrlRequests/Curl.php

@@ -599,7 +599,7 @@ class Curl implements Interface\RequestsInterface
 		// for post we set POST option
 		if ($type == "post") {
 			curl_setopt($handle, CURLOPT_POST, true);
-		} elseif (!empty($type) && in_array($type, self::CUSTOM_REQUESTS)) {
+		} elseif (in_array($type, self::CUSTOM_REQUESTS)) {
 			curl_setopt($handle, CURLOPT_CUSTOMREQUEST, strtoupper($type));
 		}
 		// set body data if not null, will send empty [] for empty data
@@ -700,12 +700,12 @@ class Curl implements Interface\RequestsInterface
 		// if we have a timeout signal
 		if (!empty($this->config['timeout'])) {
 			$timeout_requires_no_signal = $this->config['timeout'] < 1;
-			curl_setopt($handle, CURLOPT_TIMEOUT_MS, (int)round($this->config['timeout'] * 1000));
+			curl_setopt($handle, CURLOPT_TIMEOUT_MS, $this->config['timeout'] * 1000);
 		}
 		if (!empty($this->config['connection_timeout'])) {
 			$timeout_requires_no_signal = $timeout_requires_no_signal ||
 				$this->config['connection_timeout'] < 1;
-			curl_setopt($handle, CURLOPT_CONNECTTIMEOUT_MS, (int)round($this->config['connection_timeout'] * 1000, 1));
+			curl_setopt($handle, CURLOPT_CONNECTTIMEOUT_MS, $this->config['connection_timeout'] * 1000);
 		}
 		if ($timeout_requires_no_signal && strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
 			curl_setopt($handle, CURLOPT_NOSIGNAL, true);