First phpstan strict check

.eslintrc.js

@@ -1,43 +0,0 @@
-module.exports = {
-	'env': {
-		'browser': true,
-		'es6': true,
-		'commonjs': true,
-		'jquery': true
-	},
-	'extends': 'eslint:recommended',
-	'parserOptions': {
-		'ecmaVersion': 6
-	},
-	'rules': {
-		'indent': [
-			'error',
-			'tab',
-			{
-				'SwitchCase': 1
-			}
-		],
-		'linebreak-style': [
-			'error',
-			'unix'
-		],
-		'quotes': [
-			'error',
-			'single'
-		],
-		'semi': [
-			'error',
-			'always'
-		],
-		'no-console': 'off',
-		'no-unused-vars': [
-			'error', {
-				'vars': 'all',
-				'args': 'after-used',
-				'ignoreRestSiblings': false
-			}
-		],
-		// Requires eslint >= v8.14.0
-		'no-constant-binary-expression': 'error'
-	}
-};

.gitignore

@@ -1,7 +0,0 @@
-.libs
-node_modules/
-composer.lock
-vendor/
-tools/
-www/composer.lock
-www/vendor

.phan/config.php

@@ -27,7 +27,6 @@ use Phan\Config;
 
 return [
 	// "target_php_version" => "8.2",
-	"minimum_target_php_version" => "8.2",
 	// turn color on (-C)
 	"color_issue_messages_if_supported" => true,
 	// If true, missing properties will be created when
@@ -96,6 +95,8 @@ return [
 	"exclude_analysis_directory_list" => [
 		'www/vendor',
 		'www/tests',
+		'www/lib/Smarty',
+		'www/lib/smarty-4.3.0',
 		'www/templates_c',
 		'www/log',
 		'www/tmp',
@@ -116,6 +117,10 @@ return [
 		// ignore the old qq tests
 		'www/admin/qq_file_upload_front.php',
 		'www/admin/qq_file_upload_ajax.php',
+		// symlink ignore
+		'www/lib/smarty-4.3.0/libs/Smarty.class.php',
+		// legacy edit base (until removal)
+		'www/includes/edit_base.LEGACY.php'
 	],
 
 	// what not to show as problem
@@ -128,12 +133,7 @@ return [
 		'PhanWriteOnlyPublicProperty',
 		'PhanUnreferencedConstant',
 		'PhanWriteOnlyPublicProperty',
-		'PhanReadOnlyPublicProperty',
-		// start ignore annotations
-		'PhanUnextractableAnnotationElementName',
-		'PhanUnextractableAnnotationSuffix',
-		// enum problems in comments
-		'PhanCommentObjectInClassConstantType'
+		'PhanReadOnlyPublicProperty'
 	],
 
 	// Override to hardcode existence and types of (non-builtin) globals in the global scope.

.phive/phars.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phive xmlns="https://phar.io/phive">
-  <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="phan" version="^5.4.2" installed="5.4.3" location="./tools/phan" copy="false"/>
-  <phar name="psalm" version="^5.15.0" installed="5.24.0" location="./tools/psalm" copy="false"/>
-  <phar name="phpdox" version="^0.12.0" installed="0.12.0" location="./tools/phpdox" copy="false"/>
-  <phar name="phpdocumentor" version="^3.4.2" installed="3.4.3" location="./tools/phpDocumentor" copy="false"/>
-  <phar name="php-cs-fixer" version="^3.34.1" installed="3.57.2" location="./tools/php-cs-fixer" copy="false"/>
-</phive>

.shellcheckrc

@@ -1,2 +0,0 @@
-shell=bash
-external-sources=true

4dev/bin/create_mo.sh

@@ -1,20 +1,19 @@
 #!/usr/bin/env bash
 
-BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/";
+BASE_FOLDER=$(dirname $(readlink -f $0))"/";
 # Assume script is in 4dev/bin
 base_folder="${BASE_FOLDER}../../www/";
 
 # locale gettext po to mo translator master
-for file in "${base_folder}"../4dev/locale/*.po; do
-	[[ -e "$file" ]] || break
-	file=$(basename "$file" .po);
+for file in $(ls -1 ${base_folder}../4dev/locale/*.po); do
+	file=$(basename $file .po);
 	locale=$(echo "${file}" | cut -d "-" -f 1);
 	domain=$(echo "${file}" | cut -d "-" -f 2);
 	echo "- Translate language file '${file}' for locale '${locale}' and domain '${domain}':";
 	if [ ! -d "${base_folder}/includes/locale/${locale}/LC_MESSAGES/" ]; then
 		mkdir -p "${base_folder}/includes/locale/${locale}/LC_MESSAGES/";
 	fi;
-	msgfmt -o "${base_folder}/includes/locale/${locale}/LC_MESSAGES/${domain}.mo" "${base_folder}../4dev/locale/${locale}-${domain}.po";
+	msgfmt -o ${base_folder}/includes/locale/${locale}/LC_MESSAGES/${domain}.mo ${base_folder}../4dev/locale/${locale}-${domain}.po;
 done;
 
 # __END__

4dev/bin/mo_to_js.sh

@@ -2,18 +2,16 @@
 
 # read source mo files and writes target js files in object form
 
-# check for ARG 1 is "no-move"
-# then do not move the files directly for manual check
-FILE_MOVE=1;
-if [ "${1}" = "no-move" ]; then
-	echo "+++ CREATE TEMPORARY FILES +++";
-	FILE_MOVE=0;
-else
+# check for ARG 1 is "mv"
+# then move the files directly and don't do manual check (don't create temp files)
+FILE_MOVE=0;
+if [ "${1}" = "mv" ]; then
 	echo "*** Direct write ***";
+	FILE_MOVE=1;
 fi;
 
 target='';
-BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/";
+BASE_FOLDER=$(dirname $(readlink -f $0))"/";
 # Assume script is in 4dev/bin
 base_folder="${BASE_FOLDER}../../www/";
 po_folder='../4dev/locale/'
@@ -28,9 +26,9 @@ if [ "${target}" == '' ]; then
 	echo "*** Non smarty ***";
 	TEXTDOMAINDIR=${base_folder}${mo_folder}.
 	# default is admin
-	TEXTDOMAIN="admin";
+	TEXTDOMAIN=admin;
 fi;
-js_folder="${TEXTDOMAIN}/layout/javascript/";
+js_folder="layout/${TEXTDOMAIN}/javascript/";
 
 error=0;
 # this checks if the TEXTDOMAIN target actually exists
@@ -46,16 +44,15 @@ if [ ${error} -eq 1 ]; then
 fi;
 
 # locale gettext po to mo translator master
-for file in "${base_folder}"../4dev/locale/*.po; do
-	[[ -e "$file" ]] || break
-	file=$(basename "$file" .po);
+for file in $(ls -1 ${base_folder}../4dev/locale/*.po); do
+	file=$(basename $file .po);
+	echo "Translate language ${file}";
 	locale=$(echo "${file}" | cut -d "-" -f 1);
 	domain=$(echo "${file}" | cut -d "-" -f 2);
-	echo "- Translate language file '${file}' for locale '${locale}' and domain '${domain}':";
 	if [ ! -d "${base_folder}/includes/locale/${locale}/LC_MESSAGES/" ]; then
 		mkdir -p "${base_folder}/includes/locale/${locale}/LC_MESSAGES/";
 	fi;
-	msgfmt -o "${base_folder}/includes/locale/${locale}/LC_MESSAGES/${domain}.mo" "${base_folder}${po_folder}${locale}-${domain}.po";
+	msgfmt -o ${base_folder}/includes/locale/${locale}/LC_MESSAGES/${domain}.mo ${base_folder}${po_folder}${locale}-${domain}.po;
 done;
 
 rx_msgid_empty="^msgid \"\"";
@@ -65,7 +62,7 @@ rx_msgstr="^msgstr \""
 # quick copy string at the end
 quick_copy='';
 
-for language in "${language_list[@]}"; do
+for language in ${language_list[*]}; do
 	# I don't know which one must be set, but I think at least LANGUAGE
 	case ${language} in
 		ja)
@@ -82,8 +79,7 @@ for language in "${language_list[@]}"; do
 	esac;
 	# write only one for language and then symlink files
 	template_file=$(echo ${template_file_stump} | sed -e "s/##SUFFIX##//" | sed -e "s/##LANGUAGE##/${LANG}/");
-	# original_file=$(echo ${template_file} | sed -e 's/\.TMP//g');
-	original_file=${template_file//.TMP/};
+	original_file=$(echo ${template_file} | sed -e 's/\.TMP//g');
 	if [ "${FILE_MOVE}" -eq 0 ]; then
 		file=${target_folder}${template_file};
 	else
@@ -92,18 +88,16 @@ for language in "${language_list[@]}"; do
 	echo "===> Write translation file ${file}";
 	echo ". = normal, : = escape, x = skip";
 	# init line [aka don't touch this file]
-	echo "// AUTO FILL, changes will be overwritten" > "$file";
-	{
-		echo "// source: ${suffix}, language: ${language}";
-		echo "// Translation strings in the format";
-		echo "// \"Original\":\"Translated\""$'\n'
-		echo "var i18n = {"
-	}  >> "$file"
+	echo "// AUTO FILL, changes will be overwritten" > $file;
+	echo "// source: ${suffix}, language: ${language}" >> $file;
+	echo "// Translation strings in the format" >> $file;
+	echo "// \"Original\":\"Translated\""$'\n' >> $file;
+	echo "var i18n = {" >> $file;
 	# translations stuff
 	# read the po file
 	pos=0; # do we add a , for the next line
 	cat "${base_folder}${po_folder}${language}-${TEXTDOMAIN}.po" |
-	while read -r str; do
+	while read str; do
 		# echo "S: ${str}";
 		# skip empty
 		if [[ "${str}" =~ ${rx_msgid_empty} ]]; then
@@ -118,13 +112,12 @@ for language in "${language_list[@]}"; do
 			str_source=$(echo "${str}" | sed -e "s/^msgid \"//" | sed -e "s/\"$//");
 			# close right side, if not last add ,
 			if [ "${pos}" -eq 1 ]; then
-				echo -n "," >> "$file";
+				echo -n "," >> $file;
 			fi;
 			# all " inside string need to be escaped
-			# str_source=$(echo "${str_source}" | sed -e 's/"/\\"/g');
-			str_source=${str_source//\"/\\\"}
+			str_source=$(echo "${str_source}" | sed -e 's/"/\\"/g');
 			# fix with proper layout
-			echo -n "\"$str_source\":\"$(TEXTDOMAINDIR=${TEXTDOMAINDIR} LANGUAGE=${language} LANG=${LANG} gettext "${TEXTDOMAIN}" "${str_source}")\"" >> "$file";
+			echo -n "\"$str_source\":\"$(TEXTDOMAINDIR=${TEXTDOMAINDIR} LANGUAGE=${language} LANG=${LANG} gettext ${TEXTDOMAIN} "${str_source}")\"" >> $file;
 			pos=1;
 		elif [[ "${str}" =~ ${rx_msgstr} ]]; then
 			# open right side (ignore)
@@ -135,8 +128,8 @@ for language in "${language_list[@]}"; do
 		fi;
 	done;
 
-	echo "" >> "$file";
-	echo "};" >> "$file";
+	echo "" >> $file;
+	echo "};" >> $file;
 	echo " [DONE]";
 
 	# on no move
@@ -147,19 +140,19 @@ for language in "${language_list[@]}"; do
 	fi;
 
 	# symlink to master file
-	for suffix in "${source_list[@]}"; do
+	for suffix in ${source_list[*]}; do
 		# symlink with full lang name
 		symlink_file[0]=$(echo ${template_file_stump} | sed -e "s/##SUFFIX##/${suffix}_/" | sed -e "s/##LANGUAGE##/${LANG}/" | sed -e 's/\.TMP//g');
 		# create second one with lang (no country) + encoding
 		symlink_file[1]=$(echo ${template_file_stump} | sed -e "s/##SUFFIX##/${suffix}_/" | sed -e "s/##LANGUAGE##/${LANGUAGE}\.${ENCODING}/" | sed -e 's/\.TMP//g');
-		for template_file in "${symlink_file[@]}"; do
+		for template_file in ${symlink_file[@]}; do
 		# if this is not symlink, create them
 			if [ ! -h "${template_file}" ]; then
 				echo "Create symlink: ${template_file}";
 				# symlik to original
-				cd "${target_folder}" || exit;
+				cd "${target_folder}";
 				ln -sf "${original_file}" "${template_file}";
-				cd - >/dev/null || exit;
+				cd - >/dev/null;
 			fi;
 		done;
 	done;

4dev/checking/phan.sh

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

4dev/checking/phpstan.sh

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

4dev/checking/phpunit.sh

@@ -12,31 +12,28 @@ if [ "${1}" = "t" ] || [ "${2}" = "t" ]; then
 	opt_testdox="--testdox";
 fi;
 php_bin="";
-if [ -n "${1}" ]; then
+if [ ! -z "${1}" ]; then
 	case "${1}" in
 		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
-		# "7.4") php_bin="/usr/bin/php7.4 "; ;;
-		# "8.0") php_bin="/usr/bin/php8.0 "; ;;
-		# "8.1") php_bin="/usr/bin/php8.1 "; ;;
+		"7.4") php_bin="/usr/bin/php7.4 "; ;;
+		"8.0") php_bin="/usr/bin/php8.0 "; ;;
+		"8.1") php_bin="/usr/bin/php8.1 "; ;;
 		"8.2") php_bin="/usr/bin/php8.2 "; ;;
-		"8.3") php_bin="/usr/bin/php8.4 "; ;;
 		*) echo "Not support PHP: ${1}"; exit; ;;
 	esac;
 fi;
-if [ -n "${2}" ] && [ -z "${php_bin}" ]; then
+if [ ! -z "${2}" ] && [ -z "${php_bin}" ]; then
 	case "${2}" in
 		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
-		# "7.4") php_bin="/usr/bin/php7.4 "; ;;
-		# "8.0") php_bin="/usr/bin/php8.0 "; ;;
-		# "8.1") php_bin="/usr/bin/php8.1 "; ;;
+		"7.4") php_bin="/usr/bin/php7.4 "; ;;
+		"8.0") php_bin="/usr/bin/php8.0 "; ;;
+		"8.1") php_bin="/usr/bin/php8.1 "; ;;
 		"8.2") php_bin="/usr/bin/php8.2 "; ;;
-		"8.3") php_bin="/usr/bin/php8.3 "; ;;
 		*) echo "Not support PHP: ${1}"; exit; ;;
 	esac;
 fi;
 
-# 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}www/vendor/bin/phpunit ${opt_testdox} -c ${base}phpunit.xml ${base}4dev/tests/";
 
 ${phpunit_call};
 

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

@@ -1,22 +0,0 @@
-#!/bin/env bash
-
-# syncs
-# 4dev/tests/
-# www/lib/CoreLibs/
-#
-# to the composer corelibs all repo
-
-GO="${1}";
-DRY_RUN="";
-if [ "${GO}" != "go" ]; then
-	DRY_RUN="-n ";
-fi;
-
-BASE="/storage/var/www/html/developers/clemens/core_data/";
-SOURCE="${BASE}php_libraries/master/"
-TARGET="${BASE}composer-packages/CoreLibs-Composer-All/"
-
-rsync ${DRY_RUN}-Plzvrupt --stats --delete ${SOURCE}4dev/tests/ ${TARGET}test/phpunit/
-rsync ${DRY_RUN}-Plzvrupt --stats --delete ${SOURCE}www/lib/CoreLibs/ ${TARGET}src/
-
-# __END__

4dev/database/function/set_edit_generic.sql

@@ -9,7 +9,6 @@ BEGIN
     IF TG_OP = 'INSERT' THEN
         NEW.date_created := 'now';
         NEW.cuid := random_string(random_length);
-        NEW.cuuid := gen_random_uuid();
     ELSIF TG_OP = 'UPDATE' THEN
         NEW.date_updated := 'now';
     END IF;

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,11 +7,9 @@
 
 -- 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,
     username VARCHAR,
     password VARCHAR,
     event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
@@ -23,7 +21,6 @@ CREATE TABLE edit_log (
     page VARCHAR,
     action VARCHAR,
     action_id VARCHAR,
-    action_sub_id VARCHAR,
     action_yes VARCHAR,
     action_flag VARCHAR,
     action_menu VARCHAR,

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,

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/documentation/DB_Query_Params.md

@@ -1,31 +0,0 @@
-# DB Query Params ? and : to $
-
-dbReturn*
-dbExec
-
-keep
-->query
-->params
-for reference
-
-## : named params
-
-in order for each named found replace with order number:
-
-```txt
-:name, :foo, :bar, :name =>
-$1,    $2,   $3,    $1
-```
-
-```php
-$query = str_replace(
-    [':name', ':foo', ':bar'],
-    ['$1', '$2', '$3'],
-    $query
-);
-```
-
-## ? Params
-
-Foreach ? set $1 to $n and store that in new params array
-in QUERY for each ? replace with matching $n

4dev/sync/sync_template.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # create path
 path=$(pwd)"/"$0;
@@ -10,11 +10,6 @@ TARGET_HOST_WEB="<user>@<host>";
 TMP_DIR=$LOCAL_BASE_DIR"/4dev/tmp/";
 tmpf_web=$TMP_DIR"sync.exclude.tmp";
 
-if [ ! -d "$LOCAL_BASE_DIR" ]; then
-	echo "Folder: $LOCAL_BASE_DIR not found";
-	exit;
-fi;
-
 # if vendor be sure group folder is +x
 chmod -R ug+rX ${LOCAL_DIR}/vender/
 

4dev/tests/AAASetupData/CoreLibsAAASetupDataTest.php

@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test base setup
- * @testdox AAASetupData\AAASetupDataTest just setup BASE
- */
-final class CoreLibsAAASetupDataTest extends TestCase
-{
-	/**
-	 * Covers nothing
-	 *
-	 * @testdox Just setup BASE
-	 *
-	 * @return void
-	 */
-	public function testSetupData(): void
-	{
-		if (!defined('BASE')) {
-			define(
-				'BASE',
-				str_replace('/configs', '', __DIR__)
-					. DIRECTORY_SEPARATOR
-			);
-		}
-		$this->assertEquals(
-			str_replace('/configs', '', __DIR__)
-				. DIRECTORY_SEPARATOR,
-			BASE,
-			'BASE Path set check'
-		);
-	}
-}
-
-// __END__

4dev/tests/AAASetupData/includes

@@ -1 +0,0 @@
-../Language/includes/

4dev/tests/AAASetupData/log

@@ -1 +0,0 @@
-../Debug/log/

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/includes

@@ -1 +0,0 @@
-../AAASetupData/includes

4dev/tests/Convert/CoreLibsConvertMathTest.php

@@ -1,500 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Undocumented class
- * @coversDefaultClass \CoreLibs\Convert\Math
- * @testdox \CoreLibs\Convert\Math method tests
- */
-final class CoreLibsConvertMathTest extends TestCase
-{
-	/**
-	 * Undocumented function
-	 *
-	 * @return array<mixed>
-	 */
-	public function providerFceil(): array
-	{
-		return [
-			'5.5 must be 6' => [5.5, 6],
-			'5.1234567890 with 5 must be 6' => [5.1234567890, 6],
-			'6 must be 6' => [6, 6]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::fceil
-	 * @dataProvider providerFceil
-	 * @testdox fceil: Input $input must be $expected
-	 *
-	 * @param float $input
-	 * @param int $expected
-	 * @return void
-	 */
-	public function testMathFceilValue(float $input, int $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Math::fceil($input)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array<mixed>
-	 */
-	public function providerFloor(): array
-	{
-		return [
-			'5123456 with -3 must be 5123000' => [5123456, -3, 5123000],
-			'5123456 with -10 must be 5000000' => [5123456, -10, 5000000]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::floorp
-	 * @dataProvider providerFloor
-	 * @testdox floor: Input $input with cutoff $cutoff must be $expected
-	 *
-	 * @param int $input
-	 * @param int $cutoff
-	 * @param int $expected
-	 * @return void
-	 */
-	public function testMathFloorValue(int $input, int $cutoff, int $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Math::floorp($input, $cutoff)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array<mixed>
-	 */
-	public function providerInitNumeric(): array
-	{
-		return [
-			'5 must be 5' => [5, 5, 'int'],
-			'5.123 must be 5.123' => [5.123, 5.123, 'float'],
-			"'5' must be 5" => ['5', 5, 'string'],
-			"'5.123' must be 5.123" => ['5.123', 5.123, 'string'],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::initNumeric
-	 * @dataProvider providerInitNumeric
-	 * @testdox initNumeric: Input $info $input must match $expected [$_dataName]
-	 *
-	 * @param int|float|string $input
-	 * @param float $expected
-	 * @param string $info
-	 * @return void
-	 */
-	public function testMathInitNumericValue($input, float $expected, string $info): void
-	{
-		$this->assertEquals(
-			$expected,
-			\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/Convert/data/UTF8.csv

@@ -1 +0,0 @@
-Asset Type,Epic,File Name

4dev/tests/Convert/data/UTF8BOM.csv

@@ -1 +0,0 @@
-Asset Type,Epic,File Name

4dev/tests/CoreLibsACLLoginTest.php

@@ -7,14 +7,6 @@ namespace tests;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 
-/*
-Not yet covered tests:
-- loginGetLocale
-- loginGetHeaderColor
-- loginGetPages
-- loginGetEuid
-*/
-
 /**
  * Test class for ACL\Login
  * @coversDefaultClass \CoreLibs\ACL\Login
@@ -68,10 +60,13 @@ final class CoreLibsACLLoginTest extends TestCase
 
 		// logger is always needed
 		// define basic connection set valid and one invalid
-		self::$log = new \CoreLibs\Logging\Logging([
+		self::$log = new \CoreLibs\Debug\Logging([
 			// 'log_folder' => __DIR__ . DIRECTORY_SEPARATOR . 'log',
 			'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
-			'log_file_id' => 'CoreLibs-ACL-Login-Test',
+			'file_id' => 'CoreLibs-ACL-Login-Test',
+			'debug_all' => true,
+			'echo_all' => false,
+			'print_all' => true,
 		]);
 		// test database we need to connect do, if not possible this test is skipped
 		self::$db = new \CoreLibs\DB\IO(
@@ -125,6 +120,8 @@ final class CoreLibsACLLoginTest extends TestCase
 		// define('LOGIN_DB_SCHEMA', '');
 
 		// SHOULD SET
+		// PASSWORD_MIN_LENGTH (d9)
+		// PASSWORD_MAX_LENGTH (d255)
 		// DEFAULT_ACL_LEVEL (d80)
 
 		// OPT:
@@ -167,10 +164,8 @@ final class CoreLibsACLLoginTest extends TestCase
 		//             change_password, pw_username, pw_old_password, pw_new_password,
 		//             pw_new_password_confirm
 		// 3[session]: override session set
-		// 4[error]  : expected error code, 0 for all ok, 100 for login page view
-		//             note that 1000 (no db), 2000 (no session), 3000 (options set error)
-		//             must be tested too
-		//             <1000 info, >=1000 critical error
+		// 4[error]  : expected error code, 0 for all ok, 3000 for login page view
+		//             note that 1000 (no db), 2000 (no session) must be tested too
 		// 5[return] : expected return array, eg login_error code,
 		//             or other info data to match
 		$tests = [
@@ -182,7 +177,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				[],
 				[],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 0,
 					'error_string' => 'Success: <b>No error</b>',
@@ -200,7 +195,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				[],
 				[],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 0,
 					'error_string' => 'Success: <b>No error</b>',
@@ -223,7 +218,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				[],
 				[],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 0,
 					'error_string' => 'Success: <b>No error</b>',
@@ -243,8 +238,6 @@ final class CoreLibsACLLoginTest extends TestCase
 				[],
 				[
 					'EUID' => 1,
-					'ECUID' => 'abc',
-					'ECUUID' => '1233456-1234-1234-1234-123456789012',
 				],
 				2,
 				[],
@@ -262,16 +255,12 @@ final class CoreLibsACLLoginTest extends TestCase
 				[],
 				[
 					'EUID' => 1,
-					'ECUID' => 'abc',
-					'ECUUID' => '1233456-1234-1234-1234-123456789012',
 					'USER_NAME' => '',
 					'GROUP_NAME' => '',
 					'ADMIN' => 1,
 					'GROUP_ACL_LEVEL' => -1,
 					'PAGES_ACL_LEVEL' => [],
 					'USER_ACL_LEVEL' => -1,
-					'USER_ADDITIONAL_ACL' => [],
-					'GROUP_ADDITIONAL_ACL' => [],
 					'UNIT_UID' => [
 						'AdminAccess' => 1,
 					],
@@ -285,7 +274,6 @@ final class CoreLibsACLLoginTest extends TestCase
 							'data' => [
 								'test' => 'value',
 							],
-							'additional_acl' => []
 						],
 					],
 					// 'UNIT_DEFAULT' => '',
@@ -314,7 +302,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					'login_password' => '',
 				],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 102,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -335,7 +323,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					'login_password' => 'abc',
 				],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 102,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -356,7 +344,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					'login_password' => '',
 				],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 102,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -377,7 +365,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					'login_password' => 'abc',
 				],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 1010,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -401,7 +389,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					'login_password' => 'abc',
 				],
 				[],
-				100,
+				3000,
 				[
 					// default password is plain text
 					'login_error' => 1012,
@@ -427,7 +415,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					'login_password' => 'admin',
 				],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 106,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -452,7 +440,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					'login_password' => 'admin',
 				],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 104,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -477,7 +465,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					'login_password' => 'admin',
 				],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 105,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -526,7 +514,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					'login_password' => 'admin',
 				],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 107,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -580,7 +568,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					'login_password' => 'admin',
 				],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 107,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -606,7 +594,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					'login_password' => 'admin',
 				],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 107,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -631,7 +619,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					'login_password' => 'admin',
 				],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 108,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -767,7 +755,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				],
 				[],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 1010,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -859,7 +847,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				],
 				[],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 1101,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -915,7 +903,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				],
 				[],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 1102,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -971,7 +959,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				],
 				[],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 1102,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -998,7 +986,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				],
 				[],
 				[],
-				100,
+				3000,
 				[
 					'login_error' => 1102,
 					'error_string' => '<span style="color: red;">Fatal Error:</span> '
@@ -1089,9 +1077,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 () {
@@ -1118,28 +1106,13 @@ final class CoreLibsACLLoginTest extends TestCase
 
 		/** @var \CoreLibs\ACL\Login&MockObject */
 		$login_mock = $this->getMockBuilder(\CoreLibs\ACL\Login::class)
-			->setConstructorArgs([
-				self::$db,
-				self::$log,
-				$session_mock,
-				[
-					'auto_login' => false,
-					'default_acl_level' => 80,
-					'logout_target' => '',
-					'site_locale' => 'en_US.UTF-8',
-					'site_domain' => 'admin',
-					'site_encoding' => 'UTF-8',
-					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
-						. 'includes' . DIRECTORY_SEPARATOR
-						. 'locale' . DIRECTORY_SEPARATOR,
-				]
-			])
+			->setConstructorArgs([self::$db, self::$log, $session_mock, false])
 			->onlyMethods(['loginTerminate', 'loginReadPageName', 'loginPrintLogin'])
 			->getMock();
 		$login_mock->expects($this->any())
 			->method('loginTerminate')
 			->will(
-				$this->returnCallback(function ($message, $code) {
+				$this->returnCallback(function ($code) {
 					throw new \Exception('', $code);
 				})
 			);
@@ -1233,11 +1206,7 @@ final class CoreLibsACLLoginTest extends TestCase
 			$login_mock->loginSetMaxLoginErrorCount($mock_settings['max_login_error_count']);
 			// temporary wrong password
 			$_POST['login_password'] = 'wrong';
-			for (
-				$run = 1, $max_run = $login_mock->loginGetMaxLoginErrorCount();
-				$run <= $max_run;
-				$run++
-			) {
+			for ($run = 1, $max_run = $login_mock->loginGetMaxLoginErrorCount(); $run <= $max_run; $run++) {
 				try {
 					$login_mock->loginMainCall();
 				} catch (\Exception $e) {
@@ -1485,10 +1454,10 @@ final class CoreLibsACLLoginTest extends TestCase
 			// print "AJAX: " . $login_mock->loginGetAjaxFlag() . "\n";
 			// print "AJAX GLOBAL: " . ($GLOBALS['AJAX_PAGE'] ?? '{f}') . "\n";
 			// print "Login error expext: " . ($expected['login_error'] ?? '{0}') . "\n";
-			// if this is 100, then we do further error checks
+			// if this is 3000, then we do further error checks
 			if (
-				$e->getCode() == 100 ||
-				!empty($_POST['login_exit']) && $_POST['login_exit'] == 100
+				$e->getCode() == 3000 ||
+				!empty($_POST['login_exit']) && $_POST['login_exit'] == 3000
 			) {
 				$this->assertEquals(
 					$expected['login_error'],
@@ -1760,7 +1729,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				],
 				20
 			],
-			'invalid search' => [
+			'invalud search' => [
 				12,
 				'foo',
 				[],
@@ -1792,9 +1761,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 () {
@@ -1805,28 +1774,13 @@ final class CoreLibsACLLoginTest extends TestCase
 		);
 		/** @var \CoreLibs\ACL\Login&MockObject */
 		$login_mock = $this->getMockBuilder(\CoreLibs\ACL\Login::class)
-			->setConstructorArgs([
-				self::$db,
-				self::$log,
-				$session_mock,
-				[
-					'auto_login' => false,
-					'default_acl_level' => 80,
-					'logout_target' => '',
-					'site_locale' => 'en_US.UTF-8',
-					'site_domain' => 'admin',
-					'site_encoding' => 'UTF-8',
-					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
-						. 'includes' . DIRECTORY_SEPARATOR
-						. 'locale' . DIRECTORY_SEPARATOR,
-				]
-			])
+			->setConstructorArgs([self::$db, self::$log, $session_mock, false])
 			->onlyMethods(['loginTerminate'])
 			->getMock();
 		$login_mock->expects($this->any())
 			->method('loginTerminate')
 			->will(
-				$this->returnCallback(function ($message, $code) {
+				$this->returnCallback(function ($code) {
 					throw new \Exception('', $code);
 				})
 			);
@@ -1906,9 +1860,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 () {
@@ -1919,28 +1873,13 @@ final class CoreLibsACLLoginTest extends TestCase
 		);
 		/** @var \CoreLibs\ACL\Login&MockObject */
 		$login_mock = $this->getMockBuilder(\CoreLibs\ACL\Login::class)
-			->setConstructorArgs([
-				self::$db,
-				self::$log,
-				$session_mock,
-				[
-					'auto_login' => false,
-					'default_acl_level' => 80,
-					'logout_target' => '',
-					'site_locale' => 'en_US.UTF-8',
-					'site_domain' => 'admin',
-					'site_encoding' => 'UTF-8',
-					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
-						. 'includes' . DIRECTORY_SEPARATOR
-						. 'locale' . DIRECTORY_SEPARATOR,
-				]
-			])
+			->setConstructorArgs([self::$db, self::$log, $session_mock, false])
 			->onlyMethods(['loginTerminate'])
 			->getMock();
 		$login_mock->expects($this->any())
 			->method('loginTerminate')
 			->will(
-				$this->returnCallback(function ($message, $code) {
+				$this->returnCallback(function ($code) {
 					throw new \Exception('', $code);
 				})
 			);
@@ -1994,9 +1933,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 () {
@@ -2007,28 +1946,13 @@ final class CoreLibsACLLoginTest extends TestCase
 		);
 		/** @var \CoreLibs\ACL\Login&MockObject */
 		$login_mock = $this->getMockBuilder(\CoreLibs\ACL\Login::class)
-			->setConstructorArgs([
-				self::$db,
-				self::$log,
-				$session_mock,
-				[
-					'auto_login' => false,
-					'default_acl_level' => 80,
-					'logout_target' => '',
-					'site_locale' => 'en_US.UTF-8',
-					'site_domain' => 'admin',
-					'site_encoding' => 'UTF-8',
-					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
-						. 'includes' . DIRECTORY_SEPARATOR
-						. 'locale' . DIRECTORY_SEPARATOR,
-				]
-			])
+			->setConstructorArgs([self::$db, self::$log, $session_mock, false])
 			->onlyMethods(['loginTerminate'])
 			->getMock();
 		$login_mock->expects($this->any())
 			->method('loginTerminate')
 			->will(
-				$this->returnCallback(function ($message, $code) {
+				$this->returnCallback(function ($code) {
 					throw new \Exception('', $code);
 				})
 			);
@@ -2090,9 +2014,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 () {
@@ -2103,28 +2027,13 @@ final class CoreLibsACLLoginTest extends TestCase
 		);
 		/** @var \CoreLibs\ACL\Login&MockObject */
 		$login_mock = $this->getMockBuilder(\CoreLibs\ACL\Login::class)
-			->setConstructorArgs([
-				self::$db,
-				self::$log,
-				$session_mock,
-				[
-					'auto_login' => false,
-					'default_acl_level' => 80,
-					'logout_target' => '',
-					'site_locale' => 'en_US.UTF-8',
-					'site_domain' => 'admin',
-					'site_encoding' => 'UTF-8',
-					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
-						. 'includes' . DIRECTORY_SEPARATOR
-						. 'locale' . DIRECTORY_SEPARATOR,
-				]
-			])
+			->setConstructorArgs([self::$db, self::$log, $session_mock, false])
 			->onlyMethods(['loginTerminate'])
 			->getMock();
 		$login_mock->expects($this->any())
 			->method('loginTerminate')
 			->will(
-				$this->returnCallback(function ($message, $code) {
+				$this->returnCallback(function ($code) {
 					throw new \Exception('', $code);
 				})
 			);

4dev/tests/CoreLibsCheckColorsTest.php

@@ -13,11 +13,6 @@ use PHPUnit\Framework\TestCase;
  */
 final class CoreLibsCheckColorsTest extends TestCase
 {
-	/**
-	 * Undocumented function
-	 *
-	 * @return array<mixed>
-	 */
 	public function validateColorProvider(): array
 	{
 		/*
@@ -326,7 +321,7 @@ final class CoreLibsCheckColorsTest extends TestCase
 	 */
 	public function testValidateColorException(int $flag): void
 	{
-		$this->expectException(\UnexpectedValueException::class);
+		$this->expectException(\Exception::class);
 		\CoreLibs\Check\Colors::validateColor('#ffffff', $flag);
 	}
 }

4dev/tests/CoreLibsCheckFileTest.php

@@ -28,10 +28,10 @@ final class CoreLibsCheckFileTest extends TestCase
 	public function filesList(): array
 	{
 		return [
-			['filename.txt', 'txt', 5, 'text/plain'],
-			['filename.csv', 'csv', 15, 'text/csv'],
-			['filename.tsv', 'tsv', 0, 'text/plain'],
-			['file_does_not_exits', '', -1, ''],
+			['filename.txt', 'txt', 5],
+			['filename.csv', 'csv', 15],
+			['filename.tsv', 'tsv', 0],
+			['file_does_not_exits', '', -1],
 		];
 	}
 
@@ -63,15 +63,6 @@ final class CoreLibsCheckFileTest extends TestCase
 		return $list;
 	}
 
-	public function mimeTypeProvider(): array
-	{
-		$list = [];
-		foreach ($this->filesList() as $row) {
-			$list[$row[0] . ' must be mime type ' . $row[3]] = [$row[0], $row[3]];
-		}
-		return $list;
-	}
-
 	/**
 	 * Tests if file extension matches
 	 *
@@ -124,51 +115,6 @@ final class CoreLibsCheckFileTest extends TestCase
 			unlink($this->base_folder . $input);
 		}
 	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::getMimeType
-	 * @dataProvider mimeTypeProvider
-	 * @testdox getMimeType $input must be mime type $expected [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testGetMimeType(string $input, string $expected): void
-	{
-		if (!empty($expected)) {
-			$file = $this->base_folder . $input;
-			$fp = fopen($file, 'w');
-			switch ($expected) {
-				case 'text/csv':
-					for ($i = 1; $i <= 10; $i++) {
-						fwrite($fp, '"This is row","' . $expected . '",' . $i . PHP_EOL);
-					}
-					break;
-				case 'text/tsv':
-					for ($i = 1; $i <= 10; $i++) {
-						fwrite($fp, "\"This is row\"\t\"" . $expected . "\"\t\"" . $i . PHP_EOL);
-					}
-					break;
-				case 'text/plain':
-					fwrite($fp, 'This is mime type: ' . $expected . PHP_EOL);
-					break;
-			}
-			fclose($fp);
-		} else {
-			$this->expectException(\UnexpectedValueException::class);
-		}
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Check\File::getMimeType($this->base_folder . $input)
-		);
-		// unlink file
-		if (is_file($this->base_folder . $input)) {
-			unlink($this->base_folder . $input);
-		}
-	}
 }
 
 // __END__

4dev/tests/CoreLibsCheckPasswordTest.php

@@ -7,11 +7,11 @@ namespace tests;
 use PHPUnit\Framework\TestCase;
 
 /**
- * Test class for Security\Password
- * @coversDefaultClass \CoreLibs\Security\Password
- * @testdox \CoreLibs\Security\Password method tests
+ * Test class for Check\Password
+ * @coversDefaultClass \CoreLibs\Check\Password
+ * @testdox \CoreLibs\Check\Password method tests
  */
-final class CoreLibsSecurityPasswordTest extends TestCase
+final class CoreLibsCheckPasswordTest extends TestCase
 {
 	public function passwordProvider(): array
 	{
@@ -46,7 +46,7 @@ final class CoreLibsSecurityPasswordTest extends TestCase
 	{
 		$this->assertEquals(
 			$expected,
-			\CoreLibs\Security\Password::passwordVerify($input, \CoreLibs\Security\Password::passwordSet($input_hash))
+			\CoreLibs\Check\Password::passwordVerify($input, \CoreLibs\Check\Password::passwordSet($input_hash))
 		);
 	}
 
@@ -65,7 +65,7 @@ final class CoreLibsSecurityPasswordTest extends TestCase
 	{
 		$this->assertEquals(
 			$expected,
-			\CoreLibs\Security\Password::passwordRehashCheck($input)
+			\CoreLibs\Check\Password::passwordRehashCheck($input)
 		);
 	}
 }

4dev/tests/CoreLibsCombinedArrayHandlerTest.php

@@ -31,7 +31,6 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 		4,
 		'b',
 		'c' => 'test',
-		'single' => 'single',
 		'same' => 'same',
 		'deep' => [
 			'sub' => [
@@ -108,13 +107,6 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 */
 	public function arraySearchRecursiveAllProvider(): array
 	{
-		/*
-		0: $needle,
-		1: array $input,
-		2: ?string $key_search_for,
-		3: bool $flag,
-		4: array $expected
-		*/
 		return [
 			'find value' => [
 				0 => 'bar',
@@ -180,13 +172,6 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 */
 	public function arraySearchSimpleProvider(): array
 	{
-		/*
-		0: array $input,
-		1: $key,
-		2: $value,
-		3: bool $flag,
-		4: bool $expected
-		*/
 		return [
 			'key/value exist' => [
 				0 => self::$array,
@@ -289,188 +274,6 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function arraySearchKeyProvider(): array
-	{
-		/*
-		0: search in array
-		1: search keys
-		2: flat flag
-		3: prefix flag
-		4: expected array
-		*/
-		return [
-			// single
-			'find single, standard' => [
-				0 => self::$array,
-				1 => ['single'],
-				2 => null,
-				3 => null,
-				4 => [
-					0 => [
-						'value' => 'single',
-						'path' => ['single'],
-					],
-				],
-			],
-			'find single, prefix' => [
-				0 => self::$array,
-				1 => ['single'],
-				2 => null,
-				3 => true,
-				4 => [
-					'single' => [
-						0 => [
-							'value' => 'single',
-							'path' => ['single'],
-						],
-					],
-				],
-			],
-			'find single, flat' => [
-				0 => self::$array,
-				1 => ['single'],
-				2 => true,
-				3 => null,
-				4 => [
-					'single',
-				],
-			],
-			'find single, flat, prefix' => [
-				0 => self::$array,
-				1 => ['single'],
-				2 => true,
-				3 => true,
-				4 => [
-					'single' => [
-						'single',
-					],
-				],
-			],
-			// not found
-			'not found, standard' => [
-				0 => self::$array,
-				1 => ['NOT FOUND'],
-				2 => null,
-				3 => null,
-				4 => [],
-			],
-			'not found, standard, prefix' => [
-				0 => self::$array,
-				1 => ['NOT FOUND'],
-				2 => null,
-				3 => true,
-				4 => [
-					'NOT FOUND' => [],
-				],
-			],
-			'not found, flat' => [
-				0 => self::$array,
-				1 => ['NOT FOUND'],
-				2 => true,
-				3 => null,
-				4 => [],
-			],
-			'not found, flat, prefix' => [
-				0 => self::$array,
-				1 => ['NOT FOUND'],
-				2 => true,
-				3 => true,
-				4 => [
-					'NOT FOUND' => [],
-				],
-			],
-			// multi
-			'multiple found, standard' => [
-				0 => self::$array,
-				1 => ['same'],
-				2 => null,
-				3 => null,
-				4 => [
-					[
-						'value' => 'same',
-						'path' => ['a', 'same', ],
-					],
-					[
-						'value' => 'same',
-						'path' => ['same', ],
-					],
-					[
-						'value' => 'same',
-						'path' => ['deep', 'sub', 'same', ],
-					],
-				]
-			],
-			'multiple found, flat' => [
-				0 => self::$array,
-				1 => ['same'],
-				2 => true,
-				3 => null,
-				4 => ['same', 'same', 'same', ],
-			],
-			// search with multiple
-			'search multiple, standard' => [
-				0 => self::$array,
-				1 => ['single', 'nested'],
-				2 => null,
-				3 => null,
-				4 => [
-					[
-						'value' => 'single',
-						'path' => ['single'],
-					],
-					[
-						'value' => 'bar',
-						'path' => ['deep', 'sub', 'nested', ],
-					],
-				],
-			],
-			'search multiple, prefix' => [
-				0 => self::$array,
-				1 => ['single', 'nested'],
-				2 => null,
-				3 => true,
-				4 => [
-					'single' => [
-						[
-							'value' => 'single',
-							'path' => ['single'],
-						],
-					],
-					'nested' => [
-						[
-							'value' => 'bar',
-							'path' => ['deep', 'sub', 'nested', ],
-						],
-					],
-				],
-			],
-			'search multiple, flat' => [
-				0 => self::$array,
-				1 => ['single', 'nested'],
-				2 => true,
-				3 => null,
-				4 => [
-					'single', 'bar',
-				],
-			],
-			'search multiple, flat, prefix' => [
-				0 => self::$array,
-				1 => ['single', 'nested'],
-				2 => true,
-				3 => true,
-				4 => [
-					'single' => ['single', ],
-					'nested' => ['bar', ],
-				],
-			],
-		];
-	}
-
 	/**
 	 * provides array listing for the merge test
 	 *
@@ -518,20 +321,17 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 		return [
 			// error <2 arguments
 			'too view arguments' => [
-				'ArgumentCountError',
 				'arrayMergeRecursive needs two or more array arguments',
 				[1]
 			],
 			// error <2 arrays
 			'only one array' => [
-				'ArgumentCountError',
 				'arrayMergeRecursive needs two or more array arguments',
 				[1],
 				true,
 			],
 			// error element is not array
 			'non array between array' => [
-				'TypeError',
 				'arrayMergeRecursive encountered a non array argument',
 				[1],
 				'string',
@@ -865,7 +665,7 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 *
 	 * @param array $input
 	 * @param string|int $key
-	 * @param string|int|bool $value
+	 * @param string|int $value
 	 * @param bool $expected
 	 * @return void
 	 */
@@ -877,44 +677,6 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 		);
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @covers::arraySearchKey
-	 * @dataProvider arraySearchKeyProvider
-	 * @testdox arraySearchKey Search array with keys and flat: $flat, prefix: $prefix [$_dataName]
-	 *
-	 * @param  array $input
-	 * @param  array $needles
-	 * @param  bool|null $flat
-	 * @param  bool|null $prefix
-	 * @param  array $expected
-	 * @return void
-	 */
-	public function testArraySearchKey(
-		array $input,
-		array $needles,
-		?bool $flat,
-		?bool $prefix,
-		array $expected
-	): void {
-		if ($flat === null && $prefix === null) {
-			$result = \CoreLibs\Combined\ArrayHandler::arraySearchKey($input, $needles);
-		} elseif ($flat === null) {
-			$result = \CoreLibs\Combined\ArrayHandler::arraySearchKey($input, $needles, prefix: $prefix);
-		} elseif ($prefix === null) {
-			$result = \CoreLibs\Combined\ArrayHandler::arraySearchKey($input, $needles, flat: $flat);
-		} else {
-			$result = \CoreLibs\Combined\ArrayHandler::arraySearchKey($input, $needles, $flat, $prefix);
-		}
-		// print "E: " . print_r($expected, true) . "\n";
-		// print "R: " . print_r($result, true) . "\n";
-		$this->assertEquals(
-			$expected,
-			$result
-		);
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -950,21 +712,19 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 */
 	public function testArrayMergeRecursiveWarningA(): void
 	{
-		// set_error_handler(
-		// 	static function (int $errno, string $errstr): never {
-		// 		throw new Exception($errstr, $errno);
-		// 	},
-		// 	E_USER_WARNING
-		// );
+		set_error_handler(
+			static function (int $errno, string $errstr): never {
+				throw new Exception($errstr, $errno);
+			},
+			E_USER_WARNING
+		);
 
 		$arrays = func_get_args();
 		// first is expected warning
-		$exception = array_shift($arrays);
 		$warning = array_shift($arrays);
 
 		// phpunit 10.0 compatible
-		$this->expectException($exception);
-		$this->expectExceptionMessage($warning);
+		$this->expectExceptionMessage(($warning));
 
 		\CoreLibs\Combined\ArrayHandler::arrayMergeRecursive(...$arrays);
 
@@ -1098,109 +858,16 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 * @testdox arrayFlatForKey array $input will be $expected [$_dataName]
 	 *
 	 * @param array $input
-	 * @param string $search
 	 * @param array $expected
 	 * @return void
 	 */
-	public function testArrayFlatForKey(array $input, string $search, array $expected): void
+	public function testArrayFlatForKey(array $input, $search, array $expected): void
 	{
 		$this->assertEquals(
 			$expected,
 			\CoreLibs\Combined\ArrayHandler::arrayFlatForKey($input, $search)
 		);
 	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerArrayGetNextPrevKey(): array
-	{
-		return [
-			'find, ok' => [
-				'input' => [
-					'a' => 'First',
-					'b' => 'Second',
-					'c' => 'Third',
-				],
-				'b',
-				'a',
-				'c'
-			],
-			'find, first' => [
-				'input' => [
-					'a' => 'First',
-					'b' => 'Second',
-					'c' => 'Third',
-				],
-				'a',
-				null,
-				'b'
-			],
-			'find, last' => [
-				'input' => [
-					'a' => 'First',
-					'b' => 'Second',
-					'c' => 'Third',
-				],
-				'c',
-				'b',
-				null
-			],
-			'find, not found' => [
-				'input' => [
-					'a' => 'First',
-					'b' => 'Second',
-					'c' => 'Third',
-				],
-				'z',
-				null,
-				null
-			],
-			'int, index' => [
-				'input' => [
-					'a',
-					'b',
-					'c'
-				],
-				1,
-				0,
-				2
-			]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::arrayGetPrevKey, ::arrayGetNextKey
-	 * @dataProvider providerArrayGetNextPrevKey
-	 * @testdox arrayGetNextPrevKey get next/prev key for $search wtih $expected_prev/$expected_next [$_dataName]
-	 *
-	 * @param  array           $input
-	 * @param  int|string      $search
-	 * @param  int|string|null $expected_prev
-	 * @param  int|string|null $expected_next
-	 * @return void
-	 */
-	public function testArrayGetNextPrevKey(
-		array $input,
-		int|string $search,
-		int|string|null $expected_prev,
-		int|string|null $expected_next
-	): void {
-		$this->assertEquals(
-			$expected_prev,
-			\CoreLibs\Combined\ArrayHandler::arrayGetPrevKey($input, $search),
-			'Find prev key in array'
-		);
-		$this->assertEquals(
-			$expected_next,
-			\CoreLibs\Combined\ArrayHandler::arrayGetNextKey($input, $search),
-			'Find next key in array'
-		);
-	}
 }
 
 // __END__

4dev/tests/CoreLibsCombinedDateTimeTest.php

@@ -66,34 +66,6 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 		];
 	}
 
-	/**
-	 * date string convert test
-	 *
-	 * @covers ::dateStringFormat
-	 * @dataProvider timestampProvider
-	 * @testdox dateStringFormat $input (microtime $flag) will be $expected [$_dataName]
-	 *
-	 * @param int|float $input
-	 * @param bool      $flag
-	 * @param string    $expected
-	 * @return void
-	 */
-	public function testDateStringFormat(
-		$input,
-		bool $flag_show_micro,
-		bool $flag_micro_as_float,
-		string $expected
-	): void {
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Combined\DateTime::dateStringFormat(
-				$input,
-				$flag_show_micro,
-				$flag_micro_as_float
-			)
-		);
-	}
-
 	/**
 	 * interval for both directions
 	 *
@@ -102,11 +74,6 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 	public function intervalProvider(): array
 	{
 		return [
-			'on hour' => [
-				3600,
-				false,
-				'1h 0m 0s'
-			],
 			'interval no microtime' => [
 				1641515890,
 				false,
@@ -115,7 +82,7 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 			'interval with microtime' => [
 				1641515890,
 				true,
-				'18999d 0h 38m 10s 0ms',
+				'18999d 0h 38m 10s',
 			],
 			'micro interval no microtime' => [
 				1641515890.123456,
@@ -125,7 +92,7 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 			'micro interval with microtime' => [
 				1641515890.123456,
 				true,
-				'18999d 0h 38m 10s 124ms',
+				'18999d 0h 38m 10s 1235ms',
 			],
 			'negative interval no microtime' => [
 				-1641515890,
@@ -136,27 +103,27 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 			'microtime only' => [
 				0.123456,
 				true,
-				'0s 123ms',
+				'0s 1235ms',
 			],
 			'seconds only' => [
 				30.123456,
 				true,
-				'30s 123ms',
+				'30s 1235ms',
 			],
 			'minutes only' => [
 				90.123456,
 				true,
-				'1m 30s 123ms',
+				'1m 30s 1235ms',
 			],
 			'hours only' => [
 				3690.123456,
 				true,
-				'1h 1m 30s 123ms',
+				'1h 1m 30s 1235ms',
 			],
 			'days only' => [
 				90090.123456,
 				true,
-				'1d 1h 1m 30s 123ms',
+				'1d 1h 1m 30s 1235ms',
 			],
 			'already set' => [
 				'1d 1h 1m 30s 1235ms',
@@ -176,306 +143,6 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 		];
 	}
 
-	/**
-	 * time seconds convert test
-	 *
-	 * @covers ::timeStringFormat
-	 * @dataProvider intervalProvider
-	 * @testdox timeStringFormat $input (microtime $flag) will be $expected [$_dataName]
-	 *
-	 * @param string|int|float $input
-	 * @param bool      $flag
-	 * @param string    $expected
-	 * @return void
-	 */
-	public function testTimeStringFormat(string|int|float $input, bool $flag, string $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Combined\DateTime::timeStringFormat($input, $flag)
-		);
-	}
-
-	/**
-	 * interval seconds convert
-	 *
-	 * @covers ::intervalStringFormat
-	 * @dataProvider intervalProvider
-	 * @testdox intervalStringFormat $input (microtime $show_micro) will be $expected [$_dataName]
-	 *
-	 * @param  string|int|float $input
-	 * @param  bool      $show_micro
-	 * @param  string    $expected
-	 * @return void
-	 */
-	public function testIntervalStringFormat(string|int|float $input, bool $show_micro, string $expected): void
-	{
-		// we skip string input, that is not allowed
-		if (is_string($input)) {
-			$this->assertTrue(true, 'Skip strings');
-			return;
-		}
-		// invalid values throw exception in default
-		if ($input == 999999999999999) {
-			$this->expectException(\LengthException::class);
-		}
-		// below is equal to timeStringFormat
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Combined\DateTime::intervalStringFormat(
-				$input,
-				show_microseconds: $show_micro,
-				show_only_days: true,
-				skip_zero: false,
-				skip_last_zero: false,
-				truncate_nanoseconds: true,
-				truncate_zero_seconds_if_microseconds: false
-			)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function intervalExtendedProvider(): array
-	{
-		return [
-			// A
-			'(60) default value' => [
-				[
-					'seconds' => 60,
-				],
-				'expected' => '1m',
-				'exception' => null
-			],
-			'(60) default value, skip_last_zero:false' => [
-				[
-					'seconds' => 60,
-					'skip_last_zero' => false,
-				],
-				'expected' => '1m 0s 0ms',
-				'exception' => null
-			],
-			// B
-			'(120.1) default value' => [
-				[
-					'seconds' => 120.1,
-				],
-				'expected' => '2m 100ms',
-				'exception' => null
-			],
-			'(120.1) default value, skip_zero:false' => [
-				[
-					'seconds' => 120.1,
-					'skip_zero' => false,
-				],
-				'expected' => '2m 0s 100ms',
-				'exception' => null
-			],
-			'(120.1) default value, skip_last_zero:false' => [
-				[
-					'seconds' => 120.1,
-					'skip_last_zero' => false,
-				],
-				'expected' => '2m 100ms',
-				'exception' => null
-			],
-			// C
-			'(3601) default value' => [
-				[
-					'seconds' => 3601,
-				],
-				'expected' => '1h 1s',
-				'exception' => null
-			],
-			'(3601) default value, skip_zero:false' => [
-				[
-					'seconds' => 3601,
-					'skip_zero' => false,
-				],
-				'expected' => '1h 0m 1s',
-				'exception' => null
-			],
-			'(3601) default value, skip_last_zero:false' => [
-				[
-					'seconds' => 3601,
-					'skip_last_zero' => false,
-				],
-				'expected' => '1h 1s 0ms',
-				'exception' => null
-			],
-			// TODO create unit tests for ALL edge cases
-			// CREATE abort tests, simple, all others are handled in exception tests
-			'exception: \UnexpectedValueException:1' => [
-				[
-					'seconds' => 99999999999999999999999
-				],
-				'expected' => null,
-				'exception' => [
-					'class' => \UnexpectedValueException::class,
-					'code' => 1,
-				],
-			]
-		];
-	}
-
-	/**
-	 * test all options for interval conversion
-	 *
-	 * @covers ::intervalStringFormat
-	 * @dataProvider intervalExtendedProvider
-	 * @testdox intervalStringFormat $input will be $expected / $exception [$_dataName]
-	 *
-	 * @param  array<string,null|int|float|bool> $parameter_list
-	 * @param  string       $expected
-	 * @param  array<string,mixed> $exception
-	 * @return void
-	 */
-	public function testExtendedIntervalStringFormat(
-		array $parameter_list,
-		?string $expected,
-		?array $exception
-	): void {
-		if ($expected === null && $exception === null) {
-			$this->assertFalse(true, 'Cannot have expected and exception null in test data');
-		}
-		$parameters = [];
-		foreach (
-			[
-				'seconds' => null,
-				'truncate_after' => '',
-				'natural_seperator' => false,
-				'name_space_seperator' => false,
-				'show_microseconds' => true,
-				'short_time_name' => true,
-				'skip_last_zero' => true,
-				'skip_zero' => true,
-				'show_only_days' => false,
-				'auto_fix_microseconds' => false,
-				'truncate_nanoseconds' => false,
-				'truncate_zero_seconds_if_microseconds' => true,
-			] as $param => $default
-		) {
-			if (empty($parameter_list[$param]) && $default === null) {
-				$this->assertFalse(true, 'Parameter ' . $param . ' is mandatory ');
-			} elseif (!isset($parameter_list[$param]) || $parameter_list[$param] === null) {
-				$parameters[] = $default;
-			} else {
-				$parameters[] = $parameter_list[$param];
-			}
-		}
-		if ($expected !== null) {
-			$this->assertEquals(
-				$expected,
-				call_user_func_array('CoreLibs\Combined\DateTime::intervalStringFormat', $parameters)
-			);
-		} else {
-			if (empty($exception['class']) || empty($exception['code'])) {
-				$this->assertFalse(true, 'Exception tests need Exception name and Code');
-			}
-			$this->expectException($exception['class']);
-			$this->expectExceptionCode($exception['code']);
-			// if we have a message, must be regex
-			if (!empty($exception['message'])) {
-				$this->expectExceptionMessageMatches($exception['message']);
-			}
-			call_user_func_array('CoreLibs\Combined\DateTime::intervalStringFormat', $parameters);
-		}
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array<mixed>
-	 */
-	public function exceptionsIntervalProvider(): array
-	{
-		return [
-			'UnexpectedValueException: 1 A' => [
-				'seconds' => 99999999999999999999999,
-				'params' => [],
-				'exception' => \UnexpectedValueException::class,
-				'exception_message' => "/^Seconds value is invalid, too large or more than six decimals: /",
-				'excpetion_code' => 1,
-			],
-			'UnexpectedValueException: 1 B' => [
-				'seconds' => 123.1234567,
-				'params' => [],
-				'exception' => \UnexpectedValueException::class,
-				'exception_message' => "/^Seconds value is invalid, too large or more than six decimals: /",
-				'excpetion_code' => 1,
-			],
-			// exception 2 is very likely covered by exception 1
-			'LengthException: 3' => [
-				'seconds' => 999999999999999999,
-				'params' => [
-					'show_only_days',
-				],
-				'exception' => \LengthException::class,
-				'exception_message' => "/^Input seconds value is too large for days output: /",
-				'excpetion_code' => 3,
-			],
-			'UnexpectedValueException: 4' => [
-				'seconds' => 1234567,
-				'params' => [
-					'truncate_after'
-				],
-				'exception' => \UnexpectedValueException::class,
-				'exception_message' => "/^truncate_after has an invalid value: /",
-				'excpetion_code' => 4,
-			],
-			'UnexpectedValueException: 5' => [
-				'seconds' => 1234567,
-				'params' => [
-					'show_only_days:truncate_after'
-				],
-				'exception' => \UnexpectedValueException::class,
-				'exception_message' =>
-					"/^If show_only_days is turned on, the truncate_after cannot be years or months: /",
-				'excpetion_code' => 5,
-			]
-		];
-	}
-
-	/**
-	 * Test all exceptions
-	 *
-	 * @covers ::intervalStringFormat
-	 * @dataProvider exceptionsIntervalProvider
-	 * @testdox intervalStringFormat: test Exceptions
-	 *
-	 * @param  int|float     $seconds
-	 * @param  array<string> $params
-	 * @param  string        $exception
-	 * @param  string        $exception_message
-	 * @param  int           $excpetion_code
-	 * @return void
-	 */
-	public function testExceptionsIntervalStringFormat(
-		int|float $seconds,
-		array $params,
-		string $exception,
-		string $exception_message,
-		int $excpetion_code,
-	): void {
-		$this->expectException($exception);
-		$this->expectExceptionMessageMatches($exception_message);
-		$this->expectExceptionCode($excpetion_code);
-		if (empty($params)) {
-			\CoreLibs\Combined\DateTime::intervalStringFormat($seconds);
-		} else {
-			if (in_array('show_only_days', $params)) {
-				\CoreLibs\Combined\DateTime::intervalStringFormat($seconds, show_only_days:true);
-			} elseif (in_array('truncate_after', $params)) {
-				\CoreLibs\Combined\DateTime::intervalStringFormat($seconds, truncate_after: 'v');
-			} elseif (in_array('show_only_days:truncate_after', $params)) {
-				\CoreLibs\Combined\DateTime::intervalStringFormat($seconds, show_only_days:true, truncate_after: 'y');
-			}
-		}
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -536,25 +203,6 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::stringToTime
-	 * @dataProvider reverseIntervalProvider
-	 * @testdox stringToTime $input will be $expected [$_dataName]
-	 *
-	 * @param string|int|float $input
-	 * @param string|int|float $expected
-	 * @return void
-	 */
-	public function testStringToTime($input, $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Combined\DateTime::stringToTime($input)
-		);
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -590,25 +238,6 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::checkDate
-	 * @dataProvider dateProvider
-	 * @testdox checkDate $input will be $expected [$_dataName]
-	 *
-	 * @param string $input
-	 * @param bool $expected
-	 * @return void
-	 */
-	public function testCheckDate(string $input, bool $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Combined\DateTime::checkDate($input)
-		);
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -668,25 +297,6 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::checkDateTime
-	 * @dataProvider dateTimeProvider
-	 * @testdox checkDateTime $input will be $expected [$_dataName]
-	 *
-	 * @param string $input
-	 * @param bool $expected
-	 * @return void
-	 */
-	public function testCheckDateTime(string $input, bool $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Combined\DateTime::checkDateTime($input)
-		);
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -699,104 +309,45 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 				'2020-12-12',
 				'2021-12-12',
 				-1,
-				null,
-				null,
 			],
 			'dates equal' => [
 				'2020-12-12',
 				'2020-12-12',
 				0,
-				null,
-				null,
 			],
 			'second date smaller' => [
 				'2021-12-12',
 				'2020-12-12',
-				1,
-				null,
-				null,
+				1
 			],
 			'dates equal with different time' => [
 				'2020-12-12 12:12:12',
 				'2020-12-12 13:13:13',
 				0,
-				null,
-				null,
 			],
 			'invalid dates --' => [
 				'--',
 				'--',
-				false,
-				'UnexpectedValueException',
-				1,
+				false
 			],
 			'empty dates' => [
 				'',
 				'',
-				false,
-				'UnexpectedValueException',
-				1
+				false
 			],
 			'invalid dates' => [
 				'not a date',
 				'not a date either',
 				false,
-				'UnexpectedValueException',
-				2
-			],
-			'invalid end date' => [
-				'1990-01-01',
-				'not a date either',
-				false,
-				'UnexpectedValueException',
-				3
 			],
 			'out of bound dates' => [
 				'1900-1-1',
 				'9999-12-31',
-				-1,
-				null,
-				null,
+				-1
 			]
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::compareDate
-	 * @dataProvider dateCompareProvider
-	 * @testdox compareDate $input_a compared to $input_b will be $expected [$_dataName]
-	 *
-	 * @param string $input_a
-	 * @param string $input_b
-	 * @param int|bool $expected
-	 * @param string|null $exception
-	 * @param int|null $exception_code
-	 * @return void
-	 */
-	public function testCompareDate(
-		string $input_a,
-		string $input_b,
-		int|bool $expected,
-		?string $exception,
-		?int $exception_code
-	): void {
-		if ($expected === false) {
-			$this->expectException($exception);
-			$this->expectExceptionCode($exception_code);
-		}
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Combined\DateTime::compareDate($input_a, $input_b)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array<mixed>
-	 */
 	public function dateTimeCompareProvider(): array
 	{
 		return [
@@ -804,120 +355,55 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 				'2020-12-12',
 				'2021-12-12',
 				-1,
-				null,
-				null,
 			],
 			'dates equal no timestamp' => [
 				'2020-12-12',
 				'2020-12-12',
 				0,
-				null,
-				null,
 			],
 			'second date smaller no timestamp' => [
 				'2021-12-12',
 				'2020-12-12',
-				1,
-				null,
-				null,
+				1
 			],
 			'date equal first time smaller' => [
 				'2020-12-12 12:12:12',
 				'2020-12-12 13:13:13',
 				-1,
-				null,
-				null,
 			],
 			'date equal time equal' => [
 				'2020-12-12 12:12:12',
 				'2020-12-12 12:12:12',
 				0,
-				null,
-				null,
 			],
 			'date equal second time smaller' => [
 				'2020-12-12 13:13:13',
 				'2020-12-12 12:12:12',
 				1,
-				null,
-				null,
 			],
 			'valid date invalid time' => [
 				'2020-12-12 13:99:13',
 				'2020-12-12 12:12:99',
 				false,
-				'UnexpectedValueException',
-				2
-			],
-			'valid date invalid end time' => [
-				'2020-12-12 13:12:13',
-				'2020-12-12 12:12:99',
-				false,
-				'UnexpectedValueException',
-				3
 			],
 			'invalid datetimes --' => [
 				'--',
 				'--',
 				false,
-				'UnexpectedValueException',
-				1
 			],
 			'empty datetimess' => [
 				'',
 				'',
 				false,
-				'UnexpectedValueException',
-				1
 			],
-			'invalid date times' => [
+			'invalid datetimes' => [
 				'not a date',
 				'not a date either',
 				false,
-				'UnexpectedValueException',
-				2
-			],
-			'invalid end date time' => [
-				'1990-01-01 12:12:12',
-				'not a date either',
-				false,
-				'UnexpectedValueException',
-				3
 			],
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::compareDateTime
-	 * @dataProvider dateTimeCompareProvider
-	 * @testdox compareDateTime $input_a compared to $input_b will be $expected [$_dataName]
-	 *
-	 * @param string $input_a
-	 * @param string $input_b
-	 * @param int|bool $expected
-	 * @param string|null $exception
-	 * @param int|null $exception_code
-	 * @return void
-	 */
-	public function testCompareDateTime(
-		string $input_a,
-		string $input_b,
-		int|bool $expected,
-		?string $exception,
-		?int $exception_code
-	): void {
-		if ($expected === false) {
-			$this->expectException($exception);
-			$this->expectExceptionCode($exception_code);
-		}
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Combined\DateTime::compareDateTime($input_a, $input_b)
-		);
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -972,6 +458,151 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 		];
 	}
 
+	/**
+	 * date string convert test
+	 *
+	 * @covers ::dateStringFormat
+	 * @dataProvider timestampProvider
+	 * @testdox dateStringFormat $input (microtime $flag) will be $expected [$_dataName]
+	 *
+	 * @param int|float $input
+	 * @param bool      $flag
+	 * @param string    $expected
+	 * @return void
+	 */
+	public function testDateStringFormat(
+		$input,
+		bool $flag_show_micro,
+		bool $flag_micro_as_float,
+		string $expected
+	): void {
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Combined\DateTime::dateStringFormat(
+				$input,
+				$flag_show_micro,
+				$flag_micro_as_float
+			)
+		);
+	}
+
+	/**
+	 * interval convert test
+	 *
+	 * @covers ::timeStringFormat
+	 * @dataProvider intervalProvider
+	 * @testdox timeStringFormat $input (microtime $flag) will be $expected [$_dataName]
+	 *
+	 * @param int|float $input
+	 * @param bool      $flag
+	 * @param string    $expected
+	 * @return void
+	 */
+	public function testTimeStringFormat($input, bool $flag, string $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Combined\DateTime::timeStringFormat($input, $flag)
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::stringToTime
+	 * @dataProvider reverseIntervalProvider
+	 * @testdox stringToTime $input will be $expected [$_dataName]
+	 *
+	 * @param string|int|float $input
+	 * @param string|int|float $expected
+	 * @return void
+	 */
+	public function testStringToTime($input, $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Combined\DateTime::stringToTime($input)
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::checkDate
+	 * @dataProvider dateProvider
+	 * @testdox checkDate $input will be $expected [$_dataName]
+	 *
+	 * @param string $input
+	 * @param bool $expected
+	 * @return void
+	 */
+	public function testCheckDate(string $input, bool $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Combined\DateTime::checkDate($input)
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::checkDateTime
+	 * @dataProvider dateTimeProvider
+	 * @testdox checkDateTime $input will be $expected [$_dataName]
+	 *
+	 * @param string $input
+	 * @param bool $expected
+	 * @return void
+	 */
+	public function testCheckDateTime(string $input, bool $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Combined\DateTime::checkDateTime($input)
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::compareDate
+	 * @dataProvider dateCompareProvider
+	 * @testdox compareDate $input_a compared to $input_b will be $expected [$_dataName]
+	 *
+	 * @param string $input_a
+	 * @param string $input_b
+	 * @param int|bool $expected
+	 * @return void
+	 */
+	public function testCompareDate(string $input_a, string $input_b, $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Combined\DateTime::compareDate($input_a, $input_b)
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::compareDateTime
+	 * @dataProvider dateTimeCompareProvider
+	 * @testdox compareDateTime $input_a compared to $input_b will be $expected [$_dataName]
+	 *
+	 * @param string $input_a
+	 * @param string $input_b
+	 * @param int|bool $expected
+	 * @return void
+	 */
+	public function testCompareDateTime(string $input_a, string $input_b, $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Combined\DateTime::compareDateTime($input_a, $input_b)
+		);
+	}
+
 	/**
 	 * Undocumented function
 	 *
@@ -1149,70 +780,6 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 			$output
 		);
 	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function dateRangeHasWeekendProvider(): array
-	{
-		return [
-			'no weekend' => [
-				'2023-07-03',
-				'2023-07-04',
-				false
-			],
-			'start weekend sat' => [
-				'2023-07-01',
-				'2023-07-04',
-				true
-			],
-			'start weekend sun' => [
-				'2023-07-02',
-				'2023-07-04',
-				true
-			],
-			'end weekend sat' => [
-				'2023-07-03',
-				'2023-07-08',
-				true
-			],
-			'end weekend sun' => [
-				'2023-07-03',
-				'2023-07-09',
-				true
-			],
-			'long period > 6 days' => [
-				'2023-07-03',
-				'2023-07-27',
-				true
-			]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::dateRangeHasWeekend
-	 * @dataProvider dateRangeHasWeekendProvider
-	 * @testdox dateRangeHasWeekend $start_date and $end_date are expected weekend $expected [$_dataName]
-	 *
-	 * @param  string $start_date
-	 * @param  string $end_date
-	 * @param  bool   $expected
-	 * @return void
-	 */
-	public function testDateRangeHasWeekend(
-		string $start_date,
-		string $end_date,
-		bool $expected
-	): void {
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Combined\DateTime::dateRangeHasWeekend($start_date, $end_date)
-		);
-	}
 }
 
 // __END__

4dev/tests/CoreLibsConvertByteTest.php

@@ -253,8 +253,7 @@ final class CoreLibsConvertByteTest extends TestCase
 	 */
 	public function testHumanReadableByteFormatException(int $flag): void
 	{
-		$this->expectException(\InvalidArgumentException::class);
-		$this->expectExceptionCode(1);
+		$this->expectException(\Exception::class);
 		\CoreLibs\Convert\Byte::humanReadableByteFormat(12, $flag);
 	}
 
@@ -273,8 +272,7 @@ final class CoreLibsConvertByteTest extends TestCase
 	 */
 	public function testStringByteFormatException(int $flag): void
 	{
-		$this->expectException(\InvalidArgumentException::class);
-		$this->expectExceptionCode(1);
+		$this->expectException(\Exception::class);
 		\CoreLibs\Convert\Byte::stringByteFormat(12, $flag);
 	}
 }

4dev/tests/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' => [
@@ -59,27 +59,6 @@ final class CoreLibsConvertColorsTest extends TestCase
 				3 => false,
 				4 => false
 			],
-			'invalid color red ' => [
-				0 => -12,
-				1 => 12,
-				2 => 12,
-				3 => false,
-				4 => false
-			],
-			'invalid color green ' => [
-				0 => 12,
-				1 => -12,
-				2 => 12,
-				3 => false,
-				4 => false
-			],
-			'invalid color blue ' => [
-				0 => 12,
-				1 => 12,
-				2 => -12,
-				3 => false,
-				4 => false
-			],
 		];
 	}
 
@@ -88,7 +67,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 *
 	 * @return array
 	 */
-	public function providerHex2rgbColor(): array
+	public function hex2rgbColorProvider(): array
 	{
 		return [
 			'color' => [
@@ -171,40 +150,10 @@ final class CoreLibsConvertColorsTest extends TestCase
 				'valid' => true,
 			],
 			// invalid values
-			'invalid color r/h/h low' => [
-				'rgb' => [-1, 12, 12],
-				'hsb' => [-1, 50, 50],
-				'hsl' => [-1, 50, 50],
-				'valid' => false,
-			],
-			'invalid color r/h/h high' => [
-				'rgb' => [256, 12, 12],
-				'hsb' => [361, 50, 50],
-				'hsl' => [361, 50, 50],
-				'valid' => false,
-			],
-			'invalid color g/s/s low' => [
-				'rgb' => [12, -1, 12],
-				'hsb' => [1, -1, 50],
-				'hsl' => [1, -1, 50],
-				'valid' => false,
-			],
-			'invalid color g/s/s high' => [
-				'rgb' => [12, 256, 12],
-				'hsb' => [1, 101, 50],
-				'hsl' => [1, 101, 50],
-				'valid' => false,
-			],
-			'invalid color b/b/l low' => [
-				'rgb' => [12, 12, -1],
-				'hsb' => [1, 50, -1],
-				'hsl' => [1, 50, -1],
-				'valid' => false,
-			],
-			'invalid color b/b/l high' => [
-				'rgb' => [12, 12, 256],
-				'hsb' => [1, 50, 101],
-				'hsl' => [1, 50, 101],
+			'invalid color' => [
+				'rgb' => [-12, 300, 12],
+				'hsb' => [-12, 300, 12],
+				'hsl' => [-12, 300, 12],
 				'valid' => false,
 			],
 		];
@@ -215,7 +164,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 +183,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 +202,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 +221,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 *
 	 * @return array
 	 */
-	public function providerHsl2rgbColor(): array
+	public function hsl2rgbColorProvider(): array
 	{
 		$list = [];
 		foreach ($this->rgb2hslAndhsbList() as $name => $values) {
@@ -291,28 +240,17 @@ 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
 	 * @param int $input_g
 	 * @param int $input_b
-	 * @param string|bool $expected_hash
 	 * @param string|bool $expected
 	 * @return void
 	 */
-	public function testRgb2hex(
-		int $input_r,
-		int $input_g,
-		int $input_b,
-		string|bool $expected_hash,
-		string|bool $expected
-	) {
-		// if expected hash is or expected is false, we need to check for
-		// LengthException
-		if ($expected_hash === false || $expected === false) {
-			$this->expectException(\LengthException::class);
-		}
+	public function testRgb2hex(int $input_r, int $input_g, int $input_b, $expected_hash, $expected)
+	{
 		// with #
 		$this->assertEquals(
 			$expected_hash,
@@ -342,7 +280,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
@@ -354,19 +292,11 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 */
 	public function testHex2rgb(
 		string $input,
-		array|bool $expected,
-		string|bool $expected_str,
+		$expected,
+		$expected_str,
 		string $separator,
-		string|bool $expected_str_sep
+		$expected_str_sep
 	): void {
-		if ($expected === false || $expected_str === false || $expected_str_sep === false) {
-			$hex_string = preg_replace("/[^0-9A-Fa-f]/", '', $input);
-			if (!is_string($hex_string)) {
-				$this->expectException(\InvalidArgumentException::class);
-			} else {
-				$this->expectException(\UnexpectedValueException::class);
-			}
-		}
 		$this->assertEquals(
 			$expected,
 			\CoreLibs\Convert\Colors::hex2rgb($input)
@@ -385,7 +315,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
@@ -394,11 +324,8 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 * @param array|bool $expected
 	 * @return void
 	 */
-	public function testRgb2hsb(int $input_r, int $input_g, int $input_b, array|bool $expected): void
+	public function testRgb2hsb(int $input_r, int $input_g, int $input_b, $expected): void
 	{
-		if ($expected === false) {
-			$this->expectException(\LengthException::class);
-		}
 		$this->assertEquals(
 			$expected,
 			\CoreLibs\Convert\Colors::rgb2hsb($input_r, $input_g, $input_b)
@@ -409,7 +336,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
@@ -418,12 +345,8 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 * @param array|bool $expected
 	 * @return void
 	 */
-	public function testHsb2rgb(float $input_h, float $input_s, float $input_b, array|bool $expected): void
+	public function testHsb2rgb(float $input_h, float $input_s, float $input_b, $expected): void
 	{
-		if ($expected === false) {
-			$this->expectException(\LengthException::class);
-			$expected = [];
-		}
 		$this->assertEquals(
 			$expected,
 			\CoreLibs\Convert\Colors::hsb2rgb($input_h, $input_s, $input_b)
@@ -434,7 +357,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
@@ -443,11 +366,8 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 * @param array|bool $expected
 	 * @return void
 	 */
-	public function testRgb2hsl(int $input_r, int $input_g, int $input_b, array|bool $expected): void
+	public function testRgb2hsl(int $input_r, int $input_g, int $input_b, $expected): void
 	{
-		if ($expected === false) {
-			$this->expectException(\LengthException::class);
-		}
 		$this->assertEquals(
 			$expected,
 			\CoreLibs\Convert\Colors::rgb2hsl($input_r, $input_g, $input_b)
@@ -458,7 +378,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
@@ -467,11 +387,8 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 * @param array|bool $expected
 	 * @return void
 	 */
-	public function testHsl2rgb(int|float $input_h, float $input_s, float $input_l, array|bool $expected): void
+	public function testHsl2rgb($input_h, float $input_s, float $input_l, $expected): void
 	{
-		if ($expected === false) {
-			$this->expectException(\LengthException::class);
-		}
 		$this->assertEquals(
 			$expected,
 			\CoreLibs\Convert\Colors::hsl2rgb($input_h, $input_s, $input_l)
@@ -489,11 +406,11 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 */
 	public function testHslHsb360hue(): void
 	{
-		$this->assertIsArray(
+		$this->assertNotFalse(
 			\CoreLibs\Convert\Colors::hsl2rgb(360.0, 90.5, 41.2),
 			'HSL to RGB with 360 hue'
 		);
-		$this->assertIsArray(
+		$this->assertNotFalse(
 			\CoreLibs\Convert\Colors::hsb2rgb(360, 95, 78.0),
 			'HSB to RGB with 360 hue'
 		);

4dev/tests/CoreLibsConvertJsonTest.php

@@ -16,7 +16,7 @@ final class CoreLibsConvertJsonTest extends TestCase
 	/**
 	 * test list for json convert tests
 	 *
-	 * @return array<mixed>
+	 * @return array
 	 */
 	public function jsonProvider(): array
 	{
@@ -54,36 +54,10 @@ final class CoreLibsConvertJsonTest extends TestCase
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @return array<mixed>
-	 */
-	public function jsonArrayProvider(): array
-	{
-		return [
-			'valid json' => [
-				[
-					'm' => 2,
-					'f' => 'sub_2'
-				],
-				'{"m":2,"f":"sub_2"}',
-			],
-			'empty json array' => [
-				[],
-				'[]'
-			],
-			'empty json hash' => [
-				['' => ''],
-				'{"":""}'
-			]
-		];
-	}
-
 	/**
 	 * json error list
 	 *
-	 * @return array<mixed> JSON error list
+	 * @return array JSON error list
 	 */
 	public function jsonErrorProvider(): array
 	{
@@ -153,7 +127,7 @@ final class CoreLibsConvertJsonTest extends TestCase
 	 *
 	 * @param string|null $input
 	 * @param bool $flag
-	 * @param array<mixed> $expected
+	 * @param array $expected
 	 * @return void
 	 */
 	public function testJsonConvertToArray(?string $input, bool $flag, array $expected): void
@@ -172,8 +146,7 @@ final class CoreLibsConvertJsonTest extends TestCase
 	 * @testdox jsonGetLastError $input will be $expected_i/$expected_s [$_dataName]
 	 *
 	 * @param string|null $input
-	 * @param int $expected_i
-	 * @param string $expected_s
+	 * @param string $expected
 	 * @return void
 	 */
 	public function testJsonGetLastError(?string $input, int $expected_i, string $expected_s): void
@@ -188,25 +161,6 @@ final class CoreLibsConvertJsonTest extends TestCase
 			\CoreLibs\Convert\Json::jsonGetLastError(true)
 		);
 	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::jsonConvertArrayTo
-	 * @dataProvider jsonArrayProvider
-	 * @testdox jsonConvertArrayTo $input (Override: $flag) will be $expected [$_dataName]
-	 *
-	 * @param  array<mixed> $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testJsonConvertArrayto(array $input, string $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Json::jsonConvertArrayTo($input)
-		);
-	}
 }
 
 // __END__

4dev/tests/CoreLibsConvertMathTest.php

@@ -0,0 +1,118 @@
+<?php
+
+declare(strict_types=1);
+
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Undocumented class
+ * @coversDefaultClass \CoreLibs\Convert\Math
+ * @testdox \CoreLibs\Convert\Math method tests
+ */
+final class CoreLibsConvertMathTest extends TestCase
+{
+	/**
+	 * Undocumented function
+	 *
+	 * @return array<mixed>
+	 */
+	public function fceilProvider(): array
+	{
+		return [
+			'5.5 must be 6' => [5.5, 6],
+			'5.1234567890 with 5 must be 6' => [5.1234567890, 6],
+			'6 must be 6' => [6, 6]
+		];
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::fceil
+	 * @dataProvider fceilProvider
+	 * @testdox fceil: Input $input must be $expected
+	 *
+	 * @param float $input
+	 * @param int $expected
+	 * @return void
+	 */
+	public function testMathFceilValue(float $input, int $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Convert\Math::fceil($input)
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array<mixed>
+	 */
+	public function floorProvider(): array
+	{
+		return [
+			'5123456 with -3 must be 5123000' => [5123456, -3, 5123000],
+			'5123456 with -10 must be 5000000' => [5123456, -10, 5000000]
+		];
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::floorp
+	 * @dataProvider floorProvider
+	 * @testdox floor: Input $input with cutoff $cutoff must be $expected
+	 *
+	 * @param int $input
+	 * @param int $cutoff
+	 * @param int $expected
+	 * @return void
+	 */
+	public function testMathFloorValue(int $input, int $cutoff, int $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Convert\Math::floorp($input, $cutoff)
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array<mixed>
+	 */
+	public function initNumericProvider(): array
+	{
+		return [
+			'5 must be 5' => [5, 5, 'int'],
+			'5.123 must be 5.123' => [5.123, 5.123, 'float'],
+			"'5' must be 5" => ['5', 5, 'string'],
+			"'5.123' must be 5.123" => ['5.123', 5.123, 'string'],
+		];
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::initNumeric
+	 * @dataProvider initNumericProvider
+	 * @testdox initNumeric: Input $info $input must match $expected [$_dataName]
+	 *
+	 * @param int|float|string $input
+	 * @param float $expected
+	 * @param string $info
+	 * @return void
+	 */
+	public function testMathInitNumericValue($input, float $expected, string $info): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Convert\Math::initNumeric($input)
+		);
+	}
+}
+
+// __END__

4dev/tests/CoreLibsConvertMimeEncodeTest.php

@@ -33,14 +33,15 @@ final class CoreLibsConvertMimeEncodeTest extends TestCase
 				'The quick brown fox jumps over the lazy sheep that sleeps in the ravine '
 					. 'and has no idea what is going on here',
 				'UTF-8',
-				"The quick brown fox jumps over the lazy sheep that sleeps in the ravine and\r\n"
-					. ' has no idea what is going on here'
+				'The quick brown fox jumps over the lazy sheep that sleeps in the ravine '
+					. 'and has no idea what is going on here'
 			],
 			'standard with special chars UTF-8' => [
 				'This is ümläßtと漢字もカタカナ！!^$%&',
 				'UTF-8',
-				"This is =?UTF-8?B?w7xtbMOkw59044Go5ryi5a2X44KC44Kr44K/44Kr44OK77yBIV4k?=\r\n"
-					. ' =?UTF-8?B?JSY=?='
+				'This is =?UTF-8?B?w7xtbMOkw59044Go5ryi5a2X44KC44Kr44K/44Kr44OK77yBIV4k?='
+					. "\r\n"
+					. ' =?UTF-8?B?JQ==?=&'
 			],
 			'35 chars and space at the end UTF-8' => [
 				'12345678901234567890123456789012345 '
@@ -61,8 +62,9 @@ final class CoreLibsConvertMimeEncodeTest extends TestCase
 					. 'is there a space?',
 				'UTF-8',
 				"=?UTF-8?B?44Kr44K/44Kr44OK44Kr44K/44Kr44OK44GL44Gq44Kr44K/44Kr44OK44Kr?=\r\n"
-					. " =?UTF-8?B?44K/44Kr44OK44GL44Gq44Kr44K/44Kr44OK44Kr44K/44Kr44OK44GL44Gq?=\r\n"
-					. " =?UTF-8?B?44Kr44K/44Kr44OK44Kr44K/IGlzIHRoZXJlIGEgc3BhY2U/?="
+					. " =?UTF-8?B?44K/44Kr44OK?=\r\n"
+					. " =?UTF-8?B?44GL44Gq44Kr44K/44Kr44OK44Kr44K/44Kr44OK44GL44Gq44Kr44K/44Kr?=\r\n"
+					. " =?UTF-8?B?44OK44Kr44K/?= is there a =?UTF-8?B?c3BhY2U/?="
 			]
 		];
 	}
@@ -83,28 +85,16 @@ final class CoreLibsConvertMimeEncodeTest extends TestCase
 		// print "MIME: -" . $encoded . "-\n";
 		$this->assertEquals(
 			$expected,
-			$encoded,
-			"__mbMimeEncode"
+			$encoded
 		);
 		$decoded = mb_decode_mimeheader($encoded);
-		// print "ENCODED: " . $encoded . "\n";
-		// print "INPUT  : " . $input . " | " . mb_strlen($input) . "\n";
-		// print "DECODED: " . $decoded . " | " . mb_strlen($decoded) . "\n";
-		// $test_enc = mb_encode_mimeheader($input, $encoding);
-		// $test_dec = mb_decode_mimeheader($test_enc);
-		// print "TEST ENC: " . $test_enc . "\n";
+		// print "INPUT  : " . $input . "\n";
+		// print "DECODED: " . $decoded . "\n";
 		// back compare decoded
 		$this->assertEquals(
 			$input,
-			$decoded,
-			"mb_decode_mimeheader"
+			$decoded
 		);
-
-		// $this->assertEquals(
-		// 	$input,
-		// 	$test_dec,
-		// 	'mb_encode_to_decode'
-		// );
 	}
 }
 

4dev/tests/CoreLibsConvertSetVarTypeNullTest.php

@@ -43,17 +43,12 @@ final class CoreLibsConvertSetVarTypeNullTest extends TestCase
 			'int, no override' => [
 				1,
 				null,
-				'1'
+				null
 			],
 			'int, override set' => [
 				1,
 				'not int',
-				'1'
-			],
-			'array, override set' => [
-				[1, 2],
-				null,
-				null
+				'not int'
 			]
 		];
 	}
@@ -206,7 +201,7 @@ final class CoreLibsConvertSetVarTypeNullTest extends TestCase
 			'float' => [
 				1.5,
 				null,
-				1
+				null
 			]
 		];
 	}
@@ -354,7 +349,7 @@ final class CoreLibsConvertSetVarTypeNullTest extends TestCase
 			'int' => [
 				1,
 				null,
-				1.0
+				null
 			]
 		];
 	}

4dev/tests/CoreLibsConvertSetVarTypeTest.php

@@ -43,16 +43,11 @@ final class CoreLibsConvertSetVarTypeTest extends TestCase
 			'int, no override' => [
 				1,
 				null,
-				'1'
+				''
 			],
 			'int, override set' => [
 				1,
 				'not int',
-				'1'
-			],
-			'array, override set' => [
-				[1, 2],
-				'not int',
 				'not int'
 			]
 		];
@@ -194,7 +189,7 @@ final class CoreLibsConvertSetVarTypeTest extends TestCase
 			'float' => [
 				1.5,
 				null,
-				1
+				0
 			]
 		];
 	}
@@ -335,7 +330,7 @@ final class CoreLibsConvertSetVarTypeTest extends TestCase
 			'int' => [
 				1,
 				null,
-				1.0
+				0.0
 			]
 		];
 	}
@@ -346,7 +341,7 @@ final class CoreLibsConvertSetVarTypeTest extends TestCase
 	 * @dataProvider varSetTypeFloatProvider
 	 * @testdox setFloat $input with override $default will be $expected [$_dataName]
 	 *
-	 * @param  mixed      $input
+	 * @param  mixed    $input
 	 * @param  float|null $default
 	 * @param  float      $expected
 	 * @return void

4dev/tests/CoreLibsConvertStringsTest.php

@@ -13,8 +13,6 @@ use PHPUnit\Framework\TestCase;
  */
 final class CoreLibsConvertStringsTest extends TestCase
 {
-	private const DATA_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR;
-
 	/**
 	 * Undocumented function
 	 *
@@ -258,126 +256,6 @@ final class CoreLibsConvertStringsTest extends TestCase
 			$output
 		);
 	}
-
-	/**
-	 * provider for testStripMultiplePathSlashes
-	 *
-	 * @return array<mixed>
-	 */
-	public function stripMultiplePathSlashesProvider(): array
-	{
-		return [
-			'no slahses' => [
-				'input' => 'string_abc',
-				'expected' => 'string_abc',
-			],
-			'one slash' => [
-				'input' => 'some/foo',
-				'expected' => 'some/foo',
-			],
-			'two slashes' => [
-				'input' => 'some//foo',
-				'expected' => 'some/foo',
-			],
-			'three slashes' => [
-				'input' => 'some///foo',
-				'expected' => 'some/foo',
-			],
-			'slashes in front' => [
-				'input' => '/foo',
-				'expected' => '/foo',
-			],
-			'two slashes in front' => [
-				'input' => '//foo',
-				'expected' => '/foo',
-			],
-			'thee slashes in front' => [
-				'input' => '///foo',
-				'expected' => '/foo',
-			],
-			'slashes in back' => [
-				'input' => 'foo/',
-				'expected' => 'foo/',
-			],
-			'two slashes in back' => [
-				'input' => 'foo//',
-				'expected' => 'foo/',
-			],
-			'thee slashes in back' => [
-				'input' => 'foo///',
-				'expected' => 'foo/',
-			],
-			'multiple slashes' => [
-				'input' => '/foo//bar///string/end_times',
-				'expected' => '/foo/bar/string/end_times',
-			]
-		];
-	}
-
-	/**
-	 * test multiple slashes clean up
-	 *
-	 * @covers ::stripMultiplePathSlashes
-	 * @dataProvider stripMultiplePathSlashesProvider
-	 * @testdox stripMultiplePathSlashes $input will be $expected [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testStripMultiplePathSlashes(string $input, string $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Strings::stripMultiplePathSlashes($input)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerStripUTF8BomBytes(): array
-	{
-		return [
-			"utf8-bom" => [
-				"file" => "UTF8BOM.csv",
-				"expect" => "Asset Type,Epic,File Name\n",
-			],
-			"utf8" => [
-				"file" => "UTF8.csv",
-				"expect" => "Asset Type,Epic,File Name\n",
-			],
-		];
-	}
-
-	/**
-	 * test utf8 bom remove
-	 *
-	 * @covers ::stripUTF8BomBytes
-	 * @dataProvider providerStripUTF8BomBytes
-	 * @testdox stripUTF8BomBytes $file will be $expected [$_dataName]
-	 *
-	 * @param  string $file
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testStripUTF8BomBytes(string $file, string $expected): void
-	{
-		// load sample file
-		if (!is_file(self::DATA_FOLDER . $file)) {
-			$this->markTestSkipped('File: ' . $file . ' could not be opened');
-		}
-		$file = file_get_contents(self::DATA_FOLDER . $file);
-		if ($file === false) {
-			$this->markTestSkipped('File: ' . $file . ' could not be read');
-		}
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Strings::stripUTF8BomBytes($file)
-		);
-	}
 }
 
 // __END__

4dev/tests/CoreLibsCreateEmailTest.php

@@ -22,9 +22,12 @@ final class CoreLibsCreateEmailTest extends TestCase
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		self::$log = new \CoreLibs\Logging\Logging([
+		self::$log = new \CoreLibs\Debug\Logging([
 			'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
-			'log_file_id' => 'CoreLibs-Create-Email-Test',
+			'file_id' => 'CoreLibs-Create-Email-Test',
+			'debug_all' => true,
+			'echo_all' => false,
+			'print_all' => true,
 		]);
 	}
 
@@ -621,7 +624,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 		// force new set for each run
 		self::$log->setLogUniqueId(true);
 		// set on of unique log id
-		self::$log->setLogFlag(\CoreLibs\Logging\Logger\Flag::per_run);
+		self::$log->setLogPer('run', true);
 		// init logger
 		$status = \CoreLibs\Create\Email::sendEmail(
 			$subject,
@@ -643,9 +646,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 		// assert content: must load JSON from log file
 		if ($status == 2) {
 			// open file, get last entry with 'SEND EMAIL JSON' key
-			$file = file_get_contents(
-				self::$log->getLogFolder() . self::$log->getLogFile()
-			);
+			$file = file_get_contents(self::$log->getLogFileName());
 			if ($file !== false) {
 				// extract SEND EMAIL JSON line
 				$found = preg_match_all("/^.* <SEND EMAIL JSON> - (.*)$/m", $file, $matches);

4dev/tests/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,
@@ -29,11 +30,12 @@ final class CoreLibsCreateSessionTest extends TestCase
 		//    setSessionName: true/false,
 		//    checkActiveSession: true/false, [1st call, 2nd call]
 		//    getSessionId: string or false
-		// 3: exepcted name (session)]
-		// 4: auto write close flag
+		// 3: exepcted name (session)
+		// 4: expected error string
 		return [
 			'session parameter' => [
 				'sessionNameParameter',
+				'p',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
@@ -42,10 +44,11 @@ final class CoreLibsCreateSessionTest extends TestCase
 					'getSessionId' => '1234abcd4567'
 				],
 				'sessionNameParameter',
-				null,
+				''
 			],
 			'session globals' => [
 				'sessionNameGlobals',
+				'g',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
@@ -54,10 +57,11 @@ final class CoreLibsCreateSessionTest extends TestCase
 					'getSessionId' => '1234abcd4567'
 				],
 				'sessionNameGlobals',
-				false,
+				''
 			],
-			'auto write close' => [
-				'sessionNameAutoWriteClose',
+			'session name default' => [
+				'',
+				'd',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
@@ -65,8 +69,95 @@ final class CoreLibsCreateSessionTest extends TestCase
 					'checkActiveSession' => [false, true],
 					'getSessionId' => '1234abcd4567'
 				],
-				'sessionNameAutoWriteClose',
-				true,
+				'',
+				''
+			],
+			// error checks
+			// 1: we are in cli
+			'on cli error' => [
+				'',
+				'd',
+				[
+					'checkCliStatus' => true,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => true,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => '1234abcd4567'
+				],
+				'',
+				'[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'
+				],
+				'',
+				'[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'
+				],
+				'',
+				'[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'
+				],
+				'',
+				'[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'
+				],
+				'',
+				'[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
+				],
+				'',
+				'[SESSION] getSessionId did not return a session id'
 			],
 		];
 	}
@@ -79,23 +170,29 @@ 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 string $expected_error
 	 * @return void
 	 */
 	public function testStartSession(
 		string $input,
+		string $type,
 		array $mock_data,
 		string $expected,
-		?bool $auto_write_close,
+		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',
-				'getSessionStatus', 'checkActiveSession',
-				'getSessionId',
+				'checkCliStatus', 'getSessionStatus', 'checkActiveSession',
+				'setSessionName', 'startSessionCall', 'getSessionId',
 				'getSessionName'
 			]
 		);
@@ -114,8 +211,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']);
@@ -123,7 +224,20 @@ final class CoreLibsCreateSessionTest extends TestCase
 		// regex for session id
 		$ression_id_regex = "/^\w+$/";
 
-		$session_id = $session_mock->getSessionId();
+		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(
@@ -139,76 +253,16 @@ final class CoreLibsCreateSessionTest extends TestCase
 				$expected,
 				$session_mock->getSessionName()
 			);
+		} else {
+			// false checks
+			$this->assertEquals(
+				$expected_error,
+				$session_mock->getErrorStr(),
+				'error assert'
+			);
 		}
 	}
 
-	/**
-	 * 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/'
-			],
-			'not a valid session id returned' => [
-				\UnexpectedValueException::class,
-				5,
-				'/^\[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);
-		new \CoreLibs\Create\Session($session_name);
-	}
-
 	/**
 	 * provider for session name check
 	 *
@@ -272,147 +326,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 ::get
-	 * @covers ::isset
-	 * @covers ::unset
-	 * @dataProvider providerSessionData
-	 * @testdox set/get/isset/unset $name with $input is $expected ($exception) [$_dataName]
+	 * @covers ::setS
+	 * @covers ::getS
+	 * @covers ::issetS
+	 * @covers ::unsetS
+	 * @dataProvider sessionDataProvider
+	 * @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()) {
-			$this->markTestSkipped('Cannot run testMethodSetGet in CLI');
-		}
-		$session = new \CoreLibs\Create\Session('TEST_METHOD');
-		if ($expected !== null) {
-			$this->expectException($exception);
-		}
-		$session->set($name, $input);
+		$session = new \CoreLibs\Create\Session();
+		$session->setS($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
-	 */
-	public function providerSessionDataMany(): array
-	{
-		return [
-			'valid set' => [
-				[
-					'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 ::__set
+	 * @covers ::__get
+	 * @covers ::__isset
+	 * @covers ::__unset
+	 * @dataProvider sessionDataProvider
+	 * @testdox __set/__get/__iseet/__unset $name with $input is $expected [$_dataName]
 	 *
-	 * @covers ::setMany
-	 * @covers ::getMany
-	 * @dataProvider providerSessionDataMany
-	 * @testdox setMany/getMany/unsetMany $set is $expected ($exception) [$_dataName]
-	 *
-	 * @param  array<string|int,mixed> $set
-	 * @param  array<string,mixed> $expected
-	 * @param  ?mixed $exception
+	 * @param  string|int $name
+	 * @param  mixed $input
+	 * @param  mixed $expected
 	 * @return void
 	 */
-	public function testMany($set, $expected, $exception): void
+	public function testMagicSetGet($name, $input, $expected): void
 	{
-		if (\CoreLibs\Get\System::checkCLI()) {
-			$this->markTestSkipped('Cannot run testMethodSetGet in CLI');
-		}
-		$session = new \CoreLibs\Create\Session('TEST_METHOD');
-		if ($expected !== null) {
-			$this->expectException($exception);
-		}
-		$session->setMany($set);
+		$session = new \CoreLibs\Create\Session();
+		$session->$name = $input;
 		$this->assertEquals(
 			$expected,
-			$session->getMany(array_keys($set)),
-			'set many failed'
+			$session->$name,
+			'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)),
-			'unset many failed'
+			'',
+			$session->$name,
+			'magic unset assert'
+		);
+		// isset true
+		$this->assertFalse(
+			isset($session->$name),
+			'magic isset assert false'
 		);
 	}
 
@@ -426,30 +442,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/CoreLibsCreateUidsTest.php

@@ -21,83 +21,45 @@ final class CoreLibsCreateUidsTest extends TestCase
 	public function uniqIdProvider(): array
 	{
 		return [
-			// number length
-			'too short' => [
-				0 => 1,
-				1 => 4,
-				2 => null
-			],
-			'valid length: 10' => [
-				0 => 10,
-				1 => 10,
-				2 => null
-			],
-			'valid length: 9, auto length' => [
-				0 => 9,
-				1 => 8,
-				2 => null
-			],
-			'valid length: 9, force length' => [
-				0 => 9,
-				1 => 9,
-				2 => true,
-			],
-			'very long: 512' => [
-				0 => 512,
-				1 => 512,
-				2 => null
-			],
-			// below is all legacy
 			'md5 hash' => [
 				0 => 'md5',
 				1 => 32,
-				2 => null
 			],
 			'sha256 hash' => [
 				0 => 'sha256',
-				1 => 64,
-				2 => null
+				1 => 64
 			],
 			'ripemd160 hash' => [
 				0 => 'ripemd160',
-				1 => 40,
-				2 => null
+				1 => 40
 			],
 			'adler32 hash' => [
 				0 => 'adler32',
-				1 => 8,
-				2 => null
+				1 => 8
 			],
-			'not in list, set default length' => [
+			'not in list hash but valid' => [
 				0 => 'sha3-512',
-				1 => 64,
-				2 => null
+				1 => strlen(hash('sha3-512', 'A'))
 			],
 			'default hash not set' => [
 				0 => null,
 				1 => 64,
-				2 => null
 			],
 			'invalid name' => [
 				0 => 'iamnotavalidhash',
 				1 => 64,
-				2 => null
 			],
-			// auto calls
-			'auto: ' . \CoreLibs\Create\Uids::DEFAULT_UNNIQ_ID_LENGTH => [
-				0 => \CoreLibs\Create\Uids::DEFAULT_UNNIQ_ID_LENGTH,
-				1 => 64,
-				2 => null
+			'auto: ' . \CoreLibs\Create\Uids::DEFAULT_HASH => [
+				0 => \CoreLibs\Create\Uids::DEFAULT_HASH,
+				1 => strlen(hash(\CoreLibs\Create\Uids::DEFAULT_HASH, 'A'))
 			],
 			'auto: ' . \CoreLibs\Create\Uids::STANDARD_HASH_LONG => [
 				0 => \CoreLibs\Create\Uids::STANDARD_HASH_LONG,
-				1 => strlen(hash(\CoreLibs\Create\Uids::STANDARD_HASH_LONG, 'A')),
-				2 => null
+				1 => strlen(hash(\CoreLibs\Create\Uids::STANDARD_HASH_LONG, 'A'))
 			],
 			'auto: ' . \CoreLibs\Create\Uids::STANDARD_HASH_SHORT => [
 				0 => \CoreLibs\Create\Uids::STANDARD_HASH_SHORT,
-				1 => strlen(hash(\CoreLibs\Create\Uids::STANDARD_HASH_SHORT, 'A')),
-				2 => null
+				1 => strlen(hash(\CoreLibs\Create\Uids::STANDARD_HASH_SHORT, 'A'))
 			],
 		];
 	}
@@ -121,7 +83,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 +91,13 @@ final class CoreLibsCreateUidsTest extends TestCase
 	{
 		$uuid = \CoreLibs\Create\Uids::uuidv4();
 		$this->assertMatchesRegularExpression(
-			'/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/',
-			$uuid,
-			'Failed regex check'
-		);
-		$this->assertTrue(
-			\CoreLibs\Create\Uids::validateUuuidv4($uuid),
-			'Failed validate regex method'
-		);
-		$this->assertFalse(
-			\CoreLibs\Create\Uids::validateUuuidv4('not-a-uuidv4'),
-			'Failed wrong uuid validated as true'
+			'/^[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}$/',
+			$uuid
 		);
+		// $this->assertStringMatchesFormat(
+		// 	'%4s%4s-%4s-%4s-%4s-%4s%4s%4s',
+		// 	$uuid
+		// );
 	}
 
 	/**
@@ -149,26 +105,25 @@ final class CoreLibsCreateUidsTest extends TestCase
 	 *
 	 * @covers ::uniqId
 	 * @dataProvider uniqIdProvider
-	 * @testdox uniqId $input will be length $expected (Force $flag) [$_dataName]
+	 * @testdox uniqId $input will be length $expected [$_dataName]
 	 *
-	 * @param int|string|null $input
+	 * @param string|null $input
 	 * @param string $expected
-	 * @param bool|null $flag
 	 * @return void
 	 */
-	public function testUniqId(int|string|null $input, int $expected, ?bool $flag): void
+	public function testUniqId(?string $input, int $expected): void
 	{
 		if ($input === null) {
-			$uniq_id_length = strlen(\CoreLibs\Create\Uids::uniqId());
-		} elseif ($flag === null) {
-			$uniq_id_length = strlen(\CoreLibs\Create\Uids::uniqId($input));
+			$this->assertEquals(
+				$expected,
+				strlen(\CoreLibs\Create\Uids::uniqId())
+			);
 		} else {
-			$uniq_id_length = strlen(\CoreLibs\Create\Uids::uniqId($input, $flag));
+			$this->assertEquals(
+				$expected,
+				strlen(\CoreLibs\Create\Uids::uniqId($input))
+			);
 		}
-		$this->assertEquals(
-			$expected,
-			$uniq_id_length
-		);
 	}
 
 	/**

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

@@ -10,13 +10,11 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * Test class for Debug\Logging
- * @coversDefaultClass \CoreLibs\Debug\LoggingLegacy
- * @testdox \CoreLibs\Debug\LoggingLegacy method tests
+ * @coversDefaultClass \CoreLibs\Debug\Logging
+ * @testdox \CoreLibs\Debug\Logging method tests
  */
-final class CoreLibsDebugLoggingLegacyTest extends TestCase
+final class CoreLibsDebugLoggingTest extends TestCase
 {
-	private const LOG_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'log' . DIRECTORY_SEPARATOR;
-
 	/**
 	 * test set for options BASIC
 	 *
@@ -25,7 +23,7 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 	 * 1: expected
 	 * 2: override
 	 * override:
-	 * - constant for CONSTANTS
+	 * - constant for COSNTANTS
 	 * - global for _GLOBALS
 	 *
 	 * @return array
@@ -35,20 +33,17 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 		return [
 			'log folder set' => [
 				[
-					'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
-					'file_id' => 'testClassInit'
+					'log_folder' => '/tmp'
 				],
 				[
-					'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
+					'log_folder' => '/tmp/',
 					'debug_all' => false,
 					'print_all' => false,
 				],
 				[]
 			],
 			'nothing set' => [
-				[
-					'file_id' => 'testClassInit'
-				],
+				null,
 				[
 					'log_folder' => getcwd() . DIRECTORY_SEPARATOR,
 					'debug_all' => false,
@@ -56,33 +51,30 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 				],
 				[]
 			],
-			'no options set, constant set [DEPRECATED]' => [
+			'no options set, constant set' => [
+				null,
 				[
-					'file_id' => 'testClassInit'
-				],
-				[
-					'log_folder' => str_replace(DIRECTORY_SEPARATOR . 'configs', '', __DIR__)
-							. DIRECTORY_SEPARATOR . 'log' . DIRECTORY_SEPARATOR,
+					'log_folder' => str_replace('/configs', '', __DIR__)
+					. DIRECTORY_SEPARATOR . 'log/',
 					'debug_all' => false,
 					'print_all' => false,
 				],
 				[
 					'constant' => [
-						'BASE' => str_replace(DIRECTORY_SEPARATOR . 'configs', '', __DIR__)
+						'BASE' => str_replace('/configs', '', __DIR__)
 							. DIRECTORY_SEPARATOR,
-						'LOG' => 'log' . DIRECTORY_SEPARATOR
+						'LOG' => 'log/'
 					]
 				]
 			],
 			'standard test set' => [
 				[
-					'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
-					'file_id' => 'testClassInit',
+					'log_folder' => '/tmp',
 					'debug_all' => true,
 					'print_all' => true,
 				],
 				[
-					'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
+					'log_folder' => '/tmp/',
 					'debug_all' => true,
 					'print_all' => true,
 				],
@@ -97,66 +89,35 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 	 * @dataProvider optionsProvider
 	 * @testdox init test [$_dataName]
 	 *
-	 * @param array $options
+	 * @param array|null $options
 	 * @param array $expected
 	 * @param array $override
 	 * @return void
 	 */
-	public function testClassInit(array $options, array $expected, array $override): void
+	public function testClassInit(?array $options, array $expected, array $override): void
 	{
 		if (!empty($override['constant'])) {
 			foreach ($override['constant'] as $var => $value) {
-				if (!defined($var)) {
-					define($var, $value);
-				}
-			}
-			// for deprecated no log_folder set
-			// if base is defined and it does have AAASetupData set
-			// change the log_folder "Debug" to "AAASetupData"
-			if (
-				defined('BASE') &&
-				strpos(BASE, DIRECTORY_SEPARATOR . 'AAASetupData') !== false
-			) {
-				$expected['log_folder'] = str_replace(
-					DIRECTORY_SEPARATOR . 'Debug',
-					DIRECTORY_SEPARATOR . 'AAASetupData',
-					$expected['log_folder']
-				);
+				define($var, $value);
 			}
 		}
-		// if not log folder and constant set -> expect E_USER_DEPRECATION
-		if (!empty($override['constant']) && empty($options['log_folder'])) {
-			// the deprecation message
-			$deprecation_message = 'options: log_folder must be set. '
-				. 'Setting via BASE and LOG constants is deprecated';
-			// convert E_USER_DEPRECATED to a exception
-			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);
+		if ($options === null) {
+			$log = new \CoreLibs\Debug\Logging();
+		} else {
+			$log = new \CoreLibs\Debug\Logging($options);
 		}
-		$log = new \CoreLibs\Debug\LoggingLegacy($options);
-		// reset error handler
-		restore_error_handler();
 		// check that settings match
 		$this->assertEquals(
 			$expected['log_folder'],
-			$log->getSetting('log_folder'),
-			'log folder not matching'
+			$log->getSetting('log_folder')
 		);
 		$this->assertEquals(
 			$expected['debug_all'],
-			$log->getSetting('debug_output_all'),
-			'debug all flag not matching'
+			$log->getSetting('debug_output_all')
 		);
 		$this->assertEquals(
 			$expected['print_all'],
-			$log->getSetting('print_output_all'),
-			'print all flag not matching'
+			$log->getSetting('print_output_all')
 		);
 		// print "LOG: " . $log->getSetting('log_folder') . "\n";
 		// print "DEBUG: " . $log->getSetting('debug_output_all') . "\n";
@@ -173,23 +134,17 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 		// 0: options
 		// 1: expected
 		// 2: override
-		// 3: exception message
 		return [
 			'no log id set' => [
-				[
-					'log_folder' => self::LOG_FOLDER,
-				],
+				null,
 				[
 					'log_file_id' => ''
 				],
-				[],
-				null
+				[]
 			],
 			// set log id manually afterwards
 			'set log id manually' => [
-				[
-					'log_folder' => self::LOG_FOLDER,
-				],
+				null,
 				[
 					'log_file_id' => '',
 					'set_log_file_id' => 'abc123',
@@ -199,26 +154,21 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 					'values' => [
 						'log_file_id' => 'abc123'
 					]
-				],
-				null
+				]
 			],
 			// set log id from options
 			'set log id via options' => [
 				[
 					'file_id' => 'abc456',
-					'log_folder' => self::LOG_FOLDER,
 				],
 				[
 					'log_file_id' => 'abc456'
 				],
-				[],
-				null
+				[]
 			],
 			// set log id from GLOBALS [DEPRECATED]
-			'set log id via globals [DEPRECATED]' => [
-				[
-					'log_folder' => self::LOG_FOLDER,
-				],
+			'set log id via globals' => [
+				null,
 				[
 					'log_file_id' => 'def123'
 				],
@@ -226,14 +176,11 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 					'globals' => [
 						'LOG_FILE_ID' => 'def123'
 					]
-				],
-				'options: file_id must be set. Setting via LOG_FILE_ID global variable is deprecated'
+				]
 			],
 			// set log id from CONSTANT [DEPRECATED]
-			'set log id via constant [DEPRECATED]' => [
-				[
-					'log_folder' => self::LOG_FOLDER,
-				],
+			'set log id via constant' => [
+				null,
 				[
 					'log_file_id' => 'ghi123'
 				],
@@ -245,14 +192,12 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 					'constant' => [
 						'LOG_FILE_ID' => 'ghi123'
 					]
-				],
-				'options: file_id must be set. Setting via LOG_FILE_ID constant is deprecated'
+				]
 			],
 			// invalid, keep previous set
 			'invalid log id' => [
 				[
-					'file_id' => 'jkl456',
-					'log_folder' => self::LOG_FOLDER,
+					'file_id' => 'jkl456'
 				],
 				[
 					'log_file_id' => 'jkl456',
@@ -262,8 +207,7 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 					'values' => [
 						'log_file_id' => './#'
 					]
-				],
-				null
+				]
 			]
 		];
 	}
@@ -275,18 +219,13 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 	 * @dataProvider logIdOptionsProvider
 	 * @testdox log id set/get tests [$_dataName]
 	 *
-	 * @param array $options
+	 * @param array|null $options
 	 * @param array $expected
 	 * @param array $override
-	 * @param string|null $deprecation_message until we remove the old code
 	 * @return void
 	 */
-	public function testLogId(
-		array $options,
-		array $expected,
-		array $override,
-		?string $deprecation_message
-	): void {
+	public function testLogId(?array $options, array $expected, array $override): void
+	{
 		// we need to set with file_id option, globals LOG_FILE_ID, constant LOG_FILE_ID
 		if (!empty($override['constant'])) {
 			foreach ($override['constant'] as $var => $value) {
@@ -298,20 +237,11 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 				$GLOBALS[$var] = $value;
 			}
 		}
-		if (!empty($override['constant']) || !empty($override['globals'])) {
-			// convert E_USER_DEPRECATED to a exception
-			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);
+		if ($options === null) {
+			$log = new \CoreLibs\Debug\Logging();
+		} else {
+			$log = new \CoreLibs\Debug\Logging($options);
 		}
-		$log = new \CoreLibs\Debug\LoggingLegacy($options);
-		// reset error handler
-		restore_error_handler();
 		// check current
 		$this->assertEquals(
 			$log->getLogId(),
@@ -386,10 +316,7 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 		bool $expected_get
 	): void {
 		// neutral start with default
-		$log = new \CoreLibs\Debug\LoggingLegacy([
-			'file_id' => 'testSetGetLogLevelAll',
-			'log_folder' => self::LOG_FOLDER
-		]);
+		$log = new \CoreLibs\Debug\Logging();
 		// set and check
 		$this->assertEquals(
 			$log->setLogLevelAll($type, $flag),
@@ -511,10 +438,7 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 		$expected_get
 	): void {
 		// neutral start with default
-		$log = new \CoreLibs\Debug\LoggingLegacy([
-			'file_id' => 'testSetGetLogLevel',
-			'log_folder' => self::LOG_FOLDER
-		]);
+		$log = new \CoreLibs\Debug\Logging();
 		// set
 		$this->assertEquals(
 			$log->setLogLevel($type, $flag, $debug_on),
@@ -593,10 +517,7 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 		bool $expected_get
 	): void {
 		// neutral start with default
-		$log = new \CoreLibs\Debug\LoggingLegacy([
-			'file_id' => 'testSetGetLogPer',
-			'log_folder' => self::LOG_FOLDER
-		]);
+		$log = new \CoreLibs\Debug\Logging();
 		// set and check
 		$this->assertEquals(
 			$log->setLogPer($type, $set),
@@ -625,10 +546,7 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 	public function testSetGetLogPrintFileDate(bool $input, bool $expected_set, bool $expected_get): void
 	{
 		// neutral start with default
-		$log = new \CoreLibs\Debug\LoggingLegacy([
-			'file_id' => 'testSetGetLogPrintFileDate',
-			'log_folder' => self::LOG_FOLDER
-		]);
+		$log = new \CoreLibs\Debug\Logging();
 		// set and check
 		$this->assertEquals(
 			$log->setGetLogPrintFileDate($input),
@@ -694,10 +612,7 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 	 */
 	public function testPrAr(array $input, string $expected): void
 	{
-		$log = new \CoreLibs\Debug\LoggingLegacy([
-			'file_id' => 'testPrAr',
-			'log_folder' => self::LOG_FOLDER
-		]);
+		$log = new \CoreLibs\Debug\Logging();
 		$this->assertEquals(
 			$log->prAr($input),
 			$expected
@@ -758,10 +673,7 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 	 */
 	public function testPrBl(bool $input, ?string $true, ?string $false, string $expected): void
 	{
-		$log = new \CoreLibs\Debug\LoggingLegacy([
-			'file_id' => 'testPrBl',
-			'log_folder' => self::LOG_FOLDER
-		]);
+		$log = new \CoreLibs\Debug\Logging();
 		$return = '';
 		if ($true === null && $false === null) {
 			$return = $log->prBl($input);
@@ -933,7 +845,7 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 		// remove any files named /tmp/error_log_TestDebug*.log
 		array_map('unlink', glob($options['log_folder'] . 'error_msg_' . $options['file_id'] . '*.log'));
 		// init logger
-		$log = new \CoreLibs\Debug\LoggingLegacy($options);
+		$log = new \CoreLibs\Debug\Logging($options);
 		// * debug (A/B)
 		// NULL check for strip/prefix
 		$this->assertEquals(
@@ -1047,16 +959,9 @@ final class CoreLibsDebugLoggingLegacyTest extends TestCase
 	public function testLogUniqueId(bool $option, bool $override): void
 	{
 		if ($option === true) {
-			$log = new \CoreLibs\Debug\LoggingLegacy([
-				'file_id' => 'testLogUniqueId',
-				'log_folder' => self::LOG_FOLDER,
-				'per_run' => $option
-			]);
+			$log = new \CoreLibs\Debug\Logging(['per_run' => $option]);
 		} else {
-			$log = new \CoreLibs\Debug\LoggingLegacy([
-				'file_id' => 'testLogUniqueId',
-				'log_folder' => self::LOG_FOLDER
-			]);
+			$log = new \CoreLibs\Debug\Logging();
 			$log->setLogUniqueId();
 		}
 		$per_run_id = $log->getLogUniqueId();

4dev/tests/CoreLibsDebugSupportTest.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace tests;
 
 use PHPUnit\Framework\TestCase;
-use CoreLibs\Debug\Support;
 
 /**
  * Test class for Debug\Support
@@ -41,32 +40,6 @@ final class CoreLibsDebugSupportTest extends TestCase
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @cover ::printTime
-	 * @dataProvider printTimeProvider
-	 * @testdox printTime test with $microtime and match to regex [$_dataName]
-	 *
-	 * @param int|null $mircrotime
-	 * @param string $expected
-	 * @return void
-	 */
-	public function testPrintTime(?int $microtime, string $regex): void
-	{
-		if ($microtime === null) {
-			$this->assertMatchesRegularExpression(
-				$regex,
-				Support::printTime()
-			);
-		} else {
-			$this->assertMatchesRegularExpression(
-				$regex,
-				Support::printTime($microtime)
-			);
-		}
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -77,55 +50,18 @@ final class CoreLibsDebugSupportTest extends TestCase
 		return [
 			'empty array' => [
 				0 => [],
-				1 => "<pre>Array\n(\n)\n</pre>",
-				2 => "Array\n(\n)\n",
+				1 => "<pre>Array\n(\n)\n</pre>"
 			],
 			'simple array' => [
 				0 => ['a', 'b'],
 				1 => "<pre>Array\n(\n"
 					. "    [0] => a\n"
 					. "    [1] => b\n"
-					. ")\n</pre>",
-				2 => "Array\n(\n"
-					. "    [0] => a\n"
-					. "    [1] => b\n"
-					. ")\n",
+					. ")\n</pre>"
 			],
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @cover ::printAr
-	 * @cover ::printArray
-	 * @dataProvider printArrayProvider
-	 * @testdox printAr/printArray $input will be $expected [$_dataName]
-	 *
-	 * @param array $input
-	 * @param string $expected
-	 * @param string $expected_strip
-	 * @return void
-	 */
-	public function testPrintAr(array $input, string $expected, string $expected_strip): void
-	{
-		$this->assertEquals(
-			$expected,
-			Support::printAr($input),
-			'assert printAr'
-		);
-		$this->assertEquals(
-			$expected,
-			Support::printArray($input),
-			'assert printArray'
-		);
-		$this->assertEquals(
-			$expected_strip,
-			Support::prAr($input),
-			'assert prAr'
-		);
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -137,31 +73,27 @@ final class CoreLibsDebugSupportTest extends TestCase
 			'true input default' => [
 				0 => true,
 				1 => [],
-				2 => 'true',
-				3 => 'true',
+				2 => 'true'
 			],
 			'false input default' => [
 				0 => false,
 				1 => [],
-				2 => 'false',
-				3 => 'false'
+				2 => 'false'
 			],
 			'false input param name' => [
 				0 => false,
 				1 => [
 					'name' => 'param test'
 				],
-				2 => '<b>param test</b>: false',
-				3 => 'false'
+				2 => '<b>param test</b>: false'
 			],
 			'true input param name, true override' => [
 				0 => true,
 				1 => [
 					'name' => 'param test',
-					'true' => 'ok',
+					'true' => 'ok'
 				],
-				2 => '<b>param test</b>: ok',
-				3 => 'ok',
+				2 => '<b>param test</b>: ok'
 			],
 			'false input param name, true override, false override' => [
 				0 => false,
@@ -170,77 +102,11 @@ final class CoreLibsDebugSupportTest extends TestCase
 					'true' => 'ok',
 					'false' => 'not',
 				],
-				2 => '<b>param test</b>: not',
-				3 => 'not'
+				2 => '<b>param test</b>: not'
 			],
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @cover ::printBool
-	 * @dataProvider printBoolProvider
-	 * @testdox printBool $input will be $expected [$_dataName]
-	 *
-	 * @param  bool   $input
-	 * @param  array  $params
-	 * @param  string $expected
-	 * @param  string $expected_strip
-	 * @return void
-	 */
-	public function testPrintBool(bool $input, array $params, string $expected, string $expected_strip): void
-	{
-		if (
-			isset($params['name']) &&
-			isset($params['true']) &&
-			isset($params['false'])
-		) {
-			$string = Support::printBool(
-				$input,
-				$params['name'],
-				$params['true'],
-				$params['false']
-			);
-			$string_strip = Support::prBl(
-				$input,
-				$params['true'],
-				$params['false']
-			);
-		} elseif (isset($params['name']) && isset($params['true'])) {
-			$string = Support::printBool(
-				$input,
-				$params['name'],
-				$params['true']
-			);
-			$string_strip = Support::prBl(
-				$input,
-				$params['true'],
-			);
-		} elseif (isset($params['name'])) {
-			$string = Support::printBool(
-				$input,
-				$params['name']
-			);
-			$string_strip = Support::prBl(
-				$input
-			);
-		} else {
-			$string = Support::printBool($input);
-			$string_strip = Support::prBl($input);
-		}
-		$this->assertEquals(
-			$expected,
-			$string,
-			'assert printBool'
-		);
-		$this->assertEquals(
-			$expected_strip,
-			$string_strip,
-			'assert prBl'
-		);
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -303,10 +169,12 @@ final class CoreLibsDebugSupportTest extends TestCase
 			'an array, no html' => [
 				['a', 'b'],
 				true,
-				"Array\n(\n"
+				"##HTMLPRE##"
+					. "Array\n(\n"
 					. "    [0] => a\n"
 					. "    [1] => b\n"
-					. ")\n",
+					. ")\n"
+					. "##/HTMLPRE##",
 			],
 			// resource
 			'a resource' => [
@@ -323,330 +191,6 @@ final class CoreLibsDebugSupportTest extends TestCase
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @cover ::printToString
-	 * @dataProvider printToStringProvider
-	 * @testdox printToString $input with $flag will be $expected [$_dataName]
-	 *
-	 * @param mixed $input anything
-	 * @param boolean|null $flag html flag, only for string and array
-	 * @param string $expected always string
-	 * @return void
-	 */
-	public function testPrintToString(mixed $input, ?bool $flag, string $expected): void
-	{
-		if ($flag === null) {
-			// if expected starts with / and ends with / then this is a regex compare
-			if (
-				substr($expected, 0, 1) == '/' &&
-				substr($expected, -1, 1) == '/'
-			) {
-				$this->assertMatchesRegularExpression(
-					$expected,
-					Support::printToString($input)
-				);
-			} else {
-				$this->assertEquals(
-					$expected,
-					Support::printToString($input)
-				);
-			}
-		} else {
-			$this->assertEquals(
-				$expected,
-				Support::printToString($input, $flag)
-			);
-		}
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerDumpExportVar(): array
-	{
-		return [
-			'string' => [
-				'input' => 'string',
-				'flag' => null,
-				'expected_dump' => 'string(6) "string"' . "\n",
-				'expected_export' => "<pre>'string'</pre>",
-			],
-			'string, no html' => [
-				'input' => 'string',
-				'flag' => true,
-				'expected_dump' => 'string(6) "string"' . "\n",
-				'expected_export' => "'string'",
-			],
-			// int
-			'int' => [
-				'input' => 6,
-				'flag' => null,
-				'expected_dump' => 'int(6)' . "\n",
-				'expected_export' => "<pre>6</pre>",
-			],
-			// float
-			'float' => [
-				'input' => 1.6,
-				'flag' => null,
-				'expected_dump' => 'float(1.6)' . "\n",
-				'expected_export' => "<pre>1.6</pre>",
-			],
-			// bool
-			'bool' => [
-				'input' => true,
-				'flag' => null,
-				'expected_dump' => 'bool(true)' . "\n",
-				'expected_export' => "<pre>true</pre>",
-			],
-			// array
-			'array' => [
-				'input' => ['string', true],
-				'flag' => null,
-				'expected_dump' => "array(2) {\n"
-					. "  [0]=>\n"
-					. "  string(6) \"string\"\n"
-					. "  [1]=>\n"
-					. "  bool(true)\n"
-					. "}\n",
-				'expected_export' => "<pre>array (\n"
-					. "  0 => 'string',\n"
-					. "  1 => true,\n"
-					. ")</pre>",
-			],
-			// more
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @cover ::dumpVar
-	 * @cover ::exportVar
-	 * @dataProvider providerDumpExportVar
-	 * @testdox dump/exportVar $input with $flag will be $expected_dump / $expected_export [$_dataName]
-	 *
-	 * @param  mixed     $input
-	 * @param  bool|null $flag
-	 * @param  string    $expected_dump
-	 * @param  string    $expected_export
-	 * @return void
-	 */
-	public function testDumpExportVar(mixed $input, ?bool $flag, string $expected_dump, string $expected_export): void
-	{
-		if ($flag === null) {
-			$dump = Support::dumpVar($input);
-			$export = Support::exportVar($input);
-		} else {
-			$dump = Support::dumpVar($input, $flag);
-			$export = Support::exportVar($input, $flag);
-		}
-		$this->assertEquals(
-			$expected_dump,
-			$dump,
-			'assert dumpVar'
-		);
-		$this->assertEquals(
-			$expected_export,
-			$export,
-			'assert dumpVar'
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @cover ::getCallerFileLine
-	 * @testWith ["vendor/phpunit/phpunit/src/Framework/TestCase.php:6434","phar:///home/clemens/.phive/phars/phpunit-9.6.13.phar/phpunit/Framework/TestCase.php:6434"]
-	 * @testdox getCallerFileLine check based on regex .../Framework/TestCase.php:\d+ [$_dataName]
-	 *
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testGetCallerFileLine(): void
-	{
-		// regex prefix with path "/../" and then fixed vendor + \d+
-		// or phar start if phiev installed
-		// phar:///home/clemens/.phive/phars/phpunit-9.6.13.phar/phpunit/Framework/TestCase.php
-		$regex = "/^("
-			. "\/.*\/vendor\/phpunit\/phpunit\/src"
-			. "|"
-			. "phar:\/\/\/.*\.phive\/phars\/phpunit-\d+\.\d+\.\d+\.phar\/phpunit"
-			. ")"
-			. "\/Framework\/TestCase.php:\d+$/";
-		$this->assertMatchesRegularExpression(
-			$regex,
-			Support::getCallerFileLine()
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @cover ::getCallerMethod
-	 * @testWith ["testGetCallerMethod"]
-	 * @testdox getCallerMethod check if it returns $expected [$_dataName]
-	 *
-	 * @return void
-	 */
-	public function testGetCallerMethod(string $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			Support::getCallerMethod()
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @cover ::getCallerMethodList
-	 * @testWith [["main", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"]]
-	 * @testdox getCallerMethodList check if it returns $expected [$_dataName]
-	 *
-	 * @param array $expected
-	 * @return void
-	 */
-	public function testGetCallerMethodList(array $expected): void
-	{
-		$compare = Support::getCallerMethodList();
-		// 10: legacy
-		// 11: direct
-		// 12: full call
-		switch (count($compare)) {
-			case 10:
-				// add nothing
-				$this->assertEquals(
-					$expected,
-					$compare,
-					'assert expected 10'
-				);
-				break;
-			case 11:
-				if ($compare[0] == 'include') {
-					// add include at first
-					array_splice(
-						$expected,
-						0,
-						0,
-						['include']
-					);
-				} else {
-					array_splice(
-						$expected,
-						6,
-						0,
-						['run']
-					);
-				}
-				$this->assertEquals(
-					$expected,
-					$compare,
-					'assert expected 11'
-				);
-				break;
-			case 12:
-				// add two "run" before "runBare"
-				array_splice(
-					$expected,
-					7,
-					0,
-					['run']
-				);
-				array_splice(
-					$expected,
-					0,
-					0,
-					['include']
-				);
-				$this->assertEquals(
-					$expected,
-					$compare,
-					'assert expected 12'
-				);
-				break;
-		}
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @cover ::getCallStack
-	 * @testdox getCallStack check if it returns data [$_dataName]
-	 *
-	 * @return void
-	 */
-	public function testGetCallStack(): void
-	{
-		$call_stack = Support::getCallStack();
-		// print "Get CALL: " . print_r(Support::getCallStack(), true) . "\n";
-		if ($call_stack < 8) {
-			$this->assertFalse(true, 'getCallStack too low: 8');
-		} else {
-			$this->assertTrue(true, 'getCallSteck ok');
-		}
-		// just test top entry
-		$first = array_shift($call_stack);
-		$this->assertStringEndsWith(
-			':tests\CoreLibsDebugSupportTest->testGetCallStack',
-			$first,
-		);
-	}
-
-	/**
-	 * test the lowest one (one above base)
-	 *
-	 * @cover ::getCallerClass
-	 * @testWith ["tests\\CoreLibsDebugSupportTest"]
-	 * @testdox getCallerClass check if it returns $expected [$_dataName]
-	 *
-	 * @return void
-	 */
-	public function testGetCallerClass(string $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			Support::getCallerClass()
-		);
-	}
-
-	/**
-	 * test highest return (top level)
-	 *
-	 * @cover ::getCallerTopLevelClass
-	 * @testWith ["PHPUnit\\TextUI\\Command"]
-	 * @testdox getCallerTopLevelClass check if it returns $expected [$_dataName]
-	 *
-	 * @return void
-	 */
-	public function testGetCallerTopLevelClass(string $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			Support::getCallerTopLevelClass()
-		);
-	}
-
-	/**
-	 * test highest return (top level)
-	 *
-	 * @cover ::getCallerClassMethod
-	 * @testWith ["tests\\CoreLibsDebugSupportTest->testGetCallerClassMethod"]
-	 * @testdox getCallerClassMethod check if it returns $expected [$_dataName]
-	 *
-	 * @return void
-	 */
-	public function testGetCallerClassMethod(string $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			Support::getCallerClassMethod()
-		);
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -692,6 +236,205 @@ final class CoreLibsDebugSupportTest extends TestCase
 		];
 	}
 
+	/**
+	 * Undocumented function
+	 *
+	 * @cover ::printTime
+	 * @dataProvider printTimeProvider
+	 * @testdox printTime test with $microtime and match to regex [$_dataName]
+	 *
+	 * @param int|null $mircrotime
+	 * @param string $expected
+	 * @return void
+	 */
+	public function testPrintTime(?int $microtime, string $regex): void
+	{
+		if ($microtime === null) {
+			$this->assertMatchesRegularExpression(
+				$regex,
+				\CoreLibs\Debug\Support::printTime()
+			);
+		} else {
+			$this->assertMatchesRegularExpression(
+				$regex,
+				\CoreLibs\Debug\Support::printTime($microtime)
+			);
+		}
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @cover ::printAr
+	 * @cover ::printArray
+	 * @dataProvider printArrayProvider
+	 * @testdox printAr/printArray $input will be $expected [$_dataName]
+	 *
+	 * @param array $input
+	 * @param string $expected
+	 * @return void
+	 */
+	public function testPrintAr(array $input, string $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Debug\Support::printAr($input),
+			'assert printAr'
+		);
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Debug\Support::printArray($input),
+			'assert printArray'
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @cover ::printBool
+	 * @dataProvider printBoolProvider
+	 * @testdox printBool $input will be $expected [$_dataName]
+	 *
+	 * @param  bool   $input
+	 * @param  array  $params
+	 * @param  string $expected
+	 * @return void
+	 */
+	public function testPrintBool(bool $input, array $params, string $expected): void
+	{
+		if (
+			isset($params['name']) &&
+			isset($params['true']) &&
+			isset($params['false'])
+		) {
+			$string = \CoreLibs\Debug\Support::printBool(
+				$input,
+				$params['name'],
+				$params['true'],
+				$params['false']
+			);
+		} elseif (isset($params['name']) && isset($params['true'])) {
+			$string = \CoreLibs\Debug\Support::printBool(
+				$input,
+				$params['name'],
+				$params['true']
+			);
+		} elseif (isset($params['name'])) {
+			$string = \CoreLibs\Debug\Support::printBool(
+				$input,
+				$params['name']
+			);
+		} else {
+			$string = \CoreLibs\Debug\Support::printBool($input);
+		}
+		$this->assertEquals(
+			$expected,
+			$string,
+			'assert printBool'
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @cover ::printToString
+	 * @dataProvider printToStringProvider
+	 * @testdox printToString $input with $flag will be $expected [$_dataName]
+	 *
+	 * @param mixed $input anything
+	 * @param boolean|null $flag html flag, only for string and array
+	 * @param string $expected always string
+	 * @return void
+	 */
+	public function testPrintToString(mixed $input, ?bool $flag, string $expected): void
+	{
+		if ($flag === null) {
+			// if expected starts with / and ends with / then this is a regex compare
+			if (
+				substr($expected, 0, 1) == '/' &&
+				substr($expected, -1, 1) == '/'
+			) {
+				$this->assertMatchesRegularExpression(
+					$expected,
+					\CoreLibs\Debug\Support::printToString($input)
+				);
+			} else {
+				$this->assertEquals(
+					$expected,
+					\CoreLibs\Debug\Support::printToString($input)
+				);
+			}
+		} else {
+			$this->assertEquals(
+				$expected,
+				\CoreLibs\Debug\Support::printToString($input, $flag)
+			);
+		}
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @cover ::getCallerMethod
+	 * @testWith ["testGetCallerMethod"]
+	 * @testdox getCallerMethod check if it returns $expected [$_dataName]
+	 *
+	 * @return void
+	 */
+	public function testGetCallerMethod(string $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Debug\Support::getCallerMethod()
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @cover ::getCallerMethodList
+	 * @testWith [["main", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"],["include", "main", "run", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"]]
+	 * @testdox getCallerMethodList check if it returns $expected [$_dataName]
+	 *
+	 * @param array $expected
+	 * @return void
+	 */
+	public function testGetCallerMethodList(array $expected, array $expected_group): void
+	{
+		$compare = \CoreLibs\Debug\Support::getCallerMethodList();
+		// if we direct call we have 10, if we call as folder we get 11
+		if (count($compare) == 10) {
+			$this->assertEquals(
+				$expected,
+				\CoreLibs\Debug\Support::getCallerMethodList(),
+				'assert expected 10'
+			);
+		} else {
+			$this->assertEquals(
+				$expected_group,
+				\CoreLibs\Debug\Support::getCallerMethodList(),
+				'assert expected group'
+			);
+		}
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @cover ::getCallerClass
+	 * @testWith ["PHPUnit\\TextUI\\Command"]
+	 * @testdox getCallerClass check if it returns $expected [$_dataName]
+	 *
+	 * @return void
+	 */
+	public function testGetCallerClass(string $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Debug\Support::getCallerClass()
+		);
+	}
+
 	/**
 	 * Undocumented function
 	 *
@@ -710,19 +453,19 @@ final class CoreLibsDebugSupportTest extends TestCase
 		if ($replace === null && $flag === null) {
 			$this->assertEquals(
 				$expected,
-				Support::debugString($input),
+				\CoreLibs\Debug\Support::debugString($input),
 				'assert all default'
 			);
 		} elseif ($flag === null) {
 			$this->assertEquals(
 				$expected,
-				Support::debugString($input, $replace),
+				\CoreLibs\Debug\Support::debugString($input, $replace),
 				'assert flag default'
 			);
 		} else {
 			$this->assertEquals(
 				$expected,
-				Support::debugString($input, $replace, $flag),
+				\CoreLibs\Debug\Support::debugString($input, $replace, $flag),
 				'assert all set'
 			);
 		}

4dev/tests/CoreLibsGetDotEnvTest.php

@@ -77,24 +77,21 @@ final class CoreLibsGetDotEnvTest extends TestCase
 				'file' => 'cannot_read.env',
 				'status' => 2,
 				'content' => [],
-				// 0000
-				'chmod' => '100000',
+				'chmod' => '000',
 			],
 			'empty file' => [
 				'folder' => __DIR__ . DIRECTORY_SEPARATOR . 'dotenv',
 				'file' => 'empty.env',
 				'status' => 1,
 				'content' => [],
-				// 0664
-				'chmod' => '100664',
+				'chmod' => null,
 			],
 			'override all' => [
 				'folder' => __DIR__ . DIRECTORY_SEPARATOR . 'dotenv',
 				'file' => 'test.env',
 				'status' => 0,
 				'content' => $dot_env_content,
-				// 0664
-				'chmod' => '100664',
+				'chmod' => null,
 			],
 			'override directory' => [
 				'folder' => __DIR__ . DIRECTORY_SEPARATOR . 'dotenv',
@@ -127,16 +124,6 @@ final class CoreLibsGetDotEnvTest extends TestCase
 		array $expected_env,
 		?string $chmod
 	): void {
-		if (
-			!empty($chmod) &&
-			$chmod == '100000' &&
-			getmyuid() == 0
-		) {
-			$this->markTestSkipped(
-				"Skip cannot read file test because run user is root"
-			);
-			return;
-		}
 		// if we have file + chmod set
 		$old_chmod = null;
 		if (
@@ -147,20 +134,6 @@ final class CoreLibsGetDotEnvTest extends TestCase
 			$old_chmod = fileperms($folder . DIRECTORY_SEPARATOR . $file);
 			chmod($folder . DIRECTORY_SEPARATOR . $file, octdec($chmod));
 		}
-		$message = '\CoreLibs\Get\DotEnv is deprecated in favor for '
-			. 'composer package gullevek\dotenv which is a copy of this';
-		// convert E_USER_DEPRECATED to a exception
-		set_error_handler(
-			static function (int $errno, string $errstr): never {
-				throw new \Exception($errstr, $errno);
-			},
-			E_USER_DEPRECATED
-		);
-		// tests are never run -> deprecated
-		if (is_file($folder . DIRECTORY_SEPARATOR . $file)) {
-			chmod($folder . DIRECTORY_SEPARATOR . $file, 0664);
-		}
-		$this->expectExceptionMessage($message);
 		if ($folder !== null && $file !== null) {
 			$status = DotEnv::readEnvFile($folder, $file);
 		} elseif ($folder !== null) {
@@ -168,7 +141,6 @@ final class CoreLibsGetDotEnvTest extends TestCase
 		} else {
 			$status = DotEnv::readEnvFile();
 		}
-		restore_error_handler();
 		$this->assertEquals(
 			$status,
 			$expected_status,
@@ -181,9 +153,8 @@ final class CoreLibsGetDotEnvTest extends TestCase
 			'Assert _ENV correct'
 		);
 		// if we have file and chmod unset
-		print "Write mode: $old_chmod\n";
-		if ($old_chmod !== null && $chmod == '100000') {
-			chmod($folder . DIRECTORY_SEPARATOR . $file, 0664);
+		if ($old_chmod !== null) {
+			chmod($folder . DIRECTORY_SEPARATOR . $file, $old_chmod);
 		}
 	}
 }

4dev/tests/CoreLibsGetSystemTest.php

@@ -67,17 +67,17 @@ final class CoreLibsGetSystemTest extends TestCase
 			'original set' => [
 				0 => null,
 				1 => 'NOHOST',
-				2 => 0,
+				2 => 'NOPORT',
 			],
 			'override set no port' => [
 				0 => 'foo.org',
 				1 => 'foo.org',
-				2 => 80
+				2 => '80'
 			],
 			'override set with port' => [
 				0 => 'foo.org:443',
 				1 => 'foo.org',
-				2 => 443
+				2 => '443'
 			]
 		];
 	}
@@ -99,7 +99,7 @@ final class CoreLibsGetSystemTest extends TestCase
 				1 => 'phpunit',
 				2 => 'phpunit',
 				// NOTE: this can change, so it is a regex check
-				3 => "/^(\/?.*\/?)?(vendor\/bin|tools)\/phpunit$/",
+				3 => "/^(\/?.*\/?)?vendor\/bin\/phpunit$/",
 			],
 			'some path with extension' => [
 				0 => '/some/path/to/file.txt',
@@ -138,10 +138,10 @@ final class CoreLibsGetSystemTest extends TestCase
 	 *
 	 * @param string|null $input
 	 * @param string $expected_host
-	 * @param int $expected_port
+	 * @param string $expected_port
 	 * @return void
 	 */
-	public function testGetHostNanme(?string $input, string $expected_host, int $expected_port): void
+	public function testGetHostNanme(?string $input, string $expected_host, string $expected_port): void
 	{
 		// print "HOSTNAME: " . $_SERVER['HTTP_HOST'] . "<br>";
 		// print "SERVER: " . print_r($_SERVER, true) . "\n";
@@ -216,29 +216,6 @@ final class CoreLibsGetSystemTest extends TestCase
 			);
 		}
 	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::getIpAddresses
-	 * @testdox getIpAddresses check
-	 *
-	 * @return void
-	 */
-	public function testGetIpAddresses()
-	{
-		// response must have "REMOTE_ADDR" entry, others are optional
-		// NOTE: we have no IP addresses on command line
-		$this->assertTrue(
-			true,
-			"We do not have REMOTE_ADDR on command line"
-		);
-		// $this->assertContains(
-		// 	'REMOTE_ADDR',
-		// 	array_keys(\CoreLibs\Get\System::getIpAddresses()),
-		// 	'failed REMOTE_ADDR assert'
-		// );
-	}
 }
 
 // __END__

4dev/tests/CoreLibsLanguageGetLocaleTest.php

@@ -0,0 +1,310 @@
+<?php // phpcs:disable Generic.Files.LineLength
+
+declare(strict_types=1);
+
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for Language\GetLocale
+ *
+ * @coversDefaultClass \CoreLibs\Language\GetLocale
+ * @testdox \CoreLibs\Language\GetLocale method tests
+ */
+final class CoreLibsLanguageGetLocaleTest extends TestCase
+{
+	/**
+	 * 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
+	 */
+	public function setLocaleProvider(): array
+	{
+		return [
+			// 0: locale
+			// 1: domain
+			// 2: encoding
+			// 3: path
+			// 4: SESSION: DEFAULT_LOCALE
+			// 5: SESSION: DEFAULT_CHARSET
+			// 6: expected array
+			'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\/$/",
+				],
+			],
+			'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\/$/",
+				],
+			],
+			'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\/$/",
+				],
+			],
+			// 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\/$/",
+				],
+			],
+			// 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\/$/",
+				],
+			],
+			// 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\/$/",
+				],
+			],
+			// 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\/$/",
+				],
+			],
+			// 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\/$/",
+				],
+			],
+			// 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\/$/",
+				],
+			],
+			// 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\/$/",
+				],
+			],
+			// 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]
+	 *
+	 * @return void
+	 */
+	public function testsetLocale(
+		?string $language,
+		?string $domain,
+		?string $encoding,
+		?string $path,
+		?string $SESSION_DEFAULT_LOCALE,
+		?string $SESSION_DEFAULT_CHARSET,
+		array $expected
+	): 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;
+		}
+		// 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
+			);
+		}
+		// 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']);
+	}
+}
+
+// __END__

4dev/tests/CoreLibsLanguageL10nTest.php

@@ -22,16 +22,37 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		// for deprecation test only, will be removed
+		// 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(DIRECTORY_SEPARATOR . 'configs', '', __DIR__) . DIRECTORY_SEPARATOR);
+			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);
+		}
 	}
 
 	/**
@@ -84,163 +105,77 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	{
 		return [
 			// 0: locale
-			// 1: encoding
-			// 2: domain
+			// 1: domain
+			// 2: encoding
 			// 3: path
 			// 4: locale expected
 			// 5: locale set expected
-			// 6: lang expected
-			// 7: lang short expected
-			// 8: encoding expected
-			// 9: domain exepcted
-			// 10: context (null for none)
-			// 11: test string in
-			// 12: test translated
-			// 13: deprecation message (until removed)
+			// 6: domain exepcted
+			// 7: context (null for none)
+			// 8: test string in
+			// 9: test translated
 			// new style load
 			'gettext load en' => [
 				'en_US.UTF-8',
-				'UTF-8',
 				'frontend',
-				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
-				// 4, 5, 6, 7, 8, 9
+				__DIR__ . 'includes/locale/',
+				//
 				'en_US.UTF-8',
 				'en_US',
-				'en_US',
-				'en',
-				'UTF-8',
 				'frontend',
-				// 10
 				null,
-				// 11, 12
 				'Original',
 				'Translated frontend en_US',
-				// 13
-				null,
 			],
 			'gettext load en' => [
 				'en_US.UTF-8',
-				'UTF-8',
 				'frontend',
-				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
+				__DIR__ . 'includes/locale/',
 				//
 				'en_US.UTF-8',
 				'en_US',
-				'en_US',
-				'en',
-				'UTF-8',
 				'frontend',
-				//
 				'context',
-				//
 				'Original',
 				'Original context frontend en_US',
-				//
-				null,
 			],
 			'gettext load ja' => [
 				'ja_JP.UTF-8',
-				'UTF-8',
 				'admin',
-				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
+				__DIR__ . 'includes/locale/',
 				//
 				'ja_JP.UTF-8',
 				'ja_JP',
-				'ja_JP',
-				'ja',
-				'UTF-8',
 				'admin',
-				//
 				null,
-				//
 				'Original',
 				'Translated admin ja_JP',
-				//
-				null,
 			],
-			// load short locale with different encoding
-			'gettext load short ja no encoding' => [
-				'ja',
-				'SJIS',
-				'admin',
-				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
-				//
-				'ja',
-				'ja',
-				'ja',
-				'ja',
-				'SJIS',
-				'admin',
-				//
-				null,
-				//
-				'Original',
-				'Translated admin ja_JP',
-				//
-				null,
-			],
-			// mixed path and domain [DEPRECATED]
-			'mixed path and domain [DEPRECATED]' => [
+			// mixed path and domain
+			'mixed path and domain' => [
 				'en_US.UTF-8',
-				'UTF-8',
-				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
+				__DIR__ . 'includes/locale/',
 				'frontend',
 				//
 				'en_US.UTF-8',
 				'en_US',
-				'en_US',
-				'en',
-				'UTF-8',
 				'frontend',
-				//
 				'context',
-				//
 				'Original',
 				'Original context frontend en_US',
-				//
-				'L10n constructor parameter switch is no longer supported. domain is 2nd, path is 3rd parameter'
-			],
-			// unset path
-			'unset path with locale and domain [DEPRECATED]' => [
-				'ja_JP.UTF-8',
-				'UTF-8',
-				'admin',
-				null,
-				//
-				'ja_JP.UTF-8',
-				'ja_JP',
-				'ja_JP',
-				'ja',
-				'UTF-8',
-				'admin',
-				//
-				null,
-				//
-				'Original',
-				'Translated admin ja_JP',
-				//
-				'Empty path parameter is no longer allowed if locale and domain are set',
 			],
 			// null set
 			'empty load new ' => [
 				'',
 				'',
 				'',
-				'',
 				//
 				'',
 				'',
 				'',
-				'',
-				'', // unset on empty call
-				'',
-				//
 				null,
-				//
 				'Original',
 				'Original',
-				//
-				null,
 			]
 		];
 	}
@@ -253,62 +188,37 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	 * @testdox check l10n init with Locale $locale, Path $path, Domain $domain, Legacy: $legacy with $context [$_dataName]
 	 *
 	 * @param  string|null $locale
-	 * @param  string|null $encoding
 	 * @param  string|null $domain
 	 * @param  string|null $path
 	 * @param  string      $locale_expected
 	 * @param  string      $locale_set_expected
-	 * @param  string      $lang_expected
-	 * @param  string      $lang_short_expected
-	 * @param  string      $encoding_expected
 	 * @param  string      $domain_expected
-	 * @param  string|null $context
+	 * @param  ?string     $context
 	 * @param  string      $original
 	 * @param  string      $translated
-	 * @param  string|null $deprecation_message
 	 * @return void
 	 */
 	public function testL10nObject(
 		?string $locale,
-		?string $encoding,
 		?string $domain,
 		?string $path,
 		string $locale_expected,
 		string $locale_set_expected,
-		string $lang_expected,
-		string $lang_short_expected,
-		string $encoding_expected,
 		string $domain_expected,
 		?string $context,
 		string $original,
-		string $translated,
-		?string $deprecation_message
+		string $translated
 	): void {
-		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);
-		}
 		if ($locale === null) {
 			$l10n = new \CoreLibs\Language\L10n();
 		} elseif ($domain === null) {
-			// deprecated, locale + domain must be set, handled like empty calls
 			$l10n = new \CoreLibs\Language\L10n($locale);
 		} elseif ($path === null) {
-			// deprecated, path must be set, will thow DEPRECATION error, handled like empty
 			$l10n = new \CoreLibs\Language\L10n($locale, $domain);
-		} elseif ($encoding === null) {
-			// if encoding not found will be UTF-8
-			$l10n = new \CoreLibs\Language\L10n($locale, $domain, $path);
 		} else {
-			$l10n = new \CoreLibs\Language\L10n($locale, $domain, $path, $encoding);
+			$l10n = new \CoreLibs\Language\L10n($locale, $domain, $path);
 		}
-		restore_error_handler();
+		// print "LOC: " . $locale . ", " . $l10n->getLocale() . ", " . $locale_expected . "\n";
 		// print "MO: " . $l10n->getMoFile() . "\n";
 		$this->assertEquals(
 			$locale_expected,
@@ -338,20 +248,6 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				'Translated string assert failed in context: ' . $context
 			);
 		}
-		// test get locel as array
-		$locale = $l10n->getLocaleAsArray();
-		$this->assertEquals(
-			[
-				'locale' => $locale_expected,
-				'lang' => $lang_expected,
-				'lang_short' => $lang_short_expected,
-				'domain' => $domain_expected,
-				'encoding' => $encoding_expected,
-				'path' => $path
-			],
-			$locale,
-			'getLocaleAsArray mismatch'
-		);
 	}
 
 	// l10nReloadMOfile and getTranslator
@@ -387,7 +283,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				// set 0-2
 				'en_US.UTF-8',
 				'frontend',
-				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
+				__DIR__ . 'includes/locale/',
 				// status 3
 				false,
 				// to translate 4
@@ -400,7 +296,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				// set new 8-10
 				'ja_JP.UTF-8',
 				'frontend',
-				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
+				__DIR__ . 'includes/locale/',
 				// status new 11
 				false,
 				// check new setter 12-14
@@ -426,7 +322,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				// set new 8-10
 				'en_US.UTF-8',
 				'frontend',
-				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
+				__DIR__ . 'includes/locale/',
 				// status new 11
 				false,
 				// check new setter 12-14
@@ -491,8 +387,12 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		string $domain_expected_b,
 		string $translated_b
 	): void {
-		if ($locale === null || $domain === null || $path === null) {
+		if ($locale === null) {
 			$l10n = new \CoreLibs\Language\L10n();
+		} elseif ($domain === null) {
+			$l10n = new \CoreLibs\Language\L10n($locale);
+		} elseif ($path === null) {
+			$l10n = new \CoreLibs\Language\L10n($locale, $domain);
 		} else {
 			$l10n = new \CoreLibs\Language\L10n($locale, $domain, $path);
 		}
@@ -594,16 +494,16 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	{
 		return [
 			// 0: locale
-			// 1: domain
-			// 2: path
+			// 1: path
+			// 2: domain
 			// 3: context (null for none)
 			// 4: single string
 			// 5: plural string
 			// 6: array for each n value expected string
 			'plural text en' => [
 				'en_US',
+				__DIR__ . 'includes/locale/',
 				'admin',
-				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
 				// context
 				null,
 				// text single/multi in
@@ -618,8 +518,8 @@ final class CoreLibsLanguageL10nTest extends TestCase
 			],
 			'plural text context en' => [
 				'en_US',
+				__DIR__ . 'includes/locale/',
 				'admin',
-				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
 				// context
 				'context',
 				// text single/multi in
@@ -644,8 +544,8 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	 * @testdox plural string test for locale $locale and domain $domain with $context [$_dataName]
 	 *
 	 * @param  string  $locale
-	 * @param  string  $domain
 	 * @param  string  $path
+	 * @param  string  $domain
 	 * @param  ?string $context
 	 * @param  string  $original_single
 	 * @param  string  $original_plural
@@ -655,8 +555,8 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	public function testNgettext(
 		// config 0-3
 		string $locale,
-		string $domain,
 		string $path,
+		string $domain,
 		// context string
 		?string $context,
 		// input strings
@@ -665,7 +565,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		// expected
 		array $expected_strings
 	): void {
-		$l10n = new \CoreLibs\Language\L10n($locale, $domain, $path);
+		$l10n = new \CoreLibs\Language\L10n($locale, $path, $domain, false);
 
 		foreach ($expected_strings as $n => $expected) {
 			if (empty($context)) {
@@ -1081,7 +981,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 			'standard en' => [
 				'en_US.UTF-8',
 				'frontend',
-				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
+				__DIR__ . 'includes/locale/',
 				'UTF-8',
 				'Original',
 				'Translated frontend en_US',
@@ -1089,7 +989,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 			'standard ja' => [
 				'ja_JP.UTF-8',
 				'admin',
-				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
+				__DIR__ . 'includes/locale/',
 				'UTF-8',
 				'Original',
 				'Translated admin ja_JP',
@@ -1130,7 +1030,6 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		_textdomain($domain);
 		_bindtextdomain($domain, $path);
 		_bind_textdomain_codeset($domain, $encoding);
-
 		$this->assertEquals(
 			$translated,
 			__($original),

4dev/tests/CoreLibsOutputImageTest.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for Output\Image
+ * @coversDefaultClass \CoreLibs\Output\Image
+ * @testdox \CoreLibs\Output\Image method tests
+ */
+final class CoreLibsOutputImageTest extends TestCase
+{
+	/**
+	 * Undocumented function
+	 *
+	 * @testdox Output\Image Class tests
+	 *
+	 * @return void
+	 */
+	public function testOutputImage()
+	{
+		// $this->assertTrue(true, 'Output Image Tests not implemented');
+		$this->markTestIncomplete(
+			'Output\Image Tests have not yet been implemented'
+		);
+		// $this->markTestSkipped('No implementation for Output\Image at the moment');
+	}
+}
+
+// __END__

4dev/tests/Debug/log/.gitignore

@@ -1,3 +0,0 @@
-*log
-*LOG
-!.gitignore

4dev/tests/Language/CoreLibsLanguageGetLocaleTest.php

@@ -1,568 +0,0 @@
-<?php // phpcs:disable Generic.Files.LineLength
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for Language\GetLocale
- *
- * @coversDefaultClass \CoreLibs\Language\GetLocale
- * @testdox \CoreLibs\Language\GetLocale method tests
- */
-final class CoreLibsLanguageGetLocaleTest extends TestCase
-{
-	public const SITE_ENCODING = 'UTF-8';
-	public const SITE_LOCALE = 'en_US.UTF-8';
-	public const SITE_DOMAIN = 'admin';
-	public const LOCALE_PATH = __DIR__ . DIRECTORY_SEPARATOR
-		. '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
-	 *
-	 * @return array<mixed>
-	 */
-	public function setLocaleFromSessionProvider(): array
-	{
-		return [
-			// 0: locale
-			// 1: domain
-			// 2: encoding
-			// 3: path
-			// 4: SESSION: DEFAULT_LOCALE
-			// 5: SESSION: DEFAULT_CHARSET
-			// 5: SESSION: DEFAULT_DOMAIN
-			// 6: SESSION: LOCALE_PATH
-			// 6: expected array
-			// 7: deprecation message
-			'all session vars set' => [
-				// lang, domain, encoding, path
-				self::SITE_LOCALE, self::SITE_DOMAIN, self::SITE_ENCODING, self::LOCALE_PATH,
-				// SESSION SETTINGS: locale, charset, domain, path
-				'ja_JP.UTF-8', 'UTF-8', 'admin', __DIR__ . '/locale_other/',
-				// return array
-				[
-					'locale' => 'ja_JP.UTF-8',
-					'lang' => 'ja_JP',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?locale_other\/$/",
-				],
-			],
-			// param lang and domain (no override)
-			'no session set, only parameters' => [
-				// lang, domain, encoding, path
-				self::SITE_LOCALE, self::SITE_DOMAIN, self::SITE_ENCODING, self::LOCALE_PATH,
-				// SESSION SETTINGS: locale, charset, domain, path
-				null, null, null, null,
-				// return array
-				[
-					'locale' => 'en_US.UTF-8',
-					'lang' => 'en_US',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-			],
-			// special parse session check for locales
-			'all session vars set, short lang' => [
-				// lang, domain, encoding, path
-				self::SITE_LOCALE, self::SITE_DOMAIN, self::SITE_ENCODING, self::LOCALE_PATH,
-				// SESSION SETTINGS: locale, charset, domain, path
-				'ja', 'UTF-8', 'admin', __DIR__ . '/locale_other/',
-				// return array
-				[
-					'locale' => 'ja',
-					'lang' => 'ja',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?locale_other\/$/",
-				],
-			],
-			// lang with modifier
-			// param lang and domain (no override)
-			'long locale, domain, encoding params, no sessions' => [
-				// lang, domain, encoding, path
-				self::SITE_LOCALE, self::SITE_DOMAIN, self::SITE_ENCODING, self::LOCALE_PATH,
-				// SESSION SETTINGS: locale, charset, domain, path
-				'de_CH.UTF-8@euro', 'admin', 'UTF-8',  __DIR__ . '/includes/locale/',
-				// return array
-				[
-					'locale' => 'de_CH.UTF-8@euro',
-					'lang' => 'de_CH',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-			],
-			// missing session values check
-			// special parse session check for locales
-			'session missing encoding, set from parameters' => [
-				// lang, domain, encoding, path
-				self::SITE_LOCALE, self::SITE_DOMAIN, self::SITE_ENCODING, self::LOCALE_PATH,
-				// SESSION SETTINGS: locale, charset, domain, path
-				'ja', null, 'admin', __DIR__ . '/locale_other/',
-				// return array
-				[
-					'locale' => 'ja',
-					'lang' => 'ja',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?locale_other\/$/",
-				],
-			],
-			// null return check for invalid entries
-			'no session set, only parameters, all invalid' => [
-				// lang, domain, encoding, path
-				'###', '&&&&', '$$$$', 'foo_bar_path',
-				// SESSION SETTINGS: locale, charset, domain, path
-				null, null, null, null,
-				// return array
-				[
-					'locale' => null,
-					'lang' => null,
-					'domain' => null,
-					'encoding' => null,
-					'path' => null,
-				],
-			],
-			// invalid session names, fall backup
-			'all session vars are invalid, fallback' => [
-				// lang, domain, encoding, path
-				self::SITE_LOCALE, self::SITE_DOMAIN, self::SITE_ENCODING, self::LOCALE_PATH,
-				// SESSION SETTINGS: locale, charset, domain, path
-				'###', '&&&&', '$$$$', 'foo_bar_path',
-				// return array
-				[
-					'locale' => 'en_US.UTF-8',
-					'lang' => 'en_US',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-			],
-		];
-	}
-
-	/**
-	  * Undocumented function
-	  *
-	  * @covers ::setLocale
-	  * @dataProvider setLocaleFromSessionProvider
-	  * @testdox lang settings lang $language, domain $domain, encoding $encoding, path $path; session lang: $SESSION_DEFAULT_LOCALE, session char: $SESSION_DEFAULT_CHARSET [$_dataName]
-	  *
-	  * @param  string|      $language
-	  * @param  string|      $domain
-	  * @param  string|      $encoding
-	  * @param  string|      $path
-	  * @param  string|null  $SESSION_DEFAULT_LOCALE
-	  * @param  string|null  $SESSION_DEFAULT_CHARSET
-	  * @param  string|null  $SESSION_DEFAULT_DOMAIN
-	  * @param  string|null  $SESSION_LOCALE_PATH
-	  * @param  array<mixed> $expected
-	  * @return void
-	  */
-	public function testsetLocaleFromSession(
-		string $language,
-		string $domain,
-		string $encoding,
-		string $path,
-		?string $SESSION_DEFAULT_LOCALE,
-		?string $SESSION_DEFAULT_CHARSET,
-		?string $SESSION_DEFAULT_DOMAIN,
-		?string $SESSION_LOCALE_PATH,
-		array $expected,
-	): 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 ($SESSION_DEFAULT_DOMAIN !== null) {
-			$_SESSION['DEFAULT_DOMAIN'] = $SESSION_DEFAULT_DOMAIN;
-		}
-		if ($SESSION_LOCALE_PATH !== null) {
-			$_SESSION['LOCALE_PATH'] = $SESSION_LOCALE_PATH;
-		}
-		$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocaleFromSession(
-			$language,
-			$domain,
-			$encoding,
-			$path
-		);
-		// print "RETURN: " . print_r($return_lang_settings, true) . "\n";
-		foreach (
-			[
-				'locale', 'lang', 'domain', 'encoding', 'path'
-			] as $key
-		) {
-			$value = $expected[$key];
-			if (
-				!empty($value) &&
-				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']);
-	}
-}
-
-// __END__

4dev/tests/Language/includes/locale/ja

@@ -1 +0,0 @@
-ja_JP

4dev/tests/Logging/CoreLibsLoggingErrorMessagesTest.php

@@ -1,563 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-use CoreLibs\Logging\Logger\Level;
-
-/**
- * Test class for Logging
- * @coversDefaultClass \CoreLibs\Logging\ErrorMessages
- * @testdox \CoreLibs\Logging\ErrorMEssages method tests
- */
-final class CoreLibsLoggingErrorMessagesTest extends TestCase
-{
-	private const LOG_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'log' . DIRECTORY_SEPARATOR;
-
-	/**
-	 * tear down and remove log data
-	 *
-	 * @return void
-	 */
-	public static function tearDownAfterClass(): void
-	{
-		array_map('unlink', glob(self::LOG_FOLDER . '*.log'));
-	}
-
-	/**
-	 * for checking level only
-	 *
-	 * @return array
-	 */
-	public function providerErrorMessageLevel(): array
-	{
-		return [
-			'ok' => [
-				'level' => 'ok',
-				'str' => 'OK',
-				'expected' => 'ok',
-			],
-			'success' => [
-				'level' => 'success',
-				'str' => 'SUCCESS',
-				'expected' => 'success',
-			],
-			'info' => [
-				'level' => 'info',
-				'str' => 'INFO',
-				'expected' => 'info',
-			],
-			'notice' => [
-				'level' => 'notice',
-				'str' => 'NOTICE',
-				'expected' => 'notice',
-			],
-			'warn' => [
-				'level' => 'warn',
-				'str' => 'WARN',
-				'expected' => 'warn'
-			],
-			'warning' => [
-				'level' => 'warning',
-				'str' => 'WARN',
-				'expected' => 'warn'
-			],
-			'error' => [
-				'level' => 'error',
-				'str' => 'ERROR',
-				'expected' => 'error'
-			],
-			'abort' => [
-				'level' => 'abort',
-				'str' => 'ABORT',
-				'expected' => 'abort'
-			],
-			'crash' => [
-				'level' => 'crash',
-				'str' => 'CRASH',
-				'expected' => 'crash'
-			],
-			'wrong level' => [
-				'level' => 'wrong',
-				'str' => 'WRONG',
-				'expected' => 'unknown'
-			]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @dataProvider providerErrorMessageLevel
-	 * @testdox error message level: $level will be $expected [$_dataName]
-	 *
-	 * @param  string $level
-	 * @param  string $str
-	 * @param  string  $expected
-	 * @return void
-	 */
-	public function testErrorMessageLevelOk(string $level, string $str, string $expected): void
-	{
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testErrorMessagesLevelOk',
-			'log_folder' => self::LOG_FOLDER,
-			'log_level' => Level::Error,
-		]);
-		$em = new \CoreLibs\Logging\ErrorMessage($log);
-		$em->setMessage(
-			$level,
-			$str
-		);
-		$this->assertEquals(
-			[
-				'level' => $expected,
-				'str' => $str,
-				'id' => '',
-				'target' => '',
-				'target_style' => '',
-				'highlight' => [],
-			],
-			$em->getLastErrorMsg()
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox Test of all methods for n messages [$_dataName]
-	 *
-	 * @return void
-	 */
-	public function testErrorMessageOk(): void
-	{
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testErrorMessagesOk',
-			'log_folder' => self::LOG_FOLDER,
-			'log_level' => Level::Error
-		]);
-		$em = new \CoreLibs\Logging\ErrorMessage($log);
-		$em->setErrorMsg(
-			'100',
-			'info',
-			'INFO MESSAGE'
-		);
-
-		$this->assertEquals(
-			[
-				'id' => '100',
-				'level' => 'info',
-				'str' => 'INFO MESSAGE',
-				'target' => '',
-				'target_style' => '',
-				'highlight' => [],
-			],
-			$em->getLastErrorMsg()
-		);
-		$this->assertEquals(
-			['100'],
-			$em->getErrorIds()
-		);
-		$this->assertEquals(
-			[
-				[
-					'id' => '100',
-					'level' => 'info',
-					'str' => 'INFO MESSAGE',
-					'target' => '',
-					'target_style' => '',
-					'highlight' => [],
-				]
-			],
-			$em->getErrorMsg()
-		);
-
-		$em->setErrorMsg(
-			'200',
-			'error',
-			'ERROR MESSAGE'
-		);
-		$this->assertEquals(
-			[
-				'id' => '200',
-				'level' => 'error',
-				'str' => 'ERROR MESSAGE',
-				'target' => '',
-				'target_style' => '',
-				'highlight' => [],
-			],
-			$em->getLastErrorMsg()
-		);
-		$this->assertEquals(
-			['100', '200'],
-			$em->getErrorIds()
-		);
-		$this->assertEquals(
-			[
-				[
-					'id' => '100',
-					'level' => 'info',
-					'str' => 'INFO MESSAGE',
-					'target' => '',
-					'target_style' => '',
-					'highlight' => [],
-				],
-				[
-					'id' => '200',
-					'level' => 'error',
-					'str' => 'ERROR MESSAGE',
-					'target' => '',
-					'target_style' => '',
-					'highlight' => [],
-				]
-			],
-			$em->getErrorMsg()
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerErrorMessageLog(): array
-	{
-		return [
-			'error, not logged' => [
-				'id' => '200',
-				'level' => 'error',
-				'str' => 'ERROR MESSAGE',
-				'message' => null,
-				'log_error' => null,
-				'log_warning' => null,
-				'expected' => '<ERROR> ERROR MESSAGE',
-			],
-			'error, logged' => [
-				'id' => '200',
-				'level' => 'error',
-				'str' => 'ERROR MESSAGE',
-				'message' => null,
-				'log_error' => true,
-				'log_warning' => null,
-				'expected' => '<ERROR> ERROR MESSAGE',
-			],
-			'error, logged, message' => [
-				'id' => '200',
-				'level' => 'error',
-				'str' => 'ERROR MESSAGE',
-				'message' => 'OTHER ERROR MESSAGE',
-				'log_error' => true,
-				'log_warning' => null,
-				'expected' => '<ERROR> OTHER ERROR MESSAGE',
-			],
-			'warn, not logged' => [
-				'id' => '300',
-				'level' => 'warn',
-				'str' => 'WARNING MESSAGE',
-				'message' => null,
-				'log_error' => null,
-				'log_warning' => null,
-				'expected' => '<WARNING> WARNING MESSAGE',
-			],
-			'warn, logged' => [
-				'id' => '300',
-				'level' => 'warn',
-				'str' => 'WARNING MESSAGE',
-				'message' => null,
-				'log_error' => null,
-				'log_warning' => true,
-				'expected' => '<WARNING> WARNING MESSAGE',
-			],
-			'warn, logged, message' => [
-				'id' => '300',
-				'level' => 'warn',
-				'str' => 'WARNING MESSAGE',
-				'message' => 'OTHER WARNING MESSAGE',
-				'log_error' => null,
-				'log_warning' => true,
-				'expected' => '<WARNING> OTHER WARNING MESSAGE',
-			],
-			'notice' => [
-				'id' => '100',
-				'level' => 'notice',
-				'str' => 'NOTICE MESSAGE',
-				'message' => null,
-				'log_error' => null,
-				'log_warning' => null,
-				'expected' => '<NOTICE> NOTICE MESSAGE',
-			],
-			'notice, message' => [
-				'id' => '100',
-				'level' => 'notice',
-				'str' => 'NOTICE MESSAGE',
-				'message' => 'OTHER NOTICE MESSAGE',
-				'log_error' => null,
-				'log_warning' => null,
-				'expected' => '<NOTICE> OTHER NOTICE MESSAGE',
-			],
-			'crash' => [
-				'id' => '300',
-				'level' => 'crash',
-				'str' => 'CRASH MESSAGE',
-				'message' => null,
-				'log_error' => null,
-				'log_warning' => null,
-				'expected' => '<ALERT> CRASH MESSAGE',
-			],
-			'crash, message' => [
-				'id' => '300',
-				'level' => 'crash',
-				'str' => 'CRASH MESSAGE',
-				'message' => 'OTHER CRASH MESSAGE',
-				'log_error' => null,
-				'log_warning' => null,
-				'expected' => '<ALERT> OTHER CRASH MESSAGE',
-			],
-			'abort' => [
-				'id' => '200',
-				'level' => 'abort',
-				'str' => 'ABORT MESSAGE',
-				'message' => null,
-				'log_error' => null,
-				'log_warning' => null,
-				'expected' => '<CRITICAL> ABORT MESSAGE',
-			],
-			'abort, message' => [
-				'id' => '200',
-				'level' => 'abort',
-				'str' => 'ABORT MESSAGE',
-				'message' => 'OTHER ABORT MESSAGE',
-				'log_error' => null,
-				'log_warning' => null,
-				'expected' => '<CRITICAL> OTHER ABORT MESSAGE',
-			],
-			'unknown' => [
-				'id' => '400',
-				'level' => 'wrong level',
-				'str' => 'WRONG LEVEL MESSAGE',
-				'message' => null,
-				'log_error' => null,
-				'log_warning' => null,
-				'expected' => '<EMERGENCY> WRONG LEVEL MESSAGE',
-			],
-			'unknown, message' => [
-				'id' => '400',
-				'level' => 'wrong level',
-				'str' => 'WRONG LEVEL MESSAGE',
-				'message' => 'OTHER WRONG LEVEL MESSAGE',
-				'log_error' => null,
-				'log_warning' => null,
-				'expected' => '<EMERGENCY> OTHER WRONG LEVEL MESSAGE',
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @dataProvider providerErrorMessageLog
-	 * @testdox Test Log writing with log level Error [$_dataName]
-	 *
-	 * @param  string      $id
-	 * @param  string      $level
-	 * @param  string      $str
-	 * @param  string|null $message
-	 * @param  bool|null   $log_error
-	 * @param  bool|null   $log_warning
-	 * @param  string      $expected
-	 * @return void
-	 */
-	public function testErrorMessageLogErrorLevel(
-		string $id,
-		string $level,
-		string $str,
-		?string $message,
-		?bool $log_error,
-		?bool $log_warning,
-		string $expected
-	): void {
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testErrorMessagesLogError',
-			'log_folder' => self::LOG_FOLDER,
-			'log_level' => Level::Notice,
-			'log_per_run' => true
-		]);
-		$em = new \CoreLibs\Logging\ErrorMessage($log);
-		$em->setErrorMsg(
-			$id,
-			$level,
-			$str,
-			message: $message,
-			log_error: $log_error,
-			log_warning: $log_warning
-		);
-		$file_content = '';
-		if (is_file($log->getLogFolder() . $log->getLogFile())) {
-			$file_content = file_get_contents(
-				$log->getLogFolder() . $log->getLogFile()
-			) ?: '';
-		}
-		// if error, if null or false, it will not be logged
-		if ($level == 'error' && ($log_error === null || $log_error === false)) {
-			$this->assertStringNotContainsString(
-				$expected,
-				$file_content
-			);
-		} elseif ($level == 'warn' && ($log_warning === null || $log_warning === false)) {
-			$this->assertStringNotContainsString(
-				$expected,
-				$file_content
-			);
-		} else {
-			$this->assertStringContainsString(
-				$expected,
-				$file_content
-			);
-		}
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @dataProvider providerErrorMessageLog
-	 * @testdox Test Log writing with log Level Debug [$_dataName]
-	 *
-	 * @param  string      $id
-	 * @param  string      $level
-	 * @param  string      $str
-	 * @param  string|null $message
-	 * @param  bool|null   $log_error
-	 * @param  bool|null   $log_warning
-	 * @param  string      $expected
-	 * @return void
-	 */
-	public function testErrorMessageLogErrorDebug(
-		string $id,
-		string $level,
-		string $str,
-		?string $message,
-		?bool $log_error,
-		?bool $log_warning,
-		string $expected
-	): void {
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testErrorMessagesLogDebug',
-			'log_folder' => self::LOG_FOLDER,
-			'log_level' => Level::Debug,
-			'log_per_run' => true
-		]);
-		$em = new \CoreLibs\Logging\ErrorMessage($log);
-		$em->setErrorMsg(
-			$id,
-			$level,
-			$str,
-			message: $message,
-			log_error: $log_error,
-			log_warning: $log_warning
-		);
-		$file_content = '';
-		if (is_file($log->getLogFolder() . $log->getLogFile())) {
-			$file_content = file_get_contents(
-				$log->getLogFolder() . $log->getLogFile()
-			) ?: '';
-		}
-		// if error, and log is debug level, only explicit false are not logged
-		if ($level == 'error' && $log_error === false) {
-			$this->assertStringNotContainsString(
-				$expected,
-				$file_content
-			);
-		} elseif ($level == 'warn' && $log_warning === false) {
-			$this->assertStringNotContainsString(
-				$expected,
-				$file_content
-			);
-		} else {
-			$this->assertStringContainsString(
-				$expected,
-				$file_content
-			);
-		}
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox Test jump target set and reporting
-	 *
-	 * @return void
-	 */
-	public function testJumpTarget(): void
-	{
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testErrorMessagesLogDebug',
-			'log_folder' => self::LOG_FOLDER,
-			'log_level' => Level::Debug,
-			'log_per_run' => true
-		]);
-		$em = new \CoreLibs\Logging\ErrorMessage($log);
-		$em->setJumpTarget(
-			'target-f',
-			'Target text'
-		);
-		$this->assertEquals(
-			[
-				['target' => 'target-f', 'info' => 'Target text', 'level' => 'error']
-			],
-			$em->getJumpTarget()
-		);
-		// set same target, keep as before
-		$em->setJumpTarget(
-			'target-f',
-			'Other text'
-		);
-		$this->assertEquals(
-			[
-				['target' => 'target-f', 'info' => 'Target text', 'level' => 'error']
-			],
-			$em->getJumpTarget()
-		);
-		// add new now two messages
-		$em->setJumpTarget(
-			'target-s',
-			'More text'
-		);
-		$this->assertEquals(
-			[
-				['target' => 'target-f', 'info' => 'Target text', 'level' => 'error'],
-				['target' => 'target-s', 'info' => 'More text', 'level' => 'error'],
-			],
-			$em->getJumpTarget()
-		);
-		// add empty info
-		$em->setJumpTarget(
-			'target-e',
-			''
-		);
-		$this->assertEquals(
-			[
-				['target' => 'target-f', 'info' => 'Target text', 'level' => 'error'],
-				['target' => 'target-s', 'info' => 'More text', 'level' => 'error'],
-				['target' => 'target-e', 'info' => 'Jump to: target-e', 'level' => 'error'],
-			],
-			$em->getJumpTarget()
-		);
-		// add through message
-		$em->setErrorMsg('E-101', 'abort', 'Abort message', jump_target:[
-			'target' => 'abort-target',
-			'info' => 'Abort error'
-		]);
-		$this->assertEquals(
-			[
-				['target' => 'target-f', 'info' => 'Target text', 'level' => 'error'],
-				['target' => 'target-s', 'info' => 'More text', 'level' => 'error'],
-				['target' => 'target-e', 'info' => 'Jump to: target-e', 'level' => 'error'],
-				['target' => 'abort-target', 'info' => 'Abort error', 'level' => 'abort'],
-			],
-			$em->getJumpTarget()
-		);
-	}
-}
-
-// __END__

4dev/tests/Logging/CoreLibsLoggingLoggingTest.php

@@ -1,847 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-use CoreLibs\Logging\Logger\Level;
-use CoreLibs\Logging\Logger\Flag;
-
-// TODO: setLogPer test log file written matches pattern
-
-/**
- * Test class for Logging
- * @coversDefaultClass \CoreLibs\Logging\Logging
- * @testdox \CoreLibs\Logging\Logging method tests
- */
-final class CoreLibsLoggingLoggingTest extends TestCase
-{
-	private const LOG_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'log' . DIRECTORY_SEPARATOR;
-	private const REGEX_BASE = "\[[\d\-\s\.:]+\]\s{1}" // date
-		. "\[[\w\.]+(:\d+)?\]\s{1}" // host:port
-		. "\[(phar:\/\/)?[\w\-\.\/]+:\d+\]\s{1}" // folder/file [note phar:// is for phpunit]
-		. "\[\w+\]\s{1}" // run id
-		. "{[\w\\\\]+((::|->)\w+)?}\s{1}"; // class
-
-	public static function tearDownAfterClass(): void
-	{
-		array_map('unlink', glob(self::LOG_FOLDER . '*.log'));
-	}
-
-	/**
-	 * test set for options BASIC
-	 *
-	 * 0: options
-	 * - null for NOT set
-	 * 1: expected
-	 * 2: override
-	 * override:
-	 * - constant for COSNTANTS
-	 * - global for _GLOBALS
-	 *
-	 * @return array
-	 */
-	public function optionsProvider(): array
-	{
-		return [
-			'log folder set' => [
-				'options' => [
-					'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
-					'log_file_id' => 'testClassInit',
-				],
-				'expected' => [
-					'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
-					'log_level' => Level::Debug,
-					'log_file_id' => 'testClassInit',
-				],
-				'override' => [],
-			],
-			// -> deprecation warning, log_folder must be set
-			'no log folder set' => [
-				'options' => [
-					'log_file_id' => 'testClassInit'
-				],
-				'expected' => [
-					'log_folder' => getcwd() . DIRECTORY_SEPARATOR,
-					'log_level' => Level::Debug,
-					'log_file_id' => 'testClassInit',
-				],
-				'override' => []
-			],
-			// -> upcoming deprecated
-			'file_id set but not log_file_id' => [
-				'options' => [
-					'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
-					'file_id' => 'testClassInit',
-				],
-				'expected' => [
-					'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
-					'log_level' => Level::Debug,
-					'log_file_id' => 'testClassInit',
-				],
-				'override' => [],
-			],
-			// both file_id and log_file_id set -> WARNING
-			'file_id and log_file_id set' => [
-				'options' => [
-					'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
-					'file_id' => 'testClassInit',
-					'log_file_id' => 'testClassInit',
-				],
-				'expected' => [
-					'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
-					'log_level' => Level::Debug,
-					'log_file_id' => 'testClassInit',
-				],
-				'override' => [],
-			],
-			// no log file id set -> error,
-			'nothing set' => [
-				'options' => [],
-				'expected' => [
-					'log_folder' => getcwd() . DIRECTORY_SEPARATOR,
-					'log_level' => Level::Debug,
-					'log_file_id' => 'NOHOST-0_PHPUnit-TextUI-Command',
-				],
-				'override' => []
-			]
-		];
-	}
-
-	/**
-	 * init logging class
-	 *
-	 * @dataProvider optionsProvider
-	 * @testdox init test [$_dataName]
-	 *
-	 * @param array $options
-	 * @param array $expected
-	 * @param array $override
-	 * @return void
-	 */
-	public function testClassInit(array $options, array $expected, array $override): void
-	{
-		if (!empty($override['constant'])) {
-			foreach ($override['constant'] as $var => $value) {
-				if (!defined($var)) {
-					define($var, $value);
-				}
-			}
-			// for deprecated no log_folder set
-			// if base is defined and it does have AAASetupData set
-			// change the log_folder "Debug" to "AAASetupData"
-			if (
-				defined('BASE') &&
-				strpos(BASE, DIRECTORY_SEPARATOR . 'AAASetupData') !== false
-			) {
-				$expected['log_folder'] = str_replace(
-					DIRECTORY_SEPARATOR . 'Debug',
-					DIRECTORY_SEPARATOR . 'AAASetupData',
-					$expected['log_folder']
-				);
-			}
-		}
-		// if not log folder and constant set -> expect E_USER_DEPRECATION
-		if (!empty($override['constant']) && empty($options['log_folder'])) {
-			// the deprecation message
-			$deprecation_message = 'options: log_folder must be set. '
-				. 'Setting via BASE and LOG constants is deprecated';
-			// convert E_USER_DEPRECATED to a exception
-			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);
-		}
-		// alert for log file id with globals
-		if (!empty($override['constant']) && empty($options['log_file_id'])) {
-			//
-		}
-		// alert for log file id and file id set
-		if (
-			!empty($options['log_file_id']) &&
-			!empty($options['file_id'])
-		) {
-			set_error_handler(
-				static function (int $errno, string $errstr): never {
-					throw new \InvalidArgumentException($errstr, $errno);
-				},
-				E_USER_WARNING
-			);
-			$error_message = 'options: "file_id" is deprecated use: "log_file_id".';
-			$this->expectExceptionMessage($error_message);
-			$this->expectException(\InvalidArgumentException::class);
-			set_error_handler(
-				static function (int $errno, string $errstr): never {
-					throw new \Exception($errstr, $errno);
-				},
-				E_USER_DEPRECATED
-			);
-			$this->expectException(\Exception::class);
-			// $error_message = 'options: both log_file_id and log_id are set at the same time, will use log_file_id';
-			// $this->expectExceptionMessage($error_message);
-		}
-		// empty log folder
-		if (empty($override['constant']) && empty($options['log_folder'])) {
-			$this->expectException(\InvalidArgumentException::class);
-			$this->expectExceptionMessageMatches("/^Missing mandatory option: \"/");
-		} elseif (empty($options['log_file_id']) && !empty($options['file_id'])) {
-			// the deprecation message
-			$deprecation_message = 'options: "file_id" is deprecated use: "log_file_id".';
-			// convert E_USER_DEPRECATED to a exception
-			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);
-		}
-		$log = new \CoreLibs\Logging\Logging($options);
-		// reset error handler
-		restore_error_handler();
-		// check that settings match
-		$this->assertEquals(
-			$expected['log_folder'],
-			$log->getLogFolder(),
-			'log folder not matching'
-		);
-		$this->assertEquals(
-			$expected['log_file_id'],
-			$log->getLogFileId(),
-			'log file id not matching'
-		);
-	}
-
-	// test all setters/getters
-
-	// setLoggingLevel
-	// getLoggingLevel
-	// loggingLevelIsDebug
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::setLoggingLevel
-	 * @covers ::getLoggingLevel
-	 * @covers ::loggingLevelIsDebug
-	 * @testdox setLoggingLevel set/get checks
-	 *
-	 * @return void
-	 */
-	public function testSetLoggingLevel(): void
-	{
-		// valid that is not Debug
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testSetLoggingLevel',
-			'log_folder' => self::LOG_FOLDER,
-			'log_level' => Level::Info
-		]);
-		$this->assertEquals(
-			Level::Info,
-			$log->getLoggingLevel()
-		);
-		$this->assertFalse(
-			$log->loggingLevelIsDebug()
-		);
-		// not set, should be debug]
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testSetLoggingLevel',
-			'log_folder' => self::LOG_FOLDER,
-		]);
-		$this->assertEquals(
-			Level::Debug,
-			$log->getLoggingLevel()
-		);
-		$this->assertTrue(
-			$log->loggingLevelIsDebug()
-		);
-		// invalid, should be debug, will throw excpetion too
-		$this->expectException(\InvalidArgumentException::class);
-		$this->expectExceptionMessage('Option: "log_level" is not of instance \CoreLibs\Logging\Logger\Level');
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testSetLoggingLevel',
-			'log_folder' => self::LOG_FOLDER,
-			'log_level' => 'I'
-		]);
-		$this->assertEquals(
-			Level::Debug,
-			$log->getLoggingLevel()
-		);
-		$this->assertTrue(
-			$log->loggingLevelIsDebug()
-		);
-		// set valid, then change
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testSetLoggingLevel',
-			'log_folder' => self::LOG_FOLDER,
-			'log_level' => Level::Info
-		]);
-		$this->assertEquals(
-			Level::Info,
-			$log->getLoggingLevel()
-		);
-		$log->setLoggingLevel(Level::Notice);
-		$this->assertEquals(
-			Level::Notice,
-			$log->getLoggingLevel()
-		);
-		// illegal logging level
-		$this->expectException(\Psr\Log\InvalidArgumentException::class);
-		$this->expectExceptionMessageMatches("/^Level \"NotGood\" is not defined, use one of: /");
-		$log->setLoggingLevel('NotGood');
-	}
-
-	// setLogFileId
-	// getLogFileId
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::setLogFileId
-	 * @covers ::getLogFileId
-	 * @testdox setLogFileId set/get checks
-	 *
-	 * @return void
-	 */
-	public function testLogFileId(): void
-	{
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testLogFileId',
-			'log_folder' => self::LOG_FOLDER
-		]);
-		// bad, keep same
-		$log->setLogFileId('$$##$%#$%&');
-		$this->assertEquals(
-			'testLogFileId',
-			$log->getLogFileId()
-		);
-		// good, change
-		$log->setLogFileId('validID');
-		$this->assertEquals(
-			'validID',
-			$log->getLogFileId()
-		);
-		// invalid on init
-		$this->expectException(\Psr\Log\InvalidArgumentException::class);
-		$this->expectExceptionMessage('LogFileId: no log file id set');
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => '$$$"#"#$"#$',
-			'log_folder' => self::LOG_FOLDER
-		]);
-	}
-
-	// setLogUniqueId
-	// getLogUniqueId
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function logUniqueIdProvider(): array
-	{
-		return [
-			'option set' => [
-				'option' => true,
-				'override' => false,
-			],
-			'direct set' => [
-				'option' => false,
-				'override' => false,
-			],
-			'override set' => [
-				'option' => false,
-				'override' => true,
-			],
-			'option and override set' => [
-				'option' => false,
-				'override' => true,
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::setLogUniqueId
-	 * @covers ::getLogUniqueId
-	 * @dataProvider logUniqueIdProvider
-	 * @testdox per run log id set test: option: $option, override: $override [$_dataName]
-	 *
-	 * @param  bool $option
-	 * @param  bool $override
-	 * @return void
-	 */
-	public function testLogUniqueId(bool $option, bool $override): void
-	{
-		if ($option === true) {
-			$log = new \CoreLibs\Logging\Logging([
-				'log_file_id' => 'testLogUniqueId',
-				'log_folder' => self::LOG_FOLDER,
-				'log_per_run' => $option
-			]);
-		} else {
-			$log = new \CoreLibs\Logging\Logging([
-				'log_file_id' => 'testLogUniqueId',
-				'log_folder' => self::LOG_FOLDER
-			]);
-			$log->setLogUniqueId();
-		}
-		$per_run_id = $log->getLogUniqueId();
-		$this->assertMatchesRegularExpression(
-			"/^\d{4}-\d{2}-\d{2}_\d{6}_U_[a-z0-9]{8}$/",
-			$per_run_id,
-			'assert per log run id 1st'
-		);
-		if ($override === true) {
-			$log->setLogUniqueId(true);
-			$per_run_id_2nd = $log->getLogUniqueId();
-			$this->assertMatchesRegularExpression(
-				"/^\d{4}-\d{2}-\d{2}_\d{6}_U_[a-z0-9]{8}$/",
-				$per_run_id_2nd,
-				'assert per log run id 2nd'
-			);
-			$this->assertNotEquals(
-				$per_run_id,
-				$per_run_id_2nd,
-				'1st and 2nd don\'t match'
-			);
-		}
-	}
-
-	// setLogDate
-	// getLogDate
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::setLogDate
-	 * @covers ::getLogDate
-	 * @testdox setLogDate set/get checks
-	 *
-	 * @return void
-	 */
-	public function testSetLogDate(): void
-	{
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testLogFileId',
-			'log_folder' => self::LOG_FOLDER,
-			'log_per_date' => true,
-		]);
-		$this->assertEquals(
-			date('Y-m-d'),
-			$log->getLogDate()
-		);
-	}
-
-	// setLogFlag
-	// getLogFlag
-	// unsetLogFlag
-	// getLogFlags
-	// Logger\Flag
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers Logger\Flag
-	 * @testdox Logger\Flag enum test
-	 *
-	 * @return void
-	 */
-	public function testLoggerFlag(): void
-	{
-		// logger flags to check that they exist
-		$flags = [
-			'all_off' => 0,
-			'per_run' => 1,
-			'per_date' => 2,
-			'per_group' => 4,
-			'per_page' => 8,
-			'per_class' => 16,
-			'per_level' => 32,
-		];
-		// from int -> return value
-		foreach ($flags as $name => $value) {
-			$this->assertEquals(
-				Flag::fromName($name),
-				Flag::fromValue($value)
-			);
-		}
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::setLogFlag
-	 * @covers ::getLogFlag
-	 * @covers ::unsetLogFlag
-	 * @covers ::getLogFlags
-	 * @testdox setLogDate set/get checks
-	 *
-	 * @return void
-	 */
-	public function testSetLogFlag(): void
-	{
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testSetLogFlag',
-			'log_folder' => self::LOG_FOLDER,
-		]);
-		// set valid log flag
-		$log->setLogFlag(Flag::per_run);
-		$this->assertTrue(
-			$log->getLogFlag(Flag::per_run)
-		);
-		// flags seum
-		$this->assertEquals(
-			Flag::per_run->value,
-			$log->getLogFlags(),
-		);
-		// unset valid log flag
-		$log->unsetLogFlag(Flag::per_run);
-		$this->assertFalse(
-			$log->getLogFlag(Flag::per_run)
-		);
-		// illegal Flags cannot be set, they will throw eerros onrun
-
-		// test multi set and sum is equals set
-		$log->setLogFlag(Flag::per_date);
-		$log->setLogFlag(Flag::per_group);
-		$this->assertEquals(
-			Flag::per_date->value + Flag::per_group->value,
-			$log->getLogFlags()
-		);
-	}
-
-	// setLogFolder
-	// getLogFolder
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::setLogFolder
-	 * @covers ::getLogFolder
-	 * @testdox setLogFolder set/get checks, init check
-	 *
-	 * @return void
-	 */
-	public function testSetLogFolder(): void
-	{
-		// set to good folder
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testSetLogFolder',
-			'log_folder' => self::LOG_FOLDER,
-		]);
-		$this->assertEquals(
-			self::LOG_FOLDER,
-			$log->getLogFolder()
-		);
-		// set to a good other folder
-		$log->setLogFolder(DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR);
-		$this->assertEquals(
-			DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
-			$log->getLogFolder()
-		);
-		// good other folder with missing trailing slash
-		$log->setLogFolder(DIRECTORY_SEPARATOR . 'tmp');
-		$this->assertEquals(
-			DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
-			$log->getLogFolder()
-		);
-		// a bad folder -> last good folder
-		$log->setLogFolder('I-am-not existing');
-		$this->assertEquals(
-			DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
-			$log->getLogFolder()
-		);
-		// init with a bad folder
-		$this->expectException(\Psr\Log\InvalidArgumentException::class);
-		$this->expectExceptionMessage('Folder: "I-am-bad" is not writeable for logging');
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testSetLogFolderInvalid',
-			'log_folder' => 'I-am-bad',
-		]);
-	}
-
-	// getLogFile (no set, only correct after log run)
-
-	// setLogMaxFileSize
-	// getLogMaxFileSize
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::setLogMaxFileSize
-	 * @covers ::getLogMaxFileSize
-	 * @testdox setLogMaxFileSize set/get checks, init check
-	 *
-	 * @return void
-	 */
-	public function testSetLogMaxFileSize(): void
-	{
-		// init set to 0
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testSetLogMaxFileSize',
-			'log_folder' => self::LOG_FOLDER,
-		]);
-		$this->assertEquals(
-			0,
-			$log->getLogMaxFileSize()
-		);
-		// set to new, valid size
-		$file_size = 200 * 1024;
-		$valid = $log->setLogMaxFileSize($file_size);
-		$this->assertTrue($valid);
-		$this->assertEquals(
-			$file_size,
-			$log->getLogMaxFileSize()
-		);
-		// invalid size, < 0, will be last and return false
-		$valid = $log->setLogMaxFileSize(-1);
-		$this->assertFalse($valid);
-		$this->assertEquals(
-			$file_size,
-			$log->getLogMaxFileSize()
-		);
-		// too small (< MIN_LOG_MAX_FILESIZE)
-		$valid = $log->setLogMaxFileSize($log::MIN_LOG_MAX_FILESIZE - 1);
-		$this->assertFalse($valid);
-		$this->assertEquals(
-			$file_size,
-			$log->getLogMaxFileSize()
-		);
-	}
-
-	// getOption (option params)
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::getOption
-	 * @testdox getOption checks
-	 *
-	 * @return void
-	 */
-	public function testGetOption(): void
-	{
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testGetOption',
-			'log_folder' => self::LOG_FOLDER,
-		]);
-		$this->assertEquals(
-			self::LOG_FOLDER,
-			$log->getOption('log_folder')
-		);
-		// not found
-		$this->assertNull(
-			$log->getOption('I_do not exist')
-		);
-	}
-
-	// test all logger functions
-	// debug (special)
-	// info
-	// notice
-	// warning
-	// error
-	// critical
-	// alert
-	// emergency
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::debug
-	 * @testdox debug checks
-	 *
-	 * @return void
-	 */
-	public function testDebug(): void
-	{
-		// init logger
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testDebug',
-			'log_folder' => self::LOG_FOLDER,
-		]);
-		// clean all data in folder first
-		array_map('unlink', glob($log->getLogFolder() . $log->getLogFileId() . '*.log'));
-
-		$group_id = 'G';
-		$message = 'D';
-		$log_status = $log->debug($group_id, $message);
-		$this->assertTrue($log_status, 'debug write successful');
-		$file_content = file_get_contents(
-			$log->getLogFolder() . $log->getLogFile()
-		) ?: '';
-		$log_level = $log->getLoggingLevel()->getName();
-		// [2023-05-30 15:51:39.36128800] [NOHOST:0]
-		// [www/vendor/bin/phpunit] [7b9d0747] {PHPUnit\TextUI\Command}
-		// <DEBUG:G> D
-		$this->assertMatchesRegularExpression(
-			"/" . self::REGEX_BASE
-				. "<$log_level:$group_id>\s{1}" // log level / group id
-				. "$message" // message
-				. "/",
-			$file_content
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerLoggingLevelWrite(): array
-	{
-		return [
-			'info' => [
-				'message' => 'I',
-				'file_id' => Level::Info->name,
-				'level' => Level::Info
-			],
-			'notice' => [
-				'message' => 'N',
-				'file_id' => Level::Notice->name,
-				'level' => Level::Notice
-			],
-			'warning' => [
-				'message' => 'W',
-				'file_id' => Level::Warning->name,
-				'level' => Level::Warning
-			],
-			'error' => [
-				'message' => 'E',
-				'file_id' => Level::Error->name,
-				'level' => Level::Error
-			],
-			'crticial' => [
-				'message' => 'C',
-				'file_id' => Level::Critical->name,
-				'level' => Level::Critical
-			],
-			'alert' => [
-				'message' => 'A',
-				'file_id' => Level::Alert->name,
-				'level' => Level::Alert
-			],
-			'emergency' => [
-				'message' => 'Em',
-				'file_id' => Level::Emergency->name,
-				'level' => Level::Emergency
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::info
-	 * @covers ::notice
-	 * @covers ::warning
-	 * @covers ::error
-	 * @covers ::critical
-	 * @covers ::alert
-	 * @covers ::emergency
-	 * @dataProvider providerLoggingLevelWrite
-	 * @testdox logging level write checks for $level [$_dataName]
-	 *
-	 * @return void
-	 */
-	public function testLoggingLevelWrite(string $message, string $file_id, Level $level): void
-	{
-		// init logger
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'test' . $file_id,
-			'log_folder' => self::LOG_FOLDER,
-			'log_level' => $level,
-		]);
-		// clean all data in folder first
-		array_map('unlink', glob($log->getLogFolder() . $log->getLogFileId() . '*.log'));
-
-		switch ($level->value) {
-			case 200:
-				$log_status = $log->info($message);
-				break;
-			case 250:
-				$log_status = $log->notice($message);
-				break;
-			case 300:
-				$log_status = $log->warning($message);
-				break;
-			case 400:
-				$log_status = $log->error($message);
-				break;
-			case 500:
-				$log_status = $log->critical($message);
-				break;
-			case 550:
-				$log_status = $log->alert($message);
-				break;
-			case 600:
-				$log_status = $log->emergency($message);
-				break;
-		}
-		$this->assertTrue($log_status, 'log write successful');
-		$file_content = file_get_contents(
-			$log->getLogFolder() . $log->getLogFile()
-		) ?: '';
-		$log_level = $log->getLoggingLevel()->getName();
-		$this->assertMatchesRegularExpression(
-			"/" . self::REGEX_BASE
-				. "<$log_level>\s{1}" // log level / group id
-				. "$message" // message
-				. "/",
-			$file_content,
-			'log message regex'
-		);
-	}
-
-	// check log level that writer writes in correct level
-	// also that non debug ignores prefix/group
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::log
-	 * @testdox log() general call test
-	 *
-	 * @return void
-	 */
-	public function testLoggingLog(): void
-	{
-		// init logger
-		$log = new \CoreLibs\Logging\Logging([
-			'log_file_id' => 'testLoggingLog',
-			'log_folder' => self::LOG_FOLDER,
-			'log_per_level' => true,
-		]);
-		$log_ok = $log->log(Level::Debug, 'DEBUG', group_id: 'GROUP_ID', prefix: 'PREFIX:');
-		$this->assertTrue($log_ok, 'assert ::log (debug) OK');
-		$this->assertEquals(
-			$log->getLogFile(),
-			$log->getLogFileId() . '_DEBUG.log'
-		);
-		$log_ok = $log->log(Level::Info, 'INFO', group_id: 'GROUP_ID', prefix: 'PREFIX:');
-		$this->assertTrue($log_ok, 'assert ::log (info) OK');
-		$this->assertEquals(
-			$log->getLogFile(),
-			$log->getLogFileId() . '_INFO.log'
-		);
-	}
-
-	// must test flow:
-	// init normal
-	// log -> check file name
-	// set per date
-	// log -> check file name
-	// and same for per_run
-
-	// deprecated calls check?
-}
-
-// __END__

4dev/tests/Logging/log/.gitignore

@@ -1,3 +0,0 @@
-*log
-*LOG
-!.gitignore

4dev/tests/Output/CoreLibsOutputImageTest.php

@@ -1,105 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for Output\Image
- * @coversDefaultClass \CoreLibs\Output\Image
- * @testdox \CoreLibs\Output\Image method tests
- */
-final class CoreLibsOutputImageTest extends TestCase
-{
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::createThumbnail
-	 * @testdox createThumbnail checks
-	 *
-	 * @return void
-	 */
-	public function testCreateThumbnail(): void
-	{
-		// CONVERT does not exist
-		$this->expectException(\RuntimeException::class);
-		\CoreLibs\Output\Image::createThumbnail('do_not_exist.png', 200, 200);
-		// set convert
-		$paths = [
-			'/bin',
-			'/usr/bin',
-			'/usr/local/bin',
-		];
-		// find convert
-		foreach ($paths as $path) {
-			if (
-				file_exists($path . DIRECTORY_SEPARATOR . 'convert') &&
-				is_file($path . DIRECTORY_SEPARATOR . 'convert')
-			) {
-				// image magick convert location
-				define('CONVERT', $path . DIRECTORY_SEPARATOR . 'convert');
-				break;
-			}
-		}
-		unset($paths);
-		// cannot set dummy file
-		$this->expectException(\Exception::class);
-		\CoreLibs\Output\Image::createThumbnail('do_not_exist.png', 200, 200);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::createThumbnailSimple
-	 * @testdox createThumbnailSimple checks
-	 *
-	 * @return void
-	 */
-	public function testCreateThumbnailSimple(): void
-	{
-		// file does not exist
-		$this->expectException(\UnexpectedValueException::class);
-		\CoreLibs\Output\Image::createThumbnailSimple(
-			'do_not_exist.png',
-			200,
-			200,
-			cache_folder: '/tmp/',
-			web_folder: '/tmp/'
-		);
-		// cache folder is not dir
-		$this->expectException(\UnexpectedValueException::class);
-		\CoreLibs\Output\Image::createThumbnailSimple(
-			'do_not_exist.png',
-			200,
-			200,
-			cache_folder: '/foo/bar/',
-			web_folder: '/tmp/'
-		);
-		// target cache folder is not writeable
-
-		// RuntimeException: imagecreatetruecolor failed
-		// RuntimeException: imagecolorallocatealpha failed
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::correctImageOrientation
-	 * @testdox correctImageOrientation checks
-	 *
-	 * @return void
-	 */
-	public function testCorrectImageOrientation(): void
-	{
-		// test file does not exist
-		$this->expectException(\UnexpectedValueException::class);
-		\CoreLibs\Output\Image::correctImageOrientation('do_not_exist.png');
-		// test folder not writeable
-		// test exit_read_data not present (how)?
-		// test image rotate
-	}
-}
-
-// __END__

4dev/tests/Security/CoreLibsSecuritySymmetricEncryptionTest.php

@@ -1,402 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-use CoreLibs\Security\CreateKey;
-use CoreLibs\Security\SymmetricEncryption;
-
-/**
- * Test class for Security\SymmetricEncryption and Security\CreateKey
- * @coversDefaultClass \CoreLibs\Security\SymmetricEncryption
- * @testdox \CoreLibs\Security\SymmetricEncryption method tests
- */
-final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
-{
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerEncryptDecryptSuccess(): array
-	{
-		return [
-			'valid string' => [
-				'input' => 'I am a secret',
-				'expected' => 'I am a secret',
-			],
-		];
-	}
-
-	/**
-	 * test encrypt/decrypt produce correct output
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptDecryptSuccess
-	 * @testdox encrypt/decrypt $input must be $expected [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testEncryptDecryptSuccess(string $input, string $expected): void
-	{
-		$key = CreateKey::generateRandomKey();
-
-		// test class
-		$crypt = new SymmetricEncryption($key);
-		$encrypted = $crypt->encrypt($input);
-		$decrypted = $crypt->decrypt($encrypted);
-		$this->assertEquals(
-			$expected,
-			$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);
-		$this->assertEquals(
-			$expected,
-			$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);
-
-		$this->assertEquals(
-			$expected,
-			$decrypted,
-			'Static call',
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerEncryptFailed(): array
-	{
-		return [
-			'wrong decryption key' => [
-				'input' => 'I am a secret',
-				'excpetion_message' => 'Invalid Key'
-			],
-		];
-	}
-
-	/**
-	 * Test decryption with wrong key
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptFailed
-	 * @testdox decrypt with wrong key $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testEncryptFailed(string $input, string $exception_message): void
-	{
-		$key = CreateKey::generateRandomKey();
-		$wrong_key = CreateKey::generateRandomKey();
-
-		// wrong key in class call
-		$crypt = new SymmetricEncryption($key);
-		$encrypted = $crypt->encrypt($input);
-		$this->expectExceptionMessage($exception_message);
-		$crypt->setKey($wrong_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);
-		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::decryptKey($encrypted, $wrong_key);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerWrongKey(): array
-	{
-		return [
-			'not hex key' => [
-				'key' => 'not_a_hex_key',
-				'exception_message' => 'Invalid hex key'
-			],
-			'too short hex key' => [
-				'key' => '1cabd5cba9e042f12522f4ff2de5c31d233b',
-				'excpetion_message' => 'Key is not the correct size (must be '
-			],
-		];
-	}
-
-	/**
-	 * test invalid key provided to decrypt or encrypt
-	 *
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerWrongKey
-	 * @testdox wrong key $key throws $exception_message [$_dataName]
-	 *
-	 * @param  string $key
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongKey(string $key, string $exception_message): void
-	{
-		$enc_key = CreateKey::generateRandomKey();
-
-		// class
-		$crypt = new SymmetricEncryption($key);
-		$this->expectExceptionMessage($exception_message);
-		$crypt->encrypt('test');
-		$crypt->setKey($enc_key);
-		$encrypted = $crypt->encrypt('test');
-		$this->expectExceptionMessage($exception_message);
-		$crypt->setKey($key);
-		$crypt->decrypt($encrypted);
-
-		// 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);
-
-		// 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);
-	}
-
-	/**
-	 * 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
-	 *
-	 * @return array
-	 */
-	public function providerWrongCiphertext(): array
-	{
-		return [
-			'too short ciphertext' => [
-				'input' => 'short',
-				'exception_message' => 'Decipher message failed: '
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::decrypt
-	 * @dataProvider providerWrongCiphertext
-	 * @testdox too short ciphertext $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongCiphertext(string $input, string $exception_message): void
-	{
-		$key = CreateKey::generateRandomKey();
-		// class
-		$crypt = new SymmetricEncryption($key);
-		$this->expectExceptionMessage($exception_message);
-		$crypt->decrypt($input);
-
-		// 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 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/tests/Template/CoreLibsTemplateHtmlBuilderBlockTest.php

@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-use CoreLibs\Template\HtmlBuilder\Block;
-
-/**
- * Test class for Template\HtmlBuilder\Block
- * @coversDefaultClass \CoreLibs\Template\HtmlBuilder\Block
- * @testdox \CoreLibs\Template\HtmlBuilder\Block method tests
- */
-final class CoreLibsTemplateHtmlBuilderBlockTest extends TestCase
-{
-	public function testCreateBlock(): void
-	{
-		$el = Block::cel('div', 'id', 'content', ['css'], ['onclick' => 'foo();']);
-		$this->assertEquals(
-			'<div id="id" class="css" onclick="foo();">content</div>',
-			Block::buildHtml($el)
-		);
-	}
-
-	// ael
-	// aelx|addSub
-	// resetSub
-	// acssel/rcssel/scssel
-	// buildHtml
-	// buildHtmlFromList|printHtmlFromArray
-}
-
-// __END__

4dev/tests/Template/CoreLibsTemplateHtmlBuilderElementTest.php

@@ -1,546 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-use CoreLibs\Template\HtmlBuilder\Element;
-use CoreLibs\Template\HtmlBuilder\General\Error;
-use CoreLibs\Template\HtmlBuilder\General\HtmlBuilderExcpetion;
-
-/**
- * Test class for Template\HtmlBuilder\Element
- * @coversDefaultClass \CoreLibs\Template\HtmlBuilder\Element
- * @testdox \CoreLibs\Template\HtmlBuilder\Element method tests
- */
-final class CoreLibsTemplateHtmlBuilderElementTest extends TestCase
-{
-	public function providerCreateElements(): array
-	{
-		return [
-			'simple div' => [
-				'tag' => 'div',
-				'id' => 'id',
-				'content' => 'content',
-				'css' => ['css'],
-				'options' => ['onclick' => 'foo();'],
-				'expected' => '<div id="id" class="css" onclick="foo();">content</div>'
-			],
-			'simple input' => [
-				'tag' => 'input',
-				'id' => 'id',
-				'content' => null,
-				'css' => ['css'],
-				'options' => ['name' => 'name', 'onclick' => 'foo();'],
-				'expected' => '<input id="id" name="name" class="css" onclick="foo();">'
-			]
-		];
-	}
-
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::Element
-	 * @covers ::buildHtml
-	 * @covers ::getTag
-	 * @covers ::getId
-	 * @covers ::getContent
-	 * @covers ::getOptions
-	 * @covers ::getCss
-	 * @dataProvider providerCreateElements
-	 * @testdox create single new Element test [$_dataName]
-	 *
-	 * @param  string      $tag
-	 * @param  string|null $id
-	 * @param  string|null $content
-	 * @param  array|null  $css
-	 * @param  array|null  $options
-	 * @param  string      $expected
-	 * @return void
-	 */
-	public function testCreateElement(
-		string $tag,
-		?string $id,
-		?string $content,
-		?array $css,
-		?array $options,
-		string $expected
-	): void {
-		$el = new Element($tag, $id ?? '', $content ?? '', $css ?? [], $options ?? []);
-		$this->assertEquals(
-			$expected,
-			$el->buildHtml(),
-			'element creation failed'
-		);
-
-		$this->assertEquals(
-			$tag,
-			$el->getTag(),
-			'get tag failed'
-		);
-
-		if ($id !== null) {
-			$this->assertEquals(
-				$id,
-				$el->getId(),
-				'get id failed'
-			);
-		}
-		if ($content !== null) {
-			$this->assertEquals(
-				$content,
-				$el->getContent(),
-				'get content failed'
-			);
-		}
-		if ($css !== null) {
-			$this->assertEquals(
-				$css,
-				$el->getCss(),
-				'get css failed'
-			);
-		}
-		if ($options !== null) {
-			$this->assertEquals(
-				$options,
-				$el->getOptions(),
-				'get options failed'
-			);
-		}
-		if (!empty($options['name'])) {
-			$this->assertEquals(
-				$options['name'],
-				$el->getName(),
-				'get name failed'
-			);
-		}
-	}
-
-	/**
-	 * css add/remove
-	 *
-	 * @cover ::getCss
-	 * @cover ::addCss
-	 * @cover ::removeCss
-	 * @testdox test handling of adding and removing css classes
-	 *
-	 * @return void
-	 */
-	public function testCssHandling(): void
-	{
-		$el = new Element('div', 'css-test', 'CSS content');
-		$this->assertEqualsCanonicalizing(
-			[],
-			$el->getCss(),
-			'check empty css'
-		);
-		$el->addCss('foo');
-		$this->assertEqualsCanonicalizing(
-			['foo'],
-			$el->getCss(),
-			'check added one css'
-		);
-		$el->removeCss('foo');
-		$this->assertEqualsCanonicalizing(
-			[],
-			$el->getCss(),
-			'check remove added css'
-		);
-		// add serveral
-		// remove some of them
-		$el->addCss('a', 'b', 'c');
-		$this->assertEqualsCanonicalizing(
-			['a', 'b', 'c'],
-			$el->getCss(),
-			'check added some css'
-		);
-		$el->removeCss('a', 'c');
-		// $this->assertArray
-		$this->assertEqualsCanonicalizing(
-			['b'],
-			$el->getCss(),
-			'check remove some css'
-		);
-		// chained add and remove
-		$el->addCss('a', 'b', 'c', 'd')->removeCss('b', 'd');
-		$this->assertEqualsCanonicalizing(
-			['a', 'c'],
-			$el->getCss(),
-			'check chain add remove some css'
-		);
-		$el->resetCss();
-		$this->assertEqualsCanonicalizing(
-			[],
-			$el->getCss(),
-			'check reset css'
-		);
-		// remove something that does not eixst
-		$el->addCss('exists');
-		$el->removeCss('not');
-		$this->assertEqualsCanonicalizing(
-			['exists'],
-			$el->getCss(),
-			'check remove not exitsing'
-		);
-	}
-
-	/**
-	 * nested test
-	 *
-	 * @testdox nested test and loop assign detection
-	 *
-	 * @return void
-	 */
-	public function testBuildNested(): void
-	{
-		Error::resetMessages();
-		$el = new Element('div', 'build-test');
-		$el_sub = new Element('div', 'sub-1');
-		$el->addSub($el_sub);
-		$this->assertEquals(
-			'<div id="build-test"><div id="sub-1"></div></div>',
-			$el->buildHtml(),
-			'nested build failed'
-		);
-		// this would create a loop, throws error
-		$this->expectException(HtmlBuilderExcpetion::class);
-		$this->expectExceptionMessage("Cannot assign Element to itself, this would create an infinite loop");
-		$el_sub->addSub($el_sub);
-		$this->assertEquals(
-			'<div id="sub-1"></div>',
-			$el_sub->buildHtml(),
-			'loop detection failed'
-		);
-		$this->assertTrue(
-			Error::hasError(),
-			'failed to throw error post loop detection'
-		);
-		$this->assertEquals(
-			[[
-				'level' => 'Error',
-				'id' => '100',
-				'message' => 'Cannot assign Element to itself, this would create an infinite loop',
-				'context' => ['tag' => 'div', 'id' => 'sub-1']
-			]],
-			Error::getMessages(),
-			'check error is 100 failed'
-		);
-		// get sub
-		$this->assertEquals(
-			[$el_sub],
-			$el->getSub(),
-			'get sub failed'
-		);
-		// reset sub
-		$el->resetSub();
-		$this->assertEquals(
-			[],
-			$el->getSub(),
-			'reset sub failed'
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox updated nested connection
-	 *
-	 * @return void
-	 */
-	public function testNestedChangeContent(): void
-	{
-		$el = new Element('div', 'build-test');
-		$el_s_1 = new Element('div', 'sub-1');
-		$el_s_2 = new Element('div', 'sub-2');
-		$el_s_3 = new Element('div', 'sub-3');
-		$el_s_4 = new Element('div', 'sub-4');
-
-		$el->addSub($el_s_1, $el_s_2);
-		// only sub -1, -2
-		$this->assertEquals(
-			'<div id="build-test"><div id="sub-1"></div><div id="sub-2"></div></div>',
-			$el->buildHtml(),
-			'check basic nested'
-		);
-
-		// now add -3, -4 to both -1 and -2
-		$el_s_1->addSub($el_s_3, $el_s_4);
-		$el_s_2->addSub($el_s_3, $el_s_4);
-		$this->assertEquals(
-			'<div id="build-test"><div id="sub-1"><div id="sub-3"></div><div id="sub-4">'
-			. '</div></div><div id="sub-2"><div id="sub-3"></div><div id="sub-4"></div>'
-			. '</div></div>',
-			$el->buildHtml(),
-			'check nested added'
-		);
-
-		// now add some css to el_s_3, will update in both sets
-		$el_s_3->addCss('red');
-		$this->assertEquals(
-			'<div id="build-test"><div id="sub-1"><div id="sub-3" class="red"></div><div id="sub-4">'
-			. '</div></div><div id="sub-2"><div id="sub-3" class="red"></div><div id="sub-4"></div>'
-			. '</div></div>',
-			$el->buildHtml(),
-			'check nested u@dated'
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox test change tag/id/content
-	 *
-	 * @return void
-	 */
-	public function testChangeElementData(): void
-	{
-		$el = new Element('div', 'id', 'Content');
-		// content change
-		$this->assertEquals(
-			'Content',
-			$el->getContent(),
-			'set content'
-		);
-		$el->setContent('New Content');
-		$this->assertEquals(
-			'New Content',
-			$el->getContent(),
-			'changed content'
-		);
-
-		$this->assertEquals(
-			'div',
-			$el->getTag(),
-			'set tag'
-		);
-		$el->setTag('span');
-		$this->assertEquals(
-			'span',
-			$el->getTag(),
-			'changed tag'
-		);
-
-		$this->assertEquals(
-			'id',
-			$el->getId(),
-			'set id'
-		);
-		$el->setId('id-2');
-		$this->assertEquals(
-			'id-2',
-			$el->getId(),
-			'changed id'
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox test change options
-	 *
-	 * @return void
-	 */
-	public function testChangeOptions(): void
-	{
-		$el = new Element('button', 'id', 'Action', ['css'], ['value' => '3']);
-		$this->assertEquals(
-			['value' => '3'],
-			$el->getOptions(),
-			'set option'
-		);
-		$el->setOptions([
-			'value' => '2'
-		]);
-		$this->assertEquals(
-			['value' => '2'],
-			$el->getOptions(),
-			'changed option'
-		);
-		// add a new one
-		$el->setOptions([
-			'Foo' => 'bar',
-			'Moo' => 'cow'
-		]);
-		$this->assertEquals(
-			[
-				'value' => '2',
-				'Foo' => 'bar',
-				'Moo' => 'cow'
-			],
-			$el->getOptions(),
-			'changed option'
-		);
-	}
-
-	// build output
-	// build from array list
-
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox build element tree from object
-	 *
-	 * @return void
-	 */
-	public function testBuildHtmlObject(): void
-	{
-		// build a simple block
-		// div -> div -> button
-		//     -> div -> span
-		//     -> div -> input
-		$el = new Element('div', 'master', '', ['master']);
-		$el->addSub(
-			Element::addElement(
-				new Element('div', 'div-button', '', ['dv-bt']),
-				new Element('button', 'button-id', 'Click me', ['bt-red'], [
-					'OnClick' => 'action();',
-					'value' => 'click',
-					'type' => 'button'
-				]),
-			),
-			Element::addElement(
-				new Element('div', 'div-span', '', ['dv-sp']),
-				new Element('span', 'span-id', 'Big important message<br>other', ['red']),
-			),
-			Element::addElement(
-				new Element('div', 'div-input', '', ['dv-in']),
-				new Element('input', 'input-id', '', ['in-blue'], [
-					'OnClick' => 'otherAction();',
-					'value' => 'Touch',
-					'type' => 'button'
-				]),
-			),
-		);
-		$this->assertEquals(
-			'<div id="master" class="master">'
-			. '<div id="div-button" class="dv-bt">'
-			. '<button id="button-id" name="button-id" class="bt-red" OnClick="action();" '
-			. 'value="click" type="button">Click me</button>'
-			. '</div>'
-			. '<div id="div-span" class="dv-sp">'
-			. '<span id="span-id" class="red">Big important message<br>other</span>'
-			. '</div>'
-			. '<div id="div-input" class="dv-in">'
-			. '<input id="input-id" name="input-id" '
-			. 'class="in-blue" OnClick="otherAction();" value="Touch" type="button">'
-			. '</div>'
-			. '</div>',
-			$el->buildHtml()
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox build elements from array list
-	 *
-	 * @return void
-	 */
-	public function testbuildHtmlArray(): void
-	{
-		$this->assertEquals(
-			'<div id="id-1">A</div>'
-			. '<div id="id-2">B</div>'
-			. '<div id="id-3">C</div>',
-			Element::buildHtmlFromList([
-				new Element('div', 'id-1', 'A'),
-				new Element('div', 'id-2', 'B'),
-				new Element('div', 'id-3', 'C'),
-			])
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox check for invalid tag detection, possible invalid id, possible invalid css
-	 *
-	 * @return void
-	 */
-	public function testInvalidElement(): void
-	{
-		Error::resetMessages();
-		$this->expectException(HtmlBuilderExcpetion::class);
-		$this->expectExceptionMessage("Could not create Element");
-		$el = new Element('');
-		$this->assertTrue(
-			Error::hasError(),
-			'failed to set error invalid tag detection'
-		);
-		$this->assertEquals(
-			[[
-				'level' => 'Error',
-				'id' => '201',
-				'message' => 'invalid or empty tag',
-				'context' => ['tag' => '']
-			]],
-			Error::getMessages(),
-			'check error message failed'
-		);
-
-		// if we set invalid tag
-		$el = new Element('div');
-		$this->expectException(HtmlBuilderExcpetion::class);
-		$this->expectExceptionMessageMatches("/^Invalid or empty tag: /");
-		$this->expectExceptionMessage("Invalid or empty tag: 123123");
-		$el->setTag('123123');
-		$this->assertTrue(
-			Error::hasError(),
-			'failed to set error invalid tag detection'
-		);
-		$this->assertEquals(
-			[[
-				'level' => 'Error',
-				'id' => '201',
-				'message' => 'invalid or empty tag',
-				'context' => ['tag' => '']
-			]],
-			Error::getMessages(),
-			'check error message failed'
-		);
-
-
-		// invalid id (warning)
-		Error::resetMessages();
-		$el = new Element('div', '-$a15');
-		$this->assertTrue(
-			Error::hasWarning(),
-			'failed to set warning invalid id detection'
-		);
-		$this->assertEquals(
-			[[
-				'level' => 'Warning',
-				'id' => '202',
-				'message' => 'possible invalid id',
-				'context' => ['id' => '-$a15', 'tag' => 'div']
-			]],
-			Error::getMessages(),
-			'check error message failed'
-		);
-
-		// invalid name
-		Error::resetMessages();
-		$el = new Element('div', 'valid', '', [], ['name' => '-$asdf&']);
-		$this->assertTrue(
-			Error::hasWarning(),
-			'failed to set warning invalid name detection'
-		);
-		$this->assertEquals(
-			[[
-				'level' => 'Warning',
-				'id' => '203',
-				'message' => 'possible invalid name',
-				'context' => ['name' => '-$asdf&', 'id' => 'valid', 'tag' => 'div']
-			]],
-			Error::getMessages(),
-			'check error message failed'
-		);
-	}
-
-	// static add element
-	// print object/array
-}
-
-// __END__

4dev/tests/Template/CoreLibsTemplateHtmlBuilderStringReplaceTest.php

@@ -1,65 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-use CoreLibs\Template\HtmlBuilder\StringReplace;
-
-/**
- * Test class for Template\HtmlBuilder\StringReplace
- * @coversDefaultClass \CoreLibs\Template\HtmlBuilder\StringReplace
- * @testdox \CoreLibs\Template\HtmlBuilder\StringReplace method tests
- */
-final class CoreLibsTemplateHtmlBuilderStringReplaceTest extends TestCase
-{
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::replaceData
-	 * @testdox test basic replaceData
-	 *
-	 * @return void
-	 */
-	public function testReplaceData(): void
-	{
-		$html_block = <<<HTML
-<div id="{ID}" class="{CSS}">
-	{CONTENT}
-</div>
-HTML;
-
-		$this->assertEquals(
-			<<<HTML
-<div id="block-id" class="blue,red">
-	Some content here<br>with bla bla inside
-</div>
-HTML,
-			StringReplace::replaceData(
-				$html_block,
-				[
-					'ID' => 'block-id',
-					'CSS' => join(',', ['blue', 'red']),
-					'{CONTENT}' => 'Some content here<br>with bla bla inside',
-				]
-			)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox replaceData error
-	 *
-	 * @return void
-	 */
-	/* public function testReplaceDataErrors(): void
-	{
-		$this->expectException(HtmlBuilderExcpetion::class);
-		$this->expectExceptionMessage("Replace and content array count differ");
-		StringReplace::replaceData('<span>{FOO}</span>', ['{FOO}', '{BAR}'], ['foo']);
-	} */
-}
-
-// __END__

4dev/tests/bootstrap.php

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

4dev/tests/database/CoreLibsACLLogin_database_create_data.sql

@@ -5,15 +5,15 @@ CREATE FUNCTION random_string(randomLength int)
 RETURNS text AS
 $$
 SELECT array_to_string(
-    ARRAY(
-        SELECT substring(
-            'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
-            trunc(random() * 62)::int + 1,
-            1
-        )
-        FROM generate_series(1, randomLength) AS gs(x)
-    ),
-    ''
+	ARRAY(
+		SELECT substring(
+			'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
+			trunc(random() * 62)::int + 1,
+			1
+		)
+		FROM generate_series(1, randomLength) AS gs(x)
+	),
+	''
 )
 $$
 LANGUAGE SQL
@@ -27,16 +27,15 @@ CREATE OR REPLACE FUNCTION set_edit_generic()
 RETURNS TRIGGER AS
 $$
 DECLARE
-    random_length INT = 12; -- that should be long enough
+	random_length INT = 12; -- that should be long enough
 BEGIN
-    IF TG_OP = 'INSERT' THEN
-        NEW.date_created := 'now';
-        NEW.cuid := random_string(random_length);
-        NEW.cuuid := gen_random_uuid();
-    ELSIF TG_OP = 'UPDATE' THEN
-        NEW.date_updated := 'now';
-    END IF;
-    RETURN NEW;
+	IF TG_OP = 'INSERT' THEN
+		NEW.date_created := 'now';
+		NEW.cuid := random_string(random_length);
+	ELSIF TG_OP = 'UPDATE' THEN
+		NEW.date_updated := 'now';
+	END IF;
+	RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';
@@ -47,29 +46,29 @@ LANGUAGE 'plpgsql';
 CREATE OR REPLACE FUNCTION set_edit_access_uid() RETURNS TRIGGER AS
 $$
 DECLARE
-    myrec RECORD;
-    v_uid VARCHAR;
+	myrec RECORD;
+	v_uid VARCHAR;
 BEGIN
-    -- skip if NEW.name is not set
-    IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
-        -- use NEW.name as base, remove all spaces
-        -- name data is already unique, so we do not need to worry about this here
-        v_uid := REPLACE(NEW.name, ' ', '');
-        IF TG_OP = 'INSERT' THEN
-            -- always set
-            NEW.uid := v_uid;
-        ELSIF TG_OP = 'UPDATE' THEN
-            -- check if not set, then set
-            SELECT INTO myrec t.* FROM edit_access t WHERE edit_access_id = NEW.edit_access_id;
-            IF FOUND THEN
-                NEW.uid := v_uid;
-            END IF;
-        END IF;
-    END IF;
-    RETURN NEW;
+	-- skip if NEW.name is not set
+	IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
+		-- use NEW.name as base, remove all spaces
+		-- name data is already unique, so we do not need to worry about this here
+		v_uid := REPLACE(NEW.name, ' ', '');
+		IF TG_OP = 'INSERT' THEN
+			-- always set
+			NEW.uid := v_uid;
+		ELSIF TG_OP = 'UPDATE' THEN
+			-- check if not set, then set
+			SELECT INTO myrec t.* FROM edit_access t WHERE edit_access_id = NEW.edit_access_id;
+			IF FOUND THEN
+				NEW.uid := v_uid;
+			END IF;
+		END IF;
+	END IF;
+	RETURN NEW;
 END;
 $$
-    LANGUAGE 'plpgsql';
+	LANGUAGE 'plpgsql';
 -- END: function/edit_access_set_uid.sql
 -- START: function/edit_group_set_uid.sql
 -- add uid add for edit_group table
@@ -77,29 +76,29 @@ $$
 CREATE OR REPLACE FUNCTION set_edit_group_uid() RETURNS TRIGGER AS
 $$
 DECLARE
-    myrec RECORD;
-    v_uid VARCHAR;
+	myrec RECORD;
+	v_uid VARCHAR;
 BEGIN
-    -- skip if NEW.name is not set
-    IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
-        -- use NEW.name as base, remove all spaces
-        -- name data is already unique, so we do not need to worry about this here
-        v_uid := REPLACE(NEW.name, ' ', '');
-        IF TG_OP = 'INSERT' THEN
-            -- always set
-            NEW.uid := v_uid;
-        ELSIF TG_OP = 'UPDATE' THEN
-            -- check if not set, then set
-            SELECT INTO myrec t.* FROM edit_group t WHERE edit_group_id = NEW.edit_group_id;
-            IF FOUND THEN
-                NEW.uid := v_uid;
-            END IF;
-        END IF;
-    END IF;
-    RETURN NEW;
+	-- skip if NEW.name is not set
+	IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
+		-- use NEW.name as base, remove all spaces
+		-- name data is already unique, so we do not need to worry about this here
+		v_uid := REPLACE(NEW.name, ' ', '');
+		IF TG_OP = 'INSERT' THEN
+			-- always set
+			NEW.uid := v_uid;
+		ELSIF TG_OP = 'UPDATE' THEN
+			-- check if not set, then set
+			SELECT INTO myrec t.* FROM edit_group t WHERE edit_group_id = NEW.edit_group_id;
+			IF FOUND THEN
+				NEW.uid := v_uid;
+			END IF;
+		END IF;
+	END IF;
+	RETURN NEW;
 END;
 $$
-    LANGUAGE 'plpgsql';
+	LANGUAGE 'plpgsql';
 -- END: function/edit_group_set_uid.sql
 -- START: function/edit_log_partition_insert.sql
 -- AUTHOR: Clemens Schwaighofer
@@ -113,142 +112,142 @@ CREATE OR REPLACE FUNCTION edit_log_insert_trigger ()
 RETURNS TRIGGER AS
 $$
 DECLARE
-    start_date DATE := '2010-01-01';
-    end_date DATE;
-    timeformat TEXT := 'YYYY';
-    selector TEXT := 'year';
-    base_table TEXT := 'edit_log';
-    _interval INTERVAL := '1 ' || selector;
-    _interval_next INTERVAL := '2 ' || selector;
-    table_name TEXT;
-    -- compare date column
-    compare_date DATE := NEW.event_date;
-    compare_date_name TEXT := 'event_date';
-    -- the create commands
-    command_create_table TEXT := 'CREATE TABLE IF NOT EXISTS {TABLE_NAME} (CHECK({COMPARE_DATE_NAME} >= {START_DATE} AND {COMPARE_DATE_NAME} < {END_DATE})) INHERITS ({BASE_NAME})';
-    command_create_primary_key TEXT := 'ALTER TABLE {TABLE_NAME} ADD PRIMARY KEY ({BASE_TABLE}_id)';
-    command_create_foreign_key_1 TEXT := 'ALTER TABLE {TABLE_NAME} ADD CONSTRAINT {TABLE_NAME}_euid_fkey FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL';
-    command_create_trigger_1 TEXT = 'CREATE TRIGGER trg_{TABLE_NAME} BEFORE INSERT OR UPDATE ON {TABLE_NAME} FOR EACH ROW EXECUTE PROCEDURE set_edit_generic()';
+	start_date DATE := '2010-01-01';
+	end_date DATE;
+	timeformat TEXT := 'YYYY';
+	selector TEXT := 'year';
+	base_table TEXT := 'edit_log';
+	_interval INTERVAL := '1 ' || selector;
+	_interval_next INTERVAL := '2 ' || selector;
+	table_name TEXT;
+	-- compare date column
+	compare_date DATE := NEW.event_date;
+	compare_date_name TEXT := 'event_date';
+	-- the create commands
+	command_create_table TEXT := 'CREATE TABLE IF NOT EXISTS {TABLE_NAME} (CHECK({COMPARE_DATE_NAME} >= {START_DATE} AND {COMPARE_DATE_NAME} < {END_DATE})) INHERITS ({BASE_NAME})';
+	command_create_primary_key TEXT := 'ALTER TABLE {TABLE_NAME} ADD PRIMARY KEY ({BASE_TABLE}_id)';
+	command_create_foreign_key_1 TEXT := 'ALTER TABLE {TABLE_NAME} ADD CONSTRAINT {TABLE_NAME}_euid_fkey FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL';
+	command_create_trigger_1 TEXT = 'CREATE TRIGGER trg_{TABLE_NAME} BEFORE INSERT OR UPDATE ON {TABLE_NAME} FOR EACH ROW EXECUTE PROCEDURE set_edit_generic()';
 BEGIN
-    -- we are in valid start time area
-    IF (NEW.event_date >= start_date) THEN
-        -- current table name
-        table_name := base_table || '_' || to_char(NEW.event_date, timeformat);
-        BEGIN
-            EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
-        -- if insert failed because of missing table, create new below
-        EXCEPTION
-        WHEN undefined_table THEN
-            -- another block, so in case the creation fails here too
-            BEGIN
-                -- create new table here + all indexes
-                start_date := date_trunc(selector, NEW.event_date);
-                end_date := date_trunc(selector, NEW.event_date + _interval);
-                -- creat table
-                EXECUTE format(REPLACE( -- end date
-                    REPLACE( -- start date
-                        REPLACE( -- compare date name
-                            REPLACE( -- base name (inherit)
-                                REPLACE( -- table name
-                                    command_create_table,
-                                    '{TABLE_NAME}',
-                                    table_name
-                                ),
-                                '{BASE_NAME}',
-                                base_table
-                            ),
-                            '{COMPARE_DATE_NAME}',
-                            compare_date_name
-                        ),
-                        '{START_DATE}',
-                        quote_literal(start_date)
-                    ),
-                    '{END_DATE}',
-                    quote_literal(end_date)
-                ));
-                -- create all indexes and triggers
-                EXECUTE format(REPLACE(
-                    REPLACE(
-                        command_create_primary_key,
-                        '{TABLE_NAME}',
-                        table_name
-                    ),
-                    '{BASE_TABLE}',
-                    base_table
-                ));
-                -- FK constraints
-                EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
-                -- generic trigger
-                EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
+	-- we are in valid start time area
+	IF (NEW.event_date >= start_date) THEN
+		-- current table name
+		table_name := base_table || '_' || to_char(NEW.event_date, timeformat);
+		BEGIN
+			EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
+		-- if insert failed because of missing table, create new below
+		EXCEPTION
+		WHEN undefined_table THEN
+			-- another block, so in case the creation fails here too
+			BEGIN
+				-- create new table here + all indexes
+				start_date := date_trunc(selector, NEW.event_date);
+				end_date := date_trunc(selector, NEW.event_date + _interval);
+				-- creat table
+				EXECUTE format(REPLACE( -- end date
+					REPLACE( -- start date
+						REPLACE( -- compare date name
+							REPLACE( -- base name (inherit)
+								REPLACE( -- table name
+									command_create_table,
+									'{TABLE_NAME}',
+									table_name
+								),
+								'{BASE_NAME}',
+								base_table
+							),
+							'{COMPARE_DATE_NAME}',
+							compare_date_name
+						),
+						'{START_DATE}',
+						quote_literal(start_date)
+					),
+					'{END_DATE}',
+					quote_literal(end_date)
+				));
+				-- create all indexes and triggers
+				EXECUTE format(REPLACE(
+					REPLACE(
+						command_create_primary_key,
+						'{TABLE_NAME}',
+						table_name
+					),
+					'{BASE_TABLE}',
+					base_table
+				));
+				-- FK constraints
+				EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
+				-- generic trigger
+				EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
 
-                -- insert try again
-                EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
-            EXCEPTION
-            WHEN OTHERS THEN
-                -- if this faled, throw it into the overflow table (so we don't loose anything)
-                INSERT INTO edit_log_overflow VALUES (NEW.*);
-            END;
-        -- other errors, insert into overlow
-        WHEN OTHERS THEN
-            -- if this faled, throw it into the overflow table (so we don't loose anything)
-            INSERT INTO edit_log_overflow VALUES (NEW.*);
-        END;
-        -- main insert run done, check if we have to create next months table
-        BEGIN
-            -- check if next month table exists
-            table_name := base_table || '_' || to_char((SELECT NEW.event_date + _interval)::DATE, timeformat);
-            -- RAISE NOTICE 'SEARCH NEXT: %', table_name;
-            IF  (SELECT to_regclass(table_name)) IS NULL THEN
-                -- move inner interval same
-                start_date := date_trunc(selector, NEW.event_date + _interval);
-                end_date := date_trunc(selector, NEW.event_date + _interval_next);
-                -- RAISE NOTICE 'CREATE NEXT: %', table_name;
-                -- create table
-                EXECUTE format(REPLACE( -- end date
-                    REPLACE( -- start date
-                        REPLACE( -- compare date name
-                            REPLACE( -- base name (inherit)
-                                REPLACE( -- table name
-                                    command_create_table,
-                                    '{TABLE_NAME}',
-                                    table_name
-                                ),
-                                '{BASE_NAME}',
-                                base_table
-                            ),
-                            '{COMPARE_DATE_NAME}',
-                            compare_date_name
-                        ),
-                        '{START_DATE}',
-                        quote_literal(start_date)
-                    ),
-                    '{END_DATE}',
-                    quote_literal(end_date)
-                ));
-                -- create all indexes and triggers
-                EXECUTE format(REPLACE(
-                    REPLACE(
-                        command_create_primary_key,
-                        '{TABLE_NAME}',
-                        table_name
-                    ),
-                    '{BASE_TABLE}',
-                    base_table
-                ));
-                -- FK constraints
-                EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
-                -- generic trigger
-                EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
-            END IF;
-        EXCEPTION
-        WHEN OTHERS THEN
-            RAISE NOTICE 'Failed to create next table: %', table_name;
-        END;
-    ELSE
-        -- if outside valid date, insert into overflow
-        INSERT INTO edit_log_overflow VALUES (NEW.*);
-    END IF;
-    RETURN NULL;
+				-- insert try again
+				EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
+			EXCEPTION
+			WHEN OTHERS THEN
+				-- if this faled, throw it into the overflow table (so we don't loose anything)
+				INSERT INTO edit_log_overflow VALUES (NEW.*);
+			END;
+		-- other errors, insert into overlow
+		WHEN OTHERS THEN
+			-- if this faled, throw it into the overflow table (so we don't loose anything)
+			INSERT INTO edit_log_overflow VALUES (NEW.*);
+		END;
+		-- main insert run done, check if we have to create next months table
+		BEGIN
+			-- check if next month table exists
+			table_name := base_table || '_' || to_char((SELECT NEW.event_date + _interval)::DATE, timeformat);
+			-- RAISE NOTICE 'SEARCH NEXT: %', table_name;
+			IF  (SELECT to_regclass(table_name)) IS NULL THEN
+				-- move inner interval same
+				start_date := date_trunc(selector, NEW.event_date + _interval);
+				end_date := date_trunc(selector, NEW.event_date + _interval_next);
+				-- RAISE NOTICE 'CREATE NEXT: %', table_name;
+				-- create table
+				EXECUTE format(REPLACE( -- end date
+					REPLACE( -- start date
+						REPLACE( -- compare date name
+							REPLACE( -- base name (inherit)
+								REPLACE( -- table name
+									command_create_table,
+									'{TABLE_NAME}',
+									table_name
+								),
+								'{BASE_NAME}',
+								base_table
+							),
+							'{COMPARE_DATE_NAME}',
+							compare_date_name
+						),
+						'{START_DATE}',
+						quote_literal(start_date)
+					),
+					'{END_DATE}',
+					quote_literal(end_date)
+				));
+				-- create all indexes and triggers
+				EXECUTE format(REPLACE(
+					REPLACE(
+						command_create_primary_key,
+						'{TABLE_NAME}',
+						table_name
+					),
+					'{BASE_TABLE}',
+					base_table
+				));
+				-- FK constraints
+				EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
+				-- generic trigger
+				EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
+			END IF;
+		EXCEPTION
+		WHEN OTHERS THEN
+			RAISE NOTICE 'Failed to create next table: %', table_name;
+		END;
+	ELSE
+		-- if outside valid date, insert into overflow
+		INSERT INTO edit_log_overflow VALUES (NEW.*);
+	END IF;
+	RETURN NULL;
 END
 $$
 LANGUAGE 'plpgsql';
@@ -261,22 +260,22 @@ CREATE OR REPLACE FUNCTION set_login_user_id_set_date()
 RETURNS TRIGGER AS
 $$
 BEGIN
-    -- if new is not null/empty
-    -- and old one is null or old one different new one
-    -- set NOW()
-    -- if new one is NULL
-    -- set NULL
-    IF
-        NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND
-        (OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id)
-    THEN
-        NEW.login_user_id_set_date = NOW();
-        NEW.login_user_id_last_revalidate = NOW();
-    ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN
-        NEW.login_user_id_set_date = NULL;
-        NEW.login_user_id_last_revalidate = NULL;
-    END IF;
-    RETURN NEW;
+	-- if new is not null/empty
+	-- and old one is null or old one different new one
+	-- set NOW()
+	-- if new one is NULL
+	-- set NULL
+	IF
+		NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND
+		(OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id)
+	THEN
+		NEW.login_user_id_set_date = NOW();
+		NEW.login_user_id_last_revalidate = NOW();
+	ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN
+		NEW.login_user_id_set_date = NULL;
+		NEW.login_user_id_last_revalidate = NULL;
+	END IF;
+	RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';
@@ -291,8 +290,8 @@ LANGUAGE 'plpgsql';
 
 -- DROP TABLE temp_files;
 CREATE TABLE temp_files (
-    filename VARCHAR,
-    folder VARCHAR
+	filename	VARCHAR,
+	folder	VARCHAR
 );
 -- END: table/edit_temp_files.sql
 -- START: table/edit_generic.sql
@@ -305,10 +304,9 @@ CREATE TABLE temp_files (
 
 -- DROP TABLE edit_generic;
 CREATE TABLE edit_generic (
-    cuid VARCHAR,
-    cuuid UUID,
-    date_created TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
-    date_updated TIMESTAMP WITHOUT TIME ZONE
+	cuid	VARCHAR,
+	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
+	date_updated	TIMESTAMP WITHOUT TIME ZONE
 );
 -- END: table/edit_generic.sql
 -- START: table/edit_visible_group.sql
@@ -321,9 +319,9 @@ CREATE TABLE edit_generic (
 
 -- DROP TABLE edit_visible_group;
 CREATE TABLE edit_visible_group (
-    edit_visible_group_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-    name VARCHAR,
-    flag VARCHAR
+	edit_visible_group_id	SERIAL PRIMARY KEY,
+	name	VARCHAR,
+	flag	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_visible_group.sql
 -- START: table/edit_menu_group.sql
@@ -336,10 +334,10 @@ CREATE TABLE edit_visible_group (
 
 -- DROP TABLE edit_menu_group;
 CREATE TABLE edit_menu_group (
-    edit_menu_group_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-    name VARCHAR,
-    flag VARCHAR,
-    order_number INT NOT NULL
+	edit_menu_group_id	SERIAL PRIMARY KEY,
+	name	VARCHAR,
+	flag	VARCHAR,
+	order_number	INT NOT NULL
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 
@@ -354,18 +352,18 @@ CREATE TABLE edit_menu_group (
 
 -- DROP TABLE edit_page;
 CREATE TABLE edit_page (
-    edit_page_id INT GENERATED ALWAYS AS IDENTITY 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,
-    name VARCHAR UNIQUE,
-    order_number INT NOT NULL,
-    online SMALLINT NOT NULL DEFAULT 0,
-    menu SMALLINT NOT NULL DEFAULT 0,
-    popup SMALLINT NOT NULL DEFAULT 0,
-    popup_x SMALLINT,
-    popup_y SMALLINT,
-    hostname VARCHAR
+	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,
+	name	VARCHAR UNIQUE,
+	order_number INT NOT NULL,
+	online	SMALLINT NOT NULL DEFAULT 0,
+	menu	SMALLINT NOT NULL DEFAULT 0,
+	popup	SMALLINT NOT NULL DEFAULT 0,
+	popup_x	SMALLINT,
+	popup_y SMALLINT,
+	hostname	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_page.sql
 -- START: table/edit_query_string.sql
@@ -378,13 +376,13 @@ CREATE TABLE edit_page (
 
 -- DROP TABLE edit_query_string;
 CREATE TABLE edit_query_string (
-    edit_query_string_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-    edit_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,
-    name VARCHAR,
-    value VARCHAR,
-    dynamic SMALLINT NOT NULL DEFAULT 0
+	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,
+	name	VARCHAR,
+	value	VARCHAR,
+	dynamic	SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_query_string.sql
 -- START: table/edit_page_visible_group.sql
@@ -397,10 +395,10 @@ CREATE TABLE edit_query_string (
 
 -- DROP TABLE edit_page_visible_group;
 CREATE TABLE edit_page_visible_group (
-    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_visible_group_id INT NOT NULL,
-    FOREIGN KEY (edit_visible_group_id) REFERENCES edit_visible_group (edit_visible_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+	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_visible_group_id INT NOT NULL,
+	FOREIGN KEY (edit_visible_group_id) REFERENCES edit_visible_group (edit_visible_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 );
 -- END: table/edit_page_visible_group.sql
 -- START: table/edit_page_menu_group.sql
@@ -413,10 +411,10 @@ CREATE TABLE edit_page_visible_group (
 
 -- DROP TABLE edit_page_menu_group;
 CREATE TABLE edit_page_menu_group (
-    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_menu_group_id INT NOT NULL,
-    FOREIGN KEY (edit_menu_group_id) REFERENCES edit_menu_group (edit_menu_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+	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_menu_group_id INT NOT NULL,
+	FOREIGN KEY (edit_menu_group_id) REFERENCES edit_menu_group (edit_menu_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 );
 -- END: table/edit_page_menu_group.sql
 -- START: table/edit_access_right.sql
@@ -430,11 +428,11 @@ CREATE TABLE edit_page_menu_group (
 
 -- DROP TABLE edit_access_right;
 CREATE TABLE edit_access_right (
-    edit_access_right_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-    name VARCHAR,
-    level SMALLINT,
-    type VARCHAR,
-    UNIQUE (level,type)
+	edit_access_right_id SERIAL PRIMARY KEY,
+	name VARCHAR,
+	level SMALLINT,
+	type VARCHAR,
+	UNIQUE (level,type)
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_access_right.sql
 -- START: table/edit_scheme.sql
@@ -447,12 +445,12 @@ CREATE TABLE edit_access_right (
 
 -- DROP TABLE edit_scheme;
 CREATE TABLE edit_scheme (
-    edit_scheme_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-    enabled SMALLINT NOT NULL DEFAULT 0,
-    name VARCHAR,
-    header_color VARCHAR,
-    css_file VARCHAR,
-    template VARCHAR
+	edit_scheme_id	SERIAL PRIMARY KEY,
+	enabled	SMALLINT NOT NULL DEFAULT 0,
+	name	VARCHAR,
+	header_color	VARCHAR,
+	css_file	VARCHAR,
+	template	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_scheme.sql
 -- START: table/edit_language.sql
@@ -466,13 +464,13 @@ CREATE TABLE edit_scheme (
 
 -- DROP TABLE edit_language;
 CREATE TABLE edit_language (
-    edit_language_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-    enabled SMALLINT NOT NULL DEFAULT 0,
-    lang_default SMALLINT NOT NULL DEFAULT 0,
-    long_name VARCHAR,
-    short_name VARCHAR, -- en_US, en or en_US@latin without encoding
-    iso_name VARCHAR, -- should actually be encoding
-    order_number INT
+	edit_language_id SERIAL PRIMARY KEY,
+	enabled SMALLINT NOT NULL DEFAULT 0,
+	lang_default SMALLINT NOT NULL DEFAULT 0,
+	long_name VARCHAR,
+	short_name VARCHAR, -- en_US, en or en_US@latin without encoding
+	iso_name VARCHAR, -- should actually be encoding
+	order_number INT
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_language.sql
 -- START: table/edit_group.sql
@@ -485,16 +483,16 @@ CREATE TABLE edit_language (
 
 -- DROP TABLE edit_group;
 CREATE TABLE edit_group (
-    edit_group_id INT GENERATED ALWAYS AS IDENTITY 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,
-    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,
-    deleted SMALLINT DEFAULT 0,
-    uid VARCHAR,
-    name VARCHAR,
-    additional_acl JSONB
+	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,
+	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,
+	deleted	SMALLINT DEFAULT 0,
+	uid	VARCHAR,
+	name	VARCHAR,
+	additional_acl	JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_group.sql
 -- START: table/edit_page_access.sql
@@ -507,14 +505,14 @@ CREATE TABLE edit_group (
 
 -- DROP TABLE edit_page_access;
 CREATE TABLE edit_page_access (
-    edit_page_access_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-    edit_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,
-    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,
-    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
+	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,
+	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,
+	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;
 
 
@@ -530,15 +528,15 @@ CREATE TABLE edit_page_access (
 
 -- DROP TABLE edit_page_content;
 CREATE TABLE edit_page_content (
-    edit_page_content_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-    edit_page_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,
-    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    uid VARCHAR UNIQUE,
-    name VARCHAR,
-    order_number INT NOT NULL,
-    online SMALLINT NOT NULL DEFAULT 0
+	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,
+	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	uid	VARCHAR UNIQUE,
+	name	VARCHAR,
+	order_number INT NOT NULL,
+	online	SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_page_content.sql
 -- START: table/edit_user.sql
@@ -551,63 +549,63 @@ CREATE TABLE edit_page_content (
 
 -- DROP TABLE edit_user;
 CREATE TABLE edit_user (
-    edit_user_id INT GENERATED ALWAYS AS IDENTITY 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,
-    FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    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_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,
-    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    -- username/password
-    username VARCHAR UNIQUE,
-    password VARCHAR,
-    -- name block
-    first_name VARCHAR,
-    last_name VARCHAR,
-    first_name_furigana VARCHAR,
-    last_name_furigana VARCHAR,
-    -- email
-    email VARCHAR,
-    -- eanbled/deleted flag
-    enabled SMALLINT NOT NULL DEFAULT 0,
-    deleted SMALLINT NOT NULL DEFAULT 0,
-    -- general flags
-    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,
-    -- last login log
-    last_login TIMESTAMP WITHOUT TIME ZONE,
-    -- login error
-    login_error_count INT DEFAULT 0,
-    login_error_date_last TIMESTAMP WITHOUT TIME ZONE,
-    login_error_date_first TIMESTAMP WITHOUT TIME ZONE,
-    -- time locked
-    lock_until TIMESTAMP WITHOUT TIME ZONE,
-    lock_after TIMESTAMP WITHOUT TIME ZONE,
-    -- password change
-    password_change_date TIMESTAMP WITHOUT TIME ZONE, -- only when password is first set or changed
-    password_change_interval INTERVAL, -- null if no change is needed, or d/m/y time interval
-    password_reset_time TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested
-    password_reset_uid VARCHAR, -- the uid to access the password reset page
-    -- _GET login id for direct login
-    login_user_id VARCHAR UNIQUE, -- the loginUserId, at least 32 chars
-    login_user_id_set_date TIMESTAMP WITHOUT TIME ZONE, -- when above uid was set
-    login_user_id_last_revalidate TIMESTAMP WITHOUT TIME ZONE, -- when the last login was done with user name and password
-    login_user_id_valid_from TIMESTAMP WITHOUT TIME ZONE, -- if set, from when the above uid is valid
-    login_user_id_valid_until TIMESTAMP WITHOUT TIME ZONE, -- if set, until when the above uid is valid
-    login_user_id_revalidate_after INTERVAL, -- user must login to revalidated loginUserId after set days, 0 for forever
-    login_user_id_locked SMALLINT DEFAULT 0, -- lock for loginUserId, but still allow normal login
-    -- additional ACL json block
-    additional_acl JSONB -- additional ACL as JSON string (can be set by other pages)
+	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,
+	FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	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_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,
+	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	-- username/password
+	username	VARCHAR UNIQUE,
+	password	VARCHAR,
+	-- name block
+	first_name	VARCHAR,
+	last_name	VARCHAR,
+	first_name_furigana	VARCHAR,
+	last_name_furigana	VARCHAR,
+	-- email
+	email	VARCHAR,
+	-- eanbled/deleted flag
+	enabled	SMALLINT NOT NULL DEFAULT 0,
+	deleted	SMALLINT NOT NULL DEFAULT 0,
+	-- general flags
+	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,
+	-- last login log
+	last_login	TIMESTAMP WITHOUT TIME ZONE,
+	-- login error
+	login_error_count	INT DEFAULT 0,
+	login_error_date_last	TIMESTAMP WITHOUT TIME ZONE,
+	login_error_date_first	TIMESTAMP WITHOUT TIME ZONE,
+	-- time locked
+	lock_until	TIMESTAMP WITHOUT TIME ZONE,
+	lock_after	TIMESTAMP WITHOUT TIME ZONE,
+	-- password change
+	password_change_date	TIMESTAMP WITHOUT TIME ZONE, -- only when password is first set or changed
+	password_change_interval	INTERVAL, -- null if no change is needed, or d/m/y time interval
+	password_reset_time	TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested
+	password_reset_uid	VARCHAR, -- the uid to access the password reset page
+	-- _GET login id for direct login
+	login_user_id	VARCHAR UNIQUE, -- the loginUserId, at least 32 chars
+	login_user_id_set_date	TIMESTAMP WITHOUT TIME ZONE, -- when above uid was set
+	login_user_id_last_revalidate	TIMESTAMP WITHOUT TIME ZONE, -- when the last login was done with user name and password
+	login_user_id_valid_from	TIMESTAMP WITHOUT TIME ZONE, -- if set, from when the above uid is valid
+	login_user_id_valid_until	TIMESTAMP WITHOUT TIME ZONE, -- if set, until when the above uid is valid
+	login_user_id_revalidate_after	INTERVAL, -- user must login to revalidated loginUserId after set days, 0 for forever
+	login_user_id_locked	SMALLINT DEFAULT 0, -- lock for loginUserId, but still allow normal login
+	-- additional ACL json block
+	additional_acl	JSONB -- additional ACL as JSON string (can be set by other pages)
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 -- create unique index
@@ -652,40 +650,37 @@ COMMENT ON COLUMN edit_user.additional_acl IS 'Additional Access Control List st
 
 -- DROP TABLE edit_log;
 CREATE TABLE edit_log (
-    edit_log_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-    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,
-    username VARCHAR,
-    password VARCHAR,
-    event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
-    ip VARCHAR,
-    error TEXT,
-    event TEXT,
-    data_binary BYTEA,
-    data TEXT,
-    page VARCHAR,
-    action VARCHAR,
-    action_id VARCHAR,
-    action_sub_id VARCHAR,
-    action_yes VARCHAR,
-    action_flag VARCHAR,
-    action_menu VARCHAR,
-    action_loaded VARCHAR,
-    action_value VARCHAR,
-    action_type VARCHAR,
-    action_error VARCHAR,
-    user_agent VARCHAR,
-    referer VARCHAR,
-    script_name VARCHAR,
-    query_string VARCHAR,
-    server_name VARCHAR,
-    http_host VARCHAR,
-    http_accept VARCHAR,
-    http_accept_charset VARCHAR,
-    http_accept_encoding VARCHAR,
-    session_id VARCHAR
+	edit_log_id	SERIAL PRIMARY KEY,
+	euid	INT, -- this is a foreign key, but I don't nedd to reference to it
+	FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL,
+	username	VARCHAR,
+	password	VARCHAR,
+	event_date	TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+	ip	VARCHAR,
+	error	TEXT,
+	event	TEXT,
+	data_binary	BYTEA,
+	data	TEXT,
+	page	VARCHAR,
+	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,
+	server_name	VARCHAR,
+	http_host	VARCHAR,
+	http_accept	VARCHAR,
+	http_accept_charset	VARCHAR,
+	http_accept_encoding	VARCHAR,
+	session_id	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_log.sql
 -- START: table/edit_log_overflow.sql
@@ -712,15 +707,15 @@ ALTER TABLE edit_log_overflow ADD CONSTRAINT edit_log_overflow_euid_fkey FOREIGN
 
 -- DROP TABLE edit_access;
 CREATE TABLE edit_access (
-    edit_access_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-    enabled SMALLINT NOT NULL DEFAULT 0,
-    protected SMALLINT DEFAULT 0,
-    deleted SMALLINT DEFAULT 0,
-    uid VARCHAR,
-    name VARCHAR UNIQUE,
-    description VARCHAR,
-    color VARCHAR,
-    additional_acl JSONB
+	edit_access_id	SERIAL PRIMARY KEY,
+	enabled	SMALLINT NOT NULL DEFAULT 0,
+	protected SMALLINT DEFAULT 0,
+	deleted	SMALLINT DEFAULT 0,
+	uid	VARCHAR,
+	name	VARCHAR UNIQUE,
+	description	VARCHAR,
+	color	VARCHAR,
+	additional_acl	JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_access.sql
 -- START: table/edit_access_user.sql
@@ -733,15 +728,15 @@ CREATE TABLE edit_access (
 
 -- DROP TABLE edit_access_user;
 CREATE TABLE edit_access_user (
-    edit_access_user_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-    edit_access_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,
-    FOREIGN KEY (edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_access_right_id INT NOT NULL,
-    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_default SMALLINT DEFAULT 0,
-    enabled SMALLINT NOT NULL DEFAULT 0
+	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,
+	FOREIGN KEY (edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	edit_access_right_id	INT NOT NULL,
+	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	edit_default	SMALLINT DEFAULT 0,
+	enabled	SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_access_user.sql
 -- START: table/edit_access_data.sql
@@ -754,12 +749,12 @@ CREATE TABLE edit_access_user (
 
 -- DROP TABLE edit_access_data;
 CREATE TABLE edit_access_data (
-    edit_access_data_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-    edit_access_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,
-    name VARCHAR,
-    value VARCHAR
+	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,
+	name	VARCHAR,
+	value	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 -- create a unique index for each attached data block for each edit access can

4dev/tests/dotenv/.env

@@ -0,0 +1 @@
+test.env