Merge branch 'NewFeatures' into Features-DB_IO_SQLite

.phive/phars.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^10.3.5" installed="10.3.5" location="./tools/phpunit" copy="false"/>
+  <phar name="phpunit" version="^9.6" installed="9.6.21" location="./tools/phpunit" copy="false"/>
   <phar name="phpcbf" version="^3.7.2" installed="3.10.3" location="./tools/phpcbf" copy="false"/>
-  <phar name="phpcs" version="^3.10.3" installed="3.10.3" location="./tools/phpcs" copy="false"/>
-  <phar name="phpstan" version="^2.0" installed="2.0.4" location="./tools/phpstan" copy="false"/>
-  <phar name="phan" version="^5.4.3" installed="5.4.3" location="./tools/phan" copy="false"/>
+  <phar name="phpcs" version="^3.7.2" installed="3.10.3" location="./tools/phpcs" copy="false"/>
+  <phar name="phpstan" version="^1.10.37" installed="1.12.4" location="./tools/phpstan" copy="false"/>
+  <phar name="phan" version="^5.4.2" installed="5.4.3" location="./tools/phan" copy="false"/>
   <phar name="psalm" version="^5.15.0" installed="5.24.0" location="./tools/psalm" copy="false"/>
   <phar name="phpdox" version="^0.12.0" installed="0.12.0" location="./tools/phpdox" copy="false"/>
   <phar name="phpdocumentor" version="^3.4.2" installed="3.4.3" location="./tools/phpDocumentor" copy="false"/>

4dev/checking/phan.sh

@@ -1,5 +1,5 @@
 base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
 # must be run in ${base}
-cd $base || exit;
+cd $base;
 ${base}tools/phan --progress-bar -C --analyze-twice;
-cd ~ || exit;
+cd ~;

4dev/checking/phpstan.sh

@@ -1,5 +1,5 @@
 base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
 # must be run in ${base}
-cd $base || exit;
+cd $base;
 ${base}tools/phpstan;
-cd ~ || exit;
+cd ~;

4dev/checking/phpunit.sh

@@ -1,96 +1,49 @@
 #!/bin/env bash
 
-function error() {
-	if [ -t 1 ]; then echo "[MAK] ERROR: $*" >&2; fi; exit 0;
-}
-
-usage() {
-	cat <<EOF
-Usage: $(basename "${BASH_SOURCE[0]}") [-h] [-t] [-v] [-p VERSION]
-
-Runs all the PHP unit tests.
-
-If -p is not set, the default intalled PHP is used.
-
-Available options:
-
--h, --help        Print this help and exit
--t, --testdox     Enable testdox output for phpunit
--v, --verbose     Enable verbose output for PHPunit
--p, --php VERSION Chose PHP version in the form of "N.N", if not found will exit
-EOF
-	exit
-}
-
-# set base variables
-BASE_PATH="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
-PHPUNIT_CONFIG="${BASE_PATH}phpunit.xml";
-PHP_BIN_PATH=$(which php);
-if [ -z "${PHP_BIN_PATH}" ]; then
-	echo "Cannot find php binary";
-	exit;
-fi;
-DEFAULT_PHP_VERSION=$(${PHP_BIN_PATH} -r "echo PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;");
-if [ -z "${DEFAULT_PHP_VERSION}" ]; then
-	echo "Cannot set default PHP version";
-	exit;
-fi;
+base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
 # -c phpunit.xml
 # --testdox
-# call with "-tt" to give verbose testdox output
+# call with "t" to give verbose testdox output
 # SUPPORTED: https://www.php.net/supported-versions.php
-# call with -p <php version number> to force a certain php version
+# call with php version number to force a certain php version
 
 opt_testdox="";
-opt_verbose="";
-php_version="";
-no_php_version=0;
-while [ -n "${1-}" ]; do
+if [ "${1}" = "t" ] || [ "${2}" = "t" ]; then
+	opt_testdox="--testdox";
+fi;
+php_bin="";
+if [ -n "${1}" ]; then
 	case "${1}" in
-		-t | --testdox)
-			opt_testdox="--testdox";
-			;;
-		-v | --verbose)
-			opt_verbose="--verbose";
-			;;
-		-p | --php)
-			php_version="${2-}";
-			shift
-			;;
-		-h | --help)
-			usage
-			;;
-		# invalid option
-		-?*)
-			error "[!] Unknown option: '$1'."
-			;;
-	esac
-	shift;
-done;
-
-if [ -z "${php_version}" ]; then
-	php_version="${DEFAULT_PHP_VERSION}";
-	no_php_version=1;
+		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
+		# "7.4") php_bin="/usr/bin/php7.4 "; ;;
+		# "8.0") php_bin="/usr/bin/php8.0 "; ;;
+		# "8.1") php_bin="/usr/bin/php8.1 "; ;;
+		"8.2") php_bin="/usr/bin/php8.2 "; ;;
+		"8.3") php_bin="/usr/bin/php8.4 "; ;;
+		*) echo "Not support PHP: ${1}"; exit; ;;
+	esac;
 fi;
-php_bin="${PHP_BIN_PATH}${php_version}";
-echo "Use PHP Version: ${php_version}";
-
-if [ ! -f "${php_bin}" ]; then
-	echo "Set php ${php_bin} does not exist";
-	exit;
+if [ -n "${2}" ] && [ -z "${php_bin}" ]; then
+	case "${2}" in
+		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
+		# "7.4") php_bin="/usr/bin/php7.4 "; ;;
+		# "8.0") php_bin="/usr/bin/php8.0 "; ;;
+		# "8.1") php_bin="/usr/bin/php8.1 "; ;;
+		"8.2") php_bin="/usr/bin/php8.2 "; ;;
+		"8.3") php_bin="/usr/bin/php8.3 "; ;;
+		*) echo "Not support PHP: ${1}"; exit; ;;
+	esac;
 fi;
-php_bin="${php_bin} ";
 
 # Note 4dev/tests/bootstrap.php has to be set as bootstrap file in phpunit.xml
-phpunit_call="${php_bin}${BASE_PATH}vendor/bin/phpunit ${opt_testdox} ${opt_verbose} -c ${PHPUNIT_CONFIG} ${BASE_PATH}4dev/tests/";
+phpunit_call="${php_bin}${base}vendor/bin/phpunit ${opt_testdox} -c ${base}phpunit.xml ${base}4dev/tests/";
 
 ${phpunit_call};
 
-echo -e "\nPHPUnit Config: ${PHPUNIT_CONFIG}";
-if [ "${no_php_version}" -eq 0 ]; then
-	echo "CALLED WITH PHP: ${php_bin}$(${php_bin} --version)";
+if [ ! -z "${php_bin}" ]; then
+	echo "CALLED WITH PHP: ${php_bin}"$(${php_bin} --version);
 else
-	echo "Default PHP used: $(php --version)";
+	echo "Default PHP used: "$(php --version);
 fi;
 
 # __END__

4dev/composer/sync-to-composer-all-folder.sh

@@ -13,7 +13,7 @@ if [ "${GO}" != "go" ]; then
 fi;
 
 BASE="/storage/var/www/html/developers/clemens/core_data/";
-SOURCE="${BASE}php_libraries/master/"
+SOURCE="${BASE}php_libraries/trunk/"
 TARGET="${BASE}composer-packages/CoreLibs-Composer-All/"
 
 rsync ${DRY_RUN}-Plzvrupt --stats --delete ${SOURCE}4dev/tests/ ${TARGET}test/phpunit/

4dev/database/function/set_date.sql

@@ -5,9 +5,9 @@ RETURNS TRIGGER AS
 $$
 BEGIN
     IF TG_OP = 'INSERT' THEN
-        NEW.date_created := clock_timestamp();
+        NEW.date_created := 'now';
     ELSIF TG_OP = 'UPDATE' THEN
-        NEW.date_updated := clock_timestamp();
+        NEW.date_updated := 'now';
     END IF;
     RETURN NEW;
 END;

4dev/database/function/set_edit_generic.sql

@@ -7,11 +7,11 @@ DECLARE
     random_length INT = 25; -- that should be long enough
 BEGIN
     IF TG_OP = 'INSERT' THEN
-        NEW.date_created := clock_timestamp();
+        NEW.date_created := 'now';
         NEW.cuid := random_string(random_length);
         NEW.cuuid := gen_random_uuid();
     ELSIF TG_OP = 'UPDATE' THEN
-        NEW.date_updated := clock_timestamp();
+        NEW.date_updated := 'now';
     END IF;
     RETURN NEW;
 END;

4dev/database/function/set_generic_uid.sql

@@ -8,12 +8,12 @@ DECLARE
     random_length INT = 32; -- long for massive data
 BEGIN
     IF TG_OP = 'INSERT' THEN
-        NEW.date_created := clock_timestamp();
+        NEW.date_created := 'now';
         IF NEW.uid IS NULL THEN
             NEW.uid := random_string(random_length);
         END IF;
     ELSIF TG_OP = 'UPDATE' THEN
-        NEW.date_updated := clock_timestamp();
+        NEW.date_updated := 'now';
     END IF;
     RETURN NEW;
 END;

4dev/database/function/update_function.sql

@@ -0,0 +1,19 @@
+-- adds the created or updated date tags
+
+-- OLD, DEPRECATED, use set_generic.sql
+
+-- CREATE OR REPLACE FUNCTION set_generic()
+-- RETURNS TRIGGER AS
+-- $$
+-- BEGIN
+--     IF TG_OP = 'INSERT' THEN
+--         NEW.date_created := clock_timestamp();
+--         NEW.user_created := current_user;
+--     ELSIF TG_OP = 'UPDATE' THEN
+--         NEW.date_updated := clock_timestamp();
+--         NEW.user_updated := current_user;
+--     END IF;
+--     RETURN NEW;
+-- END;
+-- $$
+-- LANGUAGE 'plpgsql';

4dev/database/table/edit_log.sql

@@ -10,51 +10,35 @@ CREATE TABLE edit_log (
     edit_log_id INT GENERATED ALWAYS AS IDENTITY 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,
-    eucuid VARCHAR,
-    eucuuid UUID, -- this is the one we want to use, full UUIDv4 from the edit user table
-    -- date_created equal, but can be overridden
-    event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
-    -- session ID if set
-    session_id VARCHAR,
-    -- username
     username VARCHAR,
-    -- DEPRECATED [password]
     password VARCHAR,
-    ip_address JSONB, -- REMOTE_IP and all other IPs (X_FORWARD, etc) as JSON block
-    -- DEPRECATED [ip]
-    ip VARCHAR, -- just the REMOTE_IP, full set see ip_address
-    -- string blocks, general
+    ecuid VARCHAR,
+    ecuuid UUID,
+    event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ip VARCHAR,
     error TEXT,
     event TEXT,
-    -- bytea or string type storage of any data
     data_binary BYTEA,
     data TEXT,
-    -- set page name only
     page VARCHAR,
-    -- various info data sets
+    action VARCHAR,
+    action_id VARCHAR,
+    action_sub_id VARCHAR,
+    action_yes VARCHAR,
+    action_flag VARCHAR,
+    action_menu VARCHAR,
+    action_loaded VARCHAR,
+    action_value VARCHAR,
+    action_type VARCHAR,
+    action_error VARCHAR,
     user_agent VARCHAR,
     referer VARCHAR,
     script_name VARCHAR,
     query_string VARCHAR,
-    request_scheme VARCHAR, -- http or https
     server_name VARCHAR,
     http_host VARCHAR,
-    http_data JSONB,
-    -- DEPRECATED [http*]
-    http_accept VARCHAR, -- in http_data
-    http_accept_charset VARCHAR, -- in http_data
-    http_accept_encoding VARCHAR, -- in http_data
-    -- any action var, -> same set in action_data as JSON
-    action_data JSONB,
-    -- DEPRECATED [action*]
-    action VARCHAR, -- in action_data
-    action_id VARCHAR, -- in action_data
-    action_sub_id VARCHAR, -- in action_data
-    action_yes VARCHAR, -- in action_data
-    action_flag VARCHAR, -- in action_data
-    action_menu VARCHAR, -- in action_data
-    action_loaded VARCHAR, -- in action_data
-    action_value VARCHAR, -- in action_data
-    action_type VARCHAR, -- in action_data
-    action_error VARCHAR -- in action_data
+    http_accept VARCHAR,
+    http_accept_charset VARCHAR,
+    http_accept_encoding VARCHAR,
+    session_id VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_user.sql

@@ -35,10 +35,11 @@ CREATE TABLE edit_user (
     strict SMALLINT DEFAULT 0,
     locked SMALLINT DEFAULT 0,
     protected SMALLINT NOT NULL DEFAULT 0,
+    -- legacy, debug flags
+    debug SMALLINT NOT NULL DEFAULT 0,
+    db_debug SMALLINT NOT NULL DEFAULT 0,
     -- is admin user
     admin SMALLINT NOT NULL DEFAULT 0,
-    -- force lgout counter
-    force_logout INT DEFAULT 0,
     -- last login log
     last_login TIMESTAMP WITHOUT TIME ZONE,
     -- login error
@@ -75,8 +76,9 @@ COMMENT ON COLUMN edit_user.deleted IS 'Login is deleted (master switch), overri
 COMMENT ON COLUMN edit_user.strict IS 'If too many failed logins user will be locked, default off';
 COMMENT ON COLUMN edit_user.locked IS 'Locked from too many wrong password logins';
 COMMENT ON COLUMN edit_user.protected IS 'User can only be chnaged by admin user';
+COMMENT ON COLUMN edit_user.debug IS 'Turn debug flag on (legacy)';
+COMMENT ON COLUMN edit_user.db_debug IS 'Turn DB debug flag on (legacy)';
 COMMENT ON COLUMN edit_user.admin IS 'If set, this user is SUPER admin';
-COMMENT ON COLUMN edit_user.force_logout IS 'Counter for forced log out, if this one is higher than the session set one the session gets terminated';
 COMMENT ON COLUMN edit_user.last_login IS 'Last succesfull login tiemstamp';
 COMMENT ON COLUMN edit_user.login_error_count IS 'Number of failed logins, reset on successful login';
 COMMENT ON COLUMN edit_user.login_error_date_last IS 'Last login error date';

4dev/tests/ACL/CoreLibsACLLoginTest.php

@@ -22,12 +22,8 @@ Not yet covered tests:
  */
 final class CoreLibsACLLoginTest extends TestCase
 {
-	private static \CoreLibs\DB\IO $db;
-	private static \CoreLibs\Logging\Logging $log;
-
-	private static string $edit_access_cuid;
-	private static string $edit_user_cuid;
-	private static string $edit_user_cuuid;
+	private static $db;
+	private static $log;
 
 	/**
 	 * start DB conneciton, setup DB, etc
@@ -112,40 +108,14 @@ final class CoreLibsACLLoginTest extends TestCase
 		self::$db->dbSetMaxQueryCall(-1);
 		// insert additional content for testing (locked user, etc)
 		$queries = [
-			<<<SQL
-			INSERT INTO edit_access_data (
-				edit_access_id, name, value, enabled
-			) VALUES (
-				(SELECT edit_access_id FROM edit_access WHERE uid = 'AdminAccess'),
-				'test', 'value', 1
-			)
-			SQL
+			"INSERT INTO edit_access_data "
+				. "(edit_access_id, name, value, enabled) VALUES "
+				. "((SELECT edit_access_id FROM edit_access WHERE uid = 'AdminAccess'), "
+				. "'test', 'value', 1)"
 		];
 		foreach ($queries as $query) {
 			self::$db->dbExec($query);
 		}
-		// read edit access cuid, edit user cuid and edit user cuuid
-		$row = self::$db->dbReturnRowParams(
-			"SELECT cuid FROM edit_access WHERE uid = $1",
-			["AdminAccess"]
-		);
-		self::$edit_access_cuid = $row['cuid'] ?? '';
-		if (empty(self::$edit_access_cuid)) {
-			self::markTestIncomplete(
-				'Cannot read edit access cuid for "AdminAccess".'
-			);
-		}
-		$row = self::$db->dbReturnRowParams(
-			"SELECT cuid, cuuid FROM edit_user WHERE username = $1",
-			["admin"]
-		);
-		self::$edit_user_cuid = $row['cuid'] ?? '';
-		self::$edit_user_cuuid = $row['cuuid'] ?? '';
-		if (empty(self::$edit_user_cuid) || empty(self::$edit_user_cuuid)) {
-			self::markTestIncomplete(
-				'Cannot read edit user cuid or cuuid for "admin".'
-			);
-		}
 
 		// define mandatory constant
 		// must set
@@ -265,25 +235,24 @@ final class CoreLibsACLLoginTest extends TestCase
 					'ajax_post_action' => 'login',
 				],
 			],
-			'load, session eucuuid set only, php error' => [
+			'load, session euid set only, php error' => [
 				[
 					'page_name' => 'edit_users.php',
 				],
 				[],
 				[],
 				[
-					'LOGIN_EUID' => 1,
-					'LOGIN_EUCUID' => 'abc',
-					'LOGIN_EUCUUID' => '1233456-1234-1234-1234-123456789012',
+					'EUID' => 1,
+					'ECUID' => 'abc',
+					'ECUUID' => '1233456-1234-1234-1234-123456789012',
 				],
 				2,
 				[],
 			],
-			'load, session eucuuid set, all set' => [
+			'load, session euid set, all set' => [
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'edit_access_uid' => 'AdminAccess',
 					'edit_access_data' => 'test',
 					'base_access' => 'list',
@@ -292,23 +261,22 @@ final class CoreLibsACLLoginTest extends TestCase
 				[],
 				[],
 				[
-					'LOGIN_EUID' => 1,
-					'LOGIN_EUCUID' => 'abc',
-					'LOGIN_EUCUUID' => 'SET_EUCUUID_IN_TEST',
-					'LOGIN_USER_NAME' => '',
-					'LOGIN_GROUP_NAME' => '',
-					'LOGIN_ADMIN' => 1,
-					'LOGIN_GROUP_ACL_LEVEL' => -1,
-					'LOGIN_PAGES_ACL_LEVEL' => [],
-					'LOGIN_USER_ACL_LEVEL' => -1,
-					'LOGIN_USER_ADDITIONAL_ACL' => [],
-					'LOGIN_GROUP_ADDITIONAL_ACL' => [],
-					'LOGIN_UNIT_UID' => [
-						'AdminAccess' => '123456789012',
+					'EUID' => 1,
+					'ECUID' => 'abc',
+					'ECUUID' => '1233456-1234-1234-1234-123456789012',
+					'USER_NAME' => '',
+					'GROUP_NAME' => '',
+					'ADMIN' => 1,
+					'GROUP_ACL_LEVEL' => -1,
+					'PAGES_ACL_LEVEL' => [],
+					'USER_ACL_LEVEL' => -1,
+					'USER_ADDITIONAL_ACL' => [],
+					'GROUP_ADDITIONAL_ACL' => [],
+					'UNIT_UID' => [
+						'AdminAccess' => 1,
 					],
-					'LOGIN_UNIT' => [
-						'123456789012' => [
-							'id' => 1,
+					'UNIT' => [
+						1 => [
 							'acl_level' => 80,
 							'name' => 'Admin Access',
 							'uid' => 'AdminAccess',
@@ -320,8 +288,8 @@ final class CoreLibsACLLoginTest extends TestCase
 							'additional_acl' => []
 						],
 					],
-					// 'LOGIN_UNIT_DEFAULT' => '',
-					// 'LOGIN_DEFAULT_ACL_LIST' => [],
+					// 'UNIT_DEFAULT' => '',
+					// 'DEFAULT_ACL_LIST' => [],
 				],
 				0,
 				[
@@ -329,7 +297,6 @@ final class CoreLibsACLLoginTest extends TestCase
 					'admin_flag' => true,
 					'check_access' => true,
 					'check_access_id' => 1,
-					'check_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'check_access_data' => 'value',
 					'base_access' => true,
 					'page_access' => true,
@@ -449,7 +416,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'base_access' => 'list',
 					'page_access' => 'list',
 					'test_deleted' => true
@@ -475,7 +441,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'base_access' => 'list',
 					'page_access' => 'list',
 					'test_enabled' => true
@@ -501,7 +466,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'base_access' => 'list',
 					'page_access' => 'list',
 					'test_locked' => true
@@ -527,7 +491,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'base_access' => 'list',
 					'page_access' => 'list',
 					'test_get_locked' => true,
@@ -552,7 +515,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'base_access' => 'list',
 					'page_access' => 'list',
 					'test_locked_period_until' => 'on'
@@ -578,7 +540,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'edit_access_uid' => 'AdminAccess',
 					'edit_access_data' => 'test',
 					'base_access' => 'list',
@@ -598,7 +559,6 @@ final class CoreLibsACLLoginTest extends TestCase
 					'admin_flag' => true,
 					'check_access' => true,
 					'check_access_id' => 1,
-					'check_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'check_access_data' => 'value',
 					'base_access' => true,
 					'page_access' => true,
@@ -609,7 +569,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'base_access' => 'list',
 					'page_access' => 'list',
 					'test_locked_period_after' => 'on'
@@ -635,7 +594,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'base_access' => 'list',
 					'page_access' => 'list',
 					'test_locked_period_until' => 'on',
@@ -662,7 +620,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'base_access' => 'list',
 					'page_access' => 'list',
 					'test_login_user_id_locked' => true
@@ -688,7 +645,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'edit_access_uid' => 'AdminAccess',
 					'edit_access_data' => 'test',
 					'base_access' => 'list',
@@ -707,7 +663,6 @@ final class CoreLibsACLLoginTest extends TestCase
 					'admin_flag' => true,
 					'check_access' => true,
 					'check_access_id' => 1,
-					'check_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'check_access_data' => 'value',
 					'base_access' => true,
 					'page_access' => true,
@@ -718,7 +673,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'edit_access_uid' => 'AdminAccess',
 					'edit_access_data' => 'test',
 					'base_access' => 'list',
@@ -738,7 +692,6 @@ final class CoreLibsACLLoginTest extends TestCase
 					'admin_flag' => true,
 					'check_access' => true,
 					'check_access_id' => 1,
-					'check_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'check_access_data' => 'value',
 					'base_access' => true,
 					'page_access' => true,
@@ -749,7 +702,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'edit_access_uid' => 'AdminAccess',
 					'edit_access_data' => 'test',
 					'base_access' => 'list',
@@ -769,7 +721,6 @@ final class CoreLibsACLLoginTest extends TestCase
 					'admin_flag' => true,
 					'check_access' => true,
 					'check_access_id' => 1,
-					'check_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'check_access_data' => 'value',
 					'base_access' => true,
 					'page_access' => true,
@@ -780,7 +731,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'edit_access_uid' => 'AdminAccess',
 					'edit_access_data' => 'test',
 					'base_access' => 'list',
@@ -800,7 +750,6 @@ final class CoreLibsACLLoginTest extends TestCase
 					'admin_flag' => true,
 					'check_access' => true,
 					'check_access_id' => 1,
-					'check_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'check_access_data' => 'value',
 					'base_access' => true,
 					'page_access' => true,
@@ -832,7 +781,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'edit_access_uid' => 'AdminAccess',
 					'edit_access_data' => 'test',
 					'base_access' => 'list',
@@ -856,7 +804,6 @@ final class CoreLibsACLLoginTest extends TestCase
 					'admin_flag' => true,
 					'check_access' => true,
 					'check_access_id' => 1,
-					'check_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'check_access_data' => 'value',
 					'base_access' => true,
 					'page_access' => true,
@@ -867,7 +814,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'edit_access_uid' => 'AdminAccess',
 					'edit_access_data' => 'test',
 					'base_access' => 'list',
@@ -891,7 +837,6 @@ final class CoreLibsACLLoginTest extends TestCase
 					'admin_flag' => true,
 					'check_access' => true,
 					'check_access_id' => 1,
-					'check_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'check_access_data' => 'value',
 					'base_access' => true,
 					'page_access' => true,
@@ -902,7 +847,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'base_access' => 'list',
 					'page_access' => 'list',
 					'test_login_user_id_revalidate_after' => 'on',
@@ -929,7 +873,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'edit_access_uid' => 'AdminAccess',
 					'edit_access_data' => 'test',
 					'base_access' => 'list',
@@ -950,7 +893,6 @@ final class CoreLibsACLLoginTest extends TestCase
 					'admin_flag' => true,
 					'check_access' => true,
 					'check_access_id' => 1,
-					'check_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'check_access_data' => 'value',
 					'base_access' => true,
 					'page_access' => true,
@@ -961,7 +903,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'base_access' => 'list',
 					'page_access' => 'list',
 					'test_login_user_id_valid_from' => 'on',
@@ -988,7 +929,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'edit_access_uid' => 'AdminAccess',
 					'edit_access_data' => 'test',
 					'base_access' => 'list',
@@ -1009,7 +949,6 @@ final class CoreLibsACLLoginTest extends TestCase
 					'admin_flag' => true,
 					'check_access' => true,
 					'check_access_id' => 1,
-					'check_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'check_access_data' => 'value',
 					'base_access' => true,
 					'page_access' => true,
@@ -1020,7 +959,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'base_access' => 'list',
 					'page_access' => 'list',
 					'test_login_user_id_valid_until' => 'on',
@@ -1047,7 +985,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'base_access' => 'list',
 					'page_access' => 'list',
 					'test_login_user_id_valid_from' => 'on',
@@ -1075,7 +1012,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[
 					'page_name' => 'edit_users.php',
 					'edit_access_id' => 1,
-					'edit_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'edit_access_uid' => 'AdminAccess',
 					'edit_access_data' => 'test',
 					'base_access' => 'list',
@@ -1106,7 +1042,6 @@ final class CoreLibsACLLoginTest extends TestCase
 					'admin_flag' => true,
 					'check_access' => true,
 					'check_access_id' => 1,
-					'check_access_cuid' => 'SET_EDIT_ACCESS_CUID_IN_TEST',
 					'check_access_data' => 'value',
 					'base_access' => true,
 					'page_access' => true,
@@ -1176,15 +1111,11 @@ final class CoreLibsACLLoginTest extends TestCase
 			$_POST[$post_var] = $post_value;
 		}
 
-		// set ingoing session cuuid if requested
-		if (isset($session['LOGIN_EUCUUID']) && $session['LOGIN_EUCUUID'] == 'SET_EUCUUID_IN_TEST') {
-			$session['LOGIN_EUCUUID'] = self::$edit_user_cuuid;
-		}
-
 		// set _SESSION data
 		foreach ($session as $session_var => $session_value) {
 			$_SESSION[$session_var] = $session_value;
 		}
+
 		/** @var \CoreLibs\ACL\Login&MockObject */
 		$login_mock = $this->getMockBuilder(\CoreLibs\ACL\Login::class)
 			->setConstructorArgs([
@@ -1203,7 +1134,7 @@ final class CoreLibsACLLoginTest extends TestCase
 						. 'locale' . DIRECTORY_SEPARATOR,
 				]
 			])
-			->onlyMethods(['loginTerminate', 'loginReadPageName', 'loginPrintLogin', 'loginEnhanceHttpSecurity'])
+			->onlyMethods(['loginTerminate', 'loginReadPageName', 'loginPrintLogin'])
 			->getMock();
 		$login_mock->expects($this->any())
 			->method('loginTerminate')
@@ -1221,10 +1152,6 @@ final class CoreLibsACLLoginTest extends TestCase
 			->method('loginPrintLogin')
 			->willReturnCallback(function () {
 			});
-		$login_mock->expects($this->any())
-			->method('loginEnhanceHttpSecurity')
-			->willReturnCallback(function () {
-			});
 
 		// if mock_settings: enabled OFF
 		// run DB update and set off
@@ -1442,19 +1369,6 @@ final class CoreLibsACLLoginTest extends TestCase
 
 		// run test
 		try {
-			// preset, we cannot set that in the provider
-			if (
-				isset($expected['check_access_cuid']) &&
-				$expected['check_access_cuid'] == 'SET_EDIT_ACCESS_CUID_IN_TEST'
-			) {
-				$expected['check_access_cuid'] = self::$edit_access_cuid;
-			}
-			if (
-				isset($mock_settings['edit_access_cuid']) &&
-				$mock_settings['edit_access_cuid'] == 'SET_EDIT_ACCESS_CUID_IN_TEST'
-			) {
-				$mock_settings['edit_access_cuid'] = self::$edit_access_cuid;
-			}
 			// if ajax call
 			// check if parameter, or globals (old type)
 			// else normal call
@@ -1513,31 +1427,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				$login_mock->loginCheckAccessPage($mock_settings['page_access']),
 				'Assert page access'
 			);
-			// - loginCheckEditAccessCuid
-			$this->assertEquals(
-				$expected['check_access'],
-				$login_mock->loginCheckEditAccessCuid($mock_settings['edit_access_cuid']),
-				'Assert check access'
-			);
-			// - loginCheckEditAccessValidCuid
-			$this->assertEquals(
-				$expected['check_access_cuid'],
-				$login_mock->loginCheckEditAccessValidCuid($mock_settings['edit_access_cuid']),
-				'Assert check access cuid valid'
-			);
-			// - loginGetEditAccessCuidFromUid
-			$this->assertEquals(
-				$expected['check_access_cuid'],
-				$login_mock->loginGetEditAccessCuidFromUid($mock_settings['edit_access_uid']),
-				'Assert check access uid to cuid valid'
-			);
-			// - loginGetEditAccessCuidFromId
-			$this->assertEquals(
-				$expected['check_access_cuid'],
-				$login_mock->loginGetEditAccessCuidFromUid($mock_settings['edit_access_id']),
-				'Assert check access id to cuid valid'
-			);
-			// Deprecated
 			// - loginCheckEditAccess
 			$this->assertEquals(
 				$expected['check_access'],
@@ -1560,7 +1449,7 @@ final class CoreLibsACLLoginTest extends TestCase
 			$this->assertEquals(
 				$expected['check_access_data'],
 				$login_mock->loginGetEditAccessData(
-					$mock_settings['edit_access_uid'],
+					$mock_settings['edit_access_id'],
 					$mock_settings['edit_access_data']
 				),
 				'Assert check access id data value valid'
@@ -1591,12 +1480,11 @@ final class CoreLibsACLLoginTest extends TestCase
 			// - loginCheckPermissions
 			// - loginGetPermissionOkay
 		} catch (\Exception $e) {
-			/* print "[E]: " . $e->getCode() . ", ERROR: " . $login_mock->loginGetLastErrorCode() . "/"
-				. ($expected['login_error'] ?? 0) . "\n";
-			print "AJAX: " . $login_mock->loginGetAjaxFlag() . "\n";
-			print "AJAX GLOBAL: " . ($GLOBALS['AJAX_PAGE'] ?? '{f}') . "\n";
-			print "Login error expext: " . ($expected['login_error'] ?? '{0}') . "\n";
-			print "POST exit: " . ($_POST['login_exit'] ?? '{0}') . "\n"; */
+			// print "[E]: " . $e->getCode() . ", ERROR: " . $login_mock->loginGetLastErrorCode() . "/"
+			// 	. ($expected['login_error'] ?? 0) . "\n";
+			// print "AJAX: " . $login_mock->loginGetAjaxFlag() . "\n";
+			// print "AJAX GLOBAL: " . ($GLOBALS['AJAX_PAGE'] ?? '{f}') . "\n";
+			// print "Login error expext: " . ($expected['login_error'] ?? '{0}') . "\n";
 			// if this is 100, then we do further error checks
 			if (
 				$e->getCode() == 100 ||

4dev/tests/ACL/database/CoreLibsACLLogin_database_create_data.sql

@@ -30,11 +30,11 @@ DECLARE
     random_length INT = 12; -- that should be long enough
 BEGIN
     IF TG_OP = 'INSERT' THEN
-        NEW.date_created := clock_timestamp();
+        NEW.date_created := 'now';
         NEW.cuid := random_string(random_length);
         NEW.cuuid := gen_random_uuid();
     ELSIF TG_OP = 'UPDATE' THEN
-        NEW.date_updated := clock_timestamp();
+        NEW.date_updated := 'now';
     END IF;
     RETURN NEW;
 END;
@@ -321,7 +321,7 @@ CREATE TABLE edit_generic (
 
 -- 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;
@@ -336,7 +336,7 @@ CREATE TABLE edit_visible_group (
 
 -- 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
@@ -354,7 +354,7 @@ CREATE TABLE edit_menu_group (
 
 -- 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,
@@ -378,7 +378,7 @@ CREATE TABLE edit_page (
 
 -- DROP TABLE edit_query_string;
 CREATE TABLE edit_query_string (
-    edit_query_string_id INT GENERATED ALWAYS AS IDENTITY 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,
@@ -430,7 +430,7 @@ CREATE TABLE edit_page_menu_group (
 
 -- 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,
@@ -447,7 +447,7 @@ CREATE TABLE edit_access_right (
 
 -- 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,
@@ -466,7 +466,7 @@ CREATE TABLE edit_scheme (
 
 -- 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,
@@ -485,7 +485,7 @@ CREATE TABLE edit_language (
 
 -- 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,
@@ -507,7 +507,7 @@ CREATE TABLE edit_group (
 
 -- 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,
@@ -530,7 +530,7 @@ CREATE TABLE edit_page_access (
 
 -- 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,
@@ -551,7 +551,7 @@ CREATE TABLE edit_page_content (
 
 -- 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,
@@ -579,10 +579,11 @@ CREATE TABLE edit_user (
     strict SMALLINT DEFAULT 0,
     locked SMALLINT DEFAULT 0,
     protected SMALLINT NOT NULL DEFAULT 0,
+    -- legacy, debug flags
+    debug SMALLINT NOT NULL DEFAULT 0,
+    db_debug SMALLINT NOT NULL DEFAULT 0,
     -- is admin user
     admin SMALLINT NOT NULL DEFAULT 0,
-    -- forced logout counter
-    force_logout INT DEFAULT 0,
     -- last login log
     last_login TIMESTAMP WITHOUT TIME ZONE,
     -- login error
@@ -619,6 +620,8 @@ COMMENT ON COLUMN edit_user.deleted IS 'Login is deleted (master switch), overri
 COMMENT ON COLUMN edit_user.strict IS 'If too many failed logins user will be locked, default off';
 COMMENT ON COLUMN edit_user.locked IS 'Locked from too many wrong password logins';
 COMMENT ON COLUMN edit_user.protected IS 'User can only be chnaged by admin user';
+COMMENT ON COLUMN edit_user.debug IS 'Turn debug flag on (legacy)';
+COMMENT ON COLUMN edit_user.db_debug IS 'Turn DB debug flag on (legacy)';
 COMMENT ON COLUMN edit_user.admin IS 'If set, this user is SUPER admin';
 COMMENT ON COLUMN edit_user.last_login IS 'Last succesfull login tiemstamp';
 COMMENT ON COLUMN edit_user.login_error_count IS 'Number of failed logins, reset on successful login';
@@ -649,56 +652,40 @@ COMMENT ON COLUMN edit_user.additional_acl IS 'Additional Access Control List st
 
 -- 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
+    ecuid VARCHAR,
+    ecuuid UUID,
     FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL,
-    eucuid VARCHAR,
-    eucuuid UUID, -- this is the one we want to use, full UUIDv4 from the edit user table
-    -- date_created equal, but can be overridden
-    event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
-    -- session ID if set
-    session_id VARCHAR,
-    -- username
     username VARCHAR,
-    -- DEPRECATED [password]
     password VARCHAR,
-    ip_address JSONB, -- REMOTE_IP and all other IPs (X_FORWARD, etc) as JSON block
-    -- DEPRECATED [ip]
-    ip VARCHAR, -- just the REMOTE_IP, full set see ip_address
-    -- string blocks, general
+    event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ip VARCHAR,
     error TEXT,
     event TEXT,
-    -- bytea or string type storage of any data
     data_binary BYTEA,
     data TEXT,
-    -- set page name only
     page VARCHAR,
-    -- various info data sets
+    action VARCHAR,
+    action_id VARCHAR,
+    action_sub_id VARCHAR,
+    action_yes VARCHAR,
+    action_flag VARCHAR,
+    action_menu VARCHAR,
+    action_loaded VARCHAR,
+    action_value VARCHAR,
+    action_type VARCHAR,
+    action_error VARCHAR,
     user_agent VARCHAR,
     referer VARCHAR,
     script_name VARCHAR,
     query_string VARCHAR,
-    request_scheme VARCHAR, -- http or https
     server_name VARCHAR,
     http_host VARCHAR,
-    http_data JSONB,
-    -- DEPRECATED [http*]
-    http_accept VARCHAR, -- in http_data
-    http_accept_charset VARCHAR, -- in http_data
-    http_accept_encoding VARCHAR, -- in http_data
-    -- any action var, -> same set in action_data as JSON
-    action_data JSONB,
-    -- DEPRECATED [action*]
-    action VARCHAR, -- in action_data
-    action_id VARCHAR, -- in action_data
-    action_sub_id VARCHAR, -- in action_data
-    action_yes VARCHAR, -- in action_data
-    action_flag VARCHAR, -- in action_data
-    action_menu VARCHAR, -- in action_data
-    action_loaded VARCHAR, -- in action_data
-    action_value VARCHAR, -- in action_data
-    action_type VARCHAR, -- in action_data
-    action_error VARCHAR -- in action_data
+    http_accept VARCHAR,
+    http_accept_charset VARCHAR,
+    http_accept_encoding VARCHAR,
+    session_id VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_log.sql
 -- START: table/edit_log_overflow.sql
@@ -725,7 +712,7 @@ ALTER TABLE edit_log_overflow ADD CONSTRAINT edit_log_overflow_euid_fkey FOREIGN
 
 -- 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,
@@ -746,7 +733,7 @@ CREATE TABLE edit_access (
 
 -- 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,
@@ -767,7 +754,7 @@ CREATE TABLE edit_access_user (
 
 -- 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,
@@ -1028,7 +1015,7 @@ INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_
 -- edit user
 -- inserts admin user so basic users can be created
 DELETE FROM edit_user;
-INSERT INTO edit_user (username, password, enabled, email, protected, admin, edit_language_id, edit_group_id, edit_scheme_id, edit_access_right_id) VALUES ('admin', 'admin', 1, 'test@tequila.jp', 1, 1,
+INSERT INTO edit_user (username, password, enabled, debug, db_debug, email, protected, admin, edit_language_id, edit_group_id, edit_scheme_id, edit_access_right_id) VALUES ('admin', 'admin', 1, 1, 1, '', 1, 1,
     (SELECT edit_language_id FROM edit_language WHERE short_name = 'en_US'),
     (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
     (SELECT edit_scheme_id FROM edit_scheme WHERE name = 'Admin'),

4dev/tests/Combined/CoreLibsCombinedArrayHandlerTest.php

@@ -1201,91 +1201,6 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 			'Find next key in array'
 		);
 	}
-
-	public function providerReturnMatchingKeyOnley(): array
-	{
-		return [
-			'limited entries' => [
-				[
-					'a' => 'foo',
-					'b' => 'bar',
-					'c' => 'foobar'
-				],
-				[
-					'a', 'b'
-				],
-				[
-					'a' => 'foo',
-					'b' => 'bar',
-				],
-			],
-			'limited entries, with one wrong key' => [
-				[
-					'a' => 'foo',
-					'b' => 'bar',
-					'c' => 'foobar'
-				],
-				[
-					'a', 'b', 'f'
-				],
-				[
-					'a' => 'foo',
-					'b' => 'bar',
-				],
-			],
-			'wrong keys only' => [
-				[
-					'a' => 'foo',
-					'b' => 'bar',
-					'c' => 'foobar'
-				],
-				[
-					'f', 'f'
-				],
-				[
-				],
-			],
-			'empty keys' => [
-				[
-					'a' => 'foo',
-					'b' => 'bar',
-					'c' => 'foobar'
-				],
-				[],
-				[
-					'a' => 'foo',
-					'b' => 'bar',
-					'c' => 'foobar'
-				],
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::arrayReturnMatchingKeyOnly
-	 * @dataProvider providerReturnMatchingKeyOnley
-	 * @testdox arrayReturnMatchingKeyOnly get only selected key entries from array [$_dataName]
-	 *
-	 * @param  array $input
-	 * @param  array $key_list
-	 * @param  array $expected
-	 * @return void
-	 */
-	public function testArrayReturnMatchingKeyOnly(
-		array $input,
-		array $key_list,
-		array $expected
-	): void {
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Combined\ArrayHandler::arrayReturnMatchingKeyOnly(
-				$input,
-				$key_list
-			)
-		);
-	}
 }
 
 // __END__

4dev/tests/Create/CoreLibsCreateSessionTest.php

@@ -54,9 +54,7 @@ final class CoreLibsCreateSessionTest extends TestCase
 					'getSessionId' => '1234abcd4567'
 				],
 				'sessionNameGlobals',
-				[
-					'auto_write_close' => false,
-				],
+				false,
 			],
 			'auto write close' => [
 				'sessionNameAutoWriteClose',
@@ -68,9 +66,7 @@ final class CoreLibsCreateSessionTest extends TestCase
 					'getSessionId' => '1234abcd4567'
 				],
 				'sessionNameAutoWriteClose',
-				[
-					'auto_write_close' => true,
-				],
+				true,
 			],
 		];
 	}
@@ -85,14 +81,13 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 * @param string $input
 	 * @param array<mixed> $mock_data
 	 * @param string $expected
-	 * @param array<string,mixed> $options
 	 * @return void
 	 */
 	public function testStartSession(
 		string $input,
 		array $mock_data,
 		string $expected,
-		?array $options,
+		?bool $auto_write_close,
 	): void {
 		/** @var \CoreLibs\Create\Session&MockObject $session_mock */
 		$session_mock = $this->createPartialMock(
@@ -179,14 +174,9 @@ final class CoreLibsCreateSessionTest extends TestCase
 				4,
 				'/^\[SESSION\] Failed to activate session/'
 			],
-			'expired session' => [
-				\RuntimeException::class,
-				5,
-				'/^\[SESSION\] Expired session found/'
-			],
 			'not a valid session id returned' => [
 				\UnexpectedValueException::class,
-				6,
+				5,
 				'/^\[SESSION\] getSessionId did not return a session id/'
 			], */
 		];
@@ -216,8 +206,7 @@ final class CoreLibsCreateSessionTest extends TestCase
 		$this->expectException($exception);
 		$this->expectExceptionCode($exception_code);
 		$this->expectExceptionMessageMatches($expected_error);
-		// cannot set ini after header sent, plus we are on command line there are no headers
-		new \CoreLibs\Create\Session($session_name, ['session_strict' => false]);
+		new \CoreLibs\Create\Session($session_name);
 	}
 
 	/**

4dev/tests/DB/CoreLibsDBIOTest.php

@@ -17,7 +17,7 @@ Table with Primary Key: table_with_primary_key
 Table without Primary Key: table_without_primary_key
 
 Table with primary key has additional row:
-row_primary_key	INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+row_primary_key	SERIAL PRIMARY KEY,
 Each table has the following rows
 row_int INT,
 row_numeric NUMERIC,
@@ -160,6 +160,7 @@ 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,
@@ -5135,88 +5136,6 @@ final class CoreLibsDBIOTest extends TestCase
 				SQL,
 				'count' => 6,
 				'convert' => false,
-			],
-			'comments in insert' => [
-				'query' => <<<SQL
-				INSERT INTO table_with_primary_key (
-					row_int, row_numeric, row_varchar, row_varchar_literal
-				) VALUES (
-					-- comment 1 かな
-					$1, $2,
-					-- comment 2 -
-					$3
-					-- comment 3
-					, $4
-				)
-				SQL,
-				'count' => 4,
-				'convert' => false
-			],
-			'comment in update' => [
-				'query' => <<<SQL
-				UPDATE table_with_primary_key SET
-					row_int =
-					-- COMMENT 1
-					$1,
-					row_numeric =
-					$2 -- COMMENT 2
-					,
-					row_varchar -- COMMENT 3
-					= $3
-				WHERE
-					row_varchar = $4
-				SQL,
-				'count' => 4,
-				'convert' => false,
-			],
-			// Note some are not set
-			'a complete set of possible' => [
-				'query' => <<<SQL
-				UPDATE table_with_primary_key SET
-				-- ROW
-				row_varchar = $1
-				WHERE
-				row_varchar = ANY($2) AND row_varchar <> $3
-				AND row_varchar > $4 AND row_varchar < $5
-				AND row_varchar >= $6 AND row_varchar <=$7
-				AND row_jsonb->'a' = $8 AND row_jsonb->>$9 = 'a'
-				AND row_jsonb<@$10 AND row_jsonb@>$11
-				AND row_varchar ^@ $12
-				SQL,
-				'count' => 12,
-				'convert' => false,
-			],
-			// all the same
-			'all the same numbered' => [
-				'query' => <<<SQL
-				UPDATE table_with_primary_key SET
-					row_int = $1::INT, row_numeric = $1::NUMERIC, row_varchar = $1
-				WHERE
-					row_varchar = $1
-				SQL,
-				'count' => 1,
-				'convert' => false,
-			],
-			'update with case' => [
-				'query' => <<<SQL
-				UPDATE table_with_primary_key SET
-					row_int = $1::INT,
-					row_varchar = CASE WHEN row_int = 1 THEN $2 ELSE 'bar'::VARCHAR END
-				WHERE
-					row_varchar = $3
-				SQL,
-				'count' => 3,
-				'convert' => false,
-			],
-			'select with case' => [
-				'query' => <<<SQL
-				SELECT row_int
-				FROM table_with_primary_key
-				WHERE
-					row_varchar = CASE WHEN row_int = 1 THEN $1 ELSE $2 END
-				SQL,
-				'count' => 2,
-				'convert' => false,
 			]
 		];
 	}

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__

4dev/tests/Debug/CoreLibsDebugSupportTest.php

@@ -568,9 +568,6 @@ final class CoreLibsDebugSupportTest extends TestCase
 					'assert expected 12'
 				);
 				break;
-			default:
-				$this->assertTrue(true, 'Default fallback as true');
-				break;
 		}
 	}
 

4dev/tests/Language/CoreLibsLanguageGetLocaleTest.php

@@ -21,6 +21,341 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 		. 'includes' . DIRECTORY_SEPARATOR
 		. 'locale' . DIRECTORY_SEPARATOR;
 
+	/**
+	 * set all constant variables that must be set before call
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass(): void
+	{
+		// default web page encoding setting
+		/* if (!defined('DEFAULT_ENCODING')) {
+			define('DEFAULT_ENCODING', 'UTF-8');
+		}
+		if (!defined('DEFAULT_LOCALE')) {
+			// default lang + encoding
+			define('DEFAULT_LOCALE', 'en_US.UTF-8');
+		}
+		// site
+		if (!defined('SITE_ENCODING')) {
+			define('SITE_ENCODING', DEFAULT_ENCODING);
+		}
+		if (!defined('SITE_LOCALE')) {
+			define('SITE_LOCALE', DEFAULT_LOCALE);
+		} */
+		// just set
+		/* if (!defined('BASE')) {
+			define('BASE', str_replace('/configs', '', __DIR__) . DIRECTORY_SEPARATOR);
+		}
+		if (!defined('INCLUDES')) {
+			define('INCLUDES', 'includes' . DIRECTORY_SEPARATOR);
+		}
+		if (!defined('LANG')) {
+			define('LANG', 'lang' . DIRECTORY_SEPARATOR);
+		}
+		if (!defined('LOCALE')) {
+			define('LOCALE', 'locale' . DIRECTORY_SEPARATOR);
+		}
+		if (!defined('CONTENT_PATH')) {
+			define('CONTENT_PATH', 'frontend' . DIRECTORY_SEPARATOR);
+		} */
+		// array session
+		$_SESSION = [];
+		global $_SESSION;
+	}
+
+	/**
+	 * all the test data
+	 *
+	 * @return array<mixed>
+	 */
+	/* public function setLocaleProvider(): array
+	{
+		return [
+			// 0: locale
+			// 1: domain
+			// 2: encoding
+			// 3: path
+			// 4: SESSION: DEFAULT_LOCALE
+			// 5: SESSION: DEFAULT_CHARSET
+			// 6: expected array
+			// 7: deprecation message
+			'no params, all default constants' => [
+				// lang, domain, encoding, path
+				null, null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'en_US.UTF-8',
+					'lang' => 'en_US',
+					'domain' => 'frontend',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+				'setLocale: Unset $locale or unset SESSION locale is deprecated',
+			],
+			'no params, session charset and lang' => [
+				// lang, domain, encoding, path
+				null, null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				'ja_JP', 'UTF-8',
+				// return array
+				[
+					'locale' => 'ja_JP',
+					'lang' => 'ja_JP',
+					'domain' => 'frontend',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+				'setLocale: Unset $domain is deprecated'
+			],
+			'no params, session charset and lang short' => [
+				// lang, domain, encoding, path
+				null, null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				'ja', 'UTF-8',
+				// return array
+				[
+					'locale' => 'ja',
+					'lang' => 'ja',
+					'domain' => 'frontend',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+				'setLocale: Unset $domain is deprecated',
+			],
+			// param lang (no sessions)
+			'locale param only, no sessions' => [
+				// lang, domain, encoding, path
+				'ja.UTF-8', null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja.UTF-8',
+					'lang' => 'ja',
+					'domain' => 'frontend',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+				'setLocale: Unset $domain is deprecated',
+			],
+			// different locale setting
+			'locale complex param only, no sessions' => [
+				// lang, domain, encoding, path
+				'ja_JP.SJIS', null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja_JP.SJIS',
+					'lang' => 'ja_JP',
+					'domain' => 'frontend',
+					'encoding' => 'SJIS',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+				'setLocale: Unset $domain is deprecated',
+			],
+			// param lang and domain (no override)
+			'locale, domain params, no sessions' => [
+				// lang, domain, encoding, path
+				'ja.UTF-8', 'admin', null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja.UTF-8',
+					'lang' => 'ja',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+				'setLocale: Unset $path is deprecated',
+			],
+			// param lang and domain (no override)
+			'locale, domain, encoding params, no sessions' => [
+				// lang, domain, encoding, path
+				'ja.UTF-8', 'admin', 'UTF-8', null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja.UTF-8',
+					'lang' => 'ja',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+				'setLocale: Unset $path is deprecated'
+			],
+			// lang, domain, path (no override)
+			'locale, domain and path, no sessions' => [
+				// lang, domain, encoding, path
+				'ja.UTF-8', 'admin', '', __DIR__ . '/locale_other/',
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja.UTF-8',
+					'lang' => 'ja',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?locale_other\/$/",
+				],
+				null
+			],
+			// all params set (no override)
+			'all parameter, no sessions' => [
+				// lang, domain, encoding, path
+				'ja', 'admin', 'UTF-8', __DIR__ . '/locale_other/',
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja',
+					'lang' => 'ja',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?locale_other\/$/",
+				],
+				null
+			],
+			// param lang and domain (no override)
+			'long locale, domain, encoding params, no sessions' => [
+				// lang, domain, encoding, path
+				'de_CH.UTF-8@euro', 'admin', 'UTF-8', null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'de_CH.UTF-8@euro',
+					'lang' => 'de_CH',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+				'setLocale: Unset $path is deprecated',
+			],
+			// TODO invalid params (bad path) (no override)
+			// TODO param calls, but with override set
+		];
+	} */
+
+	/**
+	  * Undocumented function
+	  *
+	  * @covers ::setLocale
+	  * @dataProvider setLocaleProvider
+	  * @testdox lang settings lang $language, domain $domain, encoding $encoding, path $path; session lang: $SESSION_DEFAULT_LOCALE, session char: $SESSION_DEFAULT_CHARSET [$_dataName]
+	  *
+	  * @param  string|null  $language
+	  * @param  string|null  $domain
+	  * @param  string|null  $encoding
+	  * @param  string|null  $path
+	  * @param  string|null  $SESSION_DEFAULT_LOCALE
+	  * @param  string|null  $SESSION_DEFAULT_CHARSET
+	  * @param  array<mixed> $expected
+	  * @param  string|null  $deprecation_message
+	  * @return void
+	  */
+	/* public function testsetLocale(
+		?string $language,
+		?string $domain,
+		?string $encoding,
+		?string $path,
+		?string $SESSION_DEFAULT_LOCALE,
+		?string $SESSION_DEFAULT_CHARSET,
+		array $expected,
+		?string $deprecation_message
+	): void {
+		$return_lang_settings = [];
+		global $_SESSION;
+		// set override
+		if ($SESSION_DEFAULT_LOCALE !== null) {
+			$_SESSION['DEFAULT_LOCALE'] = $SESSION_DEFAULT_LOCALE;
+		}
+		if ($SESSION_DEFAULT_CHARSET !== null) {
+			$_SESSION['DEFAULT_CHARSET'] = $SESSION_DEFAULT_CHARSET;
+		}
+		if ($deprecation_message !== null) {
+			set_error_handler(
+				static function (int $errno, string $errstr): never {
+					throw new \Exception($errstr, $errno);
+				},
+				E_USER_DEPRECATED
+			);
+			// catch this with the message
+			$this->expectExceptionMessage($deprecation_message);
+		}
+		// function call
+		if (
+			$language === null && $domain === null &&
+			$encoding === null && $path === null
+		) {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale();
+		} elseif (
+			$language !== null && $domain === null &&
+			$encoding === null && $path === null
+		) {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
+				$language
+			);
+		} elseif (
+			$language !== null && $domain !== null &&
+			$encoding === null && $path === null
+		) {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
+				$language,
+				$domain
+			);
+		} elseif (
+			$language !== null && $domain !== null &&
+			$encoding !== null && $path === null
+		) {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
+				$language,
+				$domain,
+				$encoding
+			);
+		} else {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
+				$language,
+				$domain,
+				$encoding,
+				$path
+			);
+		}
+		restore_error_handler();
+		// print "RETURN: " . print_r($return_lang_settings, true) . "\n";
+
+		foreach (
+			[
+				'locale', 'lang', 'domain', 'encoding', 'path'
+			] as $key
+		) {
+			$value = $expected[$key];
+			if (strpos($value, "/") === 0) {
+				// this is regex
+				$this->assertMatchesRegularExpression(
+					$value,
+					$return_lang_settings[$key],
+					'assert regex failed for ' . $key
+				);
+			} else {
+				// assert equal
+				$this->assertEquals(
+					$value,
+					$return_lang_settings[$key],
+					'assert equal failed for ' . $key
+				);
+			}
+		}
+		// unset all vars
+		$_SESSION = [];
+		unset($GLOBALS['OVERRIDE_LANG']);
+	} */
+
 	/**
 	 * all the test data
 	 *

4dev/tests/Language/locale_other/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

4dev/tests/Logging/CoreLibsLoggingErrorMessagesTest.php

@@ -10,7 +10,7 @@ use CoreLibs\Logging\Logger\Level;
 /**
  * Test class for Logging
  * @coversDefaultClass \CoreLibs\Logging\ErrorMessages
- * @testdox \CoreLibs\Logging\ErrorMessages method tests
+ * @testdox \CoreLibs\Logging\ErrorMEssages method tests
  */
 final class CoreLibsLoggingErrorMessagesTest extends TestCase
 {

4dev/tests/Logging/CoreLibsLoggingLoggingTest.php

@@ -395,7 +395,7 @@ final class CoreLibsLoggingLoggingTest extends TestCase
 		}
 		$per_run_id = $log->getLogUniqueId();
 		$this->assertMatchesRegularExpression(
-			"/^\d{4}-\d{2}-\d{2}_\d{6}\.U_[a-z0-9]{8}$/",
+			"/^\d{4}-\d{2}-\d{2}_\d{6}_U_[a-z0-9]{8}$/",
 			$per_run_id,
 			'assert per log run id 1st'
 		);
@@ -403,7 +403,7 @@ final class CoreLibsLoggingLoggingTest extends TestCase
 			$log->setLogUniqueId(true);
 			$per_run_id_2nd = $log->getLogUniqueId();
 			$this->assertMatchesRegularExpression(
-				"/^\d{4}-\d{2}-\d{2}_\d{6}\.U_[a-z0-9]{8}$/",
+				"/^\d{4}-\d{2}-\d{2}_\d{6}_U_[a-z0-9]{8}$/",
 				$per_run_id_2nd,
 				'assert per log run id 2nd'
 			);
@@ -824,13 +824,13 @@ final class CoreLibsLoggingLoggingTest extends TestCase
 		$this->assertTrue($log_ok, 'assert ::log (debug) OK');
 		$this->assertEquals(
 			$log->getLogFile(),
-			$log->getLogFileId() . '.DEBUG.log'
+			$log->getLogFileId() . '_DEBUG.log'
 		);
 		$log_ok = $log->log(Level::Info, 'INFO', group_id: 'GROUP_ID', prefix: 'PREFIX:');
 		$this->assertTrue($log_ok, 'assert ::log (info) OK');
 		$this->assertEquals(
 			$log->getLogFile(),
-			$log->getLogFileId() . '.INFO.log'
+			$log->getLogFileId() . '_INFO.log'
 		);
 	}
 

4dev/tests/Security/CoreLibsSecurityAsymmetricAnonymousEncryptionTest.php

@@ -1,838 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-use CoreLibs\Security\CreateKey;
-use CoreLibs\Security\AsymmetricAnonymousEncryption;
-
-/**
- * Test class for Security\AsymmetricAnonymousEncryption and Security\CreateKey
- * @coversDefaultClass \CoreLibs\Security\AsymmetricAnonymousEncryption
- * @testdox \CoreLibs\Security\AsymmetricAnonymousEncryption method tests
- */
-final class CoreLibsSecurityAsymmetricAnonymousEncryptionTest extends TestCase
-{
-	// MARK: key set and compare
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::getKeyPair
-	 * @covers ::compareKeyPair
-	 * @covers ::getPublicKey
-	 * @covers ::comparePublicKey
-	 * @testdox Check if init class set key pair matches to created key pair and public key
-	 *
-	 * @return void
-	 */
-	public function testKeyPairInitGetCompare(): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		$crypt = new AsymmetricAnonymousEncryption($key_pair);
-		$this->assertTrue(
-			$crypt->compareKeyPair($key_pair),
-			'set key pair not equal to original key pair'
-		);
-		$this->assertTrue(
-			$crypt->comparePublicKey($public_key),
-			'automatic set public key not equal to original public key'
-		);
-		$this->assertEquals(
-			$key_pair,
-			$crypt->getKeyPair(),
-			'set key pair returned not equal to original key pair'
-		);
-		$this->assertEquals(
-			$public_key,
-			$crypt->getPublicKey(),
-			'automatic set public key returned not equal to original public key'
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::getKeyPair
-	 * @covers ::compareKeyPair
-	 * @covers ::getPublicKey
-	 * @covers ::comparePublicKey
-	 * @testdox Check if init class set key pair and public key matches to created key pair and public key
-	 *
-	 * @return void
-	 */
-	public function testKeyPairPublicKeyInitGetCompare(): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		$crypt = new AsymmetricAnonymousEncryption($key_pair, $public_key);
-		$this->assertTrue(
-			$crypt->compareKeyPair($key_pair),
-			'set key pair not equal to original key pair'
-		);
-		$this->assertTrue(
-			$crypt->comparePublicKey($public_key),
-			'set public key not equal to original public key'
-		);
-		$this->assertEquals(
-			$key_pair,
-			$crypt->getKeyPair(),
-			'set key pair returned not equal to original key pair'
-		);
-		$this->assertEquals(
-			$public_key,
-			$crypt->getPublicKey(),
-			'set public key returned not equal to original public key'
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::getKeyPair
-	 * @covers ::getPublicKey
-	 * @covers ::comparePublicKey
-	 * @testdox Check if init class set public key matches to created public key
-	 *
-	 * @return void
-	 */
-	public function testPublicKeyInitGetCompare(): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		$crypt = new AsymmetricAnonymousEncryption(public_key:$public_key);
-		$this->assertTrue(
-			$crypt->comparePublicKey($public_key),
-			'set public key not equal to original public key'
-		);
-		$this->assertEquals(
-			null,
-			$crypt->getKeyPair(),
-			'unset set key pair returned not equal to original key pair'
-		);
-		$this->assertEquals(
-			$public_key,
-			$crypt->getPublicKey(),
-			'set public key returned not equal to original public key'
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::setKeyPair
-	 * @covers ::getKeyPair
-	 * @covers ::compareKeyPair
-	 * @covers ::getPublicKey
-	 * @covers ::comparePublicKey
-	 * @testdox Check if set key pair after class init matches to created key pair and public key
-	 *
-	 * @return void
-	 */
-	public function testKeyPairSetGetCompare(): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		$crypt = new AsymmetricAnonymousEncryption();
-		$crypt->setKeyPair($key_pair);
-		$this->assertTrue(
-			$crypt->compareKeyPair($key_pair),
-			'post class init set key pair not equal to original key pair'
-		);
-		$this->assertTrue(
-			$crypt->comparePublicKey($public_key),
-			'post class init automatic set public key not equal to original public key'
-		);
-		$this->assertEquals(
-			$key_pair,
-			$crypt->getKeyPair(),
-			'post class init set key pair returned not equal to original key pair'
-		);
-		$this->assertEquals(
-			$public_key,
-			$crypt->getPublicKey(),
-			'post class init automatic set public key returned not equal to original public key'
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::setKeyPair
-	 * @covers ::setPublicKey
-	 * @covers ::getKeyPair
-	 * @covers ::compareKeyPair
-	 * @covers ::getPublicKey
-	 * @covers ::comparePublicKey
-	 * @testdox Check if set key pair after class init matches to created key pair and public key
-	 *
-	 * @return void
-	 */
-	public function testKeyPairPublicKeySetGetCompare(): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		$crypt = new AsymmetricAnonymousEncryption();
-		$crypt->setKeyPair($key_pair);
-		$crypt->setPublicKey($public_key);
-		$this->assertTrue(
-			$crypt->compareKeyPair($key_pair),
-			'post class init set key pair not equal to original key pair'
-		);
-		$this->assertTrue(
-			$crypt->comparePublicKey($public_key),
-			'post class init set public key not equal to original public key'
-		);
-		$this->assertEquals(
-			$key_pair,
-			$crypt->getKeyPair(),
-			'post class init set key pair returned not equal to original key pair'
-		);
-		$this->assertEquals(
-			$public_key,
-			$crypt->getPublicKey(),
-			'post class init set public key returned not equal to original public key'
-		);
-	}
-
-		/**
-	 * Undocumented function
-	 *
-	 * @covers ::setPublicKey
-	 * @covers ::getKeyPair
-	 * @covers ::compareKeyPair
-	 * @covers ::getPublicKey
-	 * @covers ::comparePublicKey
-	 * @testdox Check if set key pair after class init matches to created key pair and public key
-	 *
-	 * @return void
-	 */
-	public function testPublicKeySetGetCompare(): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		$crypt = new AsymmetricAnonymousEncryption();
-		$crypt->setPublicKey($public_key);
-		$this->assertTrue(
-			$crypt->comparePublicKey($public_key),
-			'post class init set public key not equal to original public key'
-		);
-		$this->assertEquals(
-			null,
-			$crypt->getKeyPair(),
-			'post class init unset key pair returned not equal to original key pair'
-		);
-		$this->assertEquals(
-			$public_key,
-			$crypt->getPublicKey(),
-			'post class init set public key returned not equal to original public key'
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox Check different key pair and public key set
-	 *
-	 * @return void
-	 */
-	public function testDifferentSetKeyPairPublicKey()
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		$key_pair_2 = CreateKey::createKeyPair();
-		$public_key_2 = CreateKey::getPublicKey($key_pair_2);
-		$crypt = new AsymmetricAnonymousEncryption($key_pair, $public_key_2);
-		$this->assertTrue(
-			$crypt->compareKeyPair($key_pair),
-			'key pair set matches key pair created'
-		);
-		$this->assertTrue(
-			$crypt->comparePublicKey($public_key_2),
-			'alternate public key set matches alternate public key created'
-		);
-		$this->assertFalse(
-			$crypt->comparePublicKey($public_key),
-			'alternate public key set does not match key pair public key'
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox Check if new set privat key does not overwrite set public key
-	 *
-	 * @return void
-	 */
-	public function testUpdateKeyPairNotUpdatePublicKey(): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		$crypt = new AsymmetricAnonymousEncryption($key_pair);
-		$this->assertTrue(
-			$crypt->compareKeyPair($key_pair),
-			'set key pair not equal to original key pair'
-		);
-		$this->assertTrue(
-			$crypt->comparePublicKey($public_key),
-			'set public key not equal to original public key'
-		);
-		$key_pair_2 = CreateKey::createKeyPair();
-		$public_key_2 = CreateKey::getPublicKey($key_pair_2);
-		$crypt->setKeyPair($key_pair_2);
-		$this->assertTrue(
-			$crypt->compareKeyPair($key_pair_2),
-			'new set key pair not equal to original new key pair'
-		);
-		$this->assertTrue(
-			$crypt->comparePublicKey($public_key),
-			'original set public key not equal to original public key'
-		);
-		$this->assertFalse(
-			$crypt->comparePublicKey($public_key_2),
-			'new public key equal to original public key'
-		);
-	}
-
-	// MARK: empty encrytped string
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::decryptKey
-	 * @covers ::decrypt
-	 * @testdox Test empty encrypted string to decrypt
-	 *
-	 * @return void
-	 */
-	public function testEmptyDecryptionString(): void
-	{
-		$this->expectExceptionMessage('Encrypted string cannot be empty');
-		AsymmetricAnonymousEncryption::decryptKey('', CreateKey::generateRandomKey());
-	}
-
-	// MARK: encrypt/decrypt
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerEncryptDecryptSuccess(): array
-	{
-		return [
-			'valid string' => [
-				'input' => 'I am a secret',
-				'expected' => 'I am a secret',
-			],
-		];
-	}
-
-	/**
-	 * test encrypt/decrypt produce correct output
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptDecryptSuccess
-	 * @testdox encrypt/decrypt $input must be $expected [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testEncryptDecryptSuccess(string $input, string $expected): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		// test class
-		$crypt = new AsymmetricAnonymousEncryption($key_pair);
-		$encrypted = $crypt->encrypt($input);
-		$decrypted = $crypt->decrypt($encrypted);
-		$this->assertEquals(
-			$expected,
-			$decrypted,
-			'Class call',
-		);
-		$crypt = new AsymmetricAnonymousEncryption($key_pair, $public_key);
-		$encrypted = $crypt->encrypt($input);
-		$decrypted = $crypt->decrypt($encrypted);
-		$this->assertEquals(
-			$expected,
-			$decrypted,
-			'Class call botjh set',
-		);
-	}
-
-	/**
-	 * test encrypt/decrypt produce correct output
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptDecryptSuccess
-	 * @testdox encrypt/decrypt indirect $input must be $expected [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testEncryptDecryptSuccessIndirect(string $input, string $expected): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		// test indirect
-		$encrypted = AsymmetricAnonymousEncryption::getInstance(public_key:$public_key)->encrypt($input);
-		$decrypted = AsymmetricAnonymousEncryption::getInstance($key_pair)->decrypt($encrypted);
-		$this->assertEquals(
-			$expected,
-			$decrypted,
-			'Class Instance call',
-		);
-	}
-
-	/**
-	 * test encrypt/decrypt produce correct output
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptDecryptSuccess
-	 * @testdox encrypt/decrypt indirect with public key $input must be $expected [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testEncryptDecryptSuccessIndirectPublicKey(string $input, string $expected): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		// test indirect
-		$encrypted = AsymmetricAnonymousEncryption::getInstance(public_key:$public_key)->encrypt($input);
-		$decrypted = AsymmetricAnonymousEncryption::getInstance($key_pair)->decrypt($encrypted);
-		$this->assertEquals(
-			$expected,
-			$decrypted,
-			'Class Instance call public key',
-		);
-	}
-
-	/**
-	 * test encrypt/decrypt produce correct output
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptDecryptSuccess
-	 * @testdox encrypt/decrypt static $input must be $expected [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testEncryptDecryptSuccessStatic(string $input, string $expected): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		// test static
-		$encrypted = AsymmetricAnonymousEncryption::encryptKey($input, $public_key);
-		$decrypted = AsymmetricAnonymousEncryption::decryptKey($encrypted, $key_pair);
-
-		$this->assertEquals(
-			$expected,
-			$decrypted,
-			'Static call',
-		);
-	}
-
-	// MARK: invalid decrypt key
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerEncryptFailed(): array
-	{
-		return [
-			'wrong decryption key' => [
-				'input' => 'I am a secret',
-				'excpetion_message' => 'Invalid key pair'
-			],
-		];
-	}
-
-	/**
-	 * Test decryption with wrong key
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptFailed
-	 * @testdox decrypt with wrong key $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testEncryptFailed(string $input, string $exception_message): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		$wrong_key_pair = CreateKey::createKeyPair();
-
-		// wrong key in class call
-		$crypt = new AsymmetricAnonymousEncryption(public_key:$public_key);
-		$encrypted = $crypt->encrypt($input);
-		$this->expectExceptionMessage($exception_message);
-		$crypt->setKeyPair($wrong_key_pair);
-		$crypt->decrypt($encrypted);
-	}
-
-	/**
-	 * Test decryption with wrong key
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptFailed
-	 * @testdox decrypt indirect with wrong key $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testEncryptFailedIndirect(string $input, string $exception_message): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		$wrong_key_pair = CreateKey::createKeyPair();
-
-		// class instance
-		$encrypted = AsymmetricAnonymousEncryption::getInstance(public_key:$public_key)->encrypt($input);
-		$this->expectExceptionMessage($exception_message);
-		AsymmetricAnonymousEncryption::getInstance($wrong_key_pair)->decrypt($encrypted);
-	}
-
-	/**
-	 * Test decryption with wrong key
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptFailed
-	 * @testdox decrypt static with wrong key $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testEncryptFailedStatic(string $input, string $exception_message): void
-	{
-		$key_pair = CreateKey::createKeyPair();
-		$public_key = CreateKey::getPublicKey($key_pair);
-		$wrong_key_pair = CreateKey::createKeyPair();
-
-		// class static
-		$encrypted = AsymmetricAnonymousEncryption::encryptKey($input, $public_key);
-		$this->expectExceptionMessage($exception_message);
-		AsymmetricAnonymousEncryption::decryptKey($encrypted, $wrong_key_pair);
-	}
-
-	// MARK: invalid key pair
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerWrongKeyPair(): array
-	{
-		return [
-			'not hex key pair' => [
-				'key_pair' => 'not_a_hex_key_pair',
-				'exception_message' => 'Invalid hex key pair'
-			],
-			'too short hex key pair' => [
-				'key_pair' => '1cabd5cba9e042f12522f4ff2de5c31d233b',
-				'excpetion_message' => 'Key pair is not the correct size (must be '
-			],
-			'empty key pair' => [
-				'key_pair' => '',
-				'excpetion_message' => 'Key pair cannot be empty'
-			]
-		];
-	}
-
-	/**
-	 * test invalid key provided to decrypt or encrypt
-	 *
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerWrongKeyPair
-	 * @testdox wrong key pair $key_pair throws $exception_message [$_dataName]
-	 *
-	 * @param  string $key_pair
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongKeyPair(string $key_pair, string $exception_message): void
-	{
-		$enc_key_pair = CreateKey::createKeyPair();
-
-		// class
-		$this->expectExceptionMessage($exception_message);
-		$crypt = new AsymmetricAnonymousEncryption($key_pair);
-		$this->expectExceptionMessage($exception_message);
-		$crypt->encrypt('test');
-		$crypt->setKeyPair($enc_key_pair);
-		$encrypted = $crypt->encrypt('test');
-		$this->expectExceptionMessage($exception_message);
-		$crypt->setKeyPair($key_pair);
-		$crypt->decrypt($encrypted);
-	}
-
-	/**
-	 * test invalid key provided to decrypt or encrypt
-	 *
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerWrongKeyPair
-	 * @testdox wrong key pair indirect $key_pair throws $exception_message [$_dataName]
-	 *
-	 * @param  string $key_pair
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongKeyPairIndirect(string $key_pair, string $exception_message): void
-	{
-		$enc_key_pair = CreateKey::createKeyPair();
-
-		// set valid encryption
-		$encrypted = AsymmetricAnonymousEncryption::getInstance($enc_key_pair)->encrypt('test');
-		$this->expectExceptionMessage($exception_message);
-		AsymmetricAnonymousEncryption::getInstance($key_pair)->decrypt($encrypted);
-	}
-
-	/**
-	 * test invalid key provided to decrypt or encrypt
-	 *
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerWrongKeyPair
-	 * @testdox wrong key pair static $key_pair throws $exception_message [$_dataName]
-	 *
-	 * @param  string $key_pair
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongKeyPairStatic(string $key_pair, string $exception_message): void
-	{
-		$enc_key_pair = CreateKey::createKeyPair();
-
-		// set valid encryption
-		$encrypted = AsymmetricAnonymousEncryption::encryptKey('test', CreateKey::getPublicKey($enc_key_pair));
-		$this->expectExceptionMessage($exception_message);
-		AsymmetricAnonymousEncryption::decryptKey($encrypted, $key_pair);
-	}
-
-	// MARK: invalid public key
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerWrongPublicKey(): array
-	{
-		return [
-			'not hex public key' => [
-				'public_key' => 'not_a_hex_public_key',
-				'exception_message' => 'Invalid hex public key'
-			],
-			'too short hex public key' => [
-				'public_key' => '1cabd5cba9e042f12522f4ff2de5c31d233b',
-				'excpetion_message' => 'Public key is not the correct size (must be '
-			],
-			'empty public key' => [
-				'public_key' => '',
-				'excpetion_message' => 'Public key cannot be empty'
-			]
-		];
-	}
-
-	/**
-	 * test invalid key provided to decrypt or encrypt
-	 *
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerWrongPublicKey
-	 * @testdox wrong public key $public_key throws $exception_message [$_dataName]
-	 *
-	 * @param  string $public_key
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongPublicKey(string $public_key, string $exception_message): void
-	{
-		$enc_key_pair = CreateKey::createKeyPair();
-		// $enc_public_key = CreateKey::getPublicKey($enc_key_pair);
-
-		// class
-		$this->expectExceptionMessage($exception_message);
-		$crypt = new AsymmetricAnonymousEncryption(public_key:$public_key);
-		$this->expectExceptionMessage($exception_message);
-		$crypt->decrypt('test');
-		$crypt->setKeyPair($enc_key_pair);
-		$encrypted = $crypt->encrypt('test');
-		$this->expectExceptionMessage($exception_message);
-		$crypt->setPublicKey($public_key);
-		$crypt->decrypt($encrypted);
-	}
-
-	/**
-	 * test invalid key provided to decrypt or encrypt
-	 *
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerWrongPublicKey
-	 * @testdox wrong public key indirect $key throws $exception_message [$_dataName]
-	 *
-	 * @param  string $key
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongPublicKeyIndirect(string $key, string $exception_message): void
-	{
-		$enc_key = CreateKey::createKeyPair();
-
-		// class instance
-		$this->expectExceptionMessage($exception_message);
-		AsymmetricAnonymousEncryption::getInstance(public_key:$key)->encrypt('test');
-		// we must encrypt valid thing first so we can fail with the wrong key
-		$encrypted = AsymmetricAnonymousEncryption::getInstance($enc_key)->encrypt('test');
-		// $this->expectExceptionMessage($exception_message);
-		AsymmetricAnonymousEncryption::getInstance($key)->decrypt($encrypted);
-	}
-
-	/**
-	 * test invalid key provided to decrypt or encrypt
-	 *
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerWrongPublicKey
-	 * @testdox wrong public key static $key throws $exception_message [$_dataName]
-	 *
-	 * @param  string $key
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongPublicKeyStatic(string $key, string $exception_message): void
-	{
-		$enc_key = CreateKey::createKeyPair();
-
-		// class static
-		$this->expectExceptionMessage($exception_message);
-		AsymmetricAnonymousEncryption::encryptKey('test', $key);
-		// we must encrypt valid thing first so we can fail with the wrong key
-		$encrypted = AsymmetricAnonymousEncryption::encryptKey('test', $enc_key);
-		$this->expectExceptionMessage($exception_message);
-		AsymmetricAnonymousEncryption::decryptKey($encrypted, $key);
-	}
-
-	// MARK: wrong cipher text
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerWrongCiphertext(): array
-	{
-		return [
-			'invalid cipher text' => [
-				'input' => 'short',
-				'exception_message' => 'base642bin failed: '
-			],
-			'cannot decrypt' => [
-				// phpcs:disable Generic.Files.LineLength
-				'input' => 'Um8tBGiVfFAOg2YoUgA5fTqK1wXPB1S7uxhPNE1lqDxgntkEhYJDOmjXa0DMpBlYHjab6sC4mgzwZSzGCUnXDAgsHckwYwfAzs/r',
-				// phpcs:enable Generic.Files.LineLength
-				'exception_message' => 'Invalid key pair'
-			],
-			'invalid text' => [
-				'input' => 'U29tZSB0ZXh0IGhlcmU=',
-				'exception_message' => 'Invalid key pair'
-			]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::decrypt
-	 * @dataProvider providerWrongCiphertext
-	 * @testdox too short ciphertext $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongCiphertext(string $input, string $exception_message): void
-	{
-		$key = CreateKey::createKeyPair();
-		// class
-		$crypt = new AsymmetricAnonymousEncryption($key);
-		$this->expectExceptionMessage($exception_message);
-		$crypt->decrypt($input);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::decryptKey
-	 * @dataProvider providerWrongCiphertext
-	 * @testdox too short ciphertext indirect $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongCiphertextIndirect(string $input, string $exception_message): void
-	{
-		$key = CreateKey::createKeyPair();
-
-		// class instance
-		$this->expectExceptionMessage($exception_message);
-		AsymmetricAnonymousEncryption::getInstance($key)->decrypt($input);
-
-		// class static
-		$this->expectExceptionMessage($exception_message);
-		AsymmetricAnonymousEncryption::decryptKey($input, $key);
-	}
-
-		/**
-	 * Undocumented function
-	 *
-	 * @covers ::decryptKey
-	 * @dataProvider providerWrongCiphertext
-	 * @testdox too short ciphertext static $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongCiphertextStatic(string $input, string $exception_message): void
-	{
-		$key = CreateKey::createKeyPair();
-		// class static
-		$this->expectExceptionMessage($exception_message);
-		AsymmetricAnonymousEncryption::decryptKey($input, $key);
-	}
-}
-
-// __END__

4dev/tests/Security/CoreLibsSecurityPasswordTest.php

@@ -13,11 +13,6 @@ use PHPUnit\Framework\TestCase;
  */
 final class CoreLibsSecurityPasswordTest extends TestCase
 {
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
 	public function passwordProvider(): array
 	{
 		return [
@@ -26,11 +21,6 @@ final class CoreLibsSecurityPasswordTest extends TestCase
 		];
 	}
 
-	/**
-	 * Note: we need different hash types for PHP versions
-	 *
-	 * @return array
-	 */
 	public function passwordRehashProvider(): array
 	{
 		return [
@@ -73,10 +63,6 @@ final class CoreLibsSecurityPasswordTest extends TestCase
 	 */
 	public function testPasswordRehashCheck(string $input, bool $expected): void
 	{
-		// in PHP 8.4 the length is $12
-		if (PHP_VERSION_ID > 80400) {
-			$input = str_replace('$2y$10$', '$2y$12$', $input);
-		}
 		$this->assertEquals(
 			$expected,
 			\CoreLibs\Security\Password::passwordRehashCheck($input)

4dev/tests/Security/CoreLibsSecuritySymmetricEncryptionTest.php

@@ -15,77 +15,6 @@ use CoreLibs\Security\SymmetricEncryption;
  */
 final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 {
-	// MARK: key set compare
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::compareKey
-	 * @covers ::getKey
-	 * @testdox Check if init class set key matches to created key
-	 *
-	 * @return void
-	 */
-	public function testKeyInitGetCompare(): void
-	{
-		$key = CreateKey::generateRandomKey();
-		$crypt = new SymmetricEncryption($key);
-		$this->assertTrue(
-			$crypt->compareKey($key),
-			'set key not equal to original key'
-		);
-		$this->assertEquals(
-			$key,
-			$crypt->getKey(),
-			'set key returned not equal to original key'
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::setKey
-	 * @covers ::compareKey
-	 * @covers ::getKey
-	 * @testdox Check if set key after class init matches to created key
-	 *
-	 * @return void
-	 */
-	public function testKeySetGetCompare(): void
-	{
-		$key = CreateKey::generateRandomKey();
-		$crypt = new SymmetricEncryption();
-		$crypt->setKey($key);
-		$this->assertTrue(
-			$crypt->compareKey($key),
-			'set key not equal to original key'
-		);
-		$this->assertEquals(
-			$key,
-			$crypt->getKey(),
-			'set key returned not equal to original key'
-		);
-	}
-
-	// MARK: empty encrypted string
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::decryptKey
-	 * @covers ::decrypt
-	 * @testdox Test empty encrypted string to decrypt
-	 *
-	 * @return void
-	 */
-	public function testEmptyDecryptionString(): void
-	{
-		$this->expectExceptionMessage('Encrypted string cannot be empty');
-		SymmetricEncryption::decryptKey('', CreateKey::generateRandomKey());
-	}
-
-	// MARK: encrypt/decrypt compare
-
 	/**
 	 * Undocumented function
 	 *
@@ -127,24 +56,7 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 			$decrypted,
 			'Class call',
 		);
-	}
 
-	/**
-	 * test encrypt/decrypt produce correct output
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptDecryptSuccess
-	 * @testdox encrypt/decrypt indirect $input must be $expected [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testEncryptDecryptSuccessIndirect(string $input, string $expected): void
-	{
-		$key = CreateKey::generateRandomKey();
 		// test indirect
 		$encrypted = SymmetricEncryption::getInstance($key)->encrypt($input);
 		$decrypted = SymmetricEncryption::getInstance($key)->decrypt($encrypted);
@@ -153,24 +65,7 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 			$decrypted,
 			'Class Instance call',
 		);
-	}
 
-	/**
-	 * test encrypt/decrypt produce correct output
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encryptKey
-	 * @covers ::decryptKey
-	 * @dataProvider providerEncryptDecryptSuccess
-	 * @testdox encrypt/decrypt static $input must be $expected [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testEncryptDecryptSuccessStatic(string $input, string $expected): void
-	{
-		$key = CreateKey::generateRandomKey();
 		// test static
 		$encrypted = SymmetricEncryption::encryptKey($input, $key);
 		$decrypted = SymmetricEncryption::decryptKey($encrypted, $key);
@@ -182,8 +77,6 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 		);
 	}
 
-	// MARK: invalid key
-
 	/**
 	 * Undocumented function
 	 *
@@ -221,51 +114,13 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 		$crypt = new SymmetricEncryption($key);
 		$encrypted = $crypt->encrypt($input);
 		$this->expectExceptionMessage($exception_message);
-		$crypt->setKey($wrong_key);
+		$crypt->setKey($key);
 		$crypt->decrypt($encrypted);
-	}
-
-	/**
-	 * Test decryption with wrong key
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptFailed
-	 * @testdox decrypt indirect with wrong key $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testEncryptFailedIndirect(string $input, string $exception_message): void
-	{
-		$key = CreateKey::generateRandomKey();
-		$wrong_key = CreateKey::generateRandomKey();
 
 		// class instance
 		$encrypted = SymmetricEncryption::getInstance($key)->encrypt($input);
 		$this->expectExceptionMessage($exception_message);
 		SymmetricEncryption::getInstance($wrong_key)->decrypt($encrypted);
-	}
-
-	/**
-	 * Test decryption with wrong key
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encryptKey
-	 * @covers ::decryptKey
-	 * @dataProvider providerEncryptFailed
-	 * @testdox decrypt static with wrong key $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testEncryptFailedStatic(string $input, string $exception_message): void
-	{
-		$key = CreateKey::generateRandomKey();
-		$wrong_key = CreateKey::generateRandomKey();
 
 		// class static
 		$encrypted = SymmetricEncryption::encryptKey($input, $key);
@@ -273,8 +128,6 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 		SymmetricEncryption::decryptKey($encrypted, $wrong_key);
 	}
 
-	// MARK: wrong key
-
 	/**
 	 * Undocumented function
 	 *
@@ -291,10 +144,6 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 				'key' => '1cabd5cba9e042f12522f4ff2de5c31d233b',
 				'excpetion_message' => 'Key is not the correct size (must be '
 			],
-			'empty key' => [
-				'key' => '',
-				'excpetion_message' => 'Key cannot be empty'
-			]
 		];
 	}
 
@@ -315,7 +164,6 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 		$enc_key = CreateKey::generateRandomKey();
 
 		// class
-		$this->expectExceptionMessage($exception_message);
 		$crypt = new SymmetricEncryption($key);
 		$this->expectExceptionMessage($exception_message);
 		$crypt->encrypt('test');
@@ -324,23 +172,6 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 		$this->expectExceptionMessage($exception_message);
 		$crypt->setKey($key);
 		$crypt->decrypt($encrypted);
-	}
-
-	/**
-	 * test invalid key provided to decrypt or encrypt
-	 *
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerWrongKey
-	 * @testdox wrong key indirect $key throws $exception_message [$_dataName]
-	 *
-	 * @param  string $key
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongKeyIndirect(string $key, string $exception_message): void
-	{
-		$enc_key = CreateKey::generateRandomKey();
 
 		// class instance
 		$this->expectExceptionMessage($exception_message);
@@ -349,23 +180,6 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 		$encrypted = SymmetricEncryption::getInstance($enc_key)->encrypt('test');
 		$this->expectExceptionMessage($exception_message);
 		SymmetricEncryption::getInstance($key)->decrypt($encrypted);
-	}
-
-		/**
-	 * test invalid key provided to decrypt or encrypt
-	 *
-	 * @covers ::encryptKey
-	 * @covers ::decryptKey
-	 * @dataProvider providerWrongKey
-	 * @testdox wrong key static $key throws $exception_message [$_dataName]
-	 *
-	 * @param  string $key
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongKeyStatic(string $key, string $exception_message): void
-	{
-		$enc_key = CreateKey::generateRandomKey();
 
 		// class static
 		$this->expectExceptionMessage($exception_message);
@@ -376,8 +190,6 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 		SymmetricEncryption::decryptKey($encrypted, $key);
 	}
 
-	// MARK: wrong input
-
 	/**
 	 * Undocumented function
 	 *
@@ -420,49 +232,6 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 		$this->expectExceptionMessage($exception_message);
 		SymmetricEncryption::decryptKey($input, $key);
 	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::decryptKey
-	 * @dataProvider providerWrongCiphertext
-	 * @testdox too short ciphertext indirect $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongCiphertextIndirect(string $input, string $exception_message): void
-	{
-		$key = CreateKey::generateRandomKey();
-
-		// class instance
-		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::getInstance($key)->decrypt($input);
-
-		// class static
-		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::decryptKey($input, $key);
-	}
-
-		/**
-	 * Undocumented function
-	 *
-	 * @covers ::decryptKey
-	 * @dataProvider providerWrongCiphertext
-	 * @testdox too short ciphertext static $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongCiphertextStatic(string $input, string $exception_message): void
-	{
-		$key = CreateKey::generateRandomKey();
-		// class static
-		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::decryptKey($input, $key);
-	}
 }
 
 // __END__

4dev/update/20241203_update_edit_tables/edit_tables_cuid_cuuid_update_add.sql

@@ -1,16 +1,8 @@
 -- 20241203: update edit tables
 ALTER TABLE edit_generic ADD cuuid UUID DEFAULT gen_random_uuid();
-ALTER TABLE edit_log ADD eucuid VARCHAR;
-ALTER TABLE edit_log ADD eucuuid VARCHAR;
+ALTER TABLE edit_log ADD ecuid VARCHAR;
+ALTER TABLE edit_log ADD ecuuid VARCHAR;
 ALTER TABLE edit_log ADD action_sub_id VARCHAR;
-ALTER TABLE edit_log ADD http_data JSONB;
-ALTER TABLE edit_log ADD ip_address JSONB;
-ALTER TABLE edit_log ADD action_data JSONB;
-ALTER TABLE edit_log ADD request_scheme VARCHAR;
-ALTER TABLE edit_user ADD force_logout INT DEFAULT 0;
-COMMENT ON COLUMN edit_user.force_logout IS 'Counter for forced log out, if this one is higher than the session set one the session gets terminated';
-ALTER TABLE edit_user ADD last_login TIMESTAMP WITHOUT TIME ZONE;
-COMMENT ON COLUMN edit_user.last_login IS 'Last succesfull login tiemstamp';
 
 -- update set_edit_gneric
 -- adds the created or updated date tags
@@ -22,15 +14,13 @@ DECLARE
     random_length INT = 25; -- that should be long enough
 BEGIN
     IF TG_OP = 'INSERT' THEN
-        NEW.date_created := clock_timestamp();
+        NEW.date_created := 'now';
         NEW.cuid := random_string(random_length);
         NEW.cuuid := gen_random_uuid();
     ELSIF TG_OP = 'UPDATE' THEN
-        NEW.date_updated := clock_timestamp();
+        NEW.date_updated := 'now';
     END IF;
     RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';
-
--- END --

phpstan.neon

@@ -9,7 +9,7 @@ parameters:
 	#friendly:
 	#	lineBefore: 3
 	#	lineAfter: 3
-	level: 8 # max is now 10
+	level: 8 # max is now 9
 	# strictRules:
 	# 	allRules: false
 	checkMissingCallableSignature: true

phpunit.xml

@@ -1,13 +1,8 @@
 <phpunit
 	cacheResultFile="/tmp/phpunit-corelibs.result.cache"
 	colors="true"
-	verbose="false"
+	verbose="true"
 	convertDeprecationsToExceptions="true"
 	bootstrap="4dev/tests/bootstrap.php"
 >
-	<testsuites>
-		<testsuite name="deploy">
-			<directory>4dev/tests</directory>
-		</testsuite>
-	</testsuites>
 </phpunit>

www/admin/class_test.admin.backend.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.array.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -250,19 +250,6 @@ foreach (array_keys($array) as $search) {
 }
 print "Key not exists: " . DgS::printAr(ArrayHandler::arrayGetNextKey($array, 'z')) . "<br>";
 
-print "<hr>";
-$keys = ['b', 'c', 'f'];
-print "Return only: " . DgS::printAr($keys) . ": "
-	. DgS::printAr(ArrayHandler::arrayReturnMatchingKeyOnly($array, $keys)) . "<br>";
-
-$out = array_filter($array, fn($key) => in_array($key, $keys), ARRAY_FILTER_USE_KEY);
-print "array filter: " . DgS::printAr($keys) . ": " . DgS::printAr($out) . "<br>";
-$out = array_intersect_key(
-	$array,
-	array_flip($keys)
-);
-print "array intersect key: " . DgS::printAr($keys) . ": " . DgS::printAr($out) . "<br>";
-
 print "</body></html>";
 
 // __END__

www/admin/class_test.autoloader.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 // basic class test file

www/admin/class_test.byte.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.check.colors.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.class-calls.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.config.direct.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.config.link.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.convert.colors.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -18,7 +18,7 @@ require 'config.php';
 $LOG_FILE_ID = 'classTest-convert-colors';
 ob_end_flush();
 
-// use CoreLibs\Convert\Colors;
+use CoreLibs\Convert\Colors;
 use CoreLibs\Convert\Color\Color;
 use CoreLibs\Convert\Color\Coordinates;
 use CoreLibs\Debug\Support as DgS;
@@ -29,6 +29,7 @@ $log = new CoreLibs\Logging\Logging([
 	'log_file_id' => $LOG_FILE_ID,
 	'log_per_date' => true,
 ]);
+$color_class = 'CoreLibs\Convert\Colors';
 
 /**
  * print out a color block with info
@@ -130,8 +131,7 @@ try {
 } catch (\LengthException $e) {
 	print "*Exception: " . $e->getMessage() . "<br><pre>" . print_r($e, true) . "</pre><br>";
 }
-
-/* print "<hr>";
+print "<hr>";
 print "<h2>LEGACY</h2>";
 // B(valid)
 $rgb = [50, 20, 30];
@@ -173,7 +173,7 @@ $hsb = [0, 0, 5];
 print "S::COLOR hsb->rgb: $hsb[0], $hsb[1], $hsb[2]: "
 	. DgS::printAr(SetVarType::setArray(
 		Colors::hsb2rgb($hsb[0], $hsb[1], $hsb[2])
-	)) . "<br>"; */
+	)) . "<br>";
 
 print "<hr>";
 

www/admin/class_test.create_email.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.datetime.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

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

@@ -7,7 +7,7 @@
 declare(strict_types=1);
 
 // turn on all error reporting
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -28,6 +28,7 @@ $log = new CoreLibs\Logging\Logging([
 	'log_per_date' => true,
 ]);
 
+
 $PAGE_NAME = 'TEST CLASS: DB CONVERT PLACEHOLDER';
 print "<!DOCTYPE html>";
 print "<html><head><title>" . $PAGE_NAME . "</title></head>";

www/admin/class_test.db.dbReturn.php

@@ -7,7 +7,7 @@
 declare(strict_types=1);
 
 // turn on all error reporting
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.db.php

@@ -7,7 +7,7 @@
 declare(strict_types=1);
 
 // turn on all error reporting
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -273,8 +273,8 @@ $query_insert = <<<SQL
 INSERT INTO
 	test_foo
 (
-	test, some_bool, string_a, number_a, numeric_a,
-	some_internval, some_timestamp, json_string
+	test, some_bool, string_a, number_a, number_a_numeric,
+	some_time, some_timestamp, json_string
 ) VALUES (
 	$1, $2, $3, $4, $5,
 	$6, $7, $8
@@ -283,8 +283,8 @@ RETURNING test
 SQL;
 $query_select = <<<SQL
 SELECT
-	test, some_bool, string_a, number_a, numeric_a,
-	some_time, some_internval, some_timestamp, json_string
+	test, some_bool, string_a, number_a, number_a_numeric,
+	some_time, some_time, some_timestamp, json_string
 FROM
 	test_foo
 WHERE
@@ -554,7 +554,7 @@ print "<b>PREPARE QUERIES</b><br>";
 // READ PREPARE
 $q_prep = <<<SQL
 SELECT test_foo_id, test, some_bool, string_a, number_a,
-numeric_a, some_time
+number_a_numeric, some_time
 FROM test_foo
 WHERE test = $1
 ORDER BY test_foo_id DESC LIMIT 5
@@ -582,7 +582,7 @@ if ($db->dbPrepare('sel_test_foo', $q_prep) === false) {
 
 // sel test with ANY () type
 $q_prep = "SELECT test_foo_id, test, some_bool, string_a, number_a, "
-	. "numeric_a, some_time "
+	. "number_a_numeric, some_time "
 	. "FROM test_foo "
 	. "WHERE test = ANY($1) "
 	. "ORDER BY test_foo_id DESC LIMIT 5";
@@ -618,7 +618,7 @@ $test_bar = $db->dbEscapeLiteral('SOMETHING DIFFERENT');
 $q = <<<SQL
 SELECT test_foo_id, test, some_bool, string_a, number_a,
 -- comment
-numeric_a, some_time
+number_a_numeric, some_time
 FROM test_foo
 WHERE test = $test_bar
 ORDER BY test_foo_id DESC LIMIT 5
@@ -631,7 +631,7 @@ print "DB RETURN PARAMS<br>";
 $q = <<<SQL
 SELECT test_foo_id, test, some_bool, string_a, number_a,
 -- comment
-numeric_a, some_time
+number_a_numeric, some_time
 FROM test_foo
 WHERE test = $1
 ORDER BY test_foo_id DESC LIMIT 5
@@ -646,7 +646,7 @@ echo "<hr>";
 print "DB RETURN PARAMS LIKE<br>";
 $q = <<<SQL
 SELECT
-	test_foo_id, test, some_bool, string_a, number_a, numeric_a
+	test_foo_id, test, some_bool, string_a, number_a, number_a_numeric
 FROM test_foo
 WHERE string_a LIKE $1;
 SQL;
@@ -660,7 +660,7 @@ echo "<hr>";
 print "DB RETURN PARAMS ANY<br>";
 $q = <<<SQL
 SELECT
-	test_foo_id, test, some_bool, string_a, number_a, numeric_a
+	test_foo_id, test, some_bool, string_a, number_a, number_a_numeric
 FROM test_foo
 WHERE string_a = ANY($1);
 SQL;

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

@@ -7,7 +7,7 @@
 declare(strict_types=1);
 
 // turn on all error reporting
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -53,9 +53,6 @@ if (($dbh = $db->dbGetDbh()) instanceof \PgSql\Connection) {
 } else {
 	print "NO DB HANDLER<br>";
 }
-// REGEX for placeholder count
-print "Placeholder regex: <pre>" . CoreLibs\DB\Support\ConvertPlaceholder::REGEX_LOOKUP_PLACEHOLDERS . "</pre>";
-
 // turn on debug replace for placeholders
 $db->dbSetDebugReplacePlaceholder(true);
 
@@ -65,135 +62,59 @@ $db->dbExec("TRUNCATE test_foo");
 $uniqid = \CoreLibs\Create\Uids::uniqIdShort();
 $binary_data = $db->dbEscapeBytea(file_get_contents('class_test.db.php') ?:  '');
 $query_params = [
-	$uniqid, // test
-	true, // some_bool
-	'STRING A', // string_a
-	2, // number_a
-	2.5, // numeric_a
-	1, // smallint
-	date('H:m:s'), // some_internval
-	date('Y-m-d H:i:s'), // some_timestamp
-	json_encode(['a' => 'string', 'b' => 1, 'c' => 1.5, 'f' => true, 'g' => ['a', 1, 1.5]]), // json_string
-	null, // null_var
-	'{"a", "b"}', // array_char_1
-	'{1,2}', // array_int_1
-	'{"(array Text A, 5, 8.8)","(array Text B, 10, 15.2)"}', // array_composite
-	'("Text", 4, 6.3)', // composite_item
-	$binary_data, // some_binary
-	date('Y-m-d'), // some_date
-	date('H:i:s'), // some_time
-	'{"c", "d", "e"}', // array_char_2
-	'{3,4,5}', // array_int_2
-	12345667778818, // bigint
-	1.56, // numbrer_real
-	3.75, // number_double
-	124.5, // numeric_3
-	\CoreLibs\Create\Uids::uuidv4() // uuid_var
+	$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_insert = <<<SQL
 INSERT INTO test_foo (
-	-- row 1
-	test, some_bool, string_a, number_a, numeric_a, smallint_a,
-	-- row 2
-	some_internval, some_timestamp, json_string, null_var,
-	-- row 3
+	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,
-	-- row 4
 	array_composite,
-	-- row 5
 	composite_item,
-	-- row 6
-	some_binary,
-	-- row 7
-	some_date, some_time,
-	-- row 8
-	array_char_2, array_int_2,
-	-- row 9
-	bigint_a, number_real, number_double, numeric_3,
-	-- row 10
-	uuid_var
+	some_binary
 ) VALUES (
-	-- row 1
 	$1, $2, $3, $4, $5, $6,
-	-- row 2
 	$7, $8, $9, $10,
-	-- row 3
 	$11, $12,
-	-- row 4
 	$13,
-	-- row 5
 	$14,
-	-- row 6
-	$15,
-	-- row 7
-	$16, $17,
-	-- row 8
-	$18, $19,
-	-- row 9
-	$20, $21, $22, $23,
-	-- row 10
-	$24
+	$15
 )
 RETURNING
-	test_foo_id, number_serial, identity_always, identitiy_default, default_uuid,
-	test, some_bool, string_a, number_a, numeric_a, smallint_a,
-	some_internval, some_timestamp, json_string, null_var,
+	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,
-	some_date,
-	array_char_2, array_int_2,
-	bigint_a, number_real, number_double, numeric_3,
-	uuid_var
+	some_binary
 SQL;
 $status = $db->dbExecParams($query_insert, $query_params);
 echo "<b>*</b><br>";
 echo "INSERT ALL COLUMN TYPES: "
 	. Support::printToString($query_params) . " |<br>"
-	. "QUERY: <pre>" . $db->dbGetQuery() . "</pre> |<br>"
+	. "QUERY: " . $db->dbGetQuery() . " |<br>"
 	. "PRIMARY KEY: " . Support::printToString($db->dbGetInsertPK()) . " |<br>"
 	. "RETURNING EXT: <pre>" . print_r($db->dbGetReturningExt(), true) . "</pre> |<br>"
 	. "RETURNING RETURN: <pre>" . print_r($db->dbGetReturningArray(), true) . "<pre> |<br>"
 	. "ERROR: " . $db->dbGetLastError(true) . "<br>";
 echo "<hr>";
 
-print "<b>ANY call</b><br>";
-$query = <<<SQL
-SELECT test
-FROM test_foo
-WHERE string_a = ANY($1)
-SQL;
-$query_value = '{'
-	. join(',', ['STRING A'])
-. '}';
-while (is_array($res = $db->dbReturnParams($query, [$query_value]))) {
-	print "Result: " . Support::prAr($res) . "<br>";
-}
-
-echo "<hr>";
-
-echo "<b>CASE part</b><br>";
-$query = <<<SQL
-UPDATE
-test_foo
-SET
-some_timestamp = NOW(),
-	-- if not 1 set, else keep at one
-	smallint_a = (CASE
-			WHEN smallint_a <> 1 THEN $1
-			ELSE 1::INT
-	END)::INT
-WHERE
-	string_a = $2
-SQL;
-echo "QUERY: <pre>" . $query . "</pre>";
-$res = $db->dbExecParams($query, [1, 'foobar']);
-print "ERROR: " . $db->dbGetLastError(true) . "<br>";
-
-echo "<hr>";
-
 // test connectors: = , <> () for query detection
 
 // convert placeholder tests
@@ -210,16 +131,6 @@ 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 (
@@ -246,18 +157,6 @@ SQL,
 		],
 		'direction' => 'pg',
 	],
-	'select, compare $' => [
-		'query' => <<<SQL
-		SELECT string_a
-		FROM test_foo
-		WHERE
-			number_a >= $1 OR number_a <= $2 OR
-			number_a > $3 OR number_a < $4
-			OR number_a = $5 OR number_a <> $6
-		SQL,
-		'params' => [1, 2, 3, 4, 5, 6],
-		'direction' => 'pg'
-	],
 ];
 
 $db->dbSetConvertPlaceholder(true);
@@ -270,12 +169,11 @@ foreach ($test_queries as $info => $data) {
 	// 	. "<br>";
 	if ($db->dbCheckQueryForSelect($query)) {
 		$row = $db->dbReturnRowParams($query, $params);
-		print "<b>[$info]</b> SELECT: " . Support::prAr($row) . "<br>";
+		print "[$info] SELECT: " . Support::prAr($row) . "<br>";
 	} else {
 		$db->dbExecParams($query, $params);
 	}
-	print "ERROR: " . $db->dbGetLastError(true) . "<br>";
-	print "<b>[$info]</b> " . Support::printAr($db->dbGetPlaceholderConverted()) . "<br>";
+	print "[$info] " . Support::printAr($db->dbGetPlaceholderConverted()) . "<br>";
 	echo "<hr>";
 }
 
@@ -290,29 +188,22 @@ SQL,
 		['string A-1']
 	))
 ) {
-	print "<b>RES</b>: " . Support::prAr($res) . "<br>";
+	print "RES: " . Support::prAr($res) . "<br>";
 }
-print "ERROR: " . $db->dbGetLastError(true) . "<br>";
-echo "<hr>";
 
 print "CursorExt: " . Support::prAr($db->dbGetCursorExt(<<<SQL
 SELECT test, string_a, number_a
 FROM test_foo
 WHERE string_a = ?
 SQL, ['string A-1']));
-echo "<hr>";
 
-// ERROR BELOW: missing params
 $res = $db->dbReturnRowParams(<<<SQL
 SELECT test, string_a, number_a
 FROM test_foo
 WHERE string_a = $1
 SQL, []);
 print "PL: " . Support::PrAr($db->dbGetPlaceholderConverted()) . "<br>";
-print "ERROR: " . $db->dbGetLastError(true) . "<br>";
-echo "<hr>";
 
-// ERROR BELOW: LIKE cannot have placeholder
 echo "dbReturn read LIKE: <br>";
 while (
 	is_array($res = $db->dbReturnParams(
@@ -326,7 +217,6 @@ SQL,
 ) {
 	print "RES: " . Support::prAr($res) . "<br>";
 }
-print "ERROR: " . $db->dbGetLastError(true) . "<br>";
 
 print "</body></html>";
 $db->log->debug('DEBUGEND', '==================================== [END]');

www/admin/class_test.db.single.php

@@ -7,7 +7,7 @@
 declare(strict_types=1);
 
 // turn on all error reporting
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

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.db.types.php

@@ -7,7 +7,7 @@
 declare(strict_types=1);
 
 // turn on all error reporting
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -57,43 +57,6 @@ if (($dbh = $db->dbGetDbh()) instanceof \PgSql\Connection) {
 print "<b>TRUNCATE test_foo</b><br>";
 $db->dbExec("TRUNCATE test_foo");
 
-/*
-BELOW IS THE FULL TABLE WITH ALL PostgreSQL Types
-=> \d test_foo
-												Table "public.test_foo"
-Column            |            Type             | Nullable |                     Default
-------------------+-----------------------------+----------+-----------------------------------------------
-test              | character varying           |          |
-some_bool         | boolean                     |          |
-string_a          | character varying           |          |
-number_a          | integer                     |          |
-numeric_a         | numeric                     |          |
-some_internval    | interval                    |          |
-test_foo_id       | integer                     | not null | generated always as identity
-json_string       | jsonb                       |          |
-some_timestamp    | timestamp without time zone |          |
-some_binary       | bytea                       |          |
-null_var          | character varying           |          |
-smallint_a        | smallint                    |          |
-number_real       | real                        |          |
-number_double     | double precision            |          |
-number_serial     | integer                     | not null | nextval('test_foo_number_serial_seq'::regclass)
-array_char_1      | character varying[]         |          |
-array_char_2      | character varying[]         |          |
-array_int_1       | integer[]                   |          |
-array_int_2       | integer[]                   |          |
-composite_item    | inventory_item              |          |
-array_composite   | inventory_item[]            |          |
-numeric_3         | numeric(3,0)                |          |
-identity_always   | bigint                      | not null | generated always as identity
-identitiy_default | bigint                      | not null | generated by default as identity
-uuid_var          | uuid                        |          | gen_random_uuid()
-some_date         | date                        |          |
-some_time         | time without time zone      |          |
-bigint_a          | bigint                      |          |
-default_uuid      | uuid                        |          | gen_random_uuid()
-*/
-
 /* $q = <<<SQL
 INSERT INTO test_foo (test, array_composite) VALUES ('C', '{"(a,1,1.5)","(b,2,2.5)"}')
 SQL;
@@ -127,7 +90,7 @@ $query_params = [
 
 $query_insert = <<<SQL
 INSERT INTO test_foo (
-	test, some_bool, string_a, number_a, numeric_a, smallint_a,
+	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,
@@ -143,7 +106,7 @@ INSERT INTO test_foo (
 )
 RETURNING
 	test_foo_id,
-	test, some_bool, string_a, number_a, numeric_a, smallint_a,
+	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,
@@ -164,8 +127,8 @@ echo "<hr>";
 $query_select = <<<SQL
 SELECT
 	test_foo_id,
-	test, some_bool, string_a, number_a, numeric_a, smallint_a,
-	number_real, number_double, numeric_3, number_serial,
+	test, some_bool, string_a, number_a, number_a_numeric, smallint_a,
+	number_real, number_double, number_numeric_3, number_serial,
 	some_time, some_timestamp, json_string, null_var,
 	array_char_1, array_char_2, array_int_1, array_int_2, array_composite,
 	composite_item, (composite_item).*,

www/admin/class_test.debug.php

@@ -12,7 +12,7 @@ $PRINT_ALL = false;
 $ECHO_ALL = true;
 $DB_DEBUG = true;
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.deprecated.helper.php

@@ -1,62 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// define log file id
-$LOG_FILE_ID = 'classTest-phpv';
-ob_end_flush();
-
-$log = new CoreLibs\Logging\Logging([
-	'log_folder' => BASE . LOG,
-	'log_file_id' => $LOG_FILE_ID,
-	'log_per_date' => true,
-]);
-$_phpv = new CoreLibs\Check\PhpVersion();
-$phpv_class = 'CoreLibs\Check\PhpVersion';
-
-$PAGE_NAME = 'TEST CLASS: PHP VERSION';
-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>';
-
-// fputcsv
-print "<h3>\CoreLibs\DeprecatedHelper\Deprecated84::fputcsv()</h3>";
-$test_csv = BASE . TMP . 'DeprecatedHelper.test.csv';
-print "File: $test_csv<br>";
-
-$fp = fopen($test_csv, "w");
-if (!is_resource($fp)) {
-	die("Cannot open file: $test_csv");
-}
-\CoreLibs\DeprecatedHelper\Deprecated84::fputcsv($fp, ["A", "B", "C"]);
-fclose($fp);
-
-$fp = fopen($test_csv, "r");
-if (!is_resource($fp)) {
-	die("Cannot open file: $test_csv");
-}
-while ($entry = \CoreLibs\DeprecatedHelper\Deprecated84::fgetcsv($fp)) {
-	print "fgetcsv: <pre>" . print_r($entry, true) . "</pre>";
-}
-fclose($fp);
-
-$out = \CoreLibs\DeprecatedHelper\Deprecated84::str_getcsv("A,B,C");
-print "str_getcsv: <pre>" . print_r($out, true) . "</pre>";
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.email.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.encoding.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.encryption.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -18,7 +18,6 @@ require 'config.php';
 $LOG_FILE_ID = 'classTest-encryption';
 ob_end_flush();
 
-use CoreLibs\Security\AsymmetricAnonymousEncryption;
 use CoreLibs\Security\SymmetricEncryption;
 use CoreLibs\Security\CreateKey;
 
@@ -37,8 +36,6 @@ print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
-print "<h2>Symmetric Encryption</h2>";
-
 $key = CreateKey::generateRandomKey();
 print "Secret Key: " . $key . "<br>";
 
@@ -108,49 +105,6 @@ try {
 // $encrypted = $se->encrypt($string);
 // $decrypted = $se->decrypt($encrypted);
 
-echo "<hr>";
-print "<h2>Asymmetric Encryption</h2>";
-
-$key_pair = CreateKey::createKeyPair();
-$public_key = CreateKey::getPublicKey($key_pair);
-
-$string = "I am some asymmetric secret";
-print "Message: " . $string . "<br>";
-$encrypted = sodium_crypto_box_seal($string, CreateKey::hex2bin($public_key));
-$message = sodium_bin2base64($encrypted, SODIUM_BASE64_VARIANT_ORIGINAL);
-print "Encrypted PL: " . $message . "<br>";
-$result = sodium_base642bin($message, SODIUM_BASE64_VARIANT_ORIGINAL);
-$decrypted = sodium_crypto_box_seal_open($result, CreateKey::hex2bin($key_pair));
-print "Decrypted PL: " . $decrypted . "<br>";
-
-$encrypted = AsymmetricAnonymousEncryption::encryptKey($string, $public_key);
-print "Encrypted ST: " . $encrypted . "<br>";
-$decrypted = AsymmetricAnonymousEncryption::decryptKey($encrypted, $key_pair);
-print "Decrypted ST: " . $decrypted . "<br>";
-
-$aa_crypt = new AsymmetricAnonymousEncryption($key_pair, $public_key);
-$encrypted = $aa_crypt->encrypt($string);
-print "Encrypted: " . $encrypted . "<br>";
-$decrypted = $aa_crypt->decrypt($encrypted);
-print "Decrypted: " . $decrypted . "<br>";
-
-print "Base64 encode: " . base64_encode('Some text here') . "<Br>";
-
-/// this has to fail
-$crypt = new AsymmetricAnonymousEncryption();
-$crypt->setPublicKey(CreateKey::getPublicKey(CreateKey::createKeyPair()));
-print "Public Key: " . $crypt->getPublicKey() . "<br>";
-try {
-	$crypt->setPublicKey(CreateKey::createKeyPair());
-} catch (RangeException $e) {
-	print "Invalid range: <pre>$e</pre>";
-}
-try {
-	$crypt->setKeyPair(CreateKey::getPublicKey(CreateKey::createKeyPair()));
-} catch (RangeException $e) {
-	print "Invalid range: <pre>$e</pre>";
-}
-
 print "</body></html>";
 
 // __END__

www/admin/class_test.error_msg.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.file.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.hash.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.html.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.html_build.block.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.html_build.element.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -74,8 +74,8 @@ print "EL_O: <pre>" . print_r($el_o, true) . "</pre>";
 
 echo "<hr>";
 print "buildHtml(): <pre>" . htmlentities($el_o->buildHtml()) . "</pre>";
-/* echo "<hr>";
-print "phfo(\$el_o): <pre>" . htmlentities($el_o::printHtmlFromObject($el_o, true)) . "</pre>"; */
+echo "<hr>";
+print "phfo(\$el_o): <pre>" . htmlentities($el_o::printHtmlFromObject($el_o, true)) . "</pre>";
 echo "<hr>";
 print "phfa(\$el_list): <pre>" . htmlentities($el_o::buildHtmlFromList($el_o_list, true)) . "</pre>";
 

www/admin/class_test.html_build.replace.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.image.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.json.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.lang.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -34,21 +34,22 @@ use CoreLibs\Debug\Support;
 echo "<br><b>LIST LOCALES</b><br>";
 
 $locale = 'en_US.UTF-8';
-$locales = Language\L10n::listLocales($locale);
+$locales = L10n::listLocales($locale);
 print "[" . $locale . "] LOCALES: " . Support::printAr($locales) . "<br>";
 $locale = 'en.UTF-8';
-$locales = Language\L10n::listLocales($locale);
+$locales = L10n::listLocales($locale);
 print "[" . $locale . "] LOCALES: " . Support::printAr($locales) . "<br>";
 
 echo "<br><b>PARSE LOCAL</b><br>";
 $locale = 'en_US.UTF-8';
-$locale_info = Language\L10n::parseLocale($locale);
+$locale_info = L10n::parseLocale($locale);
 print "[" . $locale . "] INFO: " . Support::printAr($locale_info) . "<br>";
 $locale = 'en.UTF-8';
-$locale_info = Language\L10n::parseLocale($locale);
+$locale_info = L10n::parseLocale($locale);
 print "[" . $locale . "] INFO: " . Support::printAr($locale_info) . "<br>";
 
-/* echo "<br><b>AUTO DETECT</b><br>";
+echo "<br><b>AUTO DETECT</b><br>";
+
 // DEPRECATED
 // $get_locale = Language\GetLocale::setLocale();
 // print "[AUTO, DEPRECATED]: " . Support::printAr($get_locale) . "<br>";
@@ -102,7 +103,6 @@ $get_locale = Language\GetLocale::setLocaleFromSession(
 	BASE . INCLUDES . LOCALE
 );
 print "[SESSION SET INVALID]: " . Support::printAr($get_locale) . "<br>";
- */
 
 // try to load non existing
 echo "<br><b>NEW TYPE</b><br>";

www/admin/class_test.logging.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.login.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -17,14 +17,8 @@ require 'config.php';
 // define log file id
 $LOG_FILE_ID = 'classTest-login';
 $SET_SESSION_NAME = EDIT_SESSION_NAME;
-
-use CoreLibs\Debug\Support;
-
 // init login & backend class
-$session = new CoreLibs\Create\Session($SET_SESSION_NAME, [
-	'regenerate' => 'interval',
-	'regenerate_interval' => 10, // every 10 seconds
-]);
+$session = new CoreLibs\Create\Session($SET_SESSION_NAME);
 $log = new CoreLibs\Logging\Logging([
 	'log_folder' => BASE . LOG,
 	'log_file_id' => $LOG_FILE_ID,
@@ -49,87 +43,23 @@ ob_end_flush();
 $login->loginMainCall();
 
 $PAGE_NAME = 'TEST CLASS: LOGIN';
-print str_replace(
-	'{PAGE_NAME}',
-	$PAGE_NAME,
-<<<HTML
-<!DOCTYPE html>
-<html><head>
-<title>{PAGE_NAME}</title>
-</head>
-<body>
-<div><a href="class_test.php">Class Test Master</a></div>
-<div><h1>{PAGE_NAME}</h1></div>
-HTML
-);
-
-// button logout
-print <<<HTML
-<script language="JavaScript">
-function loginLogout()
-{
-	const form = document.createElement('form');
-	form.method = 'post';
-	const hiddenField = document.createElement('input');
-	hiddenField.type = 'hidden';
-	hiddenField.name = 'login_logout';
-	hiddenField.value = 'Logout';
-	form.appendChild(hiddenField);
-	document.body.appendChild(form);
-	form.submit();
-}
-</script>
-<div style="margin: 20px 0;">
-	<button onclick="loginLogout();" type="button">Logout</button>
-</div>
-HTML;
-// string logout
-print <<<HTML
-<div style="margin: 20px 0;">
-<form method="post" name="loginlogout">
-<a href="javascript:document.loginlogout.login_logout.value=Logout;document.loginlogout.submit();">Logout</a>
-<input type="hidden" name="login_logout" value="">
-</form>
-</div>
-HTML;
-
-echo "SESSION ID: " . $session->getSessionIdCall() . "<br>";
+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>';
 
 echo "CHECK PERMISSION: " . ($login->loginCheckPermissions() ? 'OK' : 'BAD') . "<br>";
 echo "IS ADMIN: " . ($login->loginIsAdmin() ? 'OK' : 'BAD') . "<br>";
 echo "MIN ACCESS BASE: " . ($login->loginCheckAccessBase('admin') ? 'OK' : 'BAD') . "<br>";
 echo "MIN ACCESS PAGE: " . ($login->loginCheckAccessPage('admin') ? 'OK' : 'BAD') . "<br>";
 
-echo "ACL: " . Support::printAr($login->loginGetAcl()) . "<br>";
-echo "ACL (MIN): " . Support::printAr($login->loginGetAcl()['min'] ?? []) . "<br>";
-echo "LOCALE: " . Support::printAr($login->loginGetLocale()) . "<br>";
+echo "ACL: " . \CoreLibs\Debug\Support::printAr($login->loginGetAcl()) . "<br>";
+echo "ACL (MIN): " . \CoreLibs\Debug\Support::printAr($login->loginGetAcl()['min'] ?? []) . "<br>";
+echo "LOCALE: " . \CoreLibs\Debug\Support::printAr($login->loginGetLocale()) . "<br>";
 
-echo "ECUID: " . $login->loginGetEuCuid() . "<br>";
-echo "ECUUID: " . $login->loginGetEuCuuid() . "<br>";
-
-echo "<hr>";
-// set + check edit access id
-$edit_access_cuid = 'buRW8Gu2Lkkf';
-if (isset($login->loginGetAcl()['unit'])) {
-	print "EDIT ACCESS CUID: " . $edit_access_cuid . "<br>";
-	print "ACL UNIT: " . print_r(array_keys($login->loginGetAcl()['unit']), true) . "<br>";
-	print "ACCESS CHECK: " . Support::prBl($login->loginCheckEditAccessCuid($edit_access_cuid)) . "<br>";
-	if ($login->loginCheckEditAccessCuid($edit_access_cuid)) {
-		print "Set new:" . $edit_access_cuid . "<br>";
-	} else {
-		print "Load default unit id: " . $login->loginGetAcl()['unit_id'] . "<br>";
-	}
-} else {
-	print "Something went wrong with the login<br>";
-}
-
-// echo "<hr>";
-// IP check: 'REMOTE_ADDR', 'HTTP_X_FORWARDED_FOR', 'CLIENT_IP' in _SERVER
-// Agent check: 'HTTP_USER_AGENT'
-
-
-echo "<hr>";
-print "SESSION: " . Support::printAr($_SESSION) . "<br>";
+echo "ECUID: " . $login->loginGetEcuid() . "<br>";
+echo "ECUUID: " . $login->loginGetEcuuid() . "<br>";
 
 $login->writeLog(
 	'TEST LOG',

www/admin/class_test.math.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.memoryusage.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.mime.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.output.form.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -29,17 +29,15 @@ $table_arrays = [];
 $table_arrays[\CoreLibs\Get\System::getPageName(1)] = [
 	// form fields mtaching up with db fields
 	'table_array' => [
-		'foo',
-		'bar'
 	],
 	// laod query
-	'load_query' => 'SELECT uuid_nr, foo, bar FROM test',
+	'load_query' => '',
 	// database table to load from
-	'table_name' => 'test',
+	'table_name' => '',
 	// for load dro pdown, format output
 	'show_fields' => [
 		[
-			'name' => 'foo'
+			'name' => 'name'
 		],
 		[
 			'name' => 'enabled',

www/admin/class_test.password.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -37,8 +37,6 @@ print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
-print "PHP Version: " . PHP_VERSION . "<br>";
-
 $password = 'something1234';
 $enc_password = $_password->passwordSet($password);
 print "PASSWORD: $password: " . $enc_password . "<br>";
@@ -53,20 +51,6 @@ print "PASSWORD REHASH: " . (string)$password_class::passwordRehashCheck($enc_pa
 // direct static
 print "S::PASSWORD VERFIY: " . (string)PwdChk::passwordVerify($password, $enc_password) . "<br>";
 
-if (PHP_VERSION_ID < 80400) {
-	$rehash_test = '$2y$10$EgWJ2WE73DWi.hIyFRCdpejLXTvHbmTK3LEOclO1tAvXAXUNuUS4W';
-	$rehash_test_throw = '$2y$12$EgWJ2WE73DWi.hIyFRCdpejLXTvHbmTK3LEOclO1tAvXAXUNuUS4W';
-} else {
-	$rehash_test = '$2y$12$EgWJ2WE73DWi.hIyFRCdpejLXTvHbmTK3LEOclO1tAvXAXUNuUS4W';
-	$rehash_test_throw = '$2y$10$EgWJ2WE73DWi.hIyFRCdpejLXTvHbmTK3LEOclO1tAvXAXUNuUS4W';
-}
-if (PwdChk::passwordRehashCheck($rehash_test)) {
-	print "Bad password [BAD]<br>";
-}
-if (PwdChk::passwordRehashCheck($rehash_test_throw)) {
-	print "Bad password [OK]<br>";
-}
-
 print "</body></html>";
 
 // __END__

www/admin/class_test.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -62,39 +62,19 @@ $backend = new CoreLibs\Admin\Backend(
 $backend->db->dbInfo(true);
 ob_end_flush();
 
-print <<<HTML
-<!DOCTYPE html>
-<html><head>
-<title>TEST CLASS</title>
-<script language="JavaScript">
-function loginLogout()
-{
-	const form = document.createElement('form');
-	form.method = 'post';
-	const hiddenField = document.createElement('input');
-	hiddenField.type = 'hidden';
-	hiddenField.name = 'login_logout';
-	hiddenField.value = 'Logout';
-	form.appendChild(hiddenField);
-	document.body.appendChild(form);
-	form.submit();
-}
-</script>
-</head>
-<body>
-<div style="margin: 20px 0;">
-	<button onclick="loginLogout();" type="button">Logout</button>
-</div>
-HTML;
+print "<!DOCTYPE html>";
+print "<html><head><title>TEST CLASS</title></head>";
+print "<body>";
 
 // key: file name, value; name
 $test_files = [
 	'class_test.db.php' => 'Class Test: DB',
 	'class_test.db.types.php' => 'Class Test: DB column type convert',
-	'class_test.db.query-placeholder.php' => 'Class Test: DB placeholder queries',
+	'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',
@@ -141,7 +121,6 @@ $test_files = [
 	'class_test.error_msg.php' => 'Class Test: ERROR MSG',
 	'class_test.url-requests.curl.php' => 'Class Test: URL REQUESTS: CURL',
 	'subfolder/class_test.config.direct.php' => 'Class Test: CONFIG DIRECT SUB',
-	'class_test.deprecated.helper.php' => 'Class Test: DEPRECATED HELPERS',
 ];
 
 asort($test_files);
@@ -150,20 +129,33 @@ foreach ($test_files as $file => $name) {
 	print '<div><a href="' . $file . '">' . $name . '</a></div>';
 }
 
-
-print "<br>";
-print "ECUID: " . $session->get('LOGIN_EUCUID') . "<br>";
-print "ECUUID: " . $session->get('LOGIN_EUCUUID') . "<br>";
-
 print "<hr>";
-print "LOCALE: " . Support::dumpVar($locale) . "<br>";
+print "L: " . Support::dumpVar($locale) . "<br>";
 // print all _ENV vars set
 print "<div>READ _ENV ARRAY:</div>";
 print Support::dumpVar(array_map('htmlentities', $_ENV));
+// set + check edit access id
+$edit_access_id = 3;
+if (isset($login->loginGetAcl()['unit'])) {
+	print "ACL UNIT: " . print_r(array_keys($login->loginGetAcl()['unit']), true) . "<br>";
+	print "ACCESS CHECK: " . (string)$login->loginCheckEditAccess($edit_access_id) . "<br>";
+	if ($login->loginCheckEditAccess($edit_access_id)) {
+		$backend->edit_access_id = $edit_access_id;
+	} else {
+		$backend->edit_access_id = $login->loginGetAcl()['unit_id'];
+	}
+} else {
+	print "Something went wrong with the login<br>";
+}
 
 //	$backend->log->debug('SESSION', \CoreLibs\Debug\Support::dumpVar($_SESSION));
 
-print "<br>";
+print '<form method="post" name="loginlogout">';
+print '<a href="javascript:document.loginlogout.login_logout.value=\'Logou\';'
+	. 'document.loginlogout.submit();">Logout</a>';
+print '<input type="hidden" name="login_logout" value="">';
+print '</form>';
+
 print "Log Level: " . $backend->log->getLoggingLevel()->getName() . "<br>";
 print "Log ID: " . $backend->log->getLogFileId() . "<br>";
 print "Log Date: " . $backend->log->getLogDate() . "<br>";
@@ -185,7 +177,26 @@ foreach (
 
 $log->debug('SOME MARK', 'Some error output');
 
-print "<br>";
+// INTERNAL SET
+print "EDIT ACCESS ID: " . $backend->edit_access_id . "<br>";
+//	print "ACL: <br>".$backend->print_ar($login->loginGetAcl())."<br>";
+// $log->debug('ACL', "ACL: " . \CoreLibs\Debug\Support::dumpVar($login->loginGetAcl()));
+//	print "DEFAULT ACL: <br>".$backend->print_ar($login->default_acl_list)."<br>";
+//	print "DEFAULT ACL: <br>".$backend->print_ar($login->default_acl_list)."<br>";
+// $result = array_flip(
+// 	array_filter(
+// 		array_flip($login->default_acl_list),
+// 		function ($key) {
+// 			if (is_numeric($key)) {
+// 				return $key;
+// 			}
+// 		}
+// 	)
+// );
+//	print "DEFAULT ACL: <br>".$backend->print_ar($result)."<br>";
+// DEPRICATED CALL
+//	$backend->adbSetACL($login->loginGetAcl());
+
 print "THIS HOST: " . HOST_NAME . ", with PROTOCOL: " . HOST_PROTOCOL . " is running SSL: " . HOST_SSL . "<br>";
 print "DIR: " . DIR . "<br>";
 print "BASE: " . BASE . "<br>";
@@ -195,8 +206,8 @@ print "HOST: " . HOST_NAME . " => DB HOST: " . DB_CONFIG_NAME . " => " . Support
 print "DS is: " . DIRECTORY_SEPARATOR . "<br>";
 print "SERVER HOST: " . $_SERVER['HTTP_HOST'] . "<br>";
 
-print "<div>READ _SERVER ARRAY:</div>";
-print Support::dumpVar(array_map('htmlentities', $_SERVER));
+print "ECUID: " . $session->get('ECUID') . "<br>";
+print "ECUUID: " . $session->get('ECUUID') . "<br>";
 
 print "</body></html>";
 

www/admin/class_test.phpv.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -28,6 +28,8 @@ $log = new CoreLibs\Logging\Logging([
 $_phpv = new CoreLibs\Check\PhpVersion();
 $phpv_class = 'CoreLibs\Check\PhpVersion';
 
+// define a list of from to color sets for conversion test
+
 $PAGE_NAME = 'TEST CLASS: PHP VERSION';
 print "<!DOCTYPE html>";
 print "<html><head><title>" . $PAGE_NAME . "</title></head>";

www/admin/class_test.randomkey.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.readenvfile.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -34,12 +34,10 @@ print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 print "ALREADY from config.php: " . \CoreLibs\Debug\Support::printAr($_ENV) . "<br>";
 
-// This is now in \gullevek\dotenv\DotEnv::readEnvFile(...)
-
 // test .env in local
-/* $status = \CoreLibs\Get\DotEnv::readEnvFile('.', 'test.env');
+$status = \CoreLibs\Get\DotEnv::readEnvFile('.', 'test.env');
 print "test.env: STATUS: " . $status . "<br>";
-print "AFTER reading test.env file: " . \CoreLibs\Debug\Support::printAr($_ENV) . "<br>"; */
+print "AFTER reading test.env file: " . \CoreLibs\Debug\Support::printAr($_ENV) . "<br>";
 
 print "</body></html>";
 // ;;

www/admin/class_test.runningtime.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.session.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 /**
  * Undocumented function
@@ -146,7 +146,7 @@ $_SESSION['this_will_be_written'] = 'not empty';
 // open again with same name
 $session_name = 'class-test-session';
 try {
-	$session_alt = new Session($session_name, ['auto_write_close' => true]);
+	$session_alt = new Session($session_name, auto_write_close:true);
 	print "[4 SET] Current session id: " . $session_alt->getSessionId() . "<br>";
 	print "[4 SET] Current session auto write close: " . ($session_alt->checkAutoWriteClose() ? 'Yes' : 'No') . "<br>";
 	print "[START AGAIN] Current session id: " . $session_alt->getSessionId() . "<br>";

www/admin/class_test.session.read.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 /**
  * Undocumented function

www/admin/class_test.smarty.php

@@ -4,11 +4,9 @@
  * @phan-file-suppress PhanTypeSuspiciousStringExpression
  */
 
-// FIXME: Smarty Class must be updated for PHP 8.4
-
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 
@@ -35,7 +33,6 @@ $l10n = new \CoreLibs\Language\L10n(
 );
 $smarty = new CoreLibs\Template\SmartyExtend(
 	$l10n,
-	$log,
 	CACHE_ID,
 	COMPILE_ID,
 );
@@ -48,7 +45,6 @@ $adm = new CoreLibs\Admin\Backend(
 );
 $adm->DATA['adm_set'] = 'SET from admin class';
 
-
 $PAGE_NAME = 'TEST CLASS: SMARTY';
 print "<!DOCTYPE html>";
 print "<html><head><title>" . $PAGE_NAME . "</title></head>";

www/admin/class_test.strings.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.system.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.token.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.uids.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.url-requests.curl.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/class_test.varistype.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/subfolder/class_test.config.direct.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/admin/test_edit_base.php

@@ -4,7 +4,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 
 ob_start();
 

www/composer.json

@@ -21,7 +21,7 @@
         }
     },
     "require": {
-        "egrajp/smarty-extended": "^5.4",
+        "egrajp/smarty-extended": "^4.3",
         "php": ">=8.1",
         "gullevek/dotenv": "^2.0",
         "psr/log": "^2.0 || ^3.0"

www/includes/admin_header.php

@@ -91,7 +91,7 @@ $l10n = new \CoreLibs\Language\L10n(
 );
 
 // create smarty object
-$smarty = new \CoreLibs\Template\SmartyExtend($l10n, $log, CACHE_ID, COMPILE_ID);
+$smarty = new \CoreLibs\Template\SmartyExtend($l10n, CACHE_ID, COMPILE_ID);
 // create new Backend class with db and loger attached
 $cms = new \CoreLibs\Admin\Backend($db, $log, $session, $l10n, DEFAULT_ACL_LEVEL);
 // the menu show flag (what menu to show)
@@ -116,7 +116,7 @@ $data = [
 // log action
 // no log if login
 if (!$login->loginActionRun()) {
-	$login->writeLog('Submit', $data, action_set:$cms->adbGetActionSet(), write_type:'BINARY');
+	$login->writeLog('Submit', $data, $cms->adbGetActionSet(), 'BINARY');
 }
 //------------------------------ logging end
 

www/lib/CoreLibs/ACL/LoginUserStatus.php

@@ -1,68 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/12/12
- * DESCRIPTION:
- * ACL Login user status bitmap list
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\ACL;
-
-final class LoginUserStatus
-{
-	// lock status bitmap (smallint, 256)
-	/** @var int enabled flag */
-	public const ENABLED = 1;
-	/** @var int deleted flag */
-	public const DELETED = 2;
-	/** @var int locked flag */
-	public const LOCKED = 4;
-	/** @var int banned/suspened flag [not implemented] */
-	public const BANNED = 8;
-	/** @var int password reset in progress [not implemented] */
-	public const RESET = 16;
-	/** @var int confirm/paending, eg waiting for confirm of email [not implemented] */
-	public const CONFIRM = 32;
-	/** @var int strict, on error lock */
-	public const STRICT = 64;
-	/** @var int proected, cannot delete */
-	public const PROTECTED = 128;
-	/** @var int master admin flag */
-	public const ADMIN = 256;
-
-	/**
-	 * Returns an array mapping the numerical role values to their descriptive names
-	 *
-	 * @return array<int|string,string>
-	 */
-	public static function getMap()
-	{
-		return array_flip((new \ReflectionClass(static::class))->getConstants());
-	}
-
-	/**
-	 * Returns the descriptive role names
-	 *
-	 * @return string[]
-	 */
-	public static function getNames()
-	{
-
-		return array_keys((new \ReflectionClass(static::class))->getConstants());
-	}
-
-	/**
-	 * Returns the numerical role values
-	 *
-	 * @return int[]
-	 */
-	public static function getValues()
-	{
-		return array_values((new \ReflectionClass(static::class))->getConstants());
-	}
-}
-
-// __END__

www/lib/CoreLibs/Admin/Backend.php

@@ -289,7 +289,7 @@ class Backend
 	 *                                                        JSON, STRING/SERIEAL, BINARY/BZIP or ZLIB
 	 * @param  string|null         $db_schema [default=null]  override target schema
 	 * @return void
-	 * @deprecated Use $login->writeLog($event, $data, action_set:$cms->adbGetActionSet(), write_type:$write_type)
+	 * @deprecated Use $login->writeLog() and set action_set from ->adbGetActionSet()
 	 */
 	public function adbEditLog(
 		string $event = '',
@@ -358,7 +358,7 @@ class Backend
 		}
 		$q = <<<SQL
 		INSERT INTO {DB_SCHEMA}.edit_log (
-			username, euid, eucuid, eucuuid, event_date, event, error, data, data_binary, page,
+			username, euid, ecuid, ecuuid, event_date, event, error, data, data_binary, page,
 			ip, user_agent, referer, script_name, query_string, server_name, http_host,
 			http_accept, http_accept_charset, http_accept_encoding, session_id,
 			action, action_id, action_sub_id, action_yes, action_flag, action_menu, action_loaded,

www/lib/CoreLibs/Admin/EditBase.php

@@ -14,6 +14,9 @@ declare(strict_types=1);
 
 namespace CoreLibs\Admin;
 
+use Exception;
+use SmartyException;
+
 class EditBase
 {
 	/** @var array<mixed> */
@@ -60,7 +63,6 @@ class EditBase
 		// smarty template engine (extended Translation version)
 		$this->smarty = new \CoreLibs\Template\SmartyExtend(
 			$l10n,
-			$log,
 			$options['cache_id'] ?? '',
 			$options['compile_id'] ?? '',
 		);
@@ -413,6 +415,8 @@ class EditBase
 					$elements[] = $this->form->formCreateElement('lock_until');
 					$elements[] = $this->form->formCreateElement('lock_after');
 					$elements[] = $this->form->formCreateElement('admin');
+					$elements[] = $this->form->formCreateElement('debug');
+					$elements[] = $this->form->formCreateElement('db_debug');
 					$elements[] = $this->form->formCreateElement('edit_language_id');
 					$elements[] = $this->form->formCreateElement('edit_scheme_id');
 					$elements[] = $this->form->formCreateElementListTable('edit_access_user');
@@ -536,7 +540,8 @@ class EditBase
 	 * builds the smarty content and runs smarty display output
 	 *
 	 * @return void
-	 * @throws \Smarty\Exception
+	 * @throws Exception
+	 * @throws SmartyException
 	 */
 	public function editBaseRun(
 		?string $template_dir = null,

www/lib/CoreLibs/Combined/ArrayHandler.php

@@ -525,32 +525,6 @@ class ArrayHandler
 	{
 		return array_diff($array, $remove);
 	}
-
-	/**
-	 * From the array with key -> mixed values,
-	 * return only the entries where the key matches the key given in the key list parameter
-	 *
-	 * key list is a list[string]
-	 * if key list is empty, return array as is
-	 *
-	 * @param  array<string,mixed> $array
-	 * @param  array<string>       $key_list
-	 * @return array<string,mixed>
-	 */
-	public static function arrayReturnMatchingKeyOnly(
-		array $array,
-		array $key_list
-	): array {
-		// on empty return as is
-		if (empty($key_list)) {
-			return $array;
-		}
-		return array_filter(
-			$array,
-			fn($key) => in_array($key, $key_list),
-			ARRAY_FILTER_USE_KEY
-		);
-	}
 }
 
 // __END__

www/lib/CoreLibs/Create/Session.php

@@ -21,107 +21,21 @@ class Session
 	private string $session_id = '';
 	/** @var bool flag auto write close */
 	private bool $auto_write_close = false;
-	/** @var string regenerate option, default never */
-	private string $regenerate = 'never';
-	/** @var int regenerate interval either 1 to 100 for random or 0 to 3600 for interval */
-	private int $regenerate_interval = 0;
-
-	/** @var array<string> allowed session id regenerate (rotate) options */
-	private const ALLOWED_REGENERATE_OPTIONS = ['none', 'random', 'interval'];
-	/** @var int default random interval */
-	public const DEFAULT_REGENERATE_RANDOM = 100;
-	/** @var int default rotate internval in minutes */
-	public const DEFAULT_REGENERATE_INTERVAL = 5 * 60;
-	/** @var int maximum time for regenerate interval is one hour */
-	public const MAX_REGENERATE_INTERAL = 60 * 60;
 
 	/**
 	 * init a session, if array is empty or array does not have session_name set
 	 * then no auto init is run
 	 *
 	 * @param string $session_name if set and not empty, will start session
-	 * @param array{auto_write_close?:bool,session_strict?:bool,regenerate?:string,regenerate_interval?:int} $options
 	 */
-	public function __construct(
-		string $session_name,
-		array $options = []
-	) {
-		$this->setOptions($options);
+	public function __construct(string $session_name, bool $auto_write_close = false)
+	{
 		$this->initSession($session_name);
+		$this->auto_write_close = $auto_write_close;
 	}
 
 	// MARK: private methods
 
-	/**
-	 * set session class options
-	 *
-	 * @param array{auto_write_close?:bool,session_strict?:bool,regenerate?:string,regenerate_interval?:int} $options
-	 * @return void
-	 */
-	private function setOptions(array $options): void
-	{
-		if (
-			!isset($options['auto_write_close']) ||
-			!is_bool($options['auto_write_close'])
-		) {
-			$options['auto_write_close'] = false;
-		}
-		$this->auto_write_close = $options['auto_write_close'];
-		if (
-			!isset($options['session_strict']) ||
-			!is_bool($options['session_strict'])
-		) {
-			$options['session_strict'] = true;
-		}
-		// set strict options, on not started sessiononly
-		if (
-			$options['session_strict'] &&
-			$this->getSessionStatus() === PHP_SESSION_NONE
-		) {
-			// use cookies to store session IDs
-			ini_set('session.use_cookies', 1);
-			// use cookies only (do not send session IDs in URLs)
-			ini_set('session.use_only_cookies', 1);
-			// do not send session IDs in URLs
-			ini_set('session.use_trans_sid', 0);
-		}
-		// session regenerate id options
-		if (
-			empty($options['regenerate']) ||
-			!in_array($options['regenerate'], self::ALLOWED_REGENERATE_OPTIONS)
-		) {
-			$options['regenerate'] = 'never';
-		}
-		$this->regenerate = (string)$options['regenerate'];
-		// for regenerate: 'random' (default 100)
-		// regenerate_interval must be between (1 = always) and 100 (1 in 100)
-		// for regenerate: 'interval' (default 5min)
-		// regenerate_interval must be 0 = always, to 3600 (every hour)
-		if (
-			$options['regenerate'] == 'random' &&
-			(
-				!isset($options['regenerate_interval']) ||
-				!is_numeric($options['regenerate_interval']) ||
-				$options['regenerate_interval'] < 0 ||
-				$options['regenerate_interval'] > 100
-			)
-		) {
-			$options['regenerate_interval'] = self::DEFAULT_REGENERATE_RANDOM;
-		}
-		if (
-			$options['regenerate'] == 'interval' &&
-			(
-				!isset($options['regenerate_interval']) ||
-				!is_numeric($options['regenerate_interval']) ||
-				$options['regenerate_interval'] < 1 ||
-				$options['regenerate_interval'] > self::MAX_REGENERATE_INTERAL
-			)
-		) {
-			$options['regenerate_interval'] = self::DEFAULT_REGENERATE_INTERVAL;
-		}
-		$this->regenerate_interval = (int)($options['regenerate_interval'] ?? 0);
-	}
-
 	/**
 	 * Start session
 	 * startSession should be called for complete check
@@ -158,72 +72,6 @@ class Session
 		return false;
 	}
 
-	// MARK: regenerate session
-
-	/**
-	 * auto rotate session id
-	 *
-	 * @return void
-	 * @throws \RuntimeException failure to regenerate session id
-	 * @throws \UnexpectedValueException failed to get new session id
-	 * @throws \RuntimeException failed to set new sesson id
-	 * @throws \UnexpectedValueException new session id generated does not match the new set one
-	 */
-	private function sessionRegenerateSessionId()
-	{
-		// never
-		if ($this->regenerate == 'never') {
-			return;
-		}
-		// regenerate
-		if (
-			!(
-				// is not session obsolete
-				empty($_SESSION['SESSION_REGENERATE_OBSOLETE']) &&
-				(
-					(
-						// random
-						$this->regenerate == 'random' &&
-						mt_rand(1, $this->regenerate_interval) == 1
-					) || (
-						// interval type
-						$this->regenerate == 'interval' &&
-						($_SESSION['SESSION_REGENERATE_TIMESTAMP'] ?? 0) + $this->regenerate_interval < time()
-					)
-				)
-			)
-		) {
-			return;
-		}
-		// Set current session to expire in 1 minute
-		$_SESSION['SESSION_REGENERATE_OBSOLETE'] = true;
-		$_SESSION['SESSION_REGENERATE_EXPIRES'] = time() + 60;
-		$_SESSION['SESSION_REGENERATE_TIMESTAMP'] = time();
-		// Create new session without destroying the old one
-		if (session_regenerate_id(false) === false) {
-			throw new \RuntimeException('[SESSION] Session id regeneration failed', 1);
-		}
-		// Grab current session ID and close both sessions to allow other scripts to use them
-		if (false === ($new_session_id = $this->getSessionIdCall())) {
-			throw new \UnexpectedValueException('[SESSION] getSessionIdCall did not return a session id', 2);
-		}
-		$this->writeClose();
-		// Set session ID to the new one, and start it back up again
-		if (($get_new_session_id = session_id($new_session_id)) === false) {
-			throw new \RuntimeException('[SESSION] set session_id failed', 3);
-		}
-		if ($get_new_session_id != $new_session_id) {
-			throw new \UnexpectedValueException('[SESSION] new session id does not match the new set one', 4);
-		}
-		$this->session_id = $new_session_id;
-		$this->startSessionCall();
-		// Don't want this one to expire
-		unset($_SESSION['SESSION_REGENERATE_OBSOLETE']);
-		unset($_SESSION['SESSION_REGENERATE_EXPIRES']);
-	}
-
-	// MARK: session validation
-
 	/**
 	 * check if session name is valid
 	 *
@@ -303,13 +151,6 @@ class Session
 			if (!$this->checkActiveSession()) {
 				throw new \RuntimeException('[SESSION] Failed to activate session', 5);
 			}
-			if (
-				!empty($_SESSION['SESSION_REGENERATE_OBSOLETE']) &&
-				!empty($_SESSION['SESSION_REGENERATE_EXPIRES']) && $_SESSION['SESSION_REGENERATE_EXPIRES'] < time()
-			) {
-				$this->sessionDestroy();
-				throw new \RuntimeException('[SESSION] Expired session found', 6);
-			}
 		} elseif ($session_name != $this->getSessionName()) {
 			throw new \UnexpectedValueException(
 				'[SESSION] Another session exists with a different name: ' . $this->getSessionName(),
@@ -318,12 +159,10 @@ class Session
 		}
 		// check session id
 		if (false === ($session_id = $this->getSessionIdCall())) {
-			throw new \UnexpectedValueException('[SESSION] getSessionIdCall did not return a session id', 7);
+			throw new \UnexpectedValueException('[SESSION] getSessionId did not return a session id', 6);
 		}
 		// set session id
 		$this->session_id = $session_id;
-		// run session id re-create from time to time
-		$this->sessionRegenerateSessionId();
 		// if flagged auto close, write close session
 		if ($this->auto_write_close) {
 			$this->writeClose();
@@ -363,12 +202,11 @@ class Session
 	 * set the auto write close flag
 	 *
 	 * @param  bool $flag
-	 * @return Session
+	 * @return void
 	 */
-	public function setAutoWriteClose(bool $flag): Session
+	public function setAutoWriteClose(bool $flag): void
 	{
 		$this->auto_write_close = $flag;
-		return $this;
 	}
 
 	/**
@@ -514,15 +352,14 @@ class Session
 	 *
 	 * @param  string $name  array name in _SESSION
 	 * @param  mixed  $value value to set (can be anything)
-	 * @return Session
+	 * @return void
 	 */
-	public function set(string $name, mixed $value): Session
+	public function set(string $name, mixed $value): void
 	{
 		$this->checkValidSessionEntryKey($name);
 		$this->restartSession();
 		$_SESSION[$name] = $value;
 		$this->closeSessionCall();
-		return $this;
 	}
 
 	/**
@@ -579,17 +416,16 @@ class Session
 	 * unset one _SESSION entry 'name' if exists
 	 *
 	 * @param  string $name _SESSION key name to remove
-	 * @return Session
+	 * @return void
 	 */
-	public function unset(string $name): Session
+	public function unset(string $name): void
 	{
 		if (!isset($_SESSION[$name])) {
-			return $this;
+			return;
 		}
 		$this->restartSession();
 		unset($_SESSION[$name]);
 		$this->closeSessionCall();
-		return $this;
 	}
 
 	/**

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/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,26 +14,10 @@ namespace CoreLibs\DB\Support;
 
 class ConvertPlaceholder
 {
-	// NOTE for missing: range */+ are not iplemented in the regex below, but - is for now
-	// NOTE some combinations are allowed, but the query will fail before this
-	/** @var string split regex, entries before $ group */
-	private const PATTERN_QUERY_SPLIT =
-		'\?\?|' // UNKNOWN: double ??, is this to avoid something?
-		. '[\(,]|' // for ',' and '(' mostly in INSERT or ANY()
-		. '[<>=]|' // general set for <, >, = in any query with any combination
-		. '\^@|' // text search for start from text with ^@
-		. '\|\||' // concats two elements
-		. '&&|' // array overlap
-		. '\-\|\-|' // range overlap for array
-		. '[^-]-{1}|' // single -, used in JSON too
-		. '->|->>|#>|#>>|@>|<@|@@|@\?|\?{1}|\?\||\?&|#-|' // JSON searches, Array searchs, etc
-		. 'THEN|ELSE' // command parts (CASE)
-	;
+	/** @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 comment regex
-	 * anything that starts with -- and ends with a line break but any character that is not line break inbetween */
-	private const PATTERN_COMMENT = '(?:\-\-[^\r\n]*?\r?\n)*\s*';
+	private const PATTERN_ELEMENT = '(?:\'.*?\')?\s*(?:\?\?|' . self::PATTERN_QUERY_SPLIT . ')\s*';
 	/** @var string parts to ignore in the SQL */
 	private const PATTERN_IGNORE =
 		// digit -> ignore
@@ -50,7 +34,6 @@ class ConvertPlaceholder
 	/** @var string replace regex for named (:...) entries */
 	public const REGEX_REPLACE_NAMED = '/'
 		. '(' . self::PATTERN_ELEMENT . ')'
-		. self::PATTERN_COMMENT
 		. '('
 		. self::PATTERN_IGNORE
 		. self::PATTERN_NAMED
@@ -59,7 +42,6 @@ class ConvertPlaceholder
 	/** @var string replace regex for question mark (?) entries */
 	public const REGEX_REPLACE_QUESTION_MARK = '/'
 		. '(' . self::PATTERN_ELEMENT . ')'
-		. self::PATTERN_COMMENT
 		. '('
 		. self::PATTERN_IGNORE
 		. self::PATTERN_QUESTION_MARK
@@ -68,7 +50,6 @@ class ConvertPlaceholder
 	/** @var string replace regex for numbered ($n) entries */
 	public const REGEX_REPLACE_NUMBERED = '/'
 		. '(' . self::PATTERN_ELEMENT . ')'
-		. self::PATTERN_COMMENT
 		. '('
 		. self::PATTERN_IGNORE
 		. self::PATTERN_NUMBERED
@@ -79,7 +60,6 @@ class ConvertPlaceholder
 		// prefix string part, must match towards
 		// seperator for ( = , ? - [and json/jsonb in pg doc section 9.15]
 		. self::PATTERN_ELEMENT
-		. self::PATTERN_COMMENT
 		// match for replace part
 		. '(?:'
 		// ignore parts

www/lib/CoreLibs/DeprecatedHelper/Deprecated84.php

@@ -1,95 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2025/1/17
- * DESCRIPTION:
- * Deprecated helper for fputcsv
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\DeprecatedHelper;
-
-use InvalidArgumentException;
-
-class Deprecated84
-{
-	/**
-	 * This is a wrapper for fputcsv to fix deprecated warning for $escape parameter
-	 * See: https://www.php.net/manual/en/function.fputcsv.php
-	 * escape parameter deprecation and recommend to set to "" for compatible with PHP 9.0
-	 *
-	 * @param mixed $stream
-	 * @param array<mixed> $fields
-	 * @param string $separator
-	 * @param string $enclosure
-	 * @param string $escape
-	 * @param string $eol
-	 * @return int|false
-	 * @throws InvalidArgumentException
-	 */
-	public static function fputcsv(
-		mixed $stream,
-		array $fields,
-		string $separator = ",",
-		string $enclosure = '"',
-		string $escape = '', // set to empty for future compatible
-		string $eol = PHP_EOL
-	): int | false {
-		if (!is_resource($stream)) {
-			throw new \InvalidArgumentException("fputcsv stream parameter must be a resrouce");
-		}
-		return fputcsv($stream, $fields, $separator, $enclosure, $escape, $eol);
-	}
-
-	/**
-	 * This is a wrapper for fgetcsv to fix deprecated warning for $escape parameter
-	 * See: https://www.php.net/manual/en/function.fgetcsv.php
-	 * escape parameter deprecation and recommend to set to "" for compatible with PHP 9.0
-	 *
-	 * @param mixed $stream
-	 * @param null|int<0,max> $length
-	 * @param string $separator
-	 * @param string $enclosure
-	 * @param string $escape
-	 * @return array<mixed>|false
-	 * @throws InvalidArgumentException
-	 */
-	public static function fgetcsv(
-		mixed $stream,
-		?int $length = null,
-		string $separator = ',',
-		string $enclosure = '"',
-		string $escape = '' // set to empty for future compatible
-	): array | false {
-		if (!is_resource($stream)) {
-			throw new \InvalidArgumentException("fgetcsv stream parameter must be a resrouce");
-		}
-		return fgetcsv($stream, $length, $separator, $enclosure, $escape);
-	}
-
-	/**
-	 * This is a wrapper for str_getcsv to fix deprecated warning for $escape parameter
-	 * See: https://www.php.net/manual/en/function.str-getcsv.php
-	 * escape parameter deprecation and recommend to set to "" for compatible with PHP 9.0
-	 *
-	 * @param string $string
-	 * @param string $separator
-	 * @param string $enclosure
-	 * @param string $escape
-	 * @return array<mixed>
-	 */
-	// phpcs:disable PSR1.Methods.CamelCapsMethodName
-	public static function str_getcsv(
-		string $string,
-		string $separator = ",",
-		string $enclosure = '"',
-		string $escape = '' // set to empty for future compatible
-	): array {
-		return str_getcsv($string, $separator, $enclosure, $escape);
-	}
-	// phpcs:enable PSR1.Methods.CamelCapsMethodName
-}
-
-// __END__

www/lib/CoreLibs/Logging/Logging.php

@@ -30,10 +30,6 @@ class Logging
 {
 	/** @var int minimum size for a max file size, so we don't set 1 byte, 10kb */
 	public const MIN_LOG_MAX_FILESIZE = 10 * 1024;
-	/** @var string log file extension, not changeable */
-	private const LOG_FILE_NAME_EXT = "log";
-	/** @var string log file block separator, not changeable */
-	private const LOG_FILE_BLOCK_SEPARATOR = '.';
 
 	// NOTE: the second party array{} hs some errors
 	/** @var array<string,array<string,string|bool|Level>>|array{string:array{type:string,type_info?:string,mandatory:true,alias?:string,default:string|bool|Level,deprecated:bool,use?:string}} */
@@ -108,6 +104,8 @@ class Logging
 	private string $log_folder = '';
 	/** @var string a alphanumeric name that has to be set as global definition */
 	private string $log_file_id = '';
+	/** @var string log file name extension */
+	private string $log_file_name_ext = 'log';
 	/** @var string log file name with folder, for actual writing */
 	private string $log_file_name = '';
 	/** @var int set in bytes */
@@ -433,7 +431,7 @@ class Logging
 	private function buildLogFileName(Level $level, string $group_id = ''): string
 	{
 		// init base file path
-		$fn = $this->log_print_file . '.' . self::LOG_FILE_NAME_EXT;
+		$fn = $this->log_print_file . '.' . $this->log_file_name_ext;
 		// log ID prefix settings, if not valid, replace with empty
 		if (!empty($this->log_file_id)) {
 			$rpl_string = $this->log_file_id;
@@ -442,15 +440,14 @@ class Logging
 		}
 		$fn = str_replace('{LOGID}', $rpl_string, $fn); // log id (like a log file prefix)
 
-		$rpl_string = $this->getLogFlag(Flag::per_level) ?
-			self::LOG_FILE_BLOCK_SEPARATOR . $level->getName() :
-			'';
+		$rpl_string = !$this->getLogFlag(Flag::per_level) ? '' :
+			'_' . $level->getName();
 		$fn = str_replace('{LEVEL}', $rpl_string, $fn); // create output filename
 
 		// write per level
-		$rpl_string = $this->getLogFlag(Flag::per_group) ?
+		$rpl_string = !$this->getLogFlag(Flag::per_group) ? '' :
 			// normalize level, replace all non alphanumeric characters with -
-			self::LOG_FILE_BLOCK_SEPARATOR . (
+			'_' . (
 				// if return is only - then set error string
 				preg_match(
 					"/^-+$/",
@@ -458,29 +455,25 @@ class Logging
 				) ?
 					'INVALID-LEVEL-STRING' :
 					$level_string
-			) :
-			'';
+			);
 		$fn = str_replace('{GROUP}', $rpl_string, $fn); // create output filename
 		// set per class, but don't use get_class as we will only get self
-		$rpl_string = $this->getLogFlag(Flag::per_class) ?
-				// set sub class settings
-				self::LOG_FILE_BLOCK_SEPARATOR . str_replace('\\', '-', Support::getCallerTopLevelClass()) :
-			'';
+		$rpl_string = !$this->getLogFlag(Flag::per_class) ? '' : '_'
+			// set sub class settings
+			. str_replace('\\', '-', Support::getCallerTopLevelClass());
 		$fn = str_replace('{CLASS}', $rpl_string, $fn); // create output filename
 
 		// if request to write to one file
-		$rpl_string = $this->getLogFlag(Flag::per_page) ?
-			self::LOG_FILE_BLOCK_SEPARATOR . System::getPageName(System::NO_EXTENSION) :
-			'';
+		$rpl_string = !$this->getLogFlag(Flag::per_page) ?
+			'' :
+			'_' . System::getPageName(System::NO_EXTENSION);
 		$fn = str_replace('{PAGENAME}', $rpl_string, $fn); // create output filename
 
 		// if run id, we auto add ymd, so we ignore the log file date
 		if ($this->getLogFlag(Flag::per_run)) {
-			// add 8 char unique string and date block with time
-			$rpl_string = self::LOG_FILE_BLOCK_SEPARATOR . $this->getLogUniqueId();
+			$rpl_string = '_' . $this->getLogUniqueId(); // add 8 char unique string
 		} elseif ($this->getLogFlag(Flag::per_date)) {
-			// add date to file
-			$rpl_string = self::LOG_FILE_BLOCK_SEPARATOR . $this->getLogDate();
+			$rpl_string = '_' . $this->getLogDate(); // add date to file
 		} else {
 			$rpl_string = '';
 		}
@@ -746,10 +739,7 @@ class Logging
 	{
 		if (empty($this->log_file_unique_id) || $override == true) {
 			$this->log_file_unique_id =
-				date('Y-m-d_His')
-					. self::LOG_FILE_BLOCK_SEPARATOR
-					. 'U_'
-					// this doesn't have to be unique for everything, just for this logging purpose
+				date('Y-m-d_His') . '_U_'
 					. substr(hash(
 						'sha1',
 						random_bytes(63)

www/lib/CoreLibs/Output/Form/TableArrays/EditUsers.php

@@ -135,6 +135,30 @@ class EditUsers implements Interface\TableArraysInterface
 					'min_edit_acl' => '100',
 					'min_show_acl' => '100',
 				],
+				'debug' => [
+					'value' => $_POST['debug'] ?? '',
+					'output_name' => 'Debug',
+					'type' => 'binary',
+					'int' => 1,
+					'element_list' => [
+						'1' => 'Yes',
+						'0' => 'No'
+					],
+					'min_edit_acl' => '100',
+					'min_show_acl' => '100',
+				],
+				'db_debug' => [
+					'value' => $_POST['db_debug'] ?? '',
+					'output_name' => 'DB Debug',
+					'type' => 'binary',
+					'int' => 1,
+					'element_list' => [
+						'1' => 'Yes',
+						'0' => 'No'
+					],
+					'min_edit_acl' => '100',
+					'min_show_acl' => '100',
+				],
 				'email' => [
 					'value' => $_POST['email'] ?? '',
 					'output_name' => 'E-Mail',

www/lib/CoreLibs/Security/AsymmetricAnonymousEncryption.php

@@ -1,408 +0,0 @@
-<?php
-
-/**
- * very simple asymmetric encryption
- * Better use:
- * https://paragonie.com/project/halite
- * https://github.com/paragonie/halite
- *
- * current code is just to encrypt and decrypt
- *
- * must use a valid encryption key created with
- * Secruty\CreateKey class
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Security;
-
-use CoreLibs\Security\CreateKey;
-use SodiumException;
-
-class AsymmetricAnonymousEncryption
-{
-	/** @var AsymmetricAnonymousEncryption self instance */
-	private static AsymmetricAnonymousEncryption $instance;
-
-	/** @var ?string key pair which holds secret and public key, needed for encryption */
-	private ?string $key_pair = null;
-	/** @var ?string public key, needed for decryption
-	 * if not set but key_pair set, this will be extracted from key pair */
-	private ?string $public_key = null;
-
-	/**
-	 * init class
-	 * if key not passed, key must be set with createKey
-	 *
-	 * @param  string|null $key_pair
-	 * @param  string|null $public_key
-	 */
-	public function __construct(
-		#[\SensitiveParameter]
-		string|null $key_pair = null,
-		string|null $public_key = null
-	) {
-		if ($public_key !== null) {
-			$this->setPublicKey($public_key);
-		}
-		if ($key_pair !== null) {
-			$this->setKeyPair($key_pair);
-			if (empty($public_key)) {
-				$public_key = CreateKey::getPublicKey($key_pair);
-				$this->setPublicKey($public_key);
-			}
-		}
-	}
-
-	/**
-	 * Returns the singleton self object.
-	 * For function wrapper use
-	 *
-	 * @param  string|null $key_pair
-	 * @param  string|null $public_key
-	 * @return AsymmetricAnonymousEncryption object
-	 */
-	public static function getInstance(
-		#[\SensitiveParameter]
-		string|null $key_pair = null,
-		string|null $public_key = null
-	): self {
-		// new if no instsance or key is different
-		if (
-			empty(self::$instance) ||
-			self::$instance->key_pair != $key_pair ||
-			self::$instance->public_key != $public_key
-		) {
-			self::$instance = new self($key_pair, $public_key);
-		}
-		return self::$instance;
-	}
-
-	/**
-	 * clean up
-	 */
-	public function __destruct()
-	{
-		if (empty($this->key_pair)) {
-			return;
-		}
-		try {
-			// would set it to null, but we we do not want to make key null
-			sodium_memzero($this->key_pair);
-			return;
-		} catch (SodiumException) {
-			// empty catch
-		}
-		if (is_null($this->key_pair)) {
-			return;
-		}
-		$zero = str_repeat("\0", mb_strlen($this->key_pair, '8bit'));
-		$this->key_pair = $this->key_pair ^ (
-			$zero ^ $this->key_pair
-		);
-		unset($zero);
-		unset($this->key_pair); /** @phan-suppress-current-line PhanTypeObjectUnsetDeclaredProperty */
-	}
-
-	/* ************************************************************************
-	 * MARK: PRIVATE
-	 * *************************************************************************/
-
-	/**
-	 * Create the internal key pair in binary
-	 *
-	 * @param  ?string $key_pair
-	 * @return string
-	 * @throws \UnexpectedValueException key pair empty
-	 * @throws \UnexpectedValueException invalid hex key pair
-	 * @throws \RangeException key pair not correct size
-	 */
-	private function createKeyPair(
-		#[\SensitiveParameter]
-		?string $key_pair
-	): string {
-		if (empty($key_pair)) {
-			throw new \UnexpectedValueException('Key pair cannot be empty');
-		}
-		try {
-			$key_pair = CreateKey::hex2bin($key_pair);
-		} catch (SodiumException $e) {
-			sodium_memzero($key_pair);
-			throw new \UnexpectedValueException('Invalid hex key pair: ' . $e->getMessage());
-		}
-		if (mb_strlen($key_pair, '8bit') !== SODIUM_CRYPTO_BOX_KEYPAIRBYTES) {
-			sodium_memzero($key_pair);
-			throw new \RangeException(
-				'Key pair is not the correct size (must be '
-					. SODIUM_CRYPTO_BOX_KEYPAIRBYTES . ' bytes long).'
-			);
-		}
-		return $key_pair;
-	}
-
-	/**
-	 * create the internal public key in binary
-	 *
-	 * @param  ?string $public_key
-	 * @return string
-	 * @throws \UnexpectedValueException public key empty
-	 * @throws \UnexpectedValueException invalid hex key
-	 * @throws \RangeException invalid key length
-	 */
-	private function createPublicKey(?string $public_key): string
-	{
-		if (empty($public_key)) {
-			throw new \UnexpectedValueException('Public key cannot be empty');
-		}
-		try {
-			$public_key = CreateKey::hex2bin($public_key);
-		} catch (SodiumException $e) {
-			sodium_memzero($public_key);
-			throw new \UnexpectedValueException('Invalid hex public key: ' . $e->getMessage());
-		}
-		if (mb_strlen($public_key, '8bit') !== SODIUM_CRYPTO_BOX_PUBLICKEYBYTES) {
-			sodium_memzero($public_key);
-			throw new \RangeException(
-				'Public key is not the correct size (must be '
-					. SODIUM_CRYPTO_BOX_PUBLICKEYBYTES . ' bytes long).'
-			);
-		}
-		return $public_key;
-	}
-
-	/**
-	 * encrypt a message asymmetric with a bpulic key
-	 *
-	 * @param  string  $message
-	 * @param  ?string $public_key
-	 * @return string
-	 * @throws \UnexpectedValueException create encryption failed
-	 * @throws \UnexpectedValueException convert to base64 failed
-	 */
-	private function asymmetricEncryption(
-		#[\SensitiveParameter]
-		string $message,
-		?string $public_key
-	): string {
-		$public_key = $this->createPublicKey($public_key);
-		try {
-			$encrypted = sodium_crypto_box_seal($message, $public_key);
-		} catch (SodiumException $e) {
-			sodium_memzero($message);
-			throw new \UnexpectedValueException("Create encrypted message failed: " . $e->getMessage());
-		}
-		sodium_memzero($message);
-		try {
-			$result = sodium_bin2base64($encrypted, SODIUM_BASE64_VARIANT_ORIGINAL);
-		} catch (SodiumException $e) {
-			sodium_memzero($encrypted);
-			throw new \UnexpectedValueException("bin2base64 failed: " . $e->getMessage());
-		}
-		sodium_memzero($encrypted);
-		return $result;
-	}
-
-	/**
-	 * decrypt a message that is asymmetric encrypted with a key pair
-	 *
-	 * @param  string  $message
-	 * @param  ?string $key_pair
-	 * @return string
-	 * @throws \UnexpectedValueException message string empty
-	 * @throws \UnexpectedValueException base64 decoding failed
-	 * @throws \UnexpectedValueException decryption failed
-	 * @throws \UnexpectedValueException could not decrypt message
-	 */
-	private function asymmetricDecryption(
-		#[\SensitiveParameter]
-		string $message,
-		#[\SensitiveParameter]
-		?string $key_pair
-	): string {
-		if (empty($message)) {
-			throw new \UnexpectedValueException('Encrypted string cannot be empty');
-		}
-		$key_pair = $this->createKeyPair($key_pair);
-		try {
-			$result = sodium_base642bin($message, SODIUM_BASE64_VARIANT_ORIGINAL);
-		} catch (SodiumException $e) {
-			sodium_memzero($message);
-			sodium_memzero($key_pair);
-			throw new \UnexpectedValueException("base642bin failed: " . $e->getMessage());
-		}
-		sodium_memzero($message);
-		$plaintext = false;
-		try {
-			$plaintext = sodium_crypto_box_seal_open($result, $key_pair);
-		} catch (SodiumException $e) {
-			sodium_memzero($message);
-			sodium_memzero($key_pair);
-			sodium_memzero($result);
-			throw new \UnexpectedValueException("Decrypting message failed: " . $e->getMessage());
-		}
-		sodium_memzero($key_pair);
-		sodium_memzero($result);
-		if (!is_string($plaintext)) {
-			throw new \UnexpectedValueException('Invalid key pair');
-		}
-		return $plaintext;
-	}
-
-	/* ************************************************************************
-	 * MARK: PUBLIC
-	 * *************************************************************************/
-
-	/**
-	 * sets the private key for encryption
-	 *
-	 * @param  string $key_pair Key pair in hex
-	 * @return AsymmetricAnonymousEncryption
-	 * @throws \UnexpectedValueException key pair empty
-	 */
-	public function setKeyPair(
-		#[\SensitiveParameter]
-		string $key_pair
-	): AsymmetricAnonymousEncryption {
-		if (empty($key_pair)) {
-			throw new \UnexpectedValueException('Key pair cannot be empty');
-		}
-		// check if valid;
-		$this->createKeyPair($key_pair);
-		// set new key pair
-		$this->key_pair = $key_pair;
-		sodium_memzero($key_pair);
-		// set public key if not set
-		if (empty($this->public_key)) {
-			$this->public_key = CreateKey::getPublicKey($this->key_pair);
-			// check if valid
-			$this->createPublicKey($this->public_key);
-		}
-		return $this;
-	}
-
-	/**
-	 * check if set key pair matches given one
-	 *
-	 * @param  string $key_pair
-	 * @return bool
-	 */
-	public function compareKeyPair(
-		#[\SensitiveParameter]
-		string $key_pair
-	): bool {
-		return $this->key_pair === $key_pair;
-	}
-
-	/**
-	 * get the current set key pair, null if not set
-	 *
-	 * @return string|null
-	 */
-	public function getKeyPair(): ?string
-	{
-		return $this->key_pair;
-	}
-
-	/**
-	 * sets the public key for decryption
-	 * if only key pair exists Security\Create::getPublicKey() can be used to
-	 * extract the public key from the key pair
-	 *
-	 * @param  string $public_key Public Key in hex
-	 * @return AsymmetricAnonymousEncryption
-	 * @throws \UnexpectedValueException public key empty
-	 */
-	public function setPublicKey(string $public_key): AsymmetricAnonymousEncryption
-	{
-		if (empty($public_key)) {
-			throw new \UnexpectedValueException('Public key cannot be empty');
-		}
-		// check if valid
-		$this->createPublicKey($public_key);
-		$this->public_key = $public_key;
-		sodium_memzero($public_key);
-		return $this;
-	}
-
-	/**
-	 * check if the set public key matches the given one
-	 *
-	 * @param  string $public_key
-	 * @return bool
-	 */
-	public function comparePublicKey(string $public_key): bool
-	{
-		return $this->public_key === $public_key;
-	}
-
-	/**
-	 * get the current set public key, null if not set
-	 *
-	 * @return string|null
-	 */
-	public function getPublicKey(): ?string
-	{
-		return $this->public_key;
-	}
-
-	/**
-	 * Encrypt a message with a public key
-	 * static version
-	 *
-	 * @param  string $message    Message to encrypt
-	 * @param  string $public_key Public key in hex to encrypt message with
-	 * @return string             Encrypted message as hex string
-	 */
-	public static function encryptKey(
-		#[\SensitiveParameter]
-		string $message,
-		string $public_key
-	): string {
-		return self::getInstance()->asymmetricEncryption($message, $public_key);
-	}
-
-	/**
-	 * Encrypt a message
-	 *
-	 * @param  string $message Message to ecnrypt
-	 * @return string          Encrypted message as hex string
-	 */
-	public function encrypt(
-		#[\SensitiveParameter]
-		string $message
-	): string {
-		return $this->asymmetricEncryption($message, $this->public_key);
-	}
-
-	/**
-	 * decrypt a message with a key pair
-	 * static version
-	 *
-	 * @param  string $message  Message to decrypt in hex
-	 * @param  string $key_pair Key pair in hex to decrypt the message with
-	 * @return string           Decrypted message
-	 */
-	public static function decryptKey(
-		#[\SensitiveParameter]
-		string $message,
-		#[\SensitiveParameter]
-		string $key_pair
-	): string {
-		return self::getInstance()->asymmetricDecryption($message, $key_pair);
-	}
-
-	/**
-	 * decrypt a message
-	 *
-	 * @param  string $message Message to decrypt in hex
-	 * @return string          Decrypted message
-	 */
-	public function decrypt(
-		#[\SensitiveParameter]
-		string $message
-	): string {
-		return $this->asymmetricDecryption($message, $this->key_pair);
-	}
-}
-
-// __END__

www/lib/CoreLibs/Security/CreateKey.php

@@ -35,39 +35,14 @@ class CreateKey
 		return random_bytes(SODIUM_CRYPTO_SECRETBOX_KEYBYTES);
 	}
 
-	/**
-	 * creates a sodium cyptobox keypair as hex string
-	 *
-	 * @return string hex string for the keypair
-	 */
-	public static function createKeyPair(): string
-	{
-		return self::bin2hex(sodium_crypto_box_keypair());
-	}
-
-	/**
-	 * extracts the public key and returns it as hex string from the hex keypari
-	 *
-	 * @param  string $hex_keypair hex encoded keypair
-	 * @return string              hex encoded public key
-	 */
-	public static function getPublicKey(
-		#[\SensitiveParameter]
-		string $hex_keypair
-	): string {
-		return self::bin2hex(sodium_crypto_box_publickey(self::hex2bin($hex_keypair)));
-	}
-
 	/**
 	 * convert binary key to hex string
 	 *
 	 * @param  string $hex_key Convert binary key string to hex
 	 * @return string
 	 */
-	public static function bin2hex(
-		#[\SensitiveParameter]
-		string $hex_key
-	): string {
+	public static function bin2hex(string $hex_key): string
+	{
 		return sodium_bin2hex($hex_key);
 	}
 
@@ -77,10 +52,8 @@ class CreateKey
 	 * @param  string $string_key Convery hex key string to binary
 	 * @return string
 	 */
-	public static function hex2bin(
-		#[\SensitiveParameter]
-		string $string_key
-	): string {
+	public static function hex2bin(string $string_key): string
+	{
 		return sodium_hex2bin($string_key);
 	}
 }