core composer settings update

.gitignore

@@ -3,5 +3,3 @@ node_modules/
 composer.lock
 vendor/
 tools/
-www/composer.lock
-www/vendor

.phan/config.php

@@ -27,7 +27,7 @@ use Phan\Config;
 
 return [
 	// "target_php_version" => "8.2",
-	"minimum_target_php_version" => "8.2",
+	"minimum_target_php_version" => "8.1",
 	// turn color on (-C)
 	"color_issue_messages_if_supported" => true,
 	// If true, missing properties will be created when

.phive/phars.xml

@@ -3,7 +3,7 @@
   <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.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="phpstan" version="^1.10.37" installed="1.12.6" 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"/>

4dev/checking/phpunit.sh

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

4dev/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,10 @@ 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/function/upgrade_serial_to_identity.sql

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

4dev/database/table/edit_access.sql

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

4dev/database/table/edit_access_data.sql

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

4dev/database/table/edit_access_right.sql

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

4dev/database/table/edit_access_user.sql

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

4dev/database/table/edit_generic.sql

@@ -8,7 +8,6 @@
 -- DROP TABLE edit_generic;
 CREATE TABLE edit_generic (
     cuid VARCHAR,
-    cuuid UUID DEFAULT gen_random_uuid(),
     date_created TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
     date_updated TIMESTAMP WITHOUT TIME ZONE
 );

4dev/database/table/edit_group.sql

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

4dev/database/table/edit_language.sql

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

4dev/database/table/edit_log.sql

@@ -7,54 +7,35 @@
 
 -- DROP TABLE edit_log;
 CREATE TABLE edit_log (
-    edit_log_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_log_id SERIAL PRIMARY KEY,
     euid INT, -- this is a foreign key, but I don't nedd to reference to it
     FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL,
-    ecuid VARCHAR,
-    ecuuid 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
+    event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
-    -- DEPRECATED [ip]
+    ip VARCHAR,
-    ip VARCHAR, -- just the REMOTE_IP, full set see ip_address
-    -- string blocks, general
     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_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,
+    http_accept VARCHAR,
-    -- DEPRECATED [http*]
+    http_accept_charset VARCHAR,
-    http_accept VARCHAR, -- in http_data
+    http_accept_encoding VARCHAR,
-    http_accept_charset VARCHAR, -- in http_data
+    session_id VARCHAR
-    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
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_menu_group.sql

@@ -7,8 +7,10 @@
 
 -- 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
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+

4dev/database/table/edit_page.sql

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

4dev/database/table/edit_page_access.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_page_access;
 CREATE TABLE edit_page_access (
-    edit_page_access_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_page_access_id SERIAL PRIMARY KEY,
     edit_group_id INT NOT NULL,
     FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
     edit_page_id INT NOT NULL,
@@ -16,3 +16,5 @@ CREATE TABLE edit_page_access (
     FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
     enabled SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+

4dev/database/table/edit_page_content.sql

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

4dev/database/table/edit_query_string.sql

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

4dev/database/table/edit_scheme.sql

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

4dev/database/table/edit_user.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_user;
 CREATE TABLE edit_user (
-    edit_user_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    edit_user_id SERIAL PRIMARY KEY,
     connect_edit_user_id INT, -- possible reference to other user
     FOREIGN KEY (connect_edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
     edit_language_id INT NOT NULL,
@@ -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/database/table/edit_visible_group.sql

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

4dev/tests/AAASetupData/requests/http_requests.php

@@ -1,65 +0,0 @@
-<?php // phpcs:ignore PSR1.Files.SideEffects
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: Ymd
- * DESCRIPTION:
- * DescriptionHere
-*/
-
-declare(strict_types=1);
-
-/**
- * build return json
- *
- * @param  array<string,mixed> $http_headers
- * @param  ?string $body
- * @return string
- */
-function buildContent(array $http_headers, ?string $body): string
-{
-	if (is_string($body) && !empty($body)) {
-		$_body = json_decode($body, true);
-		if (!is_array($_body)) {
-			$body = [$body];
-		} else {
-			$body = $_body;
-		}
-	} elseif (is_string($body)) {
-		$body = [];
-	}
-	return json_encode([
-		'HEADERS' => $http_headers,
-		"REQUEST_TYPE" => $_SERVER['REQUEST_METHOD'],
-		"PARAMS" => $_GET,
-		"BODY" => $body,
-	]);
-}
-
-$http_headers = array_filter($_SERVER, function ($value, $key) {
-	if (str_starts_with($key, 'HTTP_')) {
-		return true;
-	}
-}, ARRAY_FILTER_USE_BOTH);
-
-header("Content-Type: application/json; charset=UTF-8");
-
-// if the header has Authorization and RunAuthTest then exit with 401
-if (!empty($http_headers['HTTP_AUTHORIZATION']) && !empty($http_headers['HTTP_RUNAUTHTEST'])) {
-	header("HTTP/1.1 401 Unauthorized");
-	print buildContent($http_headers, '{"code": 401, "content": {"Error": "Not Authorized"}}');
-	exit;
-}
-
-// if server request type is get set file_get to null -> no body
-if ($_SERVER['REQUEST_METHOD'] == "GET") {
-	$file_get = null;
-} elseif (($file_get = file_get_contents('php://input')) === false) {
-	header("HTTP/1.1 404 Not Found");
-	print buildContent($http_headers, '{"code": 404, "content": {"Error": "file_get_contents failed"}}');
-	exit;
-}
-
-print buildContent($http_headers, $file_get);
-
-// __END__

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 $db;
-	private static \CoreLibs\Logging\Logging $log;
+	private static $log;
-
-	private static string $edit_access_cuid;
-	private static string $edit_user_cuid;
-	private static string $edit_user_cuuid;
 
 	/**
 	 * 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 "
-			INSERT INTO edit_access_data (
+				. "(edit_access_id, name, value, enabled) VALUES "
-				edit_access_id, name, value, enabled
+				. "((SELECT edit_access_id FROM edit_access WHERE uid = 'AdminAccess'), "
-			) VALUES (
+				. "'test', 'value', 1)"
-				(SELECT edit_access_id FROM edit_access WHERE uid = 'AdminAccess'),
-				'test', 'value', 1
-			)
-			SQL
 		];
 		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,22 @@ 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,
+					'EUID' => 1,
-					'LOGIN_EUCUID' => 'abc',
-					'LOGIN_EUCUUID' => '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 +259,20 @@ final class CoreLibsACLLoginTest extends TestCase
 				[],
 				[],
 				[
-					'LOGIN_EUID' => 1,
+					'EUID' => 1,
-					'LOGIN_EUCUID' => 'abc',
+					'USER_NAME' => '',
-					'LOGIN_EUCUUID' => 'SET_EUCUUID_IN_TEST',
+					'GROUP_NAME' => '',
-					'LOGIN_USER_NAME' => '',
+					'ADMIN' => 1,
-					'LOGIN_GROUP_NAME' => '',
+					'GROUP_ACL_LEVEL' => -1,
-					'LOGIN_ADMIN' => 1,
+					'PAGES_ACL_LEVEL' => [],
-					'LOGIN_GROUP_ACL_LEVEL' => -1,
+					'USER_ACL_LEVEL' => -1,
-					'LOGIN_PAGES_ACL_LEVEL' => [],
+					'USER_ADDITIONAL_ACL' => [],
-					'LOGIN_USER_ACL_LEVEL' => -1,
+					'GROUP_ADDITIONAL_ACL' => [],
-					'LOGIN_USER_ADDITIONAL_ACL' => [],
+					'UNIT_UID' => [
-					'LOGIN_GROUP_ADDITIONAL_ACL' => [],
+						'AdminAccess' => 1,
-					'LOGIN_UNIT_UID' => [
-						'AdminAccess' => '123456789012',
 					],
-					'LOGIN_UNIT' => [
+					'UNIT' => [
-						'123456789012' => [
+						1 => [
-							'id' => 1,
 							'acl_level' => 80,
 							'name' => 'Admin Access',
 							'uid' => 'AdminAccess',
@@ -320,8 +284,8 @@ final class CoreLibsACLLoginTest extends TestCase
 							'additional_acl' => []
 						],
 					],
-					// 'LOGIN_UNIT_DEFAULT' => '',
+					// 'UNIT_DEFAULT' => '',
-					// 'LOGIN_DEFAULT_ACL_LIST' => [],
+					// 'DEFAULT_ACL_LIST' => [],
 				],
 				0,
 				[
@@ -329,7 +293,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 +412,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 +437,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 +462,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 +487,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 +511,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 +536,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 +555,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 +565,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 +590,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 +616,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 +641,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 +659,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 +669,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 +688,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 +698,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 +717,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 +727,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 +746,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 +777,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 +800,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 +810,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 +833,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 +843,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 +869,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 +889,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 +899,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 +925,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 +945,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 +955,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 +981,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 +1008,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 +1038,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,
@@ -1154,9 +1085,9 @@ final class CoreLibsACLLoginTest extends TestCase
 		/** @var \CoreLibs\Create\Session&MockObject */
 		$session_mock = $this->createPartialMock(
 			\CoreLibs\Create\Session::class,
-			['getSessionId', 'checkActiveSession', 'sessionDestroy']
+			['startSession', 'checkActiveSession', 'sessionDestroy']
 		);
-		$session_mock->method('getSessionId')->willReturn('ACLLOGINTEST12');
+		$session_mock->method('startSession')->willReturn('ACLLOGINTEST12');
 		$session_mock->method('checkActiveSession')->willReturn(true);
 		$session_mock->method('sessionDestroy')->will(
 			$this->returnCallback(function () {
@@ -1176,15 +1107,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 +1130,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 +1148,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 +1365,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,25 +1423,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'
-			);
-			// Deprecated
 			// - loginCheckEditAccess
 			$this->assertEquals(
 				$expected['check_access'],
@@ -1554,7 +1445,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'
@@ -1585,12 +1476,11 @@ final class CoreLibsACLLoginTest extends TestCase
 			// - loginCheckPermissions
 			// - loginGetPermissionOkay
 		} catch (\Exception $e) {
-			/* print "[E]: " . $e->getCode() . ", ERROR: " . $login_mock->loginGetLastErrorCode() . "/"
+			// print "[E]: " . $e->getCode() . ", ERROR: " . $login_mock->loginGetLastErrorCode() . "/"
-				. ($expected['login_error'] ?? 0) . "\n";
+			// 	. ($expected['login_error'] ?? 0) . "\n";
-			print "AJAX: " . $login_mock->loginGetAjaxFlag() . "\n";
+			// print "AJAX: " . $login_mock->loginGetAjaxFlag() . "\n";
-			print "AJAX GLOBAL: " . ($GLOBALS['AJAX_PAGE'] ?? '{f}') . "\n";
+			// print "AJAX GLOBAL: " . ($GLOBALS['AJAX_PAGE'] ?? '{f}') . "\n";
-			print "Login error expext: " . ($expected['login_error'] ?? '{0}') . "\n";
+			// print "Login error expext: " . ($expected['login_error'] ?? '{0}') . "\n";
-			print "POST exit: " . ($_POST['login_exit'] ?? '{0}') . "\n"; */
 			// if this is 100, then we do further error checks
 			if (
 				$e->getCode() == 100 ||
@@ -1898,9 +1788,9 @@ final class CoreLibsACLLoginTest extends TestCase
 		/** @var \CoreLibs\Create\Session&MockObject */
 		$session_mock = $this->createPartialMock(
 			\CoreLibs\Create\Session::class,
-			['getSessionId', 'checkActiveSession', 'sessionDestroy']
+			['startSession', 'checkActiveSession', 'sessionDestroy']
 		);
-		$session_mock->method('getSessionId')->willReturn('ACLLOGINTEST34');
+		$session_mock->method('startSession')->willReturn('ACLLOGINTEST34');
 		$session_mock->method('checkActiveSession')->willReturn(true);
 		$session_mock->method('sessionDestroy')->will(
 			$this->returnCallback(function () {
@@ -2012,9 +1902,9 @@ final class CoreLibsACLLoginTest extends TestCase
 		/** @var \CoreLibs\Create\Session&MockObject */
 		$session_mock = $this->createPartialMock(
 			\CoreLibs\Create\Session::class,
-			['getSessionId', 'checkActiveSession', 'sessionDestroy']
+			['startSession', 'checkActiveSession', 'sessionDestroy']
 		);
-		$session_mock->method('getSessionId')->willReturn('ACLLOGINTEST34');
+		$session_mock->method('startSession')->willReturn('ACLLOGINTEST34');
 		$session_mock->method('checkActiveSession')->willReturn(true);
 		$session_mock->method('sessionDestroy')->will(
 			$this->returnCallback(function () {
@@ -2100,9 +1990,9 @@ final class CoreLibsACLLoginTest extends TestCase
 		/** @var \CoreLibs\Create\Session&MockObject */
 		$session_mock = $this->createPartialMock(
 			\CoreLibs\Create\Session::class,
-			['getSessionId', 'checkActiveSession', 'sessionDestroy']
+			['startSession', 'checkActiveSession', 'sessionDestroy']
 		);
-		$session_mock->method('getSessionId')->willReturn('ACLLOGINTEST34');
+		$session_mock->method('startSession')->willReturn('ACLLOGINTEST34');
 		$session_mock->method('checkActiveSession')->willReturn(true);
 		$session_mock->method('sessionDestroy')->will(
 			$this->returnCallback(function () {
@@ -2196,9 +2086,9 @@ final class CoreLibsACLLoginTest extends TestCase
 		/** @var \CoreLibs\Create\Session&MockObject */
 		$session_mock = $this->createPartialMock(
 			\CoreLibs\Create\Session::class,
-			['getSessionId', 'checkActiveSession', 'sessionDestroy']
+			['startSession', 'checkActiveSession', 'sessionDestroy']
 		);
-		$session_mock->method('getSessionId')->willReturn('ACLLOGINTEST34');
+		$session_mock->method('startSession')->willReturn('ACLLOGINTEST34');
 		$session_mock->method('checkActiveSession')->willReturn(true);
 		$session_mock->method('sessionDestroy')->will(
 			$this->returnCallback(function () {

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/Convert/CoreLibsConvertColorsTest.php

@@ -9,7 +9,7 @@ use PHPUnit\Framework\TestCase;
 /**
  * Test class for Convert\Colors
  * @coversDefaultClass \CoreLibs\Convert\Colors
- * @testdox \CoreLibs\Convert\Colors legacy method tests
+ * @testdox \CoreLibs\Convert\Colors method tests
  */
 final class CoreLibsConvertColorsTest extends TestCase
 {
@@ -21,7 +21,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 *
 	 * @return array
 	 */
-	public function providerRgb2hexColor(): array
+	public function rgb2hexColorProvider(): array
 	{
 		return [
 			'color' => [
@@ -88,7 +88,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 *
 	 * @return array
 	 */
-	public function providerHex2rgbColor(): array
+	public function hex2rgbColorProvider(): array
 	{
 		return [
 			'color' => [
@@ -215,7 +215,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 *
 	 * @return array
 	 */
-	public function providerRgb2hsbColor(): array
+	public function rgb2hsbColorProvider(): array
 	{
 		$list = [];
 		foreach ($this->rgb2hslAndhsbList() as $name => $values) {
@@ -234,7 +234,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 *
 	 * @return array
 	 */
-	public function providerHsb2rgbColor(): array
+	public function hsb2rgbColorProvider(): array
 	{
 		$list = [];
 		foreach ($this->rgb2hslAndhsbList() as $name => $values) {
@@ -253,7 +253,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 *
 	 * @return array
 	 */
-	public function providerRgb2hslColor(): array
+	public function rgb2hslColorProvider(): array
 	{
 		$list = [];
 		foreach ($this->rgb2hslAndhsbList() as $name => $values) {
@@ -272,7 +272,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 *
 	 * @return array
 	 */
-	public function providerHsl2rgbColor(): array
+	public function hsl2rgbColorProvider(): array
 	{
 		$list = [];
 		foreach ($this->rgb2hslAndhsbList() as $name => $values) {
@@ -291,7 +291,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 * TODO: add cross convert check
 	 *
 	 * @covers ::rgb2hex
-	 * @dataProvider providerRgb2hexColor
+	 * @dataProvider rgb2hexColorProvider
 	 * @testdox rgb2hex $input_r,$input_g,$input_b will be $expected [$_dataName]
 	 *
 	 * @param int $input_r
@@ -342,7 +342,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @covers ::hex2rgb
-	 * @dataProvider providerHex2rgbColor
+	 * @dataProvider hex2rgbColorProvider
 	 * @testdox hex2rgb $input will be $expected, $expected_str str[,], $expected_str_sep str[$separator] [$_dataName]
 	 *
 	 * @param string $input
@@ -385,7 +385,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @covers ::rgb2hsb
-	 * @dataProvider providerRgb2hsbColor
+	 * @dataProvider rgb2hsbColorProvider
 	 * @testdox rgb2hsb $input_r,$input_g,$input_b will be $expected [$_dataName]
 	 *
 	 * @param integer $input_r
@@ -409,7 +409,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @covers ::hsb2rgb
-	 * @dataProvider providerHsb2rgbColor
+	 * @dataProvider hsb2rgbColorProvider
 	 * @testdox hsb2rgb $input_h,$input_s,$input_b will be $expected [$_dataName]
 	 *
 	 * @param float $input_h
@@ -434,7 +434,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @covers ::rgb2hsl
-	 * @dataProvider providerRgb2hslColor
+	 * @dataProvider rgb2hslColorProvider
 	 * @testdox rgb2hsl $input_r,$input_g,$input_b will be $expected [$_dataName]
 	 *
 	 * @param integer $input_r
@@ -458,7 +458,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @covers ::hsl2rgb
-	 * @dataProvider providerHsl2rgbColor
+	 * @dataProvider hsl2rgbColorProvider
 	 * @testdox hsl2rgb $input_h,$input_s,$input_l will be $expected [$_dataName]
 	 *
 	 * @param integer|float $input_h

4dev/tests/Convert/CoreLibsConvertMathTest.php

@@ -18,7 +18,7 @@ final class CoreLibsConvertMathTest extends TestCase
 	 *
 	 * @return array<mixed>
 	 */
-	public function providerFceil(): array
+	public function fceilProvider(): array
 	{
 		return [
 			'5.5 must be 6' => [5.5, 6],
@@ -31,7 +31,7 @@ final class CoreLibsConvertMathTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @covers ::fceil
-	 * @dataProvider providerFceil
+	 * @dataProvider fceilProvider
 	 * @testdox fceil: Input $input must be $expected
 	 *
 	 * @param float $input
@@ -51,7 +51,7 @@ final class CoreLibsConvertMathTest extends TestCase
 	 *
 	 * @return array<mixed>
 	 */
-	public function providerFloor(): array
+	public function floorProvider(): array
 	{
 		return [
 			'5123456 with -3 must be 5123000' => [5123456, -3, 5123000],
@@ -63,7 +63,7 @@ final class CoreLibsConvertMathTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @covers ::floorp
-	 * @dataProvider providerFloor
+	 * @dataProvider floorProvider
 	 * @testdox floor: Input $input with cutoff $cutoff must be $expected
 	 *
 	 * @param int $input
@@ -84,7 +84,7 @@ final class CoreLibsConvertMathTest extends TestCase
 	 *
 	 * @return array<mixed>
 	 */
-	public function providerInitNumeric(): array
+	public function initNumericProvider(): array
 	{
 		return [
 			'5 must be 5' => [5, 5, 'int'],
@@ -98,7 +98,7 @@ final class CoreLibsConvertMathTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @covers ::initNumeric
-	 * @dataProvider providerInitNumeric
+	 * @dataProvider initNumericProvider
 	 * @testdox initNumeric: Input $info $input must match $expected [$_dataName]
 	 *
 	 * @param int|float|string $input
@@ -113,388 +113,6 @@ final class CoreLibsConvertMathTest extends TestCase
 			\CoreLibs\Convert\Math::initNumeric($input)
 		);
 	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerCbrt(): array
-	{
-		return [
-			'cube root of 2' => [2, 1.25992, 5],
-			'cube root of 3' => [3, 1.44225, 5],
-			'cube root of -1' => [-1, 'NAN', 0],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::cbrt
-	 * @dataProvider providerCbrt
-	 * @testdox initNumeric: Input $input must match $expected [$_dataName]
-	 *
-	 * @param  float|int $number
-	 * @param  float     $expected
-	 * @param  int       $round_to
-	 * @return void
-	 */
-	public function testCbrt(float|int $number, float|string $expected, int $round_to): void
-	{
-		$this->assertEquals(
-			$expected,
-			round(\CoreLibs\Convert\Math::cbrt($number), $round_to)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerMultiplyMatrices(): array
-	{
-		return  [
-			'[3] x [3] => [3x1]' => [
-				[1, 2, 3],
-				[1, 2, 3],
-				[14]
-			],
-			'[3] x [3x1]' => [
-				[1, 2, 3],
-				[[1], [2], [3]],
-				[14]
-			],
-			'[3] x [3x1]' => [
-				[1, 2, 3],
-				[[1], [2], [3]],
-				[14]
-			],
-			'[1x3L] x [3x1]' => [
-				[[1, 2, 3]],
-				[[1], [2], [3]],
-				[14]
-			],
-			'[1x3] x [3x1]' => [
-				[[1], [2], [3]],
-				[[1], [2], [3]],
-				[1, 2, 3]
-			],
-			'[2x3] x [3] => [3x1]' => [
-				[
-					[1, 2, 3],
-					[1, 2, 3]
-				],
-				[1, 2, 3],
-				[
-					14,
-					14
-				]
-			],
-			'[2x3] x [3x1]' => [
-				[
-					[1, 2, 3],
-					[1, 2, 3]
-				],
-				[[1], [2], [3]],
-				[
-					14,
-					14
-				]
-			],
-			'[2x3] x [2x3] => [3x3]' => [
-				[
-					[1, 2, 3],
-					[1, 2, 3],
-				],
-				[
-					[1, 2, 3],
-					[1, 2, 3],
-				],
-				[
-					[3, 6, 9],
-					[3, 6, 9]
-				]
-			],
-			'[2x3] x [3x3]' => [
-				[
-					[1, 2, 3],
-					[1, 2, 3],
-				],
-				[
-					[1, 2, 3],
-					[1, 2, 3],
-					[0, 0, 0],
-				],
-				[
-					[3, 6, 9],
-					[3, 6, 9]
-				]
-			],
-			'[2x3] x [3x2]' => [
-				'a' => [
-					[1, 2, 3],
-					[1, 2, 3],
-				],
-				'b' => [
-					[1, 1],
-					[2, 2],
-					[3, 3],
-				],
-				'prod' => [
-					[14, 14],
-					[14, 14],
-				]
-			],
-			'[3x3] x [3] => [1x3]' => [
-				[
-					[1, 2, 3],
-					[1, 2, 3],
-					[1, 2, 3],
-				],
-				[1, 2, 3],
-				[
-					14,
-					14,
-					14
-				]
-			],
-			'[3x3] x [2x3] => [3x3]' => [
-				[
-					[1, 2, 3],
-					[1, 2, 3],
-					[1, 2, 3],
-				],
-				[
-					[1, 2, 3],
-					[1, 2, 3],
-				],
-				[
-					[3, 6, 9],
-					[3, 6, 9],
-					[3, 6, 9],
-				]
-			],
-			'[3x3] x [3x3]' => [
-				[
-					[1, 2, 3],
-					[1, 2, 3],
-					[1, 2, 3],
-				],
-				[
-					[1, 2, 3],
-					[1, 2, 3],
-					// [0, 0, 0],
-				],
-				[
-					[3, 6, 9],
-					[3, 6, 9],
-					[3, 6, 9],
-				]
-			],
-			'[3] x [3x3]' => [
-				[1, 2, 3],
-				[
-					[1, 2, 3],
-					[1, 2, 3],
-					[1, 2, 3],
-				],
-				[
-					[6, 12, 18],
-				]
-			],
-			'[2x3] x [3x3]' => [
-				[
-					[1, 2, 3],
-					[1, 2, 3],
-				],
-				[
-					[1, 2, 3],
-					[1, 2, 3],
-					[1, 2, 3],
-				],
-				[
-					[6, 12, 18],
-					[6, 12, 18],
-				]
-			],
-			'inblanaced [2x2,3] x [3x2]' => [
-				'a' => [
-					[1, 2, 3],
-					[4, 5]
-				],
-				'b' => [
-					[6, 7],
-					[8, 9],
-					[10, 11]
-				],
-				'result' => [
-					[52, 58],
-					[64, 73],
-				]
-			],
-			'inblanaced [2x3] x [3x1,2]' => [
-				'a' => [
-					[1, 2, 3],
-					[4, 5, 7]
-				],
-				'b' => [
-					[7, 8],
-					[9, 10],
-					[11]
-				],
-				'result' => [
-					[58, 28],
-					[150, 82],
-				]
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::multiplyMatrices
-	 * @dataProvider providerMultiplyMatrices
-	 * @testdox initNumeric: Input $input_a x $input_b must match $expected [$_dataName]
-	 *
-	 * @param  array $input_a
-	 * @param  array $input_b
-	 * @param  array $expected
-	 * @return void
-	 */
-	public function testMultiplyMatrices(array $input_a, array $input_b, array $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Math::multiplyMatrices($input_a, $input_b)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerEqualWithEpsilon(): array
-	{
-		return [
-			'equal' => [
-				'a' => 0.000000000000000222,
-				'b' => 0.000000000000000222,
-				'epsilon' => PHP_FLOAT_EPSILON,
-				'equal' => true,
-			],
-			'almost equal' => [
-				'a' => 0.000000000000000222,
-				'b' => 0.000000000000000232,
-				'epsilon' => PHP_FLOAT_EPSILON,
-				'equal' => true,
-			],
-			'not equal' => [
-				'a' => 0.000000000000000222,
-				'b' => 0.000000000000004222,
-				'epsilon' => PHP_FLOAT_EPSILON,
-				'equal' => false,
-			],
-			'equal, different epsilon' => [
-				'a' => 0.000000000000000222,
-				'b' => 0.000000000000004222,
-				'epsilon' => 0.0001,
-				'equal' => true,
-			],
-			'not equal, different epsilon' => [
-				'a' => 0.0001,
-				'b' => 0.0002,
-				'epsilon' => 0.0001,
-				'equal' => false,
-			]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::equalWithEpsilon
-	 * @dataProvider providerEqualWithEpsilon
-	 * @testdox equalWithEpsilon with $a and $b and Epsilon: $epsilon must be equal: $equal [$_dataName]
-	 *
-	 * @return void
-	 */
-	public function testEqualWithEpsilon(float $a, float $b, float $epsilon, bool $equal): void
-	{
-		$this->assertEquals(
-			$equal,
-			\CoreLibs\Convert\Math::equalWithEpsilon($a, $b, $epsilon)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerCompareWithEpsilon(): array
-	{
-		return [
-			'smaller, true' => [
-				'value' => 0.0001,
-				'compare' => '<',
-				'limit' => 0.0002,
-				'epsilon' => 0.00001,
-				'match' => true,
-			],
-			'smaller, false' => [
-				'value' => 0.0001,
-				'compare' => '<',
-				'limit' => 0.0001,
-				'epsilon' => 0.00001,
-				'match' => false,
-			],
-			'bigger, true' => [
-				'value' => 0.0002,
-				'compare' => '>',
-				'limit' => 0.0001,
-				'epsilon' => 0.00001,
-				'match' => true,
-			],
-			'bigger, false' => [
-				'value' => 0.0001,
-				'compare' => '>',
-				'limit' => 0.0001,
-				'epsilon' => 0.00001,
-				'match' => false,
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::compareWithEpsilon
-	 * @dataProvider providerCompareWithEpsilon
-	 * @testdox compareWithEpsilon $value $compare $limit with $epsilon must match: $match [$_dataName]
-	 *
-	 * @param  float  $value
-	 * @param  string $compare
-	 * @param  float  $limit
-	 * @param  float  $epslion
-	 * @param  bool   $match
-	 * @return void
-	 */
-	public function testCompareWithEpsilon(
-		float $value,
-		string $compare,
-		float $limit,
-		float $epsilon,
-		bool $match
-	): void {
-		$this->assertEquals(
-			$match,
-			\CoreLibs\Convert\Math::compareWithEpsilon($value, $compare, $limit, $epsilon)
-		);
-	}
 }
 
 // __END__

4dev/tests/Create/CoreLibsCreateSessionTest.php

@@ -22,6 +22,7 @@ final class CoreLibsCreateSessionTest extends TestCase
 	public function sessionProvider(): array
 	{
 		// 0: session name as parameter or for GLOBAL value
+		// 1: type p: parameter, g: global, d: php.ini default
 		// 2: mock data as array
 		//    checkCliStatus: true/false,
 		//    getSessionStatus: PHP_SESSION_DISABLED for abort,
@@ -30,10 +31,13 @@ final class CoreLibsCreateSessionTest extends TestCase
 		//    checkActiveSession: true/false, [1st call, 2nd call]
 		//    getSessionId: string or false
 		// 3: exepcted name (session)]
-		// 4: auto write close flag
+		// 4: Exception thrown on error
+		// 5: exception code, null for none
+		// 6: expected error string
 		return [
 			'session parameter' => [
 				'sessionNameParameter',
+				'p',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
@@ -43,9 +47,12 @@ final class CoreLibsCreateSessionTest extends TestCase
 				],
 				'sessionNameParameter',
 				null,
+				null,
+				'',
 			],
 			'session globals' => [
 				'sessionNameGlobals',
+				'g',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
@@ -54,12 +61,13 @@ final class CoreLibsCreateSessionTest extends TestCase
 					'getSessionId' => '1234abcd4567'
 				],
 				'sessionNameGlobals',
-				[
+				null,
-					'auto_write_close' => false,
+				null,
-				],
+				'',
 			],
-			'auto write close' => [
+			'session name default' => [
-				'sessionNameAutoWriteClose',
+				'',
+				'd',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
@@ -67,10 +75,109 @@ final class CoreLibsCreateSessionTest extends TestCase
 					'checkActiveSession' => [false, true],
 					'getSessionId' => '1234abcd4567'
 				],
-				'sessionNameAutoWriteClose',
+				'',
+				null,
+				null,
+				'',
+			],
+			// error checks
+			// 1: we are in cli
+			'on cli error' => [
+				'',
+				'd',
 				[
-					'auto_write_close' => true,
+					'checkCliStatus' => true,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => true,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => '1234abcd4567'
 				],
+				'',
+				'RuntimeException',
+				1,
+				'[SESSION] No sessions in php cli'
+			],
+			// 2: session disabled
+			'session disabled error' => [
+				'',
+				'd',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_DISABLED,
+					'setSessionName' => true,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => '1234abcd4567'
+				],
+				'',
+				'RuntimeException',
+				2,
+				'[SESSION] Sessions are disabled'
+			],
+			// 3: invalid session name: string
+			'invalid name chars error' => [
+				'1invalid$session#;',
+				'p',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => false,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => '1234abcd4567'
+				],
+				'',
+				'UnexpectedValueException',
+				3,
+				'[SESSION] Invalid session name: 1invalid$session#;'
+			],
+			// 3: invalid session name: only numbers
+			'invalid name numbers only error' => [
+				'123',
+				'p',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => false,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => '1234abcd4567'
+				],
+				'',
+				'UnexpectedValueException',
+				3,
+				'[SESSION] Invalid session name: 123'
+			],
+			// 3: invalid session name: invalid name short
+			// 3: invalid session name: too long (128)
+			// 4: failed to start session (2nd false on check active session)
+			'invalid name numbers only error' => [
+				'',
+				'd',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => true,
+					'checkActiveSession' => [false, false],
+					'getSessionId' => '1234abcd4567'
+				],
+				'',
+				'RuntimeException',
+				4,
+				'[SESSION] Failed to activate session'
+			],
+			// 5: get session id return false
+			'invalid name numbers only error' => [
+				'',
+				'd',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => true,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => false
+				],
+				'',
+				'UnexpectedValueException',
+				5,
+				'[SESSION] getSessionId did not return a session id'
 			],
 		];
 	}
@@ -83,24 +190,32 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 * @testdox startSession $input name for $type will be $expected (error: $expected_error) [$_dataName]
 	 *
 	 * @param string $input
+	 * @param string $type
 	 * @param array<mixed> $mock_data
 	 * @param string $expected
-	 * @param array<string,mixed> $options
+	 * @param string|null $exception
+	 * @param string $expected_error
 	 * @return void
 	 */
 	public function testStartSession(
 		string $input,
+		string $type,
 		array $mock_data,
 		string $expected,
-		?array $options,
+		?string $exception,
+		?int $exception_code,
+		string $expected_error
 	): void {
+		// override expected
+		if ($type == 'd') {
+			$expected = ini_get('session.name');
+		}
 		/** @var \CoreLibs\Create\Session&MockObject $session_mock */
 		$session_mock = $this->createPartialMock(
 			\CoreLibs\Create\Session::class,
 			[
-				'checkCliStatus',
+				'checkCliStatus', 'getSessionStatus', 'checkActiveSession',
-				'getSessionStatus', 'checkActiveSession',
+				'setSessionName', 'startSessionCall', 'getSessionId',
-				'getSessionId',
 				'getSessionName'
 			]
 		);
@@ -119,8 +234,12 @@ final class CoreLibsCreateSessionTest extends TestCase
 				$mock_data['checkActiveSession'][0],
 				$mock_data['checkActiveSession'][1],
 			);
+		// dummy set for session name
+		$session_mock->method('setSessionName')->with($input)->willReturn($mock_data['setSessionName']);
 		// set session name & return bsed on request data
 		$session_mock->method('getSessionName')->willReturn($expected);
+		// will not return anything
+		$session_mock->method('startSessionCall');
 		// in test case only return string
 		// false: will return false
 		$session_mock->method('getSessionId')->willReturn($mock_data['getSessionId']);
@@ -128,7 +247,25 @@ final class CoreLibsCreateSessionTest extends TestCase
 		// regex for session id
 		$ression_id_regex = "/^\w+$/";
 
-		$session_id = $session_mock->getSessionId();
+		if ($exception !== null) {
+			$this->expectException($exception);
+			$this->expectExceptionCode($exception_code);
+		}
+
+		unset($GLOBALS['SET_SESSION_NAME']);
+		$session_id = '';
+		switch ($type) {
+			case 'p':
+				$session_id = $session_mock->startSession($input);
+				break;
+			case 'g':
+				$GLOBALS['SET_SESSION_NAME'] = $input;
+				$session_id = $session_mock->startSession();
+				break;
+			case 'd':
+				$session_id = $session_mock->startSession();
+				break;
+		}
 		// asert checks
 		if (!empty($session_id)) {
 			$this->assertMatchesRegularExpression(
@@ -147,79 +284,6 @@ final class CoreLibsCreateSessionTest extends TestCase
 		}
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerSessionException(): array
-	{
-		return [
-			'not cli' => [
-				'TEST_EXCEPTION',
-				\RuntimeException::class,
-				1,
-				'/^\[SESSION\] No sessions in php cli$/',
-			],
-			/* 'session disabled ' => [
-				'TEST_EXCEPTION',
-				\RuntimeException::class,
-				2,
-				'/^\[SESSION\] Sessions are disabled/'
-			],
-			'invalid session name' => [
-				'--#as^-292p-',
-				\UnexpectedValueException::class,
-				3,
-				'/^\[SESSION\] Invalid session name: /'
-			],
-			'failed to activate session' => [
-				'TEST_EXCEPTION',
-				\RuntimeException::class,
-				4,
-				'/^\[SESSION\] Failed to activate session/'
-			],
-			'expired session' => [
-				\RuntimeException::class,
-				5,
-				'/^\[SESSION\] Expired session found/'
-			],
-			'not a valid session id returned' => [
-				\UnexpectedValueException::class,
-				6,
-				'/^\[SESSION\] getSessionId did not return a session id/'
-			], */
-		];
-	}
-
-	/**
-	 * exception checks
-	 *
-	 * @covers ::initSession
-	 * @dataProvider providerSessionException
-	 * @testdox create session $session_name with exception $exception ($exception_code) [$_dataName]
-	 *
-	 * @param  string $session_name
-	 * @param  string $exception
-	 * @param  int    $exception_code
-	 * @param  string $expected_error
-	 * @return void
-	 */
-	public function testSessionException(
-		string $session_name,
-		string $exception,
-		int $exception_code,
-		string $expected_error,
-	): void {
-		//
-		// throws only on new Object creation
-		$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]);
-	}
-
 	/**
 	 * provider for session name check
 	 *
@@ -283,147 +347,109 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 *
 	 * @return array
 	 */
-	public function providerSessionData(): array
+	public function sessionDataProvider(): array
 	{
 		return [
 			'test' => [
 				'foo',
 				'bar',
 				'bar',
-				null,
 			],
 			'int key test' => [
 				123,
 				'bar',
 				'bar',
-				\UnexpectedValueException::class
 			],
 			// more complex value tests
 			'array values' => [
 				'array',
 				[1, 2, 3],
 				[1, 2, 3],
-				null,
 			]
 		];
 	}
 
-	// NOTE: with auto start session, we cannot test this in the command line
-
 	/**
 	 * method call test
 	 *
-	 * @covers ::set
+	 * @covers ::setS
-	 * @covers ::get
+	 * @covers ::getS
-	 * @covers ::isset
+	 * @covers ::issetS
-	 * @covers ::unset
+	 * @covers ::unsetS
-	 * @dataProvider providerSessionData
+	 * @dataProvider sessionDataProvider
-	 * @testdox set/get/isset/unset $name with $input is $expected ($exception) [$_dataName]
+	 * @testdox setS/getS/issetS/unsetS $name with $input is $expected [$_dataName]
 	 *
 	 * @param  string|int $name
 	 * @param  mixed $input
 	 * @param  mixed $expected
-	 * @param  ?mixed $exception
 	 * @return void
 	 */
-	public function testMethodSetGet($name, $input, $expected, $exception): void
+	public function testMethodSetGet($name, $input, $expected): void
 	{
-		if (\CoreLibs\Get\System::checkCLI()) {
+		$session = new \CoreLibs\Create\Session();
-			$this->markTestSkipped('Cannot run testMethodSetGet in CLI');
+		$session->setS($name, $input);
-		}
-		$session = new \CoreLibs\Create\Session('TEST_METHOD');
-		if ($expected !== null) {
-			$this->expectException($exception);
-		}
-		$session->set($name, $input);
 		$this->assertEquals(
 			$expected,
-			$session->get($name),
+			$session->getS($name),
 			'method set assert'
 		);
 		// isset true
 		$this->assertTrue(
-			$session->isset($name),
+			$session->issetS($name),
 			'method isset assert ok'
 		);
-		$session->unset($name);
+		$session->unsetS($name);
 		$this->assertEquals(
 			'',
-			$session->get($name),
+			$session->getS($name),
 			'method unset assert'
 		);
-		// isset false
+		// iset false
 		$this->assertFalse(
-			$session->isset($name),
+			$session->issetS($name),
 			'method isset assert false'
 		);
 	}
 
 	/**
-	 * Undocumented function
+	 * magic call test
 	 *
-	 * @return array
+	 * @covers ::__set
-	 */
+	 * @covers ::__get
-	public function providerSessionDataMany(): array
+	 * @covers ::__isset
-	{
+	 * @covers ::__unset
-		return [
+	 * @dataProvider sessionDataProvider
-			'valid set' => [
+	 * @testdox __set/__get/__iseet/__unset $name with $input is $expected [$_dataName]
-				[
-					'foo 1' => 'bar 1',
-					'foo 2' => 'bar 1',
-				],
-				[
-					'foo 1' => 'bar 1',
-					'foo 2' => 'bar 1',
-				],
-				null,
-			],
-			'invalid entry' => [
-				[
-					'foo 1' => 'bar 1',
-					123 => 'bar 1',
-				],
-				[
-					'foo 1' => 'bar 1',
-				],
-				\UnexpectedValueException::class
-			]
-		];
-	}
-
-	/**
-	 * Undocumented function
 	 *
-	 * @covers ::setMany
+	 * @param  string|int $name
-	 * @covers ::getMany
+	 * @param  mixed $input
-	 * @dataProvider providerSessionDataMany
+	 * @param  mixed $expected
-	 * @testdox setMany/getMany/unsetMany $set is $expected ($exception) [$_dataName]
-	 *
-	 * @param  array<string|int,mixed> $set
-	 * @param  array<string,mixed> $expected
-	 * @param  ?mixed $exception
 	 * @return void
 	 */
-	public function testMany($set, $expected, $exception): void
+	public function testMagicSetGet($name, $input, $expected): void
 	{
-		if (\CoreLibs\Get\System::checkCLI()) {
+		$session = new \CoreLibs\Create\Session();
-			$this->markTestSkipped('Cannot run testMethodSetGet in CLI');
+		$session->$name = $input;
-		}
-		$session = new \CoreLibs\Create\Session('TEST_METHOD');
-		if ($expected !== null) {
-			$this->expectException($exception);
-		}
-		$session->setMany($set);
 		$this->assertEquals(
 			$expected,
-			$session->getMany(array_keys($set)),
+			$session->$name,
-			'set many failed'
+			'magic set assert'
 		);
-		$session->unsetMany(array_keys($set));
+		// isset true
+		$this->assertTrue(
+			isset($session->$name),
+			'magic isset assert ok'
+		);
+		unset($session->$name);
 		$this->assertEquals(
-			[],
+			'',
-			$session->getMany(array_keys($set)),
+			$session->$name,
-			'unset many failed'
+			'magic unset assert'
+		);
+		// isset true
+		$this->assertFalse(
+			isset($session->$name),
+			'magic isset assert false'
 		);
 	}
 
@@ -437,30 +463,27 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 */
 	public function testUnsetAll(): void
 	{
-		if (\CoreLibs\Get\System::checkCLI()) {
-			$this->markTestSkipped('Cannot run testUnsetAll in CLI');
-		}
 		$test_values = [
 			'foo' => 'abc',
 			'bar' => '123'
 		];
-		$session = new \CoreLibs\Create\Session('TEST_UNSET');
+		$session = new \CoreLibs\Create\Session();
 		foreach ($test_values as $name => $value) {
-			$session->set($name, $value);
+			$session->setS($name, $value);
 			// confirm set
 			$this->assertEquals(
 				$value,
-				$session->get($name),
+				$session->getS($name),
 				'set assert: ' . $name
 			);
 		}
 		// unset all
-		$session->clear();
+		$session->unsetAllS();
 		// check unset
 		foreach (array_keys($test_values) as $name) {
 			$this->assertEquals(
 				'',
-				$session->get($name),
+				$session->getS($name),
 				'unsert assert: ' . $name
 			);
 		}

4dev/tests/Create/CoreLibsCreateUidsTest.php

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

4dev/tests/DB/CoreLibsDBExtendedArrayIOTest.php

@@ -10,6 +10,7 @@ use PHPUnit\Framework\TestCase;
  * Test class for DB\Extended\ArrayIO
  * This will only test the PgSQL parts
  * @coversDefaultClass \CoreLibs\DB\Extended\ArrayIO
+ * @coversDefaultClass \CoreLibs\DB\Extended\ArrayIO
  * @testdox \CoreLibs\Extended\ArrayIO method tests for extended DB interface
  */
 final class CoreLibsDBExtendedArrayIOTest extends TestCase

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

4dev/tests/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/Security/CoreLibsSecuritySymmetricEncryptionTest.php

@@ -56,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);
@@ -82,24 +65,7 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 			$decrypted,
 			'Class Instance call',
 		);
-	}
 
-	/**
-	 * 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 = CreateKey::generateRandomKey();
 		// test static
 		$encrypted = SymmetricEncryption::encryptKey($input, $key);
 		$decrypted = SymmetricEncryption::decryptKey($encrypted, $key);
@@ -148,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 ::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 = CreateKey::generateRandomKey();
-		$wrong_key = CreateKey::generateRandomKey();
 
 		// class static
 		$encrypted = SymmetricEncryption::encryptKey($input, $key);
@@ -262,56 +190,6 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 		SymmetricEncryption::decryptKey($encrypted, $key);
 	}
 
-	/**
-	 * 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);
-		SymmetricEncryption::getInstance($key)->encrypt('test');
-		// we must encrypt valid thing first so we can fail with the wrong key
-		$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 ::encrypt
-	 * @covers ::decrypt
-	 * @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);
-		SymmetricEncryption::encryptKey('test', $key);
-		// we must encrypt valid thing first so we can fail with the wrong key
-		$encrypted = SymmetricEncryption::encryptKey('test', $enc_key);
-		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::decryptKey($encrypted, $key);
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -354,49 +232,6 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 		$this->expectExceptionMessage($exception_message);
 		SymmetricEncryption::decryptKey($input, $key);
 	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::decrypt
-	 * @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 ::decrypt
-	 * @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,34 +0,0 @@
--- 20241203: update edit tables
-ALTER TABLE edit_generic ADD cuuid UUID DEFAULT gen_random_uuid();
-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
-
-CREATE OR REPLACE FUNCTION set_edit_generic()
-RETURNS TRIGGER AS
-$$
-DECLARE
-    random_length INT = 25; -- that should be long enough
-BEGIN
-    IF TG_OP = 'INSERT' THEN
-        NEW.date_created := clock_timestamp();
-        NEW.cuid := random_string(random_length);
-        NEW.cuuid := gen_random_uuid();
-    ELSIF TG_OP = 'UPDATE' THEN
-        NEW.date_updated := clock_timestamp();
-    END IF;
-    RETURN NEW;
-END;
-$$
-LANGUAGE 'plpgsql';

composer.json

@@ -2,18 +2,16 @@
     "name": "egrajp/development-corelibs-dev",
     "version": "dev-master",
     "description": "CoreLibs: Development package",
-    "keywords": ["corelib", "logging", "database", "templating", "tools"],
     "type": "library",
     "require": {
-        "php": ">=8.3"
+        "php": ">=8.1"
     },
     "require-dev": {
-        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-deprecation-rules": "^2.0",
-        "phpstan/extension-installer": "^1.4",
         "phan/phan": "^5.4",
-        "phpunit/phpunit": "^9",
+        "phpstan/extension-installer": "^1.2",
-        "yamadashy/phpstan-friendly-formatter": "^1.1"
+        "phpstan/phpstan-strict-rules": "^1.6",
+        "phpunit/phpunit": "^9"
     },
     "config": {
         "allow-plugins": {

phpstan.neon

@@ -1,22 +1,25 @@
 # PHP Stan Config
 includes:
 	- phpstan-conditional.php
-	#- ./vendor/yamadashy/phpstan-friendly-formatter/extension.neon
-	# - phar://phpstan.phar/conf/bleedingEdge.neon
 parameters:
 	tmpDir: %currentWorkingDirectory%/tmp/phpstan-corelibs
-	#errorFormat: friendly
+	level: 9 # max is now 9
-	#friendly:
-	#	lineBefore: 3
-	#	lineAfter: 3
-	level: 8 # max is now 9
-	# strictRules:
-	# 	allRules: false
 	checkMissingCallableSignature: true
 	treatPhpDocTypesAsCertain: false
-	# phpVersion:
+	strictRules:
-	# 	min: 80200 # PHP 8.2.0
+		allRules: false
-	# 	max: 80300 # PHP latest
+		disallowedLooseComparison: false
+		booleansInConditions: false
+		uselessCast: true
+		requireParentConstructorCall: false
+		disallowedConstructs: false
+		overwriteVariablesWithLoop: false
+		closureUsesThis: false
+		matchingInheritedMethodNames: false
+		numericOperandsInArithmeticOperators: false
+		strictCalls: false
+		switchConditionsMatchingType: false
+		noVariableVariables: false
 	paths:
 		- %currentWorkingDirectory%/www
 	bootstrapFiles:
@@ -46,6 +49,8 @@ parameters:
 		- www/log
 		- www/media
 		- www/tmp
+		# File uploader
+		- www/lib/FileUpload
 		# ignore composer
 		- www/vendor
 	# ignore errores with
@@ -64,6 +69,6 @@ parameters:
 		#	paths:
 		#		- ...
 		#		- ...
-		# -
+		#-
-		# 	message: "#^Call to deprecated method #"
+		#	message: "#^Call to deprecated method #"
-		# 	path: www/admin/class_test*.php
+		#	path: www/admin/class_test*.php

phpunit.xml

@@ -5,9 +5,4 @@
 	convertDeprecationsToExceptions="true"
 	bootstrap="4dev/tests/bootstrap.php"
 >
-	<testsuites>
-		<testsuite name="deploy">
-			<directory>4dev/tests</directory>
-		</testsuite>
-	</testsuites>
 </phpunit>

www/admin/UrlRequests.target.php

@@ -1,79 +0,0 @@
-<?php // phpcs:ignore PSR1.Files.SideEffects
-
-declare(strict_types=1);
-
-// url requests target test
-require 'config.php';
-use CoreLibs\Convert\Json;
-$LOG_FILE_ID = 'classTest-urlrequests-target';
-$log = new CoreLibs\Logging\Logging([
-	'log_folder' => BASE . LOG,
-	'log_file_id' => $LOG_FILE_ID,
-	'log_per_date' => true,
-]);
-
-/**
- * build return json
- *
- * @param  array<string,mixed> $http_headers
- * @param  ?string $body
- * @return string
- */
-function buildContent(array $http_headers, ?string $body): string
-{
-	if (is_string($body) && !empty($body)) {
-		$_body = Json::jsonConvertToArray($body);
-		if (Json::jsonGetLastError()) {
-			$body = [$body];
-		} else {
-			$body = $_body;
-		}
-	} elseif (is_string($body)) {
-		$body = [];
-	}
-	return Json::jsonConvertArrayTo([
-		'HEADERS' => $http_headers,
-		"REQUEST_TYPE" => $_SERVER['REQUEST_METHOD'],
-		"PARAMS" => $_GET,
-		"BODY" => $body,
-		// "STRING_BODY" => $body,
-	]);
-}
-
-$http_headers = array_filter($_SERVER, function ($value, $key) {
-	if (str_starts_with($key, 'HTTP_')) {
-		return true;
-	}
-}, ARRAY_FILTER_USE_BOTH);
-
-header("Content-Type: application/json; charset=UTF-8");
-
-// if the header has Authorization and RunAuthTest then exit with 401
-if (!empty($http_headers['HTTP_AUTHORIZATION']) && !empty($http_headers['HTTP_RUNAUTHTEST'])) {
-	header("HTTP/1.1 401 Unauthorized");
-	print buildContent($http_headers, '{"code": 401, "content": {"Error": "Not Authorized"}}');
-	exit;
-}
-
-// if server request type is get set file_get to null -> no body
-if ($_SERVER['REQUEST_METHOD'] == "GET") {
-	$file_get = null;
-} elseif (($file_get = file_get_contents('php://input')) === false) {
-	header("HTTP/1.1 404 Not Found");
-	print buildContent($http_headers, '{"code": 404, "content": {"Error": "file_get_contents failed"}}');
-	exit;
-}
-// str_replace('\"', '"', trim($file_get, '"'));
-
-$log->debug('SERVER', $log->prAr($_SERVER));
-$log->debug('HEADERS', $log->prAr($http_headers));
-$log->debug('REQUEST TYPE', $_SERVER['REQUEST_METHOD']);
-$log->debug('GET', $log->prAr($_GET));
-$log->debug('POST', $log->prAr($_POST));
-$log->debug('PHP-INPUT', $log->prAr($file_get));
-
-print buildContent($http_headers, $file_get);
-
-$log->debug('[END]', '=========================================>');
-
-// __END__

www/admin/class_test.admin.backend.php

@@ -42,20 +42,6 @@ $backend = new CoreLibs\Admin\Backend(
 	$l10n,
 	DEFAULT_ACL_LEVEL
 );
-$login = new CoreLibs\ACL\Login(
-	$db,
-	$log,
-	$session,
-	[
-		'auto_login' => false,
-		'default_acl_level' => DEFAULT_ACL_LEVEL,
-		'logout_target' => '',
-		'site_locale' => SITE_LOCALE,
-		'site_domain' => SITE_DOMAIN,
-		'site_encoding' => SITE_ENCODING,
-		'locale_path' => BASE . INCLUDES . LOCALE,
-	]
-);
 use CoreLibs\Debug\Support;
 
 $PAGE_NAME = 'TEST CLASS: ADMIN BACKEND';
@@ -69,30 +55,10 @@ print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 print "SETACL[]: <br>";
 $backend->setACL(['EMPTY' => 'EMPTY']);
 print "ADBEDITLOG: <br>";
-$login->writeLog(
+$backend->adbEditLog('CLASSTEST-ADMIN-BINARY', 'Some info string', 'BINARY');
-	'CLASSTEST-ADMIN-BINARY',
+$backend->adbEditLog('CLASSTEST-ADMIN-ZLIB', 'Some info string', 'ZLIB');
-	'Some info string',
+$backend->adbEditLog('CLASSTEST-ADMIN-SERIAL', 'Some info string', 'SERIAL');
-	$backend->adbGetActionSet(),
+$backend->adbEditLog('CLASSTEST-ADMIN-INVALID', 'Some info string', 'INVALID');
-	write_type:'BINARY'
-);
-$login->writeLog(
-	'CLASSTEST-ADMIN-ZLIB',
-	'Some info string',
-	$backend->adbGetActionSet(),
-	write_type:'ZLIB'
-);
-$login->writeLog(
-	'CLASSTEST-ADMIN-SERIAL',
-	'Some info string',
-	$backend->adbGetActionSet(),
-	write_type:'SERIAL'
-);
-$login->writeLog(
-	'CLASSTEST-ADMIN-INVALID',
-	'Some info string',
-	$backend->adbGetActionSet(),
-	write_type:'INVALID'
-);
 // test with various
 $backend->action = 'TEST ACTION';
 $backend->action_id = 'TEST ACTION ID';
@@ -103,10 +69,10 @@ $backend->action_loaded = 'TEST ACTION LOADED';
 $backend->action_value = 'TEST ACTION VALUE';
 $backend->action_type = 'TEST ACTION TYPE';
 $backend->action_error = 'TEST ACTION ERROR';
-$login->writeLog('CLASSTEST-ADMIN-JSON', [
+$backend->adbEditLog('CLASSTEST-ADMIN-JSON', [
 	"_GET" => $_GET,
 	"_POST" => $_POST,
-], $backend->adbGetActionSet(), write_type:'JSON');
+], 'JSON');
 
 print "ADBTOPMENU(0): " . Support::printAr($backend->adbTopMenu(CONTENT_PATH)) . "<br>";
 print "ADBMSG: <br>";

www/admin/class_test.array.php

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

@@ -18,9 +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;
 use CoreLibs\Convert\SetVarType;
 
@@ -29,36 +27,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
- *
- * @param  string $color
- * @param  string $text
- * @param  string $text_add
- * @return string
- */
-function display(string $color, string $text, string $text_add): string
-{
-	$css = 'margin:5px;padding:50px;'
-		. 'width:10%;'
-		. 'text-align:center;'
-		. 'color:white;text-shadow: 0 0 5px black;font-weight:bold;';
-	$template = <<<HTML
-	<div style="background-color:{COLOR};{CSS}">
-		{TEXT}
-	</div>
-	HTML;
-	return str_replace(
-		["{COLOR}", "{TEXT}", "{CSS}"],
-		[
-			$color,
-			$text . (!empty($text_add) ? '<br>' . $text_add : ''),
-			$css
-		],
-		$template
-	);
-}
 
 $PAGE_NAME = 'TEST CLASS: CONVERT COLORS';
 print "<!DOCTYPE html>";
@@ -67,83 +36,32 @@ print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
-// out of bounds test
-
 // define a list of from to color sets for conversion test
 
-$hwb = Color::hsbToHwb(new Coordinates\HSB([
-	160,
-	0,
-	50,
-]));
-print "HWB: " . DgS::printAr($hwb) . "<br>";
-$hsb = Color::hwbToHsb($hwb);
-print "HSB: " . DgS::printAr($hsb) . "<br>";
-
-$oklch = Color::rgbToOkLch(Coordinates\RGB::create([
-	250,
-	0,
-	0
-]));
-print "OkLch: " . DgS::printAr($oklch) . "<br>";
-$rgb = Color::okLchToRgb($oklch);
-print "OkLch -> RGB: " . DgS::printAr($rgb) . "<br>";
-
-$oklab = Color::rgbToOkLab(Coordinates\RGB::create([
-	250,
-	0,
-	0
-]));
-print "OkLab: " . DgS::printAr($oklab) . "<br>";
-print display($oklab->toCssString(), $oklab->toCssString(), 'Oklab');
-$rgb = Color::okLabToRgb($oklab);
-print "OkLab -> RGB: " . DgS::printAr($rgb) . "<br>";
-print display($rgb->toCssString(), $rgb->toCssString(), 'OkLab to RGB');
-
-$rgb = Coordinates\RGB::create([250, 100, 10])->toLinear();
-print "RGBlinear: " . DgS::printAr($rgb) . "<br>";
-$rgb = Coordinates\RGB::create([0, 0, 0])->toLinear();
-print "RGBlinear: " . DgS::printAr($rgb) . "<br>";
-
-$cie_lab = Color::okLabToLab($oklab);
-print "CieLab: " . DgS::printAr($cie_lab) . "<br>";
-print display($cie_lab->toCssString(), $cie_lab->toCssString(), 'OkLab to Cie Lab');
-
-$rgb = Coordinates\RGB::create([0, 0, 60]);
-$hsb = Color::rgbToHsb($rgb);
-$rgb_b = Color::hsbToRgb($hsb);
-print "RGB: " . DgS::printAr($rgb) . "<br>";
-print "RGB->HSB: " . DgS::printAr($hsb) . "<br>";
-print "HSB->RGB: " . DgS::printAr($rgb_b) . "<br>";
-
-$hsl = Coordinates\HSL::create([0, 20, 0]);
-$hsb = Coordinates\HSB::create([0, 20, 0]);
-$hsl_from_hsb = Color::hsbToHsl($hsb);
-print "HSL from HSB: " . DgS::printAr($hsl_from_hsb) . "<br>";
-
-print "<hr>";
-
 // A(out of bounds)
 try {
 	print "C::S/COLOR invalid rgb->hex (gray 125): -1, -1, -1: "
-		. (new Coordinates\RGB([-1, -1, -1]))->returnAsHex() . "<br>";
+		. CoreLibs\Convert\Colors::rgb2hex(-1, -1, -1) . "<br>";
 } catch (\LengthException $e) {
-	print "*Exception: " . $e->getMessage() . "<br><pre>" . print_r($e, true) . "</pre><br>";
+	print "*Exception: " . $e->getMessage() . "<br>" . $e . "<br>";
+}
+try {
+	print "\$C::S/COLOR invalid rgb->hex (gray 125): -1, -1, -1: "
+		. $color_class::rgb2hex(-1, -1, -1) . "<br>";
+} catch (\LengthException $e) {
+	print "**Exception: " . $e->getMessage() . "<br><pre>" . print_r($e, true) . "</pre><br>";
 }
-
-/* print "<hr>";
-print "<h2>LEGACY</h2>";
 // B(valid)
-$rgb = [50, 20, 30];
+$rgb = [10, 20, 30];
 $hex = '#0a141e';
 $hsb = [210, 67, 12];
 $hsb_f = [210.5, 67.5, 12.5];
-$hsb = [210, 50, 7.8];
+$hsl = [210, 50, 7.8];
 print "S::COLOR rgb->hex: $rgb[0], $rgb[1], $rgb[2]: " . Colors::rgb2hex($rgb[0], $rgb[1], $rgb[2]) . "<br>";
 print "S::COLOR hex->rgb: $hex: " . DgS::printAr(SetVarType::setArray(
 	Colors::hex2rgb($hex)
 )) . "<br>";
-print "C::S/COLOR rgb->hex: $hex: " . DgS::printAr(SetVarType::setArray(
+print "C::S/COLOR rgb->hext: $hex: " . DgS::printAr(SetVarType::setArray(
 	CoreLibs\Convert\Colors::hex2rgb($hex)
 )) . "<br>";
 // C(to hsb/hsl)
@@ -164,18 +82,16 @@ print "S::COLOR hsb_f->rgb: $hsb_f[0], $hsb_f[1], $hsb_f[2]: "
 	. DgS::printAr(SetVarType::setArray(
 		Colors::hsb2rgb($hsb_f[0], $hsb_f[1], $hsb_f[2])
 	)) . "<br>";
-print "S::COLOR hsl->rgb: $hsb[0], $hsb[1], $hsb[2]: "
+print "S::COLOR hsl->rgb: $hsl[0], $hsl[1], $hsl[2]: "
 	. DgS::printAr(SetVarType::setArray(
-		Colors::hsl2rgb($hsb[0], $hsb[1], $hsb[2])
+		Colors::hsl2rgb($hsl[0], $hsl[1], $hsl[2])
 	)) . "<br>";
 
 $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>";
 
 // Random text
 $h = rand(0, 359);
@@ -183,18 +99,10 @@ $s = rand(15, 70);
 $b = 100;
 $l = 50;
 print "RANDOM IN: H: " . $h . ", S: " . $s . ", B/L: " . $b . "/" . $l . "<br>";
-print "RANDOM hsb->rgb: <pre>"
+print "RANDOM hsb->rgb: <pre>" . DgS::printAr(SetVarType::setArray(Colors::hsb2rgb($h, $s, $b))) . "</pre><br>";
-	. DgS::printAr(SetVarType::setArray(Color::hsbToRgb(new Coordinates\HSB([$h, $s, $b])))) . "</pre><br>";
+print "RANDOM hsl->rgb: <pre>" . DgS::printAr(SetVarType::setArray(Colors::hsl2rgb($h, $s, $l))) . "</pre><br>";
-print "RANDOM hsl->rgb: <pre>"
-	. DgS::printAr(SetVarType::setArray(Color::hslToRgb(new Coordinates\HSL([$h, $s, $l])))) . "</pre><br>";
 
-print "<hr>";
+// TODO: run compare check input must match output
-
-$rgb = [0, 0, 0];
-print "rgb 0,0,0: " . Dgs::printAr($rgb) . " => "
-	. Dgs::printAr(Color::rgbToHsb(new Coordinates\RGB([$rgb[0], $rgb[1], $rgb[2]]))) . "<br>";
-
-print "<hr>";
 
 print "</body></html>";
 

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

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

www/admin/class_test.db.dbReturn.php

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

www/admin/class_test.db.php

@@ -228,7 +228,7 @@ print "RETURN ROW PARAMS: " . print_r(
 $db->dbPrepare("ins_test_foo", "INSERT INTO test_foo (test) VALUES ($1) RETURNING test");
 $status = $db->dbExecute("ins_test_foo", ['BAR TEST ' . time()]);
 print "PREPARE INSERT[ins_test_foo] STATUS: " . Support::printToString($status) . " |<br>"
-	. "QUERY: " . Support::printToString($db->dbGetPrepareCursorValue('ins_test_foo', 'query')) . " |<br>"
+	. "QUERY: " . $db->dbGetPrepareCursorValue('ins_test_foo', 'query') . " |<br>"
 	. "PRIMARY KEY: " . Support::printToString($db->dbGetInsertPK()) . " | "
 	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
 	. "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) . "<br>";
@@ -239,7 +239,7 @@ print "PREPARE INSERT PREVIOUS INSERTED: "
 
 print "PREPARE CURSOR RETURN:<br>";
 foreach (['pk_name', 'count', 'query', 'returning_id'] as $key) {
-	print "KEY: " . $key . ': ' . Support::prAr($db->dbGetPrepareCursorValue('ins_test_foo', $key)) . "<br>";
+	print "KEY: " . $key . ': ' . $db->dbGetPrepareCursorValue('ins_test_foo', $key) . "<br>";
 }
 
 $query = <<<SQL
@@ -255,7 +255,7 @@ SQL;
 $db->dbPrepare("ins_test_foo_eom", $query);
 $status = $db->dbExecute("ins_test_foo_eom", ['EOM BAR TEST ' . time()]);
 print "EOM STRING PREPARE INSERT[ins_test_foo_eom] STATUS: " . Support::printToString($status) . " |<br>"
-	. "QUERY: " . Support::printToString($db->dbGetPrepareCursorValue('ins_test_foo_eom', 'query')) . " |<br>"
+	. "QUERY: " . $db->dbGetPrepareCursorValue('ins_test_foo_eom', 'query') . " |<br>"
 	. "PRIMARY KEY: " . Support::printToString($db->dbGetInsertPK()) . " | "
 	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
 	. "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) . "<br>";
@@ -316,8 +316,7 @@ print "EOM STRING EXEC RETURN TEST: " . print_r(
 	$db->dbReturnRowParams(
 		$query_select,
 		[$__last_insert_id]
-	),
+	)
-	true
 ) . "<br>";
 // B
 $status = $db->dbExecParams(
@@ -346,8 +345,7 @@ print "EOM STRING EXEC RETURN TEST: " . print_r(
 	$db->dbReturnRowParams(
 		$query_select,
 		[$__last_insert_id]
-	),
+	)
-	true
 ) . "<br>";
 // params > 10 for debug
 // error catcher
@@ -676,7 +674,7 @@ echo "<hr>";
 
 print "COMPOSITE ELEMENT READ<br>";
 $res = $db->dbReturnRow("SELECT item, count, (item).name, (item).price, (item).supplier_id FROM on_hand");
-print "ROW: <pre>" . print_r($res, true) . "</pre>";
+print "ROW: <pre>" . print_r($res) . "</pre>";
 var_dump($res);
 print "Field Name/Types: <pre>" . print_r($db->dbGetFieldNameTypes(), true) . "</pre>";
 echo "<hr>";

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

@@ -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,115 +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
+	$uniqid,
-	true, // some_bool
+	true,
-	'STRING A', // string_a
+	'STRING A',
-	2, // number_a
+	2,
-	2.5, // numeric_a
+	2.5,
-	1, // smallint
+	1,
-	date('H:m:s'), // some_internval
+	date('H:m:s'),
-	date('Y-m-d H:i:s'), // some_timestamp
+	date('Y-m-d H:i:s'),
-	json_encode(['a' => 'string', 'b' => 1, 'c' => 1.5, 'f' => true, 'g' => ['a', 1, 1.5]]), // json_string
+	json_encode(['a' => 'string', 'b' => 1, 'c' => 1.5, 'f' => true, 'g' => ['a', 1, 1.5]]),
-	null, // null_var
+	null,
-	'{"a", "b"}', // array_char_1
+	'{"a", "b"}',
-	'{1,2}', // array_int_1
+	'{1,2}',
-	'{"(array Text A, 5, 8.8)","(array Text B, 10, 15.2)"}', // array_composite
+	'{"(array Text A, 5, 8.8)","(array Text B, 10, 15.2)"}',
-	'("Text", 4, 6.3)', // composite_item
+	'("Text", 4, 6.3)',
-	$binary_data, // some_binary
+	$binary_data
-	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
 ];
 
 $query_insert = <<<SQL
 INSERT INTO test_foo (
-	-- row 1
+	test, some_bool, string_a, number_a, number_a_numeric, smallint_a,
-	test, some_bool, string_a, number_a, numeric_a, smallint_a,
+	some_time, some_timestamp, json_string, null_var,
-	-- row 2
-	some_internval, some_timestamp, json_string, null_var,
-	-- row 3
 	array_char_1, array_int_1,
-	-- row 4
 	array_composite,
-	-- row 5
 	composite_item,
-	-- row 6
+	some_binary
-	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
 ) 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
-	$15,
-	-- row 7
-	$16, $17,
-	-- row 8
-	$18, $19,
-	-- row 9
-	$20, $21, $22, $23,
-	-- row 10
-	$24
 )
 RETURNING
-	test_foo_id, number_serial, identity_always, identitiy_default, default_uuid,
+	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_internval, some_timestamp, json_string, null_var,
+	some_time, some_timestamp, json_string, null_var,
 	array_char_1, array_int_1,
 	array_composite,
 	composite_item,
-	some_binary,
+	some_binary
-	some_date,
-	array_char_2, array_int_2,
-	bigint_a, number_real, number_double, numeric_3,
-	uuid_var
 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>";
-
 // test connectors: = , <> () for query detection
 
 // convert placeholder tests
@@ -190,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 (
@@ -226,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);
@@ -250,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 "[$info] " . Support::printAr($db->dbGetPlaceholderConverted()) . "<br>";
-	print "<b>[$info]</b> " . Support::printAr($db->dbGetPlaceholderConverted()) . "<br>";
 	echo "<hr>";
 }
 
@@ -270,43 +188,21 @@ 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(
-		<<<SQL
-SELECT test, string_a, number_a
-FROM test_foo
-WHERE string_a LIKE ?
-SQL,
-		['%A-1%']
-	))
-) {
-	print "RES: " . Support::prAr($res) . "<br>";
-}
-print "ERROR: " . $db->dbGetLastError(true) . "<br>";
 
 print "</body></html>";
 $db->log->debug('DEBUGEND', '==================================== [END]');

www/admin/class_test.html_build.element.php

@@ -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>";
+echo "<hr>";
-print "phfo(\$el_o): <pre>" . htmlentities($el_o::printHtmlFromObject($el_o, true)) . "</pre>"; */
+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.lang.php

@@ -16,8 +16,6 @@ define('USE_DATABASE', false);
 require 'config.php';
 // define log file id
 $LOG_FILE_ID = 'classTest-lang';
-$SET_SESSION_NAME = EDIT_SESSION_NAME;
-$session = new CoreLibs\Create\Session($SET_SESSION_NAME);
 ob_end_flush();
 
 $PAGE_NAME = 'TEST CLASS: LANG';
@@ -34,21 +32,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>";
@@ -71,12 +70,10 @@ print "[OVERRIDE]: " . Support::printAr($get_locale) . "<br>";
 // DEFAULT_DOMAIN
 // DEFAULT_CHARSET (should be set from DEFAULT_LOCALE)
 // LOCALE_PATH
-$session->setMany([
+$_SESSION['DEFAULT_LOCALE'] = 'ja_JP.UTF-8';
-	'DEFAULT_LOCALE' => 'ja_JP.UTF-8',
+$_SESSION['DEFAULT_CHARSET'] = 'UTF-8';
-	'DEFAULT_CHARSET' => 'UTF-8',
+$_SESSION['DEFAULT_DOMAIN'] = 'admin';
-	'DEFAULT_DOMAIN' => 'admin',
+$_SESSION['LOCALE_PATH'] = BASE . INCLUDES . LOCALE;
-	'LOCALE_PATH' => BASE . INCLUDES . LOCALE,
-]);
 $get_locale = Language\GetLocale::setLocaleFromSession(
 	SITE_LOCALE,
 	SITE_DOMAIN,
@@ -89,12 +86,10 @@ print "[SESSION SET]: " . Support::printAr($get_locale) . "<br>";
 // DEFAULT_DOMAIN
 // DEFAULT_CHARSET (should be set from DEFAULT_LOCALE)
 // LOCALE_PATH
-$session->setMany([
+$_SESSION['DEFAULT_LOCALE'] = '00000#####';
-	'DEFAULT_LOCALE' => '00000#####',
+$_SESSION['DEFAULT_CHARSET'] = '';
-	'DEFAULT_CHARSET' => '',
+$_SESSION['DEFAULT_DOMAIN'] = 'admin';
-	'DEFAULT_DOMAIN' => 'admin',
+$_SESSION['LOCALE_PATH'] = BASE . INCLUDES . LOCALE;
-	'LOCALE_PATH' => BASE . INCLUDES . LOCALE,
-]);
 $get_locale = Language\GetLocale::setLocaleFromSession(
 	SITE_LOCALE,
 	SITE_DOMAIN,
@@ -102,7 +97,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.login.php

@@ -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, [
+$session = new CoreLibs\Create\Session($SET_SESSION_NAME);
-	'regenerate' => 'interval',
-	'regenerate_interval' => 10, // every 10 seconds
-]);
 $log = new CoreLibs\Logging\Logging([
 	'log_folder' => BASE . LOG,
 	'log_file_id' => $LOG_FILE_ID,
@@ -49,95 +43,19 @@ ob_end_flush();
 $login->loginMainCall();
 
 $PAGE_NAME = 'TEST CLASS: LOGIN';
-print str_replace(
+print "<!DOCTYPE html>";
-	'{PAGE_NAME}',
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
-	$PAGE_NAME,
+print "<body>";
-<<<HTML
+print '<div><a href="class_test.php">Class Test Master</a></div>';
-<!DOCTYPE html>
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
-<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>";
 
 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: " . \CoreLibs\Debug\Support::printAr($login->loginGetAcl()) . "<br>";
-echo "ACL (MIN): " . Support::printAr($login->loginGetAcl()['min'] ?? []) . "<br>";
+echo "ACL (MIN): " . \CoreLibs\Debug\Support::printAr($login->loginGetAcl()['min'] ?? []) . "<br>";
-echo "LOCALE: " . Support::printAr($login->loginGetLocale()) . "<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>";
-
-$login->writeLog(
-	'TEST LOG',
-	[
-		'test' => 'TEST A'
-	],
-	error:'No Error',
-	write_type:'JSON'
-);
 
 print "</body></html>";

www/admin/class_test.math.php

@@ -23,6 +23,7 @@ $log = new CoreLibs\Logging\Logging([
 	'log_file_id' => $LOG_FILE_ID,
 	'log_per_date' => true,
 ]);
+$_math = new CoreLibs\Convert\Math();
 $math_class = 'CoreLibs\Convert\Math';
 
 // define a list of from to color sets for conversion test
@@ -34,9 +35,13 @@ print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
+print "FCEIL: " . $_math->fceil(5.1234567890, 5) . "<br>";
+print "FLOORP: " . $_math->floorp(5123456, -3) . "<br>";
+print "FLOORP: " . $_math->floorp(5123456, -10) . "<br>";
+print "INITNUMERIC: " . $_math->initNumeric('123') . "<br>";
+
 print "S-FCEIL: " . $math_class::fceil(5.1234567890, 5) . "<br>";
 print "S-FLOORP: " . $math_class::floorp(5123456, -3) . "<br>";
-print "S-FLOORP: " . $math_class::floorp(5123456, -10) . "<br>";
 print "S-INITNUMERIC: " . $math_class::initNumeric(123) . "<br>";
 print "S-INITNUMERIC: " . $math_class::initNumeric(123.456) . "<br>";
 print "S-INITNUMERIC: " . $math_class::initNumeric('123') . "<br>";

www/admin/class_test.php

@@ -62,39 +62,17 @@ $backend = new CoreLibs\Admin\Backend(
 $backend->db->dbInfo(true);
 ob_end_flush();
 
-print <<<HTML
+print "<!DOCTYPE html>";
-<!DOCTYPE html>
+print "<html><head><title>TEST CLASS</title></head>";
-<html><head>
+print "<body>";
-<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;
 
 // 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.convert.colors.php' => 'Class Test: CONVERT COLORS',
 	'class_test.check.colors.php' => 'Class Test: CHECK COLORS',
 	'class_test.mime.php' => 'Class Test: MIME',
@@ -139,7 +117,6 @@ $test_files = [
 	'class_test.config.direct.php' => 'Class Test: CONFIG DIRECT',
 	'class_test.class-calls.php' => 'Class Test: CLASS CALLS',
 	'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',
 ];
 
@@ -149,20 +126,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 (is_object($login) && 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>";
@@ -184,7 +174,28 @@ foreach (
 
 $log->debug('SOME MARK', 'Some error output');
 
-print "<br>";
+// INTERNAL SET
+print "EDIT ACCESS ID: " . $backend->edit_access_id . "<br>";
+if (is_object($login)) {
+	//	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>";
@@ -194,9 +205,6 @@ 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 "</body></html>";
 
 # __END__

www/admin/class_test.readenvfile.php

@@ -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.session.php

@@ -45,8 +45,8 @@ $log = new CoreLibs\Logging\Logging([
 	'log_file_id' => $LOG_FILE_ID,
 	'log_per_date' => true,
 ]);
-use CoreLibs\Debug\Support;
 use CoreLibs\Create\Session;
+$session = new Session();
 
 $PAGE_NAME = 'TEST CLASS: SESSION';
 print "<!DOCTYPE html>";
@@ -56,30 +56,50 @@ print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $session_name = 'class-test-session';
-print "Valid session name static check for '" . $session_name . "': "
-	. Support::prBl(Session::checkValidSessionName($session_name)) . "<br>";
 $var = 'foo';
 $value = 'bar';
-$session = new Session($session_name);
 
 foreach (['123', '123-123', '123abc'] as $_session_name) {
-	print "[UNSET] Session Name valid for '" . $_session_name . "': "
+	print "[UNSET] Session Name valid for " . $_session_name . ": "
 		. ($session->checkValidSessionName($_session_name) ? 'Valid' : 'Invalid') . "<br>";
 }
 
 echo "Global session name: " . ($GLOBALS['SET_SESSION_NAME'] ?? '-') . "<br>";
 
+print "[UNSET] Current session id: " . $session->getSessionId() . "<br>";
+print "[UNSET] Current session name: " . $session->getSessionName() . "<br>";
+print "[UNSET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[UNSET] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
+if (isset($_SESSION)) {
+	print "[UNSET] _SESSION is: set<br>";
+} else {
+	print "[UNSET] _SESSION is: not set<br>";
+}
+#
+print "[UNSET] To set session name valid: "
+	. ($session->checkValidSessionName($session_name) ? 'Valid' : 'Invalid') . "<br>";
+try {
+	$session_id = $session->startSession($session_name);
+	print "[SET] Current session id: " . $session_id . "<br>";
+} catch (\Exception $e) {
+	print "[FAILED] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
+}
+// set again
+try {
+	$session_id = $session->startSession($session_name);
+	print "[2 SET] Current session id: " . $session_id . "<br>";
+} catch (\Exception $e) {
+	print "[2 FAILED] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
+}
 print "[SET] Current session id: " . $session->getSessionId() . "<br>";
 print "[SET] Current session name: " . $session->getSessionName() . "<br>";
 print "[SET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
-print "[SET] Current session auto write close: " . ($session->checkAutoWriteClose() ? 'Yes' : 'No') . "<br>";
 print "[SET] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
 if (isset($_SESSION)) {
 	print "[SET] _SESSION is: set<br>";
 } else {
 	print "[SET] _SESSION is: not set<br>";
 }
-#
 if (!isset($_SESSION['counter'])) {
 	$_SESSION['counter'] = 0;
 }
@@ -91,85 +111,62 @@ print "[READ] Confirm " . $var . " is " . $value . ": "
 	. (($_SESSION[$var] ?? '') == $value ? 'Matching' : 'Not matching') . "<br>";
 
 // test set wrappers methods
-$session->set('setwrap', 'YES, method set _SESSION var');
+$session->setS('setwrap', 'YES, method set _SESSION var');
-print "[READ WRAP] A setwrap: " . $session->get('setwrap') . "<br>";
+print "[READ WRAP] A setwrap: " . $session->getS('setwrap') . "<br>";
-print "[READ WRAP] Isset: " . ($session->isset('setwrap') ? 'Yes' : 'No') . "<br>";
+print "[READ WRAP] Isset: " . ($session->issetS('setwrap') ? 'Yes' : 'No') . "<br>";
-$session->unset('setwrap');
+$session->unsetS('setwrap');
-print "[READ WRAP] unset setwrap: " . $session->get('setwrap') . "<br>";
+print "[READ WRAP] unset setwrap: " . $session->getS('setwrap') . "<br>";
-print "[READ WRAP] unset Isset: " . ($session->isset('setwrap') ? 'Yes' : 'No') . "<br>";
+print "[READ WRAP] unset Isset: " . ($session->issetS('setwrap') ? 'Yes' : 'No') . "<br>";
-$session->set('foo 3', 'brause');
+// test __get/__set
-// set many
+$session->setwrap = 'YES, magic set _SESSION var'; /** @phpstan-ignore-line GET/SETTER */
-$session->setMany([
+print "[READ MAGIC] A setwrap: " . ($session->setwrap ?? '') . "<br>";
-	'foo 1' => 'bar',
+print "[READ MAGIC] Isset: " . (isset($session->setwrap) ? 'Yes' : 'No') . "<br>";
-	'foo 2' => 'kamel',
+unset($session->setwrap);
-]);
+print "[READ MAGIC] unset setwrap: " . ($session->setwrap ?? '') . "<br>";
-print "[READ MANY]: " . Support::printAr($session->getMany(['foo 1', 'foo 2'])) . "<br>";
+print "[READ MAGIC] unset Isset: " . (isset($session->setwrap) ? 'Yes' : 'No') . "<br>";
-try {
-	$session->setMany([ /** @phpstan-ignore-line deliberate error */
-		'ok' => 'ok',
-		'a123' => 'bar',
-		1 => 'bar',
-	]);
-} catch (\Exception $e) {
-	print "FAILED] Session manySet failed:<br>" . $e->getMessage() . "<br><pre>" . $e . "</pre><br>";
-}
-try {
-	$session->set('123', 'illigal');
-} catch (\Exception $e) {
-	print "FAILED] Session set failed:<br>" . $e->getMessage() . "<br><pre>" . $e . "</pre><br>";
-}
 
-print "<hr>";
 // differnt session name
 $session_name = 'class-test-session-ALT';
 try {
-	$session_alt = new Session($session_name);
+	$session_id = $session->startSession($session_name);
-	print "[3 SET] Current session id: " . $session_alt->getSessionId() . "<br>";
+	print "[3 SET] Current session id: " . $session_id . "<br>";
-	print "[SET AGAIN] Current session id: " . $session_alt->getSessionId() . "<br>";
 } catch (\Exception $e) {
-	print "[3 FAILED] Session start failed:<br>" . $e->getMessage() . "<br><pre>" . $e . "</pre><br>";
+	print "[3 FAILED] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
 }
+print "[SET AGAIN] Current session id: " . $session->getSessionId() . "<br>";
 
-
+print "[ALL SESSION]: " . \CoreLibs\Debug\Support::printAr($_SESSION) . "<br>";
-print "[ALL SESSION]: " . Support::printAr($_SESSION) . "<br>";
 
 // close session
 $session->writeClose();
 // will never be written
 $_SESSION['will_never_be_written'] = 'empty';
-// auto open session if closed to write
-$session->set('auto_write_session', 'Some value');
-// restart session
-$session->restartSession();
-$_SESSION['this_will_be_written'] = 'not empty';
 
-// open again with same name
+// open again
 $session_name = 'class-test-session';
 try {
-	$session_alt = new Session($session_name, ['auto_write_close' => true]);
+	$session_id = $session->startSession($session_name);
-	print "[4 SET] Current session id: " . $session_alt->getSessionId() . "<br>";
+	print "[4 SET] Current session id: " . $session_id . "<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>";
-	$session_alt->set('alt_write_auto_close', 'set auto');
-	// below is deprecated
-	// $session_alt->do_not_do_this = 'foo bar auto set';
 } catch (\Exception $e) {
-	print "[4 FAILED] Session start failed:<br>" . $e->getMessage() . "<br><pre>" . $e . "</pre><br>";
+	print "[4 FAILED] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
 }
+print "[START AGAIN] Current session id: " . $session->getSessionId() . "<br>";
 $_SESSION['will_be_written_again'] = 'Full';
 
-print "[ALL SESSION]: " . Support::printAr($_SESSION) . "<br>";
-
 // close session
 $session->writeClose();
 // invalid
 $session_name = '123';
 try {
-	$session_bad = new Session($session_name);
+	$session_id = $session->startSession($session_name);
-	print "[5 SET] Current session id: " . $session_bad->getSessionId() . "<br>";
+	print "[5 SET] Current session id: " . $session_id . "<br>";
 } catch (\Exception $e) {
-	print "[5 FAILED] Session start failed:<br>" . $e->getMessage() . "<br><pre>" . $e . "</pre><br>";
+	print "[5 FAILED] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
 }
+print "[BAD NAME] Current session id: " . $session->getSessionId() . "<br>";
+print "[BAD NAME] Current session name: " . $session->getSessionName() . "<br>";
+print "[BAD NAME] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[BAD NAME] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
 
 print "</body></html>";
 

www/admin/class_test.session.read.php

@@ -46,6 +46,7 @@ $log = new CoreLibs\Logging\Logging([
 	'log_per_date' => true,
 ]);
 use CoreLibs\Create\Session;
+$session = new Session();
 
 $PAGE_NAME = 'TEST CLASS: SESSION (READ)';
 print "<!DOCTYPE html>";
@@ -55,22 +56,32 @@ print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $session_name = 'class-test-session';
-$session = new Session($session_name);
 // $session_name = '';
 $var = 'foo';
 $value = 'bar';
 
 echo "Global session name: " . ($GLOBALS['SET_SESSION_NAME'] ?? '-') . "<br>";
 
-print "[SET] Current session id: " . $session->getSessionId() . "<br>";
+print "[UNSET] Current session id: " . $session->getSessionId() . "<br>";
-print "[SET] Current session name: " . $session->getSessionName() . "<br>";
+print "[UNSET] Current session name: " . $session->getSessionName() . "<br>";
-print "[SET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[UNSET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
-print "[SET] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
+print "[UNSET] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
 
 print "[READ] " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
-
+// start
+try {
+	$session_id = $session->startSession($session_name);
+	print "[1] Current session id: " . $session_id . "<br>";
+} catch (\Exception $e) {
+	print "[1] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
+}
 // set again
-print "[2] Restarted session: " . \CoreLibs\Debug\Support::prBl($session->restartSession()) . "<br>";
+try {
+	$session_id = $session->startSession($session_name);
+	print "[2] Current session id: " . $session_id . "<br>";
+} catch (\Exception $e) {
+	print "[2] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
+}
 print "[SET] Current session id: " . $session->getSessionId() . "<br>";
 print "[SET] Current session name: " . $session->getSessionName() . "<br>";
 print "[SET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";

www/admin/class_test.uids.php

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

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

@@ -1,361 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-error_reporting(E_ALL | E_STRICT | 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-urlrequests';
-ob_end_flush();
-
-use CoreLibs\UrlRequests\Curl;
-
-$log = new CoreLibs\Logging\Logging([
-	'log_folder' => BASE . LOG,
-	'log_file_id' => $LOG_FILE_ID,
-	'log_per_date' => true,
-]);
-
-$PAGE_NAME = 'TEST CLASS: URL REQUESTS CURL';
-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>';
-
-$client = new Curl();
-
-print "<hr>";
-$data = $client->get(
-	'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/UrlRequests.target.php'
-		. '?other=get_a',
-	[
-		'headers' => [
-			'test-header' => 'ABC',
-			'info-request-type' => '_GET',
-			'Funk-pop' => 'Semlly god'
-		],
-		'query' => ['foo' => 'BAR']
-	]
-);
-print "_GET RESPONSE: <pre>" . print_r($data, true) . "</pre>";
-
-print "<hr>";
-$data = $client->request(
-	'get',
-	'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/UrlRequests.target.php'
-	. '?other=get_a',
-);
-print "_GET RESPONSE, nothing set: <pre>" . print_r($data, true) . "</pre>";
-
-print "<hr>";
-try {
-	$data = $client->request(
-		'get',
-		'soba54.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/UrlRequests.target.php'
-		. '?other=get_a',
-	);
-	print "_GET RESPONSE, nothing set, invalid URL: <pre>" . print_r($data, true) . "</pre>";
-} catch (Exception $e) {
-	print "Exception: <pre>" . print_r($e, true) . "</pre><br>";
-}
-
-
-print "<hr>";
-$data = $client->request(
-	"get",
-	'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/'
-		. 'trunk/www/admin/UrlRequests.target.php'
-		. '?other=get_a',
-	[
-		"headers" => [
-			'test-header' => 'ABC',
-			'info-request-type' => '_GET',
-			'Funk-pop' => 'Semlly god'
-		],
-		"query" => ['foo' => 'BAR'],
-	],
-);
-print "[request] _GET RESPONSE: <pre>" . print_r($data, true) . "</pre>";
-
-print "<hr>";
-$data = $client->post(
-	'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/UrlRequests.target.php'
-	. '?other=post_a',
-	[
-		'body' => ['payload' => 'data post'],
-		'headers' => [
-			'Content-Type' => 'application/json',
-			'Accept' => 'application/json',
-			'test-header' => 'ABC',
-			'info-request-type' => '_POST',
-		],
-		'query' => ['foo' => 'BAR post'],
-	]
-);
-print "_POST RESPONSE: <pre>" . print_r($data, true) . "</pre>";
-print "<hr>";
-$data = $client->request(
-	"post",
-	'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/UrlRequests.target.php'
-	. '?other=post_a',
-	[
-		"body" => ['payload' => 'data post', 'request' => 'I am the request body'],
-		"headers" => [
-			'Content-Type' => 'application/json',
-			'Accept' => 'application/json',
-			'test-header' => 'ABC',
-			'info-request-type' => '_POST',
-		],
-		"query" => ['foo' => 'BAR post'],
-	]
-);
-print "[request] _POST RESPONSE: <pre>" . print_r($data, true) . "</pre>";
-print "<hr>";
-$data = $client->request(
-	"post",
-	'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/UrlRequests.target.php'
-	. '?other=post_a',
-	[
-		"body" => 'string body here',
-		"headers" => [
-			'Content-Type' => 'application/json',
-			'Accept' => 'application/json',
-			'test-header' => 'ABC',
-			'info-request-type' => '_POST',
-		],
-		"query" => ['foo' => 'BAR post'],
-	]
-);
-print "[request|string body] _POST RESPONSE: <pre>" . print_r($data, true) . "</pre>";
-
-print "<hr>";
-$data = $client->put(
-	'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/UrlRequests.target.php'
-	. '?other=put_a',
-	[
-		"body" => ['payload' => 'data put'],
-		"headers" => [
-			'Content-Type' => 'application/json',
-			'Accept' => 'application/json',
-			'test-header' => 'ABC',
-			'info-request-type' => '_PUT',
-		],
-		'query' => ['foo' => 'BAR put'],
-	]
-);
-print "_PUT RESPONSE: <pre>" . print_r($data, true) . "</pre>";
-
-print "<hr>";
-$data = $client->patch(
-	'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/UrlRequests.target.php'
-	. '?other=patch_a',
-	[
-		"body" => ['payload' => 'data patch'],
-		"headers" => [
-			'Content-Type' => 'application/json',
-			'Accept' => 'application/json',
-			'test-header' => 'ABC',
-			'info-request-type' => '_PATCH',
-		],
-		'query' => ['foo' => 'BAR patch'],
-	]
-);
-print "_PATCH RESPONSE: <pre>" . print_r($data, true) . "</pre>";
-
-print "<hr>";
-$data = $client->delete(
-	'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/UrlRequests.target.php'
-	. '?other=delete_no_body_a',
-	[
-		"body" => null,
-		"headers" => [
-			'Content-Type' => 'application/json',
-			'Accept' => 'application/json',
-			'test-header' => 'ABC',
-			'info-request-type' => '_DELETE',
-		],
-		"query" => ['foo' => 'BAR delete'],
-	]
-);
-print "_DELETE RESPONSE: <pre>" . print_r($data, true) . "</pre>";
-
-print "<hr>";
-$data = $client->delete(
-	'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/UrlRequests.target.php'
-	. '?other=delete_body_a',
-	[
-		"body" => ['payload' => 'data delete'],
-		"headers" => [
-			'Content-Type' => 'application/json',
-			'Accept' => 'application/json',
-			'test-header' => 'ABC',
-			'info-request-type' => '_DELETE',
-		],
-		"query" => ['foo' => 'BAR delete'],
-	]
-);
-print "_DELETE RESPONSE BODY: <pre>" . print_r($data, true) . "</pre>";
-
-print "<hr>";
-
-try {
-	$uc = new Curl([
-		"base_uri" => 'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/foo',
-		"headers" =>  [
-			'DEFAULT-master' => 'master-header',
-			'default-header' => 'uc-get',
-			'default-remove' => 'will be removed',
-			'default-remove-array' => ['a', 'b'],
-			'default-remove-array-part' => ['c', 'd'],
-			'default-remove-array-part-alt' => ['c', 'd', 'e'],
-			'default-overwrite' => 'will be overwritten',
-			'default-add' => 'will be added',
-		],
-		'query' => [
-			'global-p' => 'glob'
-		]
-	]);
-	print "CONFIG: <pre>" . print_r($uc->getConfig(), true) . "</pre>";
-	$uc->removeHeaders(['default-remove' => '']);
-	$uc->removeHeaders(['default-remove-array' => ['a', 'b']]);
-	$uc->removeHeaders(['default-remove-array-part' => 'c']);
-	$uc->removeHeaders(['default-remove-array-part-alt' => ['c', 'd']]);
-	$uc->setHeaders(['default-new' => 'Something new']);
-	$uc->setHeaders(['default-overwrite' => 'Something Overwritten']);
-	$uc->setHeaders(['default-add' => 'Something Added'], true);
-	print "CONFIG: <pre>" . print_r($uc->getConfig(), true) . "</pre>";
-	$data = $uc->request(
-		'get',
-		'UrlRequests.target.php',
-		[
-			'headers' => [
-				'call-header' => 'call-get',
-				'default-header' => 'overwrite-uc-get',
-				'X-Foo' => ['bar', 'baz'],
-			],
-			'query' => [
-				'other' => 'get_a',
-			],
-		]
-	);
-	print "[uc] _GET RESPONSE, nothing set: <pre>" . print_r($data, true) . "</pre>";
-	print "[uc] SENT URL: " . $uc->getUrlSent() . "<br>";
-	print "[uc] SENT URL PARSED: <pre>" . print_r($uc->getUrlParsedSent(), true) . "</pre>";
-	print "[uc] SENT HEADERS: <pre>" . print_r($uc->getHeadersSent(), true) . "</pre>";
-} catch (Exception $e) {
-	print "Exception: <pre>" . print_r(json_decode($e->getMessage(), true), true) . "</pre><br>";
-}
-
-print "<hr>";
-try {
-	$uc = new Curl([
-		"base_uri" => 'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/',
-		"http_errors" => false,
-		"headers" =>  [
-			"Authorization" => "schmalztiegel",
-			"RunAuthTest" => "yes",
-		]
-	]);
-	$response = $uc->get('UrlRequests.target.php');
-	print "AUTH REQUEST: <pre>" . print_r($response, true) . "</pre>";
-	print "[uc] SENT URL: " . $uc->getUrlSent() . "<br>";
-	print "[uc] SENT URL PARSED: <pre>" . print_r($uc->getUrlParsedSent(), true) . "</pre>";
-	print "[uc] SENT HEADERS: <pre>" . print_r($uc->getHeadersSent(), true) . "</pre>";
-} catch (Exception $e) {
-	print "Exception: <pre>" . print_r(json_decode($e->getMessage(), true), true) . "</pre><br>";
-}
-print "AUTH REQUEST WITH EXCEPTION:<br>";
-try {
-	$uc = new Curl([
-		"base_uri" => 'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/',
-		"http_errors" => true,
-		"headers" =>  [
-			"Authorization" => "schmalztiegel",
-			"RunAuthTest" => "yes",
-		]
-	]);
-	$response = $uc->get('UrlRequests.target.php');
-	print "AUTH REQUEST: <pre>" . print_r($response, true) . "</pre>";
-	print "[uc] SENT URL: " . $uc->getUrlSent() . "<br>";
-	print "[uc] SENT URL PARSED: <pre>" . print_r($uc->getUrlParsedSent(), true) . "</pre>";
-	print "[uc] SENT HEADERS: <pre>" . print_r($uc->getHeadersSent(), true) . "</pre>";
-} catch (Exception $e) {
-	print "Exception: <pre>" . print_r(json_decode($e->getMessage(), true), true) . "</pre><br>";
-}
-print "AUTH REQUEST WITH EXCEPTION (UNSET):<br>";
-try {
-	$uc = new Curl([
-		"base_uri" => 'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/',
-		"http_errors" => true,
-		"headers" =>  [
-			"Authorization" => "schmalztiegel",
-			"RunAuthTest" => "yes",
-		]
-	]);
-	$response = $uc->get('UrlRequests.target.php', ['http_errors' => false]);
-	print "AUTH REQUEST (UNSET): <pre>" . print_r($response, true) . "</pre>";
-	print "[uc] SENT URL: " . $uc->getUrlSent() . "<br>";
-	print "[uc] SENT URL PARSED: <pre>" . print_r($uc->getUrlParsedSent(), true) . "</pre>";
-	print "[uc] SENT HEADERS: <pre>" . print_r($uc->getHeadersSent(), true) . "</pre>";
-} catch (Exception $e) {
-	print "Exception: <pre>" . print_r(json_decode($e->getMessage(), true), true) . "</pre><br>";
-}
-print "AUTH REQUEST HEADER SET:<br>";
-try {
-	$uc = new Curl([
-		"base_uri" => 'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/',
-		"auth" => ["user", "pass", "basic"],
-		"headers" =>  [
-			"Authorization" => "schmalztiegel",
-			"RunAuthTest" => "yes",
-		]
-	]);
-	$response = $uc->get('UrlRequests.target.php');
-	print "AUTH REQUEST (HEADER): <pre>" . print_r($response, true) . "</pre>";
-	print "[uc] SENT URL: " . $uc->getUrlSent() . "<br>";
-	print "[uc] SENT URL PARSED: <pre>" . print_r($uc->getUrlParsedSent(), true) . "</pre>";
-	print "[uc] SENT HEADERS: <pre>" . print_r($uc->getHeadersSent(), true) . "</pre>";
-} catch (Exception $e) {
-	print "Exception: <pre>" . print_r(json_decode($e->getMessage(), true), true) . "</pre><br>";
-}
-
-print "<hr>";
-$uc = new Curl([
-	"base_uri" => 'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/',
-	"headers" =>  [
-		"header-one" => "one"
-	]
-]);
-$response = $uc->get('UrlRequests.target.php', ["headers" => null, "query" => ["test" => "one-test"]]);
-print "HEADER RESET REQUEST: <pre>" . print_r($response, true) . "</pre>";
-print "[uc] SENT URL: " . $uc->getUrlSent() . "<br>";
-print "[uc] SENT URL PARSED: <pre>" . print_r($uc->getUrlParsedSent(), true) . "</pre>";
-print "[uc] SENT HEADERS: <pre>" . print_r($uc->getHeadersSent(), true) . "</pre>";
-
-print "<hr>";
-$uc = new Curl([
-	"base_uri" => 'https://soba.egplusww.jp/developers/clemens/core_data/php_libraries/trunk/www/admin/',
-	"headers" => [
-		'bar' => 'foo:bar'
-	]
-]);
-$response = $uc->get('UrlRequests.target.php');
-print "HEADER SET TEST REQUEST: <pre>" . print_r($response, true) . "</pre>";
-print "[uc] SENT URL: " . $uc->getUrlSent() . "<br>";
-print "[uc] SENT URL PARSED: <pre>" . print_r($uc->getUrlParsedSent(), true) . "</pre>";
-print "[uc] SENT HEADERS: <pre>" . print_r($uc->getHeadersSent(), true) . "</pre>";
-
-print "</body></html>";
-
-// __END__

www/composer.lock

@@ -0,0 +1,155 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "2c73ea6fc1eba5ffc313409ccaa3b732",
+    "packages": [
+        {
+            "name": "egrajp/smarty-extended",
+            "version": "4.5.2",
+            "dist": {
+                "type": "zip",
+                "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.2/egrajp-smarty-extended.4.5.2.zip",
+                "shasum": "a2c67a5047aad349a2cfa54240a44da449df9c4c"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Clemens Schwaighofer",
+                    "email": "clemens.schwaighofer@egplusww.com"
+                }
+            ],
+            "description": "Smarty, extended with gettext, checkbox/radio labels and index numbers",
+            "homepage": "https://github.com/smarty-php/smarty/",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2024-04-16T18:25:27+09:00"
+        },
+        {
+            "name": "gullevek/dotenv",
+            "version": "v2.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/gullevek/dotEnv.git",
+                "reference": "b9feacaded4e48effff9da7d1173752aef3dc27f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/gullevek/dotEnv/zipball/b9feacaded4e48effff9da7d1173752aef3dc27f",
+                "reference": "b9feacaded4e48effff9da7d1173752aef3dc27f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4.0"
+            },
+            "require-dev": {
+                "phan/phan": "^5.4",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "gullevek\\dotEnv\\": "src/",
+                    "gullevek\\dotenv\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Clemens Schwaighofer",
+                    "email": "gullevek@gullevek.org",
+                    "homepage": "http://gullevek.org"
+                }
+            ],
+            "description": "Simple .env file processing and storing in _ENV array",
+            "homepage": "https://github.com/gullevek/dotEnv",
+            "keywords": [
+                ".env",
+                "_ENV",
+                "dotenv",
+                "environment variables"
+            ],
+            "support": {
+                "issues": "https://github.com/gullevek/dotEnv/issues",
+                "source": "https://github.com/gullevek/dotEnv/tree/v2.1.0"
+            },
+            "time": "2024-08-21T02:41:15+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/3.0.0"
+            },
+            "time": "2021-07-14T16:46:02+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=8.1"
+    },
+    "platform-dev": [],
+    "plugin-api-version": "2.6.0"
+}

www/configs/config.host.php

@@ -51,7 +51,6 @@ $SITE_CONFIG = [
 	'soba.tequila.jp' => $__LOCAL_CONFIG,
 	'soba.teq.jp' => $__LOCAL_CONFIG,
 	'soba-local.tokyo.tequila.jp' => $__LOCAL_CONFIG,
-	'localhost' => $__LOCAL_CONFIG,
 ];
 
 // __END__

www/configs/config.master.php

@@ -205,11 +205,13 @@ if (
 }
 // set SSL on
 $is_secure = false;
-if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
 	$is_secure = true;
 } elseif (
-	!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ||
+	!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) &&
-	!empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on'
+	$_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https' ||
+	!empty($_SERVER['HTTP_X_FORWARDED_SSL']) &&
+	$_SERVER['HTTP_X_FORWARDED_SSL'] === 'on'
 ) {
 	$is_secure = true;
 }

www/includes/admin_header.php

@@ -116,7 +116,7 @@ $data = [
 // log action
 // no log if login
 if (!$login->loginActionRun()) {
-	$login->writeLog('Submit', $data, $cms->adbGetActionSet(), 'BINARY');
+	$cms->adbEditLog('Submit', $data, 'BINARY');
 }
 //------------------------------ logging end
 

www/includes/edit_base.php

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

www/lib/CoreLibs/ACL/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

@@ -31,7 +31,6 @@ declare(strict_types=1);
 
 namespace CoreLibs\Admin;
 
-use CoreLibs\Create\Uids;
 use CoreLibs\Convert\Json;
 
 class Backend
@@ -259,27 +258,6 @@ class Backend
 		}
 	}
 
-	/**
-	 * return all the action data, if not set, sets entry to null
-	 *
-	 * @return array{action:?string,action_id:null|string|int,action_sub_id:null|string|int,action_yes:null|string|int|bool,action_flag:?string,action_menu:?string,action_loaded:?string,action_value:?string,action_type:?string,action_error:?string}
-	 */
-	public function adbGetActionSet(): array
-	{
-		return [
-			'action' => $this->action ?? null,
-			'action_id' => $this->action_id ?? null,
-			'action_sub_id' => $this->action_sub_id ?? null,
-			'action_yes' => $this->action_yes ?? null,
-			'action_flag' => $this->action_flag ?? null,
-			'action_menu' => $this->action_menu ?? null,
-			'action_loaded' => $this->action_loaded ?? null,
-			'action_value' => $this->action_value ?? null,
-			'action_type' => $this->action_type ?? null,
-			'action_error' => $this->action_error ?? null,
-		];
-	}
-
 	/**
 	 * writes all action vars plus other info into edit_log table
 	 *
@@ -289,7 +267,6 @@ 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() and set action_set from ->adbGetActionSet()
 	 */
 	public function adbEditLog(
 		string $event = '',
@@ -358,17 +335,17 @@ class Backend
 		}
 		$q = <<<SQL
 		INSERT INTO {DB_SCHEMA}.edit_log (
-			username, euid, ecuid, ecuuid, event_date, event, error, data, data_binary, page,
+			euid, event_date, event, 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,
+			action, action_id, action_yes, action_flag, action_menu, action_loaded,
 			action_value, action_type, action_error
 		) VALUES (
-			$1, $2, $3, $4, NOW(), $5, $6, $7, $8, $9,
+			$1, NOW(), $2, $3, $4, $5,
-			$10, $11, $12, $13, $14, $15, $16,
+			$6, $7, $8, $9, $10, $11, $12,
-			$17, $18, $19, $20,
+			$13, $14, $15, $16,
-			$21, $22, $23, $24, $25, $26, $27,
+			$17, $18, $19, $20, $21, $22,
-			$28, $29, $30
+			$23, $24, $25
 		)
 		SQL;
 		$this->db->dbExecParams(
@@ -379,15 +356,9 @@ class Backend
 			),
 			[
 				// row 1
-				'',
+				isset($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ?
-				is_numeric($this->session->get('EUID')) ?
+					$_SESSION['EUID'] : null,
-					$this->session->get('EUID') : null,
-				is_string($this->session->get('ECUID')) ?
-					$this->session->get('ECUID') : null,
-				!empty($this->session->get('ECUUID')) && Uids::validateUuuidv4($this->session->get('ECUID')) ?
-				$this->session->get('ECUID') : null,
 				(string)$event,
-				'',
 				$data_write,
 				$data_binary,
 				(string)$this->page_name,
@@ -403,12 +374,11 @@ class Backend
 				$_SERVER['HTTP_ACCEPT'] ?? '',
 				$_SERVER['HTTP_ACCEPT_CHARSET'] ?? '',
 				$_SERVER['HTTP_ACCEPT_ENCODING'] ?? '',
-				$this->session->getSessionId() !== '' ?
+				$this->session->getSessionId() !== false ?
 					$this->session->getSessionId() : null,
 				// row 4
 				$this->action ?? '',
 				$this->action_id ?? '',
-				$this->action_sub_id ?? '',
 				$this->action_yes ?? '',
 				$this->action_flag ?? '',
 				$this->action_menu ?? '',
@@ -455,7 +425,10 @@ class Backend
 		?string $set_content_path = null,
 		int $flag = 0,
 	): array {
-		if ($set_content_path === null) {
+		if (
+			$set_content_path === null ||
+			!is_string($set_content_path)
+		) {
 			/** @deprecated adbTopMenu missing set_content_path parameter */
 			trigger_error(
 				'Calling adbTopMenu without set_content_path parameter is deprecated',
@@ -468,7 +441,7 @@ class Backend
 		}
 
 		// get the session pages array
-		$PAGES = $this->session->get('PAGES');
+		$PAGES = $_SESSION['PAGES'] ?? null;
 		if (!isset($PAGES) || !is_array($PAGES)) {
 			$PAGES = [];
 		}

www/lib/CoreLibs/Admin/EditBase.php

@@ -415,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');

www/lib/CoreLibs/Basic.php

@@ -1139,6 +1139,118 @@ class Basic
 
 	// *** BETTER PASSWORD OPTIONS END ***
 
+	// *** COLORS ***
+	// [!!! DEPRECATED !!!]
+	// moved to \CoreLibs\Convert\Colors
+
+	/**
+	 * converts a hex RGB color to the int numbers
+	 * @param  string            $hexStr         RGB hexstring
+	 * @param  bool              $returnAsString flag to return as string
+	 * @param  string            $seperator      string seperator: default: ","
+	 * @return string|array<mixed>|bool          false on error or array with RGB or
+	 *                                           a string with the seperator
+	 * @deprecated use \CoreLibs\Convert\Colors::hex2rgb() instead
+	 */
+	public static function hex2rgb(string $hexStr, bool $returnAsString = false, string $seperator = ',')
+	{
+		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::hex2rgb()', E_USER_DEPRECATED);
+		return \CoreLibs\Convert\Colors::hex2rgb($hexStr, $returnAsString, $seperator);
+	}
+
+	/**
+	 * converts the rgb values from int data to the valid rgb html hex string
+	 * optional can turn of leading #
+	 * @param  int    $red        red 0-255
+	 * @param  int    $green      green 0-255
+	 * @param  int    $blue       blue 0-255
+	 * @param  bool   $hex_prefix default true, prefix with "#"
+	 * @return string|bool        rgb in hex values with leading # if set
+	 * @deprecated use \CoreLibs\Convert\Colors::rgb2hex() instead
+	 */
+	public static function rgb2hex(int $red, int $green, int $blue, bool $hex_prefix = true)
+	{
+		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hex()', E_USER_DEPRECATED);
+		return \CoreLibs\Convert\Colors::rgb2hex($red, $green, $blue, $hex_prefix);
+	}
+
+	/**
+	 * converts and int RGB to the HTML color string in hex format
+	 * @param  int    $red   red 0-255
+	 * @param  int    $green green 0-255
+	 * @param  int    $blue  blue 0-255
+	 * @return string|bool   hex rgb string
+	 * @deprecated use rgb2hex instead
+	 */
+	public static function rgb2html(int $red, int $green, int $blue)
+	{
+		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hex()', E_USER_DEPRECATED);
+		// check that each color is between 0 and 255
+		return \CoreLibs\Convert\Colors::rgb2hex($red, $green, $blue, true);
+	}
+
+	/**
+	 * converts RGB to HSB/V values
+	 * returns:
+	 * array with hue (0-360), sat (0-100%), brightness/value (0-100%)
+	 * @param  int   $red   red 0-255
+	 * @param  int   $green green 0-255
+	 * @param  int   $blue  blue 0-255
+	 * @return array<mixed>|bool  Hue, Sat, Brightness/Value
+	 * @deprecated use \CoreLibs\Convert\Colors::rgb2hsb() instead
+	 */
+	public static function rgb2hsb(int $red, int $green, int $blue)
+	{
+		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hsb()', E_USER_DEPRECATED);
+		return \CoreLibs\Convert\Colors::rgb2hsb($red, $green, $blue);
+	}
+
+	/**
+	 * converts HSB/V to RGB values RGB is full INT
+	 * @param  int    $H hue 0-360
+	 * @param  float  $S saturation 0-1 (float)
+	 * @param  float  $V brightness/value 0-1 (float)
+	 * @return array<mixed>|bool  0 red/1 green/2 blue array
+	 * @deprecated use \CoreLibs\Convert\Colors::hsb2rgb() instead
+	 */
+	public static function hsb2rgb(int $H, float $S, float $V)
+	{
+		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::hsb2rgb()', E_USER_DEPRECATED);
+		return \CoreLibs\Convert\Colors::hsb2rgb($H, (int)round($S * 100), (int)round($V * 100));
+	}
+
+	/**
+	 * converts a RGB (0-255) to HSL
+	 * return:
+	 * array with hue (0-360), saturation (0-100%) and luminance (0-100%)
+	 * @param  int    $r red 0-255
+	 * @param  int    $g green 0-255
+	 * @param  int    $b blue 0-255
+	 * @return array<mixed>|bool  hue/sat/luminance
+	 * @deprecated use \CoreLibs\Convert\Colors::rgb2hsl() instead
+	 */
+	public static function rgb2hsl(int $r, int $g, int $b)
+	{
+		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hsl()', E_USER_DEPRECATED);
+		return \CoreLibs\Convert\Colors::rgb2hsb($r, $g, $b);
+	}
+
+	/**
+	 * converts an HSL to RGB
+	 * @param  int    $h hue: 0-360 (degrees)
+	 * @param  float  $s saturation: 0-1
+	 * @param  float  $l luminance: 0-1
+	 * @return array<mixed>|bool  red/blue/green 0-255 each
+	 * @deprecated use \CoreLibs\Convert\Colors::hsl2rgb() instead
+	 */
+	public static function hsl2rgb(int $h, float $s, float $l)
+	{
+		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::hsl2rgb()', E_USER_DEPRECATED);
+		return \CoreLibs\Convert\Colors::hsl2rgb($h, $s * 100, $l * 100);
+	}
+
+	// *** COLORS END ***
+
 	// *** EMAIL FUNCTIONS ***
 	// [!!! DEPRECATED !!!]
 	// Moved to \CoreLibs\Check\Email

www/lib/CoreLibs/Check/Colors.php

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

www/lib/CoreLibs/Combined/ArrayHandler.php

@@ -525,30 +525,6 @@ class ArrayHandler
 	{
 		return array_diff($array, $remove);
 	}
-
-	/**
-	 * From the array with key -> anything values return only the matching entries from key list
-	 * 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/Convert/Color/CieXyz.php

@@ -1,359 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/11/12
- * DESCRIPTION:
- * CIE XYZ color space conversion
- * This for various interims work
- * none public
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert\Color;
-
-use CoreLibs\Convert\Math;
-use CoreLibs\Convert\Color\Coordinates\RGB;
-use CoreLibs\Convert\Color\Coordinates\Lab;
-use CoreLibs\Convert\Color\Coordinates\XYZ;
-
-class CieXyz
-{
-	// MARK: public wrapper functions
-
-	/**
-	 * Convert from RGB to OkLab
-	 * via xyz D65
-	 *
-	 * @param  RGB $rgb
-	 * @return Lab
-	 */
-	public static function rgbViaXyzD65ToOkLab(RGB $rgb): Lab
-	{
-		return self::xyzD65ToOkLab(
-			self::linRgbToXyzD65($rgb)
-		);
-	}
-
-	/**
-	 * Convet from OkLab to RGB
-	 * via xyz D65
-	 *
-	 * @param  Lab $lab
-	 * @return RGB
-	 */
-	public static function okLabViaXyzD65ToRgb(Lab $lab): RGB
-	{
-		return self::xyzD65ToLinRgb(
-			self::okLabToXyzD65($lab)
-		)->fromLinear();
-	}
-
-	/**
-	 * Convert RGB to CIE Lab
-	 * via xyz D65 to xyz D50
-	 *
-	 * @param  RGB $rgb
-	 * @return Lab
-	 */
-	public static function rgbViaXyzD65ViaXyzD50ToLab(RGB $rgb): Lab
-	{
-		return self::xyzD50ToLab(
-			self::xyzD65ToXyzD50(
-				self::linRgbToXyzD65($rgb)
-			)
-		);
-	}
-
-	/**
-	 * Convert CIE Lab to RGB
-	 * via xyz D50 to xyz D65
-	 *
-	 * @param  Lab $lab
-	 * @return RGB
-	 */
-	public static function labViaXyzD50ViaXyzD65ToRgb(Lab $lab): RGB
-	{
-		return self::xyzD65ToLinRgb(
-			self::xyzD50ToXyxD65(
-				self::labToXyzD50($lab)
-			)
-		)->fromLinear();
-	}
-
-	/**
-	 * Convert from oklab to cie lab
-	 *
-	 * @param  Lab $lab
-	 * @return Lab
-	 */
-	public static function okLabViaXyzD65ViaXyzD50ToLab(Lab $lab): Lab
-	{
-		return self::xyzD50ToLab(
-			self::xyzD65ToXyzD50(
-				self::okLabToXyzD65($lab)
-			)
-		);
-	}
-
-	/**
-	 * Convert from cie lab to oklab
-	 *
-	 * @param  Lab $lab
-	 * @return Lab
-	 */
-	public static function labViaXyzD50ViaXyzD65ToOkLab(Lab $lab): Lab
-	{
-		return self::xyzD65ToOkLab(
-			self::xyzD50ToXyxD65(
-				self::labToXyzD50($lab)
-			)
-		);
-	}
-
-	// MARK: helper convert any array to array{float, float, float}
-
-	/**
-	 * This is a hack for phpstan until we write a proper matrix to class
-	 * conversion wrapper function
-	 *
-	 * @param  array<array<float|int>|float|int> $_array
-	 * @return array{0:float,1:float,2:float}
-	 */
-	private static function convertArray(array $_array): array
-	{
-		/** @var array{0:float,1:float,2:float} */
-		return [$_array[0], $_array[1], $_array[2]];
-	}
-
-	// MARK: xyzD65 <-> xyzD50
-
-	/**
-	 * xyzD65 to xyzD50 whitepoint
-	 *
-	 * @param  XYZ $xyz
-	 * @return XYZ
-	 */
-	private static function xyzD65ToXyzD50(XYZ $xyz): XYZ
-	{
-		return new XYZ(self::convertArray(Math::multiplyMatrices(
-			a: [
-				[1.0479298208405488, 0.022946793341019088, -0.05019222954313557],
-				[0.029627815688159344, 0.990434484573249, -0.01707382502938514],
-				[-0.009243058152591178, 0.015055144896577895, 0.7518742899580008],
-			],
-			b: $xyz->returnAsArray(),
-		)), options: ["whitepoint" => 'D50']);
-	}
-
-	/**
-	 * xyzD50 to xyzD65 whitepoint
-	 *
-	 * @param  XYZ $xyz
-	 * @return XYZ
-	 */
-	private static function xyzD50ToXyxD65(XYZ $xyz): XYZ
-	{
-		return new XYZ(self::convertArray(Math::multiplyMatrices(
-			a: [
-				[0.9554734527042182, -0.023098536874261423, 0.0632593086610217],
-				[-0.028369706963208136, 1.0099954580058226, 0.021041398966943008],
-				[0.012314001688319899, -0.020507696433477912, 1.3303659366080753],
-			],
-			b: $xyz->returnAsArray()
-		)), options: ["whitepoint" => 'D65']);
-	}
-
-	// MARK: xyzD50 <-> Lab
-
-	/**
-	 * Convert xyzD50 to Lab (Cie)
-	 *
-	 * @param  XYZ $xyz
-	 * @return Lab
-	 */
-	private static function xyzD50ToLab(XYZ $xyz): Lab
-	{
-		$_xyz = $xyz->returnAsArray();
-		$d50 = [
-			0.3457 / 0.3585,
-			1.00000,
-			(1.0 - 0.3457 - 0.3585) / 0.3585,
-		];
-
-		$a = 216 / 24389;
-		$b = 24389 / 27;
-
-		$_xyz = array_map(
-			fn ($k, $v) => $v / $d50[$k],
-			array_keys($_xyz),
-			array_values($_xyz),
-		);
-
-		$f = array_map(
-			fn ($v) => (($v > $a) ?
-				pow($v, 1 / 3) :
-				(($b * $v + 16) / 116)
-			),
-			$_xyz,
-		);
-
-		return new Lab([
-			(116 * $f[1]) - 16,
-			500 * ($f[0] - $f[1]),
-			200 * ($f[1] - $f[2]),
-		], colorspace: 'CIELab');
-	}
-
-	/**
-	 * Convert Lab (Cie) to xyz D50
-	 *
-	 * @param  Lab    $lab
-	 * @return XYZ
-	 */
-	private static function labToXyzD50(Lab $lab): XYZ
-	{
-		$_lab = $lab->returnAsArray();
-		$a = 24389 / 27;
-		$b = 216 / 24389;
-		$f = [];
-		$f[1] = ($_lab[0] + 16) / 116;
-		$f[0] = $_lab[1] / 500 + $f[1];
-		$f[2] = $f[1] - $_lab[2] / 200;
-		$xyz  = [
-			// x
-			pow($f[0], 3) > $b ?
-				pow($f[0], 3) :
-				(116 * $f[0] - 16) / $a,
-			// y
-			$_lab[0] > $a * $b ?
-				pow(($_lab[0] + 16) / 116, 3) :
-				$_lab[0] / $a,
-			// z
-			pow($f[2], 3) > $b ?
-				pow($f[2], 3) :
-				(116 * $f[2] - 16) / $a,
-		];
-
-		$d50 = [
-			0.3457 / 0.3585,
-			1.00000,
-			(1.0 - 0.3457 - 0.3585) / 0.3585,
-		];
-
-		return new XYZ(
-			self::convertArray(array_map(
-				fn ($k, $v) => $v * $d50[$k],
-				array_keys($xyz),
-				$xyz,
-			)),
-			options: ["whitepoint" => 'D50']
-		);
-	}
-
-	// MARK: xyzD65 <-> (linear)RGB
-
-	/**
-	 * convert linear RGB to xyz D65
-	 * if rgb is not flagged linear, it will be auto converted
-	 *
-	 * @param  RGB  $rgb
-	 * @return XYZ
-	 */
-	private static function linRgbToXyzD65(RGB $rgb): XYZ
-	{
-		// if not linear, convert to linear
-		if (!(bool)$rgb->get('linear')) {
-			$rgb = (new RGB($rgb->returnAsArray()))->toLinear();
-		}
-		return new XYZ(self::convertArray(Math::multiplyMatrices(
-			[
-				[0.41239079926595934, 0.357584339383878, 0.1804807884018343],
-				[0.21263900587151027, 0.715168678767756, 0.07219231536073371],
-				[0.01933081871559182, 0.11919477979462598, 0.9505321522496607],
-			],
-			$rgb->returnAsArray()
-		)), options: ["whitepoint" => 'D65']);
-	}
-
-	/**
-	 * Convert xyz D65 to linear RGB
-	 *
-	 * @param  XYZ $xyz
-	 * @return RGB
-	 */
-	private static function xyzD65ToLinRgb(XYZ $xyz): RGB
-	{
-		// xyz D65 to linrgb
-		return new RGB(self::convertArray(Math::multiplyMatrices(
-			a : [
-				[  3.2409699419045226,  -1.537383177570094,   -0.4986107602930034  ],
-				[ -0.9692436362808796,   1.8759675015077202,   0.04155505740717559 ],
-				[  0.05563007969699366, -0.20397695888897652,  1.0569715142428786  ],
-			],
-			b : $xyz->returnAsArray()
-		)), options: ["linear" => true]);
-	}
-
-	// MARK: xyzD65 <-> OkLab
-
-	/**
-	 * xyz D65 to OkLab
-	 *
-	 * @param  XYZ $xyz
-	 * @return Lab
-	 */
-	private static function xyzD65ToOkLab(XYZ $xyz): Lab
-	{
-		return new Lab(self::convertArray(Math::multiplyMatrices(
-			[
-				[0.2104542553, 0.7936177850, -0.0040720468],
-				[1.9779984951, -2.4285922050, 0.4505937099],
-				[0.0259040371, 0.7827717662, -0.8086757660],
-			],
-			array_map(
-				callback: fn ($v) => pow((float)$v, 1 / 3),
-				array: Math::multiplyMatrices(
-					a: [
-						[0.8190224432164319, 0.3619062562801221, -0.12887378261216414],
-						[0.0329836671980271, 0.9292868468965546, 0.03614466816999844],
-						[0.048177199566046255, 0.26423952494422764, 0.6335478258136937],
-					],
-					b: $xyz->returnAsArray(),
-				),
-			)
-		)), colorspace: 'OkLab');
-	}
-
-	/**
-	 * xyz D65 to OkLab
-	 *
-	 * @param  Lab    $lab
-	 * @return XYZ
-	 */
-	private static function okLabToXyzD65(Lab $lab): XYZ
-	{
-		return new XYZ(self::convertArray(Math::multiplyMatrices(
-			a: [
-					[1.2268798733741557, -0.5578149965554813, 0.28139105017721583],
-					[-0.04057576262431372, 1.1122868293970594, -0.07171106666151701],
-					[-0.07637294974672142, -0.4214933239627914, 1.5869240244272418],
-			],
-			b: array_map(
-				callback: fn ($v) => is_numeric($v) ? $v ** 3 : 0,
-				array: Math::multiplyMatrices(
-					a: [
-							[0.99999999845051981432, 0.39633779217376785678, 0.21580375806075880339],
-							[1.0000000088817607767, -0.1055613423236563494, -0.063854174771705903402],
-							[1.0000000546724109177, -0.089484182094965759684, -1.2914855378640917399],
-					],
-					// Divide $lightness by 100 to convert from CSS OkLab
-					b: $lab->returnAsArray(),
-				),
-			),
-		)), options: ["whitepoint" => 'D65']);
-	}
-}
-
-// __END__

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

@@ -1,190 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/11/11
- * DESCRIPTION:
- * Color Coordinate: HSB/HSV
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert\Color\Coordinates;
-
-use CoreLibs\Convert\Color\Utils;
-
-class HSB implements Interface\CoordinatesInterface
-{
-	/** @var array<string> allowed colorspaces */
-	private const COLORSPACES = ['sRGB'];
-
-	/** @var float hue */
-	private float $H = 0.0;
-	/** @var float saturation */
-	private float $S = 0.0;
-	/** @var float brightness / value */
-	private float $B = 0.0;
-
-	/** @var string color space: either ok or cie */
-	private string $colorspace = ''; /** @phpstan-ignore-line */
-
-	/**
-	 * HSB (HSV) color coordinates
-	 * Hue/Saturation/Brightness or Value
-	 *
-	 * @param string|array{0:float,1:float,2:float} $colors
-	 * @param string $colorspace [default=sRGB]
-	 * @param array<string,string> $options [default=[]]
-	 * @throws \InvalidArgumentException only array colors allowed
-	 */
-	public function __construct(string|array $colors, string $colorspace = 'sRGB', array $options = [])
-	{
-		if (!is_array($colors)) {
-			throw new \InvalidArgumentException('Only array colors allowed', 0);
-		}
-		$this->setColorspace($colorspace)->parseOptions($options)->setFromArray($colors);
-	}
-
-	/**
-	 * set from array
-	 * where 0: Hue, 1: Saturation, 2: Brightness
-	 *
-	 * @param  string|array{0:float,1:float,2:float} $colors
-	 * @param  string $colorspace [default=sRGB]
-	 * @param  array<string,string> $options [default=[]]
-	 * @return self
-	 */
-	public static function create(string|array $colors, string $colorspace = 'sRGB', array $options = []): self
-	{
-		return new HSB($colors, $colorspace, $options);
-	}
-
-	/**
-	 * parse options
-	 *
-	 * @param  array<string,string> $options
-	 * @return self
-	 */
-	private function parseOptions(array $options): self
-	{
-		return $this;
-	}
-
-	/**
-	 * set color
-	 *
-	 * @param  string $name
-	 * @param  float  $value
-	 * @return void
-	 */
-	private function set(string $name, float $value): void
-	{
-		$name = strtoupper($name);
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		switch ($name) {
-			case 'H':
-				if ($value == 360.0) {
-					$value = 0;
-				}
-				// if ($value < 0 || $value > 360) {
-				if (Utils::compare(0.0, $value, 360.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for hue is not in the range of 0 to 360',
-						1
-					);
-				}
-				break;
-			case 'S':
-				// if ($value < 0 || $value > 100) {
-				if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for saturation is not in the range of 0 to 100',
-						2
-					);
-				}
-				break;
-			case 'B':
-				// if ($value < 0 || $value > 100) {
-				if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for brightness is not in the range of 0 to 100',
-						3
-					);
-				}
-				break;
-		}
-		$this->$name = $value;
-	}
-
-	/**
-	 * get color
-	 *
-	 * @param string $name
-	 * @return float
-	 */
-	public function get(string $name): float|string|bool
-	{
-		$name = strtoupper($name);
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		return $this->$name;
-	}
-
-	/**
-	 * set the colorspace
-	 *
-	 * @param  string $colorspace
-	 * @return self
-	 */
-	private function setColorspace(string $colorspace): self
-	{
-		if (!in_array($colorspace, $this::COLORSPACES)) {
-			throw new \InvalidArgumentException('Not allowed colorspace', 0);
-		}
-		$this->colorspace = $colorspace;
-		return $this;
-	}
-
-	/**
-	 * Returns the color as array
-	 * where 0: Hue, 1: Saturation, 2: Brightness
-	 *
-	 * @return array{0:float,1:float,2:float}
-	 */
-	public function returnAsArray(): array
-	{
-		return [$this->H, $this->S, $this->B];
-	}
-
-	/**
-	 * set color as array
-	 * where 0: Hue, 1: Saturation, 2: Brightness
-	 *
-	 * @param  array{0:float,1:float,2:float} $colors
-	 * @return self
-	 */
-	private function setFromArray(array $colors): self
-	{
-		$this->set('H', $colors[0]);
-		$this->set('S', $colors[1]);
-		$this->set('B', $colors[2]);
-		return $this;
-	}
-
-	/**
-	 * no hsb in css
-	 *
-	 * @param  float|string|null $opacity
-	 * @return string
-	 * @throws \ErrorException
-	 */
-	public function toCssString(null|float|string $opacity = null): string
-	{
-		throw new \ErrorException('HSB is not available as CSS color string', 0);
-	}
-}
-
-// __END__

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

@@ -1,195 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/11/11
- * DESCRIPTION:
- * Color Coordinate: HSL
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert\Color\Coordinates;
-
-use CoreLibs\Convert\Color\Utils;
-
-class HSL implements Interface\CoordinatesInterface
-{
-	/** @var array<string> allowed colorspaces */
-	private const COLORSPACES = ['sRGB'];
-
-	/** @var float hue */
-	private float $H = 0.0;
-	/** @var float saturation */
-	private float $S = 0.0;
-	/** @var float lightness (luminance) */
-	private float $L = 0.0;
-
-	/** @var string color space: either sRGB */
-	private string $colorspace = '';
-
-	/**
-	 * Color Coordinate HSL
-	 * Hue/Saturation/Lightness
-	 *
-	 * @param string|array{0:float,1:float,2:float} $colors
-	 * @param string $colorspace [default=sRGB]
-	 * @param array<string,string> $options [default=[]]
-	 * @throws \InvalidArgumentException only array colors allowed
-	 */
-	public function __construct(string|array $colors, string $colorspace = 'sRGB', array $options = [])
-	{
-		if (!is_array($colors)) {
-			throw new \InvalidArgumentException('Only array colors allowed', 0);
-		}
-		$this->setColorspace($colorspace)->parseOptions($options)->setFromArray($colors);
-	}
-
-	/**
-	 * set from array
-	 * where 0: Hue, 1: Saturation, 2: Lightness
-	 *
-	 * @param  string|array{0:float,1:float,2:float} $colors
-	 * @param  string $colorspace [default=sRGB]
-	 * @param  array<string,string> $options [default=[]]
-	 * @return self
-	 */
-	public static function create(string|array $colors, string $colorspace = 'sRGB', array $options = []): self
-	{
-		return new HSL($colors, $colorspace, $options);
-	}
-
-	/**
-	 * parse options
-	 *
-	 * @param  array<string,string> $options
-	 * @return self
-	 */
-	private function parseOptions(array $options): self
-	{
-		return $this;
-	}
-
-	/**
-	 * set color
-	 *
-	 * @param  string $name
-	 * @param  float  $value
-	 * @return void
-	 */
-	private function set(string $name, float $value): void
-	{
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		switch ($name) {
-			case 'H':
-				if ($value == 360.0) {
-					$value = 0;
-				}
-				// if ($value < 0 || $value > 360) {
-				if (Utils::compare(0.0, $value, 360.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for hue is not in the range of 0 to 360',
-						1
-					);
-				}
-				break;
-			case 'S':
-				// if ($value < 0 || $value > 100) {
-				if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for saturation is not in the range of 0 to 100',
-						2
-					);
-				}
-				break;
-			case 'L':
-				// if ($value < 0 || $value > 100) {
-				if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for lightness is not in the range of 0 to 100',
-						3
-					);
-				}
-				break;
-		}
-		$this->$name = $value;
-	}
-
-	/**
-	 * get color
-	 *
-	 * @param string $name
-	 * @return float
-	 */
-	public function get(string $name): float|string|bool
-	{
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		return $this->$name;
-	}
-
-	/**
-	 * set the colorspace
-	 *
-	 * @param  string $colorspace
-	 * @return self
-	 */
-	private function setColorspace(string $colorspace): self
-	{
-		if (!in_array($colorspace, $this::COLORSPACES)) {
-			throw new \InvalidArgumentException('Not allowed colorspace', 0);
-		}
-		$this->colorspace = $colorspace;
-		return $this;
-	}
-
-	/**
-	 * Returns the color as array
-	 * where 0: Hue, 1: Saturation, 2: Lightness
-	 *
-	 * @return array{0:float,1:float,2:float}
-	 */
-	public function returnAsArray(): array
-	{
-		return [$this->H, $this->S, $this->L];
-	}
-
-	/**
-	 * set color as array
-	 * where 0: Hue, 1: Saturation, 2: Lightness
-	 *
-	 * @param  array{0:float,1:float,2:float} $colors
-	 * @return self
-	 */
-	private function setFromArray(array $colors): self
-	{
-		$this->set('H', $colors[0]);
-		$this->set('S', $colors[1]);
-		$this->set('L', $colors[2]);
-		return $this;
-	}
-
-		/**
-	 * convert to css string with optional opacityt
-	 *
-	 * @param  float|string|null $opacity
-	 * @return string
-	 */
-	public function toCssString(null|float|string $opacity = null): string
-	{
-		$string = 'hsl('
-			. $this->H
-			. ' '
-			. $this->S
-			. ' '
-			. $this->L
-			. Utils::setOpacity($opacity)
-			. ')';
-		return $string;
-	}
-}
-
-// __END__

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

@@ -1,195 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/11/11
- * DESCRIPTION:
- * Color Coordinate: HWB
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert\Color\Coordinates;
-
-use CoreLibs\Convert\Color\Utils;
-
-class HWB implements Interface\CoordinatesInterface
-{
-	/** @var array<string> allowed colorspaces */
-	private const COLORSPACES = ['sRGB'];
-
-	/** @var float Hue */
-	private float $H = 0.0;
-	/** @var float Whiteness */
-	private float $W = 0.0;
-	/** @var float Blackness */
-	private float $B = 0.0;
-
-	/** @var string color space: either ok or cie */
-	private string $colorspace = '';
-
-	/**
-	 * Color Coordinate: HWB
-	 * Hue/Whiteness/Blackness
-	 *
-	 * @param string|array{0:float,1:float,2:float} $colors
-	 * @param string $colorspace [default=sRGB]
-	 * @param array<string,string> $options [default=[]]
-	 * @throws \InvalidArgumentException only array colors allowed
-	 */
-	public function __construct(string|array $colors, string $colorspace = 'sRGB', array $options = [])
-	{
-		if (!is_array($colors)) {
-			throw new \InvalidArgumentException('Only array colors allowed', 0);
-		}
-		$this->setColorspace($colorspace)->parseOptions($options)->setFromArray($colors);
-	}
-
-	/**
-	 * set from array
-	 * where 0: Hue, 1: Whiteness, 2: Blackness
-	 *
-	 * @param  string|array{0:float,1:float,2:float} $colors
-	 * @param  string $colorspace [default=sRGB]
-	 * @param  array<string,string> $options [default=[]]
-	 * @return self
-	 */
-	public static function create(string|array $colors, string $colorspace = 'sRGB', array $options = []): self
-	{
-		return new HWB($colors, $colorspace, $options);
-	}
-
-	/**
-	 * parse options
-	 *
-	 * @param  array<string,string> $options
-	 * @return self
-	 */
-	private function parseOptions(array $options): self
-	{
-		return $this;
-	}
-
-	/**
-	 * set color
-	 *
-	 * @param  string $name
-	 * @param  float  $value
-	 * @return void
-	 */
-	private function set(string $name, float $value): void
-	{
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		switch ($name) {
-			case 'H':
-				if ($value == 360.0) {
-					$value = 0;
-				}
-				// if ($value < 0 || $value > 360) {
-				if (Utils::compare(0.0, $value, 360.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for hue is not in the range of 0 to 360',
-						1
-					);
-				}
-				break;
-			case 'W':
-				// if ($value < 0 || $value > 100) {
-				if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for whiteness is not in the range of 0 to 100',
-						2
-					);
-				}
-				break;
-			case 'B':
-				// if ($value < 0 || $value > 100) {
-				if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for blackness is not in the range of 0 to 100',
-						3
-					);
-				}
-				break;
-		}
-		$this->$name = $value;
-	}
-
-	/**
-	 * get color
-	 *
-	 * @param string $name
-	 * @return float
-	 */
-	public function get(string $name): float|string|bool
-	{
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		return $this->$name;
-	}
-
-	/**
-	 * set the colorspace
-	 *
-	 * @param  string $colorspace
-	 * @return self
-	 */
-	private function setColorspace(string $colorspace): self
-	{
-		if (!in_array($colorspace, $this::COLORSPACES)) {
-			throw new \InvalidArgumentException('Not allowed colorspace', 0);
-		}
-		$this->colorspace = $colorspace;
-		return $this;
-	}
-
-	/**
-	 * Returns the color as array
-	 * where 0: Hue, 1: Whiteness, 2: Blackness
-	 *
-	 * @return array{0:float,1:float,2:float}
-	 */
-	public function returnAsArray(): array
-	{
-		return [$this->H, $this->W, $this->B];
-	}
-
-	/**
-	 * set color as array
-	 * where 0: Hue, 1: Whiteness, 2: Blackness
-	 *
-	 * @param  array{0:float,1:float,2:float} $colors
-	 * @return self
-	 */
-	private function setFromArray(array $colors): self
-	{
-		$this->set('H', $colors[0]);
-		$this->set('W', $colors[1]);
-		$this->set('B', $colors[2]);
-		return $this;
-	}
-
-	/**
-	 * convert to css string with optional opacityt
-	 *
-	 * @param  float|string|null $opacity
-	 * @return string
-	 */
-	public function toCssString(null|float|string $opacity = null): string
-	{
-		$string = 'hwb('
-			. $this->H
-			. ' '
-			. $this->W
-			. ' '
-			. $this->B
-			. Utils::setOpacity($opacity)
-			. ')';
-		return $string;
-	}
-}
-
-// __END__

www/lib/CoreLibs/Convert/Color/Coordinates/Interface/CoordinatesInterface.php

@@ -1,53 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: Ymd
- * DESCRIPTION:
- * DescriptionHere
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert\Color\Coordinates\Interface;
-
-interface CoordinatesInterface
-{
-	/**
-	 * create class via "Class::create()" call
-	 * was used for multiple create interfaces
-	 * no longer needed, use "new Class()" instead
-	 *
-	 * @param  string|array{0:float,1:float,2:float} $colors
-	 * @param  string $colorspace [default='']
-	 * @param  array<string,string|bool|int> $options [default=[]]
-	 * @return self
-	 */
-	public static function create(string|array $colors, string $colorspace = '', array $options = []): self;
-
-	/**
-	 * get color
-	 *
-	 * @param string $name
-	 * @return float
-	 */
-	public function get(string $name): float|string|bool;
-
-	/**
-	 * Returns the color as array
-	 * where 0: Lightness, 1: a, 2: b
-	 *
-	 * @return array{0:float,1:float,2:float}
-	 */
-	public function returnAsArray(): array;
-
-	/**
-	 * Convert into css string with optional opacity
-	 *
-	 * @param  null|float|string|null $opacity
-	 * @return string
-	 */
-	public function toCssString(null|float|string $opacity = null): string;
-}
-
-// __END__

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

@@ -1,227 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/11/11
- * DESCRIPTION:
- * Color Coordinate: Lch
- * for oklch or cie
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert\Color\Coordinates;
-
-use CoreLibs\Convert\Color\Utils;
-
-class LCH implements Interface\CoordinatesInterface
-{
-	/** @var array<string> allowed colorspaces */
-	private const COLORSPACES = ['OkLab', 'CIELab'];
-
-	/** @var float Lightness/Luminance
-	 * CIE: 0 to 100
-	 * OKlch: 0.0 to 1.0
-	 * BOTH: 0% to 100%
-	 */
-	private float $L = 0.0;
-	/** @var float Chroma
-	 * CIE: 0 to 150, cannot be more than 230
-	 * OkLch: 0 to 0.4, does not exceed 0.5
-	 * BOTH: 0% to 100% (0 to 150, 0 to 0.4)
-	 */
-	private float $C = 0.0;
-	/** @var float Hue
-	 * 0 to 360 deg
-	 */
-	private float $H = 0.0;
-
-	/** @var string color space: either ok or cie */
-	private string $colorspace = '';
-
-	/**
-	 * Color Coordinate Lch
-	 * for oklch
-	 *
-	 * @param string|array{0:float,1:float,2:float} $colors
-	 * @param string $colorspace [default='']
-	 * @param array<string,string> $options [default=[]]
-	 * @throws \InvalidArgumentException only array colors allowed
-	 */
-	public function __construct(string|array $colors, string $colorspace = '', array $options = [])
-	{
-		if (!is_array($colors)) {
-			throw new \InvalidArgumentException('Only array colors allowed', 0);
-		}
-		$this->setColorspace($colorspace)->parseOptions($options)->setFromArray($colors);
-	}
-
-	/**
-	 * set from array
-	 * where 0: Lightness, 1: Chroma, 2: Hue
-	 *
-	 * @param  string|array{0:float,1:float,2:float} $colors
-	 * @param  string $colorspace [default='']
-	 * @param  array<string,string> $options [default=[]]
-	 * @return self
-	 */
-	public static function create(string|array $colors, string $colorspace = '', array $options = []): self
-	{
-		return new LCH($colors, $colorspace, $options);
-	}
-
-	/**
-	 * parse options
-	 *
-	 * @param  array<string,string> $options
-	 * @return self
-	 */
-	private function parseOptions(array $options): self
-	{
-		return $this;
-	}
-
-	/**
-	 * set color
-	 *
-	 * @param  string $name
-	 * @param  float  $value
-	 * @return void
-	 */
-	private function set(string $name, float $value): void
-	{
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		switch ($name) {
-			case 'L':
-				// if ($this->colorspace == 'CIELab' && ($value < 0 || $value > 100)) {
-				if ($this->colorspace == 'CIELab' && Utils::compare(0.0, $value, 100.0, Utils::ESPILON_BIG)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for lightness is not in the range of 0 to 100 for CIE Lab',
-						1
-					);
-				// } elseif ($this->colorspace == 'OkLab' && ($value < 0 || $value > 1)) {
-				} elseif ($this->colorspace == 'OkLab' && Utils::compare(0.0, $value, 1.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for lightness is not in the range of 0.0 to 1.0 for OkLab',
-						1
-					);
-				}
-				break;
-			case 'C':
-				// if ($this->colorspace == 'CIELab' && ($value < 0 || $value > 230)) {
-				if ($this->colorspace == 'CIELab' && Utils::compare(0.0, $value, 230.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for chroma is not in the range of '
-							. '0 to 150 and a maximum of 230 for CIE Lab',
-						1
-					);
-				// } elseif ($this->colorspace == 'OkLab' && ($value < 0 || $value > 0.55)) {
-				} elseif ($this->colorspace == 'OkLab' && Utils::compare(0.0, $value, 0.55, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for lightness is not in the range of '
-							. '0.0 to 0.4 and a maximum of 0.5 for OkLab',
-						1
-					);
-				}
-				break;
-			case 'H':
-				// if ($value < 0 || $value > 360) {
-				if (Utils::compare(0.0, $value, 360.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for hue is not in the range of 0.0 to 360.0',
-						1
-					);
-				}
-				break;
-		}
-		$this->$name = $value;
-	}
-
-	/**
-	 * get color
-	 *
-	 * @param string $name
-	 * @return float
-	 */
-	public function get(string $name): float|string|bool
-	{
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		return $this->$name;
-	}
-
-	/**
-	 * set the colorspace
-	 *
-	 * @param  string $colorspace
-	 * @return self
-	 */
-	private function setColorspace(string $colorspace): self
-	{
-		if (!in_array($colorspace, $this::COLORSPACES)) {
-			throw new \InvalidArgumentException('Not allowed colorspace', 0);
-		}
-		$this->colorspace = $colorspace;
-		return $this;
-	}
-
-	/**
-	 * Returns the color as array
-	 * where 0: Lightness, 1: Chroma, 2: Hue
-	 *
-	 * @return array{0:float,1:float,2:float}
-	 */
-	public function returnAsArray(): array
-	{
-		return [$this->L, $this->C, $this->H];
-	}
-
-	/**
-	 * set color as array
-	 * where 0: Lightness, 1: Chroma, 2: Hue
-	 *
-	 * @param  array{0:float,1:float,2:float} $colors
-	 * @return self
-	 */
-	private function setFromArray(array $colors): self
-	{
-		$this->set('L', $colors[0]);
-		$this->set('C', $colors[1]);
-		$this->set('H', $colors[2]);
-		return $this;
-	}
-
-	/**
-	 * Convert into css string with optional opacity
-	 *
-	 * @param  null|float|string|null $opacity
-	 * @return string
-	 */
-	public function toCssString(null|float|string $opacity = null): string
-	{
-		$string = '';
-		switch ($this->colorspace) {
-			case 'CIELab':
-				$string = 'lch';
-				break;
-			case 'OkLab':
-				$string = 'oklch';
-				break;
-		}
-		$string .= '('
-			. $this->L
-			. ' '
-			. $this->C
-			. ' '
-			. $this->H
-			. Utils::setOpacity($opacity)
-			. ');';
-
-		return $string;
-	}
-}
-
-// __END__

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

@@ -1,233 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/11/11
- * DESCRIPTION:
- * Color Coordinate: Lab
- * for oklab or cie
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert\Color\Coordinates;
-
-use CoreLibs\Convert\Color\Utils;
-
-class Lab implements Interface\CoordinatesInterface
-{
-	/** @var array<string> allowed colorspaces */
-	private const COLORSPACES = ['OkLab', 'CIELab'];
-
-	/** @var float lightness/luminance
-	 * CIE: 0f to 100f
-	 * OKlab: 0.0 to 1.0
-	 * BOTH: 0% to 100%
-	 */
-	private float $L = 0.0;
-	/** @var float a axis distance
-	 * CIE: -125 to 125, cannot be more than +/- 160
-	 * OKlab: -0.4 to 0.4, cannot exceed +/- 0.5
-	 * BOTH: -100% to 100% (+/-125 or 0.4)
-	 */
-	private float $a = 0.0;
-	/** @var float b axis distance
-	 * CIE: -125 to 125, cannot be more than +/- 160
-	 * OKlab: -0.4 to 0.4, cannot exceed +/- 0.5
-	 * BOTH: -100% to 100% (+/-125 or 0.4)
-	 */
-	private float $b = 0.0;
-
-	/** @var string color space: either ok or cie */
-	private string $colorspace = '';
-
-	/**
-	 * Color Coordinate: Lab
-	 * for oklab or cie
-	 *
-	 * @param string|array{0:float,1:float,2:float} $colors
-	 * @param string $colorspace [default='']
-	 * @param array<string,string> $options [default=[]]
-	 * @throws \InvalidArgumentException only array colors allowed
-	 */
-	public function __construct(string|array $colors, string $colorspace = '', array $options = [])
-	{
-		if (!is_array($colors)) {
-			throw new \InvalidArgumentException('Only array colors allowed', 0);
-		}
-		$this->setColorspace($colorspace)->parseOptions($options)->setFromArray($colors);
-	}
-
-	/**
-	 * set from array
-	 * where 0: Lightness, 1: a, 2: b
-	 *
-	 * @param array{0:float,1:float,2:float} $colors
-	 * @param string $colorspace [default='']
-	 * @param array<string,string> $options [default=[]]
-	 * @return self
-	 */
-	public static function create(string|array $colors, string $colorspace = '', array $options = []): self
-	{
-		return new Lab($colors, $colorspace, $options);
-	}
-
-	/**
-	 * parse options
-	 *
-	 * @param  array<string,string> $options
-	 * @return self
-	 */
-	private function parseOptions(array $options): self
-	{
-		return $this;
-	}
-
-	/**
-	 * set color
-	 *
-	 * @param  string $name
-	 * @param  float  $value
-	 * @return void
-	 */
-	private function set(string $name, float $value): void
-	{
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		switch ($name) {
-			case 'L':
-				// if ($this->colorspace == 'CIELab' && ($value < 0 || $value > 100)) {
-				if ($this->colorspace == 'CIELab' && Utils::compare(0.0, $value, 100.0, Utils::ESPILON_BIG)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for lightness is not in the range of 0 to 100 for CIE Lab',
-						1
-					);
-				// } elseif ($this->colorspace == 'OkLab' && ($value < 0 || $value > 1)) {
-				} elseif ($this->colorspace == 'OkLab' && Utils::compare(0.0, $value, 1.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for lightness is not in the range of 0.0 to 1.0 for OkLab',
-						1
-					);
-				}
-				break;
-			case 'a':
-				// if ($this->colorspace == 'CIELab' && ($value < -125 || $value > 125)) {
-				if ($this->colorspace == 'CIELab' && Utils::compare(-125.0, $value, 125.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for a is not in the range of -125 to 125 for CIE Lab',
-						2
-					);
-				// } elseif ($this->colorspace == 'OkLab' && ($value < -0.55 || $value > 0.55)) {
-				} elseif ($this->colorspace == 'OkLab' && Utils::compare(-0.55, $value, 0.55, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for a is not in the range of -0.5 to 0.5 for OkLab',
-						2
-					);
-				}
-				break;
-			case 'b':
-				// if ($this->colorspace == 'CIELab' && ($value < -125 || $value > 125)) {
-				if ($this->colorspace == 'CIELab' && Utils::compare(-125.0, $value, 125.0, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for b is not in the range of -125 to 125 for CIE Lab',
-						3
-					);
-				// } elseif ($this->colorspace == 'OkLab' && ($value < -0.55 || $value > 0.55)) {
-				} elseif ($this->colorspace == 'OkLab' && Utils::compare(-0.55, $value, 0.55, Utils::EPSILON_SMALL)) {
-					throw new \LengthException(
-						'Argument value ' . $value . ' for b is not in the range of -0.5 to 0.5 for OkLab',
-						3
-					);
-				}
-				break;
-		}
-		$this->$name = $value;
-	}
-
-	/**
-	 * get color
-	 *
-	 * @param string $name
-	 * @return float
-	 */
-	public function get(string $name): float|string|bool
-	{
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		return $this->$name;
-	}
-
-	/**
-	 * set the colorspace
-	 *
-	 * @param  string $colorspace
-	 * @return self
-	 */
-	private function setColorspace(string $colorspace): self
-	{
-		if (!in_array($colorspace, $this::COLORSPACES)) {
-			throw new \InvalidArgumentException('Not allowed colorspace', 0);
-		}
-		$this->colorspace = $colorspace;
-		return $this;
-	}
-
-	/**
-	 * Returns the color as array
-	 * where 0: Lightness, 1: a, 2: b
-	 *
-	 * @return array{0:float,1:float,2:float}
-	 */
-	public function returnAsArray(): array
-	{
-		return [$this->L, $this->a, $this->b];
-	}
-
-	/**
-	 * set color as array
-	 * where 0: Lightness, 1: a, 2: b
-	 *
-	 * @param  array{0:float,1:float,2:float} $colors
-	 * @return self
-	 */
-	private function setFromArray(array $colors): self
-	{
-		$this->set('L', $colors[0]);
-		$this->set('a', $colors[1]);
-		$this->set('b', $colors[2]);
-		return $this;
-	}
-
-	/**
-	 * Convert into css string with optional opacity
-	 *
-	 * @param  null|float|string|null $opacity
-	 * @return string
-	 */
-	public function toCssString(null|float|string $opacity = null): string
-	{
-		$string = '';
-		switch ($this->colorspace) {
-			case 'CIELab':
-				$string = 'lab';
-				break;
-			case 'OkLab':
-				$string = 'oklab';
-				break;
-		}
-		$string .= '('
-			. $this->L
-			. ' '
-			. $this->a
-			. ' '
-			. $this->b
-			. Utils::setOpacity($opacity)
-			. ');';
-
-		return $string;
-	}
-}
-
-// __END__

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

@@ -1,329 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/11/11
- * DESCRIPTION:
- * Color Coordinate: RGB
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert\Color\Coordinates;
-
-use CoreLibs\Convert\Color\Utils;
-
-class RGB implements Interface\CoordinatesInterface
-{
-	/** @var array<string> allowed colorspaces */
-	private const COLORSPACES = ['sRGB'];
-
-	/** @var float red 0 to 255 or 0.0f to 1.0f for linear RGB */
-	private float $R = 0.0;
-	/** @var float green 0 to 255 or 0.0f to 1.0f for linear RGB */
-	private float $G = 0.0;
-	/** @var float blue 0 to 255 or 0.0f to 1.0f for linear RGB */
-	private float $B = 0.0;
-
-	/** @var string color space: either ok or cie */
-	private string $colorspace = '';
-
-	/** @var bool set if this is linear */
-	private bool $linear = false;
-
-	/**
-	 * Color Coordinate RGB
-	*  @param array{0:float,1:float,2:float}|string $colors RGB color array or hex string
-	 * @param string $colorspace [default=sRGB]
-	 * @param array<string,bool> $options [default=[]] only "linear" allowed at the moment
-	 */
-	public function __construct(string|array $colors, string $colorspace = 'sRGB', array $options = [])
-	{
-		$this->setColorspace($colorspace)->parseOptions($options);
-		if (is_array($colors)) {
-			$this->setFromArray($colors);
-		} else {
-			$this->setFromHex($colors);
-		}
-	}
-
-	/**
-	 * set from array or string
-	 * where 0: Red, 1: Green, 2: Blue
-	 * OR #ffffff or ffffff
-	 *
-	 * @param  array{0:float,1:float,2:float}|string $colors RGB color array or hex string
-	 * @param  string $colorspace [default=sRGB]
-	 * @param  array<string,bool> $options [default=[]] only "linear" allowed at the moment
-	 * @return self
-	 */
-	public static function create(string|array $colors, string $colorspace = 'sRGB', array $options = []): self
-	{
-		return new RGB($colors, $colorspace, $options);
-	}
-
-	/**
-	 * parse options
-	 *
-	 * @param  array<string,bool> $options
-	 * @return self
-	 */
-	private function parseOptions(array $options): self
-	{
-		$this->flagLinear($options['linear'] ?? false);
-		return $this;
-	}
-
-
-	/**
-	 * set color
-	 *
-	 * @param  string $name
-	 * @param  float  $value
-	 * @return void
-	 */
-	private function set(string $name, float $value): void
-	{
-		// do not allow setting linear from outside
-		if ($name == 'linear') {
-			return;
-		}
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		// if not linear
-		if (!$this->linear && ((int)$value < 0 || (int)$value > 255)) {
-			throw new \LengthException('Argument value ' . $value . ' for color ' . $name
-			. ' is not in the range of 0 to 255', 1);
-		} elseif (
-			// $this->linear && ($value < 0.0 || $value > 1.0)
-			$this->linear && Utils::compare(0.0, $value, 1.0, 0.000001)
-		) {
-			throw new \LengthException('Argument value ' . $value . ' for color ' . $name
-				. ' is not in the range of 0 to 1 for linear rgb', 2);
-		}
-		$this->$name = $value;
-	}
-
-	/**
-	 * get color
-	 *
-	 * @param string $name
-	 * @return float|bool
-	 */
-	public function get(string $name): float|string|bool
-	{
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		return $this->$name;
-	}
-
-	/**
-	 * set the colorspace
-	 *
-	 * @param  string $colorspace
-	 * @return self
-	 */
-	private function setColorspace(string $colorspace): self
-	{
-		if (!in_array($colorspace, $this::COLORSPACES)) {
-			throw new \InvalidArgumentException('Not allowed colorspace', 0);
-		}
-		$this->colorspace = $colorspace;
-		return $this;
-	}
-
-	/**
-	 * Returns the color as array
-	 * where 0: Red, 1: Green, 2: Blue
-	 *
-	 * @return array{0:float,1:float,2:float}
-	 */
-	public function returnAsArray(): array
-	{
-		return [$this->R, $this->G, $this->B];
-	}
-
-	/**
-	 * set color as array
-	 * where 0: Red, 1: Green, 2: Blue
-	 *
-	 * @param  array{0:float,1:float,2:float} $colors
-	 * @return self
-	 */
-	private function setFromArray(array $colors): self
-	{
-		$this->set('R', $colors[0]);
-		$this->set('G', $colors[1]);
-		$this->set('B', $colors[2]);
-		return $this;
-	}
-
-	/**
-	 * Return current set RGB as hex string. with or without # prefix
-	 *
-	 * @param  bool   $hex_prefix
-	 * @return string
-	 */
-	public function returnAsHex(bool $hex_prefix = true): string
-	{
-		// prefix
-		$hex_color = '';
-		if ($hex_prefix === true) {
-			$hex_color = '#';
-		}
-		// convert if in linear
-		if ($this->linear) {
-			$this->fromLinear();
-		}
-		foreach ($this->returnAsArray() as $color) {
-			$hex_color .= str_pad(dechex((int)$color), 2, '0', STR_PAD_LEFT);
-		}
-		return $hex_color;
-	}
-
-	/**
-	 * set colors RGB from hex string
-	 *
-	 * @param  string $hex_string
-	 * @return self
-	 */
-	private function setFromHex(string $hex_string): self
-	{
-		$hex_string = preg_replace("/[^0-9A-Fa-f]/", '', $hex_string); // Gets a proper hex string
-		if (empty($hex_string) || !is_string($hex_string)) {
-			throw new \InvalidArgumentException('hex_string argument cannot be empty', 3);
-		}
-		$rgbArray = [];
-		if (strlen($hex_string) == 6) {
-			// If a proper hex code, convert using bitwise operation.
-			// No overhead... faster
-			$colorVal = hexdec($hex_string);
-			$rgbArray = [
-				0xFF & ($colorVal >> 0x10),
-				0xFF & ($colorVal >> 0x8),
-				0xFF & $colorVal
-			];
-		} elseif (strlen($hex_string) == 3) {
-			// If shorthand notation, need some string manipulations
-			$rgbArray = [
-				hexdec(str_repeat(substr($hex_string, 0, 1), 2)),
-				hexdec(str_repeat(substr($hex_string, 1, 1), 2)),
-				hexdec(str_repeat(substr($hex_string, 2, 1), 2))
-			];
-		} else {
-			// Invalid hex color code
-			throw new \UnexpectedValueException('Invalid hex_string: ' . $hex_string, 4);
-		}
-		return $this->setFromArray($rgbArray);
-	}
-
-	/**
-	 * set as linear
-	 * can be used as chain call on create if input is linear RGB
-	 * RGB::__construct**(...)->flagLinear();
-	 * as it returns self
-	 *
-	 * @return self
-	 */
-	private function flagLinear(bool $linear): self
-	{
-		$this->linear = $linear;
-		return $this;
-	}
-
-	/**
-	 * Both function source:
-	 * https://bottosson.github.io/posts/colorwrong/#what-can-we-do%3F
-	 * but reverse f: fromLinear and f_inv for toLinear
-	 * Code copied from here:
-	 * https://stackoverflow.com/a/12894053
-	 *
-	 * converts RGB to linear
-	 * We come from 0-255 so we need to divide by 255
-	 *
-	 * @return self
-	 */
-	public function toLinear(): self
-	{
-		// if linear, as is
-		if ($this->linear) {
-			return $this;
-		}
-		$this->flagLinear(true)->setFromArray(array_map(
-			callback: function (int|float $v) {
-				$v = (float)($v / 255);
-				$abs = abs($v);
-				$sign = ($v < 0) ? -1 : 1;
-				return (float)(
-					$abs <= 0.04045 ?
-						$v / 12.92 :
-						$sign * pow(($abs + 0.055) / 1.055, 2.4)
-				);
-			},
-			array: $this->returnAsArray(),
-		));
-		return $this;
-	}
-
-	/**
-	 * convert back to normal sRGB from linear RGB
-	 * we go to 0-255 rgb so we multiply by 255
-	 *
-	 * @return self
-	 */
-	public function fromLinear(): self
-	{
-		// if not linear, as is
-		if (!$this->linear) {
-			return $this;
-		}
-		$this->flagLinear(false)->setFromArray(array_map(
-			callback: function (int|float $v) {
-				$abs  = abs($v);
-				$sign = ($v < 0) ? -1 : 1;
-				// during reverse in some situations the values can become negative in very small ways
-				// like -...E16 and ...E17
-				return ($ret = (float)(255 * (
-					$abs <= 0.0031308 ?
-						$v * 12.92 :
-						$sign * (1.055 * pow($abs, 1.0 / 2.4) - 0.055)
-				))) < 0 ? 0 : $ret;
-			},
-			array: $this->returnAsArray(),
-		));
-		return $this;
-	}
-
-	/**
-	 * convert to css string with optional opacity
-	 * Note: if this is a linear RGB, the data will converted during this operation and the converted back
-	 *
-	 * @param  float|string|null $opacity
-	 * @return string
-	 */
-	public function toCssString(null|float|string $opacity = null): string
-	{
-		// if we are in linear mode, convert to normal mode temporary
-		$was_linear = false;
-		if ($this->linear) {
-			$this->fromLinear();
-			$was_linear = true;
-		}
-		$string = 'rgb('
-			. (int)round($this->R, 0)
-			. ' '
-			. (int)round($this->G, 0)
-			. ' '
-			. (int)round($this->B, 0)
-			. Utils::setOpacity($opacity)
-			. ')';
-		if ($was_linear) {
-			$this->toLinear();
-		}
-		return $string;
-	}
-}
-
-// __END__

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

@@ -1,202 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/11/11
- * DESCRIPTION:
- * Color Coordinate: XYZ (Cie) (colorspace CIEXYZ)
- * Note, this is only for the D50 & D65 whitepoint conversion
- * https://en.wikipedia.org/wiki/CIE_1931_color_space#Construction_of_the_CIE_XYZ_color_space_from_the_Wright%E2%80%93Guild_data
- * https://en.wikipedia.org/wiki/Standard_illuminant#Illuminant_series_D
- * https://en.wikipedia.org/wiki/Standard_illuminant#D65_values
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert\Color\Coordinates;
-
-// use CoreLibs\Convert\Color\Utils;
-
-class XYZ implements Interface\CoordinatesInterface
-{
-	/** @var array<string> allowed colorspaces */
-	private const COLORSPACES = ['CIEXYZ'];
-	/** @var array<string> allowed whitepoints
-	 * D50: ICC profile PCS (horizon light) <-> CieLab
-	 * D65: RGB color space (noon) <-> linear RGB
-	 */
-	private const ILLUMINANT = ['D50', 'D65'];
-
-	/** @var float X coordinate */
-	private float $X = 0.0;
-	/** @var float Y coordinate (Luminance) */
-	private float $Y = 0.0;
-	/** @var float Z coordinate (blue) */
-	private float $Z = 0.0;
-
-	/** @var string color space: either ok or cie */
-	private string $colorspace = '';
-
-	/** @var string illuminat white point: only D50 and D65 are allowed */
-	private string $whitepoint = '';
-
-	/**
-	 * Color Coordinate Lch
-	 * for oklch conversion
-	 *
-	 * @param string|array{0:float,1:float,2:float} $colors
-	 * @param string $colorspace [default=CIEXYZ]
-	 * @param array<string,string> $options [default=[]] Only "whitepoint" option allowed
-	 * @throws \InvalidArgumentException only array colors allowed
-	 */
-	public function __construct(
-		string|array $colors,
-		string $colorspace = 'CIEXYZ',
-		array $options = [],
-	) {
-		if (!is_array($colors)) {
-			throw new \InvalidArgumentException('Only array colors allowed', 0);
-		}
-		$this->setColorspace($colorspace)
-			->parseOptions($options)
-			->setFromArray($colors);
-	}
-
-	/**
-	 * set from array
-	 * where 0: X, 1: Y, 2: Z
-	 *
-	 * @param array{0:float,1:float,2:float} $colors
-	 * @param string $colorspace [default=CIEXYZ]
-	 * @param array<string,string> $options [default=[]] Only "whitepoint" option allowed
-	 * @return self
-	 */
-	public static function create(
-		string|array $colors,
-		string $colorspace = 'CIEXYZ',
-		array $options = [],
-	): self {
-		return new XYZ($colors, $colorspace, $options);
-	}
-
-	/**
-	 * parse options
-	 *
-	 * @param  array<string,string> $options
-	 * @return self
-	 */
-	private function parseOptions(array $options): self
-	{
-		$this->setWhitepoint($options['whitepoint'] ?? '');
-		return $this;
-	}
-
-	/**
-	 * set color
-	 *
-	 * @param  string $name
-	 * @param  float  $value
-	 * @return void
-	 */
-	private function set(string $name, float $value): void
-	{
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		// TODO: setup XYZ value limits
-		// X: 0 to 95.047, Y: 0 to 100, Z: 0 to 108.88
-		// if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL))) {
-		// 	throw new \LengthException('Argument value ' . $value . ' for color ' . $name
-		// 		. ' is not in the range of 0 to 100.0', 1);
-		// }
-		$this->$name = $value;
-	}
-
-	/**
-	 * get color
-	 *
-	 * @param string $name
-	 * @return float
-	 */
-	public function get(string $name): float|string|bool
-	{
-		if (!property_exists($this, $name)) {
-			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
-		}
-		return $this->$name;
-	}
-
-	/**
-	 * set the colorspace
-	 *
-	 * @param  string $colorspace
-	 * @return self
-	 */
-	private function setColorspace(string $colorspace): self
-	{
-		if (!in_array($colorspace, $this::COLORSPACES)) {
-			throw new \InvalidArgumentException('Not allowed colorspace', 0);
-		}
-		$this->colorspace = $colorspace;
-		return $this;
-	}
-
-	/**
-	 * set the whitepoint flag
-	 *
-	 * @param  string $whitepoint
-	 * @return self
-	 */
-	private function setWhitepoint(string $whitepoint): self
-	{
-		if (empty($whitepoint)) {
-			$this->whitepoint = '';
-			return $this;
-		}
-		if (!in_array($whitepoint, $this::ILLUMINANT)) {
-			throw new \InvalidArgumentException('Not allowed whitepoint', 0);
-		}
-		$this->whitepoint = $whitepoint;
-		return $this;
-	}
-
-	/**
-	 * Returns the color as array
-	 * where 0: X, 1: Y, 2: Z
-	 *
-	 * @return array{0:float,1:float,2:float}
-	 */
-	public function returnAsArray(): array
-	{
-		return [$this->X, $this->Y, $this->Z];
-	}
-
-	/**
-	 * set color as array
-	 * where 0: X, 1: Y, 2: Z
-	 *
-	 * @param  array{0:float,1:float,2:float} $colors
-	 * @return self
-	 */
-	private function setFromArray(array $colors): self
-	{
-		$this->set('X', $colors[0]);
-		$this->set('Y', $colors[1]);
-		$this->set('Z', $colors[2]);
-		return $this;
-	}
-
-	/**
-	 * no hsb in css
-	 *
-	 * @param  float|string|null $opacity
-	 * @return string
-	 * @throws \ErrorException
-	 */
-	public function toCssString(null|float|string $opacity = null): string
-	{
-		throw new \ErrorException('XYZ is not available as CSS color string', 0);
-	}
-}
-
-// __END__

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

@@ -1,35 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/11/11
- * DESCRIPTION:
- * Convert color coordinate to CSS string
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert\Color;
-
-use CoreLibs\Convert\Color\Coordinates\RGB;
-use CoreLibs\Convert\Color\Coordinates\HSL;
-use CoreLibs\Convert\Color\Coordinates\HWB;
-use CoreLibs\Convert\Color\Coordinates\Lab;
-use CoreLibs\Convert\Color\Coordinates\LCH;
-
-class Stringify
-{
-	/**
-	 * return the CSS string including optional opacity
-	 *
-	 * @param  RGB|Lab|LCH|HSL|HWB $data
-	 * @param  null|float|string   $opacity
-	 * @return string
-	 */
-	public static function toCssString(RGB|Lab|LCH|HSL|HWB $data, null|float|string $opacity): string
-	{
-		return $data->toCssString($opacity);
-	}
-}
-
-// __END__

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

@@ -1,56 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/11/14
- * DESCRIPTION:
- * Utils for color
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert\Color;
-
-use CoreLibs\Convert\Math;
-
-class Utils
-{
-	/** @var float deviation allowed for valid data checks, small */
-	public const EPSILON_SMALL  = 0.000000000001;
-	/** @var float deviation allowed for valid data checks, medium */
-	public const EPSILON_MEDIUM = 0.0000001;
-	/** @var float deviation allowed for valid data checks, big */
-	public const ESPILON_BIG    = 0.0001;
-
-	public static function compare(float $lower, float $value, float $upper, float $epslion): bool
-	{
-		if (
-			Math::compareWithEpsilon($value, '<', $lower, $epslion) ||
-			Math::compareWithEpsilon($value, '>', $upper, $epslion)
-		) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Build the opactiy sub string part and return it
-	 *
-	 * @param  null|float|string|null $opacity
-	 * @return string
-	 */
-	public static function setOpacity(null|float|string $opacity = null): string
-	{
-		// set opacity, either a string or float
-		if (is_string($opacity)) {
-			$opacity = ' / ' . $opacity;
-		} elseif ($opacity !== null) {
-			$opacity = ' / ' . $opacity;
-		} else {
-			$opacity = '';
-		}
-		return $opacity;
-	}
-}
-
-// __END__

www/lib/CoreLibs/Convert/Colors.php

@@ -17,9 +17,6 @@ declare(strict_types=1);
 
 namespace CoreLibs\Convert;
 
-use CoreLibs\Convert\Color\Color;
-use CoreLibs\Convert\Color\Coordinates;
-
 class Colors
 {
 	/**
@@ -33,7 +30,6 @@ class Colors
 	 * @param  bool   $hex_prefix default true, prefix with "#"
 	 * @return string             rgb in hex values with leading # if set,
 	 * @throws \LengthException If any argument is not in the range of 0~255
-	 * @deprecated v9.20.0 use: new Coordinates\RGB([$red, $green, $blue]))->returnAsHex(true/false for #)
 	 */
 	public static function rgb2hex(
 		int $red,
@@ -41,7 +37,20 @@ class Colors
 		int $blue,
 		bool $hex_prefix = true
 	): string {
-		return (new Coordinates\RGB([$red, $green, $blue]))->returnAsHex($hex_prefix);
+		$hex_color = '';
+		if ($hex_prefix === true) {
+			$hex_color = '#';
+		}
+		foreach (['red', 'green', 'blue'] as $color) {
+			// if not valid, abort
+			if ($$color < 0 || $$color > 255) {
+				throw new \LengthException('Argument value ' . $$color . ' for color ' . $color
+					. ' is not in the range of 0 to 255', 1);
+			}
+			// pad left with 0
+			$hex_color .= str_pad(dechex($$color), 2, '0', STR_PAD_LEFT);
+		}
+		return $hex_color;
 	}
 
 	/**
@@ -54,29 +63,32 @@ class Colors
 	 *                                        or a string with the seperator
 	 * @throws \InvalidArgumentException if hex string is empty
 	 * @throws \UnexpectedValueException if the hex string value is not valid
-	 * @deprecated v9.20.0 use: new Coordinates\RGB($hex_string) (build string/array from return data)
 	 */
 	public static function hex2rgb(
 		string $hex_string,
 		bool $return_as_string = false,
 		string $seperator = ','
 	): string|array {
+		$hex_string = preg_replace("/[^0-9A-Fa-f]/", '', $hex_string); // Gets a proper hex string
+		if (!is_string($hex_string)) {
+			throw new \InvalidArgumentException('hex_string argument cannot be empty', 1);
+		}
 		$rgbArray = [];
-		// rewrite to previous r/g/b key output
+		if (strlen($hex_string) == 6) {
-		foreach ((new Coordinates\RGB($hex_string))->returnAsArray() as $p => $el) {
+			// If a proper hex code, convert using bitwise operation.
-			$k = '';
+			// No overhead... faster
-			switch ($p) {
+			$colorVal = hexdec($hex_string);
-				case 0:
+			$rgbArray['r'] = 0xFF & ($colorVal >> 0x10);
-					$k = 'r';
+			$rgbArray['g'] = 0xFF & ($colorVal >> 0x8);
-					break;
+			$rgbArray['b'] = 0xFF & $colorVal;
-				case 1:
+		} elseif (strlen($hex_string) == 3) {
-					$k = 'g';
+			// If shorthand notation, need some string manipulations
-					break;
+			$rgbArray['r'] = hexdec(str_repeat(substr($hex_string, 0, 1), 2));
-				case 2:
+			$rgbArray['g'] = hexdec(str_repeat(substr($hex_string, 1, 1), 2));
-					$k = 'b';
+			$rgbArray['b'] = hexdec(str_repeat(substr($hex_string, 2, 1), 2));
-					break;
+		} else {
-			}
+			// Invalid hex color code
-			$rgbArray[$k] = (int)round($el);
+			throw new \UnexpectedValueException('Invalid hex_string: ' . $hex_string, 2);
 		}
 		// returns the rgb string or the associative array
 		return $return_as_string ? implode($seperator, $rgbArray) : $rgbArray;
@@ -93,16 +105,42 @@ class Colors
 	 * @param  int $blue        blue 0-255
 	 * @return array<int|float> Hue, Sat, Brightness/Value
 	 * @throws \LengthException If any argument is not in the range of 0~255
-	 * @deprecated v9.20.0 use: Color::rgbToHsb(...)->returnAsArray() will return float unrounded
 	 */
 	public static function rgb2hsb(int $red, int $green, int $blue): array
 	{
-		return array_map(
+		// check that rgb is from 0 to 255
-			fn ($v) => (int)round($v),
+		foreach (['red', 'green', 'blue'] as $color) {
-			Color::rgbToHsb(
+			if ($$color < 0 || $$color > 255) {
-				new Coordinates\RGB([$red, $green, $blue])
+				throw new \LengthException('Argument value ' . $$color . ' for color ' . $color
-			)->returnAsArray()
+					. ' is not in the range of 0 to 255', 1);
-		);
+			}
+			$$color = $$color / 255;
+		}
+
+		$MAX = max($red, $green, $blue);
+		$MIN = min($red, $green, $blue);
+		$HUE = 0;
+
+		if ($MAX == $MIN) {
+			return [0, 0, round($MAX * 100)];
+		}
+		if ($red == $MAX) {
+			$HUE = ($green - $blue) / ($MAX - $MIN);
+		} elseif ($green == $MAX) {
+			$HUE = 2 + (($blue - $red) / ($MAX - $MIN));
+		} elseif ($blue == $MAX) {
+			$HUE = 4 + (($red - $green) / ($MAX - $MIN));
+		}
+		$HUE *= 60;
+		if ($HUE < 0) {
+			$HUE += 360;
+		}
+
+		return [
+			(int)round($HUE),
+			(int)round((($MAX - $MIN) / $MAX) * 100),
+			(int)round($MAX * 100)
+		];
 	}
 
 	/**
@@ -115,16 +153,80 @@ class Colors
 	 * @param  float $V   brightness/value 0-100 (int)
 	 * @return array<int> 0 red/1 green/2 blue array as 0-255
 	 * @throws \LengthException If any argument is not in the valid range
-	 * @deprecated v9.20.0 use: Color::hsbToRgb(...)->returnAsArray() will return float unrounded
 	 */
 	public static function hsb2rgb(float $H, float $S, float $V): array
 	{
-		return array_map(
+		// check that H is 0 to 359, 360 = 0
-			fn ($v) => (int)round($v),
+		// and S and V are 0 to 1
-			Color::hsbToRgb(
+		if ($H == 360) {
-				new Coordinates\HSB([$H, $S, $V])
+			$H = 0;
-			)->returnAsArray()
+		}
-		);
+		if ($H < 0 || $H > 359) {
+			throw new \LengthException('Argument value ' . $H . ' for hue is not in the range of 0 to 359', 1);
+		}
+		if ($S < 0 || $S > 100) {
+			throw new \LengthException('Argument value ' . $S . ' for saturation is not in the range of 0 to 100', 2);
+		}
+		if ($V < 0 || $V > 100) {
+			throw new \LengthException('Argument value ' . $V . ' for brightness is not in the range of 0 to 100', 3);
+		}
+		// convert to internal 0-1 format
+		$S /= 100;
+		$V /= 100;
+
+		if ($S == 0) {
+			$V = (int)round($V * 255);
+			return [$V, $V, $V];
+		}
+
+		$Hi = floor($H / 60);
+		$f = ($H / 60) - $Hi;
+		$p = $V * (1 - $S);
+		$q = $V * (1 - ($S * $f));
+		$t = $V * (1 - ($S * (1 - $f)));
+
+		switch ($Hi) {
+			case 0:
+				$red = $V;
+				$green = $t;
+				$blue = $p;
+				break;
+			case 1:
+				$red = $q;
+				$green = $V;
+				$blue = $p;
+				break;
+			case 2:
+				$red = $p;
+				$green = $V;
+				$blue = $t;
+				break;
+			case 3:
+				$red = $p;
+				$green = $q;
+				$blue = $V;
+				break;
+			case 4:
+				$red = $t;
+				$green = $p;
+				$blue = $V;
+				break;
+			case 5:
+				$red = $V;
+				$green = $p;
+				$blue = $q;
+				break;
+			default:
+				$red = 0;
+				$green = 0;
+				$blue = 0;
+		}
+
+		return [
+			(int)round($red * 255),
+			(int)round($green * 255),
+			(int)round($blue * 255)
+		];
 	}
 
 	/**
@@ -137,16 +239,50 @@ class Colors
 	 * @param  int $blue    blue 0-255
 	 * @return array<float> hue/sat/luminance
 	 * @throws \LengthException If any argument is not in the range of 0~255
-	 * @deprecated v9.20.0 use: Color::rgbToHsl(...)->returnAsArray() will return float unrounded
 	 */
 	public static function rgb2hsl(int $red, int $green, int $blue): array
 	{
-		return array_map(
+		// check that rgb is from 0 to 255
-			fn ($v) => round($v, 1),
+		foreach (['red', 'green', 'blue'] as $color) {
-			Color::rgbToHsl(
+			if ($$color < 0 || $$color > 255) {
-				new Coordinates\RGB([$red, $green, $blue])
+				throw new \LengthException('Argument value ' . $$color . ' for color ' . $color
-			)->returnAsArray()
+					. ' is not in the range of 0 to 255', 1);
-		);
+			}
+			$$color = $$color / 255;
+		}
+
+		$min = min($red, $green, $blue);
+		$max = max($red, $green, $blue);
+		$chroma = $max - $min;
+		$sat = 0;
+		$hue = 0;
+		// luminance
+		$lum = ($max + $min) / 2;
+
+		// achromatic
+		if ($chroma == 0) {
+			// H, S, L
+			return [0.0, 0.0, round($lum * 100, 1)];
+		} else {
+			$sat = $chroma / (1 - abs(2 * $lum - 1));
+			if ($max == $red) {
+				$hue = fmod((($green - $blue) / $chroma), 6);
+				if ($hue < 0) {
+					$hue = (6 - fmod(abs($hue), 6));
+				}
+			} elseif ($max == $green) {
+				$hue = ($blue - $red) / $chroma + 2;
+			} elseif ($max == $blue) {
+				$hue = ($red - $green) / $chroma + 4;
+			}
+			$hue = $hue * 60;
+			// $sat = 1 - abs(2 * $lum - 1);
+			return [
+				round($hue, 1),
+				round($sat * 100, 1),
+				round($lum * 100, 1)
+			];
+		}
 	}
 
 	/**
@@ -158,16 +294,57 @@ class Colors
 	 * @param  float $lum           luminance: 0-100
 	 * @return array<int,float|int> red/blue/green 0-255 each
 	 * @throws \LengthException If any argument is not in the valid range
-	 * @deprecated v9.20.0 use: Color::hslToRgb(...)->returnAsArray() will return float unrounded
 	 */
 	public static function hsl2rgb(float $hue, float $sat, float $lum): array
 	{
-		return array_map(
+		if ($hue == 360) {
-			fn ($v) => round($v),
+			$hue = 0;
-			Color::hslToRgb(
+		}
-				new Coordinates\HSL([$hue, $sat, $lum])
+		if ($hue < 0 || $hue > 359) {
-			)->returnAsArray()
+			throw new \LengthException('Argument value ' . $hue . ' for hue is not in the range of 0 to 359', 1);
-		);
+		}
+		if ($sat < 0 || $sat > 100) {
+			throw new \LengthException('Argument value ' . $sat . ' for saturation is not in the range of 0 to 100', 2);
+		}
+		if ($lum < 0 || $lum > 100) {
+			throw new \LengthException('Argument value ' . $lum . ' for luminance is not in the range of 0 to 100', 3);
+		}
+		// calc to internal convert value for hue
+		$hue = (1 / 360) * $hue;
+		// convert to internal 0-1 format
+		$sat /= 100;
+		$lum /= 100;
+		// if saturation is 0
+		if ($sat == 0) {
+			$lum = (int)round($lum * 255);
+			return [$lum, $lum, $lum];
+		} else {
+			$m2 = $lum < 0.5 ? $lum * ($sat + 1) : ($lum + $sat) - ($lum * $sat);
+			$m1 = $lum * 2 - $m2;
+			$hueue = function ($base) use ($m1, $m2) {
+				// base = hue, hue > 360 (1) - 360 (1), else < 0 + 360 (1)
+				$base = $base < 0 ? $base + 1 : ($base > 1 ? $base - 1 : $base);
+				// 6: 60, 2: 180, 3: 240
+				// 2/3 = 240
+				// 1/3 = 120 (all from 360)
+				if ($base * 6 < 1) {
+					return $m1 + ($m2 - $m1) * $base * 6;
+				}
+				if ($base * 2 < 1) {
+					return $m2;
+				}
+				if ($base * 3 < 2) {
+					return $m1 + ($m2 - $m1) * ((2 / 3) - $base) * 6;
+				}
+				return $m1;
+			};
+
+			return [
+				(int)round(255 * $hueue($hue + (1 / 3))),
+				(int)round(255 * $hueue($hue)),
+				(int)round(255 * $hueue($hue - (1 / 3)))
+			];
+		}
 	}
 }
 

www/lib/CoreLibs/Convert/Math.php

@@ -56,180 +56,6 @@ class Math
 			return (float)$number;
 		}
 	}
-
-	/**
-	 * calc cube root
-	 *
-	 * @param  float $number Number to cubic root
-	 * @return float         Calculated value
-	 */
-	public static function cbrt(float|int $number): float
-	{
-		return pow((float)$number, 1.0 / 3);
-	}
-
-	/**
-	 * use PHP_FLOAT_EPSILON to compare if two float numbers are matching
-	 *
-	 * @param  float $x
-	 * @param  float $y
-	 * @param  float $epsilon [default=PHP_FLOAT_EPSILON]
-	 * @return bool  True equal
-	 */
-	public static function equalWithEpsilon(float $x, float $y, float $epsilon = PHP_FLOAT_EPSILON): bool
-	{
-		if (abs($x - $y) < $epsilon) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Compare two value base on direction given
-	 * The default delta is PHP_FLOAT_EPSILON
-	 *
-	 * @param  float  $value
-	 * @param  string $compare
-	 * @param  float  $limit
-	 * @param  float  $epsilon [default=PHP_FLOAT_EPSILON]
-	 * @return bool   True on smaller/large or equal
-	 */
-	public static function compareWithEpsilon(
-		float $value,
-		string $compare,
-		float $limit,
-		float $epsilon = PHP_FLOAT_EPSILON
-	): bool {
-		switch ($compare) {
-			case '<':
-				if ($value < ($limit - $epsilon)) {
-					return true;
-				}
-				break;
-			case '<=':
-				if ($value <= ($limit - $epsilon)) {
-					return true;
-				}
-				break;
-			case '==':
-				return self::equalWithEpsilon($value, $limit, $epsilon);
-			case '>':
-				if ($value > ($limit + $epsilon)) {
-					return true;
-				}
-				break;
-			case '>=':
-				if ($value >= ($limit + $epsilon)) {
-					return true;
-				}
-				break;
-		}
-		return false;
-	}
-
-	/**
-	 * This function is directly inspired by the multiplyMatrices() function in color.js
-	 * form Lea Verou and Chris Lilley.
-	 * (see https://github.com/LeaVerou/color.js/blob/main/src/multiply-matrices.js)
-	 * From:
-	 * https://github.com/matthieumastadenis/couleur/blob/3842cf51c9517e77afaa0a36ec78643a0c258e0b/src/utils/utils.php#L507
-	 *
-	 * It returns an array which is the product of the two number matrices passed as parameters.
-	 *
-	 * NOTE:
-	 * if the right side (B matrix) has a missing row, this row will be fillwed with 0 instead of
-	 * throwing an error:
-	 * A:
-	 * [
-	 *   [1, 2, 3],
-	 *   [4, 5, 6],
-	 * ]
-	 * B:
-	 * [
-	 *   [7, 8, 9],
-	 *   [10, 11, 12],
-	 * ]
-	 * The B will get a third row with [0, 0, 0] added to make the multiplication work as it will be
-	 * rewritten as
-	 * B-rewrite:
-	 * [
-	 *   [7, 10, 0],
-	 *   [8, 11, 12],
-	 *   [0, 0, 0] <- automatically added
-	 * ]
-	 *
-	 * The same is done for unbalanced entries, they are filled with 0
-	 *
-	 * @param  array<float|int|array<int|float>> $a m x n matrice
-	 * @param  array<float|int|array<int|float>> $b n x p matrice
-	 *
-	 * @return array<float|int|array<int|float>>    m x p product
-	 */
-	public static function multiplyMatrices(array $a, array $b): array
-	{
-		$m = count($a);
-
-		if (!is_array($a[0] ?? null)) {
-			// $a is vector, convert to [[a, b, c, ...]]
-			$a = [$a];
-		}
-
-		if (!is_array($b[0])) {
-			// $b is vector, convert to [[a], [b], [c], ...]]
-			$b = array_map(
-				callback: fn ($v) => [ $v ],
-				array: $b,
-			);
-		}
-
-		$p = count($b[0]);
-
-		// transpose $b:
-		// so that we can multiply row by row
-		$bCols = array_map(
-			callback: fn ($k) => array_map(
-				(fn ($i) => is_array($i) ? $i[$k] ?? 0 : 0),
-				$b,
-			),
-			array: array_keys($b[0]),
-		);
-
-		$product = array_map(
-			callback: fn ($row) => array_map(
-				callback: fn ($col) => is_array($row) ?
-					array_reduce(
-						array: $row,
-						callback: fn ($a, $v, $i = null) => $a + $v * (
-							// if last entry missing for full copy add a 0 to it
-							$col[$i ?? array_search($v, $row, true)] ?? 0 /** @phpstan-ignore-line */
-						),
-						initial: 0,
-					) :
-					array_reduce(
-						array: $col,
-						callback: fn ($a, $v) => $a + $v * $row,
-						initial: 0,
-					),
-				array: $bCols,
-			),
-			array: $a,
-		);
-
-		if ($m === 1) {
-			// Avoid [[a, b, c, ...]]:
-			return $product[0];
-		}
-
-		if ($p === 1) {
-			// Avoid [[a], [b], [c], ...]]:
-			return array_map(
-				callback: fn ($v) => $v[0] ?? 0,
-				array: $product,
-			);
-		}
-
-		return $product;
-	}
 }
 
 // __END__

www/lib/CoreLibs/Create/Session.php

@@ -15,111 +15,17 @@ namespace CoreLibs\Create;
 
 class Session
 {
-	/** @var string current session name */
-	private string $session_name = '';
-	/** @var string current session id */
-	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(
+	public function __construct(string $session_name = '')
-		string $session_name,
-		array $options = []
-	) {
-		$this->setOptions($options);
-		$this->initSession($session_name);
-	}
-
-	// 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 (
+		if (!empty($session_name)) {
-			!isset($options['auto_write_close']) ||
+			$this->startSession($session_name);
-			!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);
 	}
 
 	/**
@@ -130,100 +36,38 @@ class Session
 	 *
 	 * @return void
 	 */
-	private function startSessionCall(): void
+	protected function startSessionCall(): void
 	{
 		session_start();
 	}
 
 	/**
-	 * get current set session id or false if none started
+	 * check if we are in CLI, we set this, so we can mock this
+	 * Not this is just a wrapper for the static System::checkCLI call
 	 *
-	 * @return string|false
+	 * @return bool True if we are in a CLI enviroment, or false for everything else
 	 */
-	public function getSessionIdCall(): string|false
+	public function checkCliStatus(): bool
 	{
-		return session_id();
+		return \CoreLibs\Get\System::checkCLI();
 	}
 
 	/**
-	 * automatically closes a session if the auto write close flag is set
+	 * Set session name call. If not valid session name, will return false
 	 *
-	 * @return bool
+	 * @param  string $session_name A valid string for session name
+	 * @return bool                 True if session name is valid,
+	 *                              False if not
 	 */
-	private function closeSessionCall(): bool
+	public function setSessionName(string $session_name): bool
 	{
-		if ($this->auto_write_close) {
+		if (!$this->checkValidSessionName($session_name)) {
-			return $this->writeClose();
+			return false;
 		}
-		return false;
+		session_name($session_name);
+		return true;
 	}
 
-	// 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
 	 *
@@ -250,34 +94,15 @@ class Session
 	}
 
 	/**
-	 * validate _SESSION key, must be valid variable
+	 * start session with given session name if set
-	 *
-	 * @param  int|float|string $key
-	 * @return true
-	 */
-	private function checkValidSessionEntryKey(int|float|string $key): true
-	{
-		if (!is_string($key) || is_numeric($key)) {
-			throw new \UnexpectedValueException(
-				'[SESSION] Given key for _SESSION is not a valid value for a varaible: ' . $key,
-				1
-			);
-		}
-		return true;
-	}
-
-	// MARK: init session (on class start)
-
-	/**
-	 * stinitart session with given session name if set
 	 * aborts on command line or if sessions are not enabled
 	 * also aborts if session cannot be started
 	 * On sucess returns the session id
 	 *
-	 * @param string $session_name
+	 * @param string|null $session_name
-	 * @return void
+	 * @return string|bool
 	 */
-	private function initSession(string $session_name): void
+	public function startSession(?string $session_name = null): string|bool
 	{
 		// we can't start sessions on command line
 		if ($this->checkCliStatus()) {
@@ -290,94 +115,39 @@ class Session
 		// session_status
 		// initial the session if there is no session running already
 		if (!$this->checkActiveSession()) {
-			// invalid session name, abort
+			// if session name is emtpy, check if there is a global set
-			if (!$this->checkValidSessionName($session_name)) {
+			// this is a deprecated fallback
-				throw new \UnexpectedValueException('[SESSION] Invalid session name: ' . $this->session_name, 3);
+			$session_name = $session_name ?? $GLOBALS['SET_SESSION_NAME'] ?? '';
+			// DEPRECTED: constant SET_SESSION_NAME is no longer used
+			// if set, set special session name
+			if (!empty($session_name)) {
+				// invalid session name, abort
+				if (!$this->checkValidSessionName($session_name)) {
+					throw new \UnexpectedValueException('[SESSION] Invalid session name: ' . $session_name, 3);
+				}
+				$this->setSessionName($session_name);
 			}
-			// set session name
-			$this->session_name = $session_name;
-			session_name($this->session_name);
 			// start session
 			$this->startSessionCall();
-			// if we faild to start the 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(),
-				4
-			);
 		}
-		// check session id
+		// if we still have no active session
-		if (false === ($session_id = $this->getSessionIdCall())) {
-			throw new \UnexpectedValueException('[SESSION] getSessionIdCall did not return a session id', 7);
-		}
-		// 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();
-		}
-	}
-
-	// MARK: public set/get status
-
-	/**
-	 * start session, will only run after initSession
-	 *
-	 * @return bool True if started, False if alrady running
-	 */
-	public function restartSession(): bool
-	{
 		if (!$this->checkActiveSession()) {
-			if (empty($this->session_name)) {
+			throw new \RuntimeException('[SESSION] Failed to activate session', 4);
-				throw new \RuntimeException('[SESSION] Cannot restart session without a session name', 1);
-			}
-			$this->startSessionCall();
-			return true;
 		}
-		return false;
+		if (false === ($session_id = $this->getSessionId())) {
+			throw new \UnexpectedValueException('[SESSION] getSessionId did not return a session id', 5);
+		}
+		return $session_id;
 	}
 
 	/**
-	 * current set session id
+	 * get current set session id or false if none started
 	 *
-	 * @return string
+	 * @return string|bool
 	 */
-	public function getSessionId(): string
+	public function getSessionId(): string|bool
 	{
-		return $this->session_id;
+		return session_id();
-	}
-
-	/**
-	 * set the auto write close flag
-	 *
-	 * @param  bool $flag
-	 * @return void
-	 */
-	public function setAutoWriteClose(bool $flag): void
-	{
-		$this->auto_write_close = $flag;
-	}
-
-	/**
-	 * return the auto write close flag
-	 *
-	 * @return bool
-	 */
-	public function checkAutoWriteClose(): bool
-	{
-		return $this->auto_write_close;
 	}
 
 	/**
@@ -405,34 +175,6 @@ class Session
 		}
 	}
 
-	/**
-	 * check if we are in CLI, we set this, so we can mock this
-	 * Not this is just a wrapper for the static System::checkCLI call
-	 *
-	 * @return bool True if we are in a CLI enviroment, or false for everything else
-	 */
-	public function checkCliStatus(): bool
-	{
-		return \CoreLibs\Get\System::checkCLI();
-	}
-
-	/**
-	 * get session status
-	 * PHP_SESSION_DISABLED if sessions are disabled.
-	 * PHP_SESSION_NONE if sessions are enabled, but none exists.
-	 * PHP_SESSION_ACTIVE if sessions are enabled, and one exists.
-	 *
-	 * https://www.php.net/manual/en/function.session-status.php
-	 *
-	 * @return int See possible return int values above
-	 */
-	public function getSessionStatus(): int
-	{
-		return session_status();
-	}
-
-	// MARK: write close session
-
 	/**
 	 * unlock the session file, so concurrent AJAX requests can be done
 	 * NOTE: after this has been called, no changes in _SESSION will be stored
@@ -446,24 +188,17 @@ class Session
 		return session_write_close();
 	}
 
-	// MARK: session close and clean up
-
 	/**
 	 * Proper destroy a session
 	 * - unset the _SESSION array
 	 * - unset cookie if cookie on and we have not strict mode
-	 * - unset session_name and session_id internal vars
 	 * - destroy session
 	 *
-	 * @return bool True on successful session destroy
+	 * @return bool
 	 */
 	public function sessionDestroy(): bool
 	{
-		// abort to false if not unsetable
+		$_SESSION = [];
-		if (!session_unset()) {
-			return false;
-		}
-		$this->clear();
 		if (
 			ini_get('session.use_cookies') &&
 			!ini_get('session.use_strict_mode')
@@ -483,92 +218,68 @@ class Session
 				$params['httponly']
 			);
 		}
-		// unset internal vars
-		$this->session_name = '';
-		$this->session_id = '';
 		return session_destroy();
 	}
 
-	// MARK: _SESSION set/unset methods
+	/**
+	 * get session status
+	 * PHP_SESSION_DISABLED if sessions are disabled.
+	 * PHP_SESSION_NONE if sessions are enabled, but none exists.
+	 * PHP_SESSION_ACTIVE if sessions are enabled, and one exists.
+	 *
+	 * https://www.php.net/manual/en/function.session-status.php
+	 *
+	 * @return int See possible return int values above
+	 */
+	public function getSessionStatus(): int
+	{
+		return session_status();
+	}
+
+	// _SESSION set/unset methods
 
 	/**
 	 * unset all _SESSION entries
 	 *
 	 * @return void
 	 */
-	public function clear(): void
+	public function unsetAllS(): void
 	{
-		$this->restartSession();
+		foreach (array_keys($_SESSION ?? []) as $name) {
-		if (!session_unset()) {
+			unset($_SESSION[$name]);
-			throw new \RuntimeException('[SESSION] Cannot unset session vars', 1);
 		}
-		if (!empty($_SESSION)) {
-			$_SESSION = [];
-		}
-		$this->closeSessionCall();
 	}
 
 	/**
 	 * set _SESSION entry 'name' with any value
 	 *
-	 * @param  string $name  array name in _SESSION
+	 * @param  string|int $name  array name in _SESSION
-	 * @param  mixed  $value value to set (can be anything)
+	 * @param  mixed      $value value to set (can be anything)
 	 * @return void
 	 */
-	public function set(string $name, mixed $value): void
+	public function setS(string|int $name, mixed $value): void
 	{
-		$this->checkValidSessionEntryKey($name);
-		$this->restartSession();
 		$_SESSION[$name] = $value;
-		$this->closeSessionCall();
-	}
-
-	/**
-	 * set many session entries in one set
-	 *
-	 * @param  array<string,mixed> $set key is the key in the _SESSION, value is any data to set
-	 * @return void
-	 */
-	public function setMany(array $set): void
-	{
-		$this->restartSession();
-		// skip any that are not valid
-		foreach ($set as $key => $value) {
-			$this->checkValidSessionEntryKey($key);
-			$_SESSION[$key] = $value;
-		}
-		$this->closeSessionCall();
 	}
 
 	/**
 	 * get _SESSION 'name' entry or empty string if not set
 	 *
-	 * @param  string $name value key to get from _SESSION
+	 * @param  string|int $name value key to get from _SESSION
-	 * @return mixed        value stored in _SESSION, if not found set to null
+	 * @return mixed            value stored in _SESSION
 	 */
-	public function get(string $name): mixed
+	public function getS(string|int $name): mixed
 	{
-		return $_SESSION[$name] ?? null;
+		return $_SESSION[$name] ?? '';
-	}
-
-	/**
-	 * get multiple session entries
-	 *
-	 * @param  array<string> $set
-	 * @return array<string,mixed>
-	 */
-	public function getMany(array $set): array
-	{
-		return array_intersect_key($_SESSION, array_flip($set));
 	}
 
 	/**
 	 * Check if a name is set in the _SESSION array
 	 *
-	 * @param  string $name Name to check for
+	 * @param  string|int $name Name to check for
-	 * @return bool                   True for set, False fornot set
+	 * @return bool             True for set, False fornot set
 	 */
-	public function isset(string $name): bool
+	public function issetS(string|int $name): bool
 	{
 		return isset($_SESSION[$name]);
 	}
@@ -576,35 +287,67 @@ class Session
 	/**
 	 * unset one _SESSION entry 'name' if exists
 	 *
-	 * @param  string $name _SESSION key name to remove
+	 * @param  string|int $name _SESSION key name to remove
 	 * @return void
 	 */
-	public function unset(string $name): void
+	public function unsetS(string|int $name): void
 	{
-		if (!isset($_SESSION[$name])) {
+		if (isset($_SESSION[$name])) {
-			return;
+			unset($_SESSION[$name]);
 		}
-		$this->restartSession();
+	}
-		unset($_SESSION[$name]);
+
-		$this->closeSessionCall();
+	// set/get below
+	// ->var = value;
+
+	/**
+	 * Undocumented function
+	 *
+	 * @param  string|int $name
+	 * @param  mixed      $value
+	 * @return void
+	 */
+	public function __set(string|int $name, mixed $value): void
+	{
+		$_SESSION[$name] = $value;
 	}
 
 	/**
-	 * reset many session entry
+	 * Undocumented function
 	 *
-	 * @param  array<string> $set list of session keys to reset
+	 * @param  string|int $name
+	 * @return mixed            If name is not found, it will return null
+	 */
+	public function __get(string|int $name): mixed
+	{
+		if (isset($_SESSION[$name])) {
+			return $_SESSION[$name];
+		}
+		return null;
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @param  string|int $name
+	 * @return bool
+	 */
+	public function __isset(string|int $name): bool
+	{
+		return isset($_SESSION[$name]);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @param  string|int $name
 	 * @return void
 	 */
-	public function unsetMany(array $set): void
+	public function __unset(string|int $name): void
 	{
-		$this->restartSession();
+		if (isset($_SESSION[$name])) {
-		foreach ($set as $key) {
+			unset($_SESSION[$name]);
-			if (!isset($_SESSION[$key])) {
-				continue;
-			}
-			unset($_SESSION[$key]);
 		}
-		$this->closeSessionCall();
 	}
 }
 

www/lib/CoreLibs/Create/Uids.php

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

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

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

www/lib/CoreLibs/DB/IO.php

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

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

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

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

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

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

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

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

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

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

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