Bug fix for Admin\Backend ->action var access

* commit 5cec54d508fd4a34de509b3ac28d6277b6abc090 (HEAD -> master, all/master, all/development, all/NewFeatures)
| log size 644
| Author: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
| Date:   2024-09-20 13:33:19 +0900
|
|     Add "Success" to message logging levels, fixes for PHP 8.4, other preg_match fixes
|
|     The Logger/MessageLevel gets "success" as level 110 to something a bit
|     heigher than "ok" which is the general "OK" for anything ending without
|     an error. The "success" is currently only used in file uploads with the
|     java script ajax file uploader
|
|     Fix any "type $var = null" with correctly "?type $var = null" for PHP 8.4 (phphan)
|
|     Fix preg match no return catches for DB IO compare version and for language
|     look up.
|
|  4dev/tests/Logging/CoreLibsLoggingErrorMessagesTest.php |  5 +++++
|  www/admin/class_test.html.php                           |  1 +
|  www/admin/class_test.php                                |  2 +-
|  www/admin/layout/javascript/edit.jq.js                  |  2 +-
|  www/lib/CoreLibs/Admin/Backend.php                      |  6 +++---
|  www/lib/CoreLibs/Basic.php                              |  2 +-
|  www/lib/CoreLibs/Convert/Extends/SetVarTypeMain.php     |  6 +++---
|  www/lib/CoreLibs/Convert/SetVarTypeNull.php             |  6 +++---
|  www/lib/CoreLibs/DB/IO.php                              | 24 ++++++++++++++++++------
|  www/lib/CoreLibs/Language/GetLocale.php                 |  4 ++--
|  www/lib/CoreLibs/Logging/Logger/MessageLevel.php        |  2 ++
|  www/lib/CoreLibs/Output/Form/Elements.php               | 12 ++++++------
|  www/lib/CoreLibs/Template/HtmlBuilder/Element.php       |  4 ++--
|  13 files changed, 48 insertions(+), 28 deletions(-)
|
* commit 8e60c992f109993b40d9e5ec9354ffb7d7db9f79
| log size 123
| Author: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
| Date:   2024-09-03 12:06:01 +0900
|
|     Fixes phan/phpstan
|
|  phpstan.neon                                    | 6 +++---
|  www/lib/CoreLibs/Get/System.php                 | 2 +-
|  www/lib/CoreLibs/Template/HtmlBuilder/Block.php | 4 ----
|  3 files changed, 4 insertions(+), 8 deletions(-)
|
* commit 1b5437b675f6ceda4318f19522d47a08f28f95a8
| log size 147
| Author: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
| Date:   2024-09-03 11:58:36 +0900
|
|     Add testing for new added bom utf8 replace
|
|  4dev/tests/Convert/CoreLibsConvertStringsTest.php | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
|  4dev/tests/Convert/data/UTF8.csv                  |  1 +
|  4dev/tests/Convert/data/UTF8BOM.csv               |  1 +
|  4dev/tests/Get/CoreLibsGetSystemTest.php          | 23 +++++++++++++++++++++++
|  www/admin/class_test.system.php                   |  4 +++-
|  5 files changed, 76 insertions(+), 1 deletion(-)
|
* commit ef80cba5610b8acae8fc11d3f0a441c1f5a03735
| log size 659
| Author: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
| Date:   2024-09-03 09:49:01 +0900
|
|     Add new functions: get IPs, strip UTF8 BOM from text, text updates
|
|     Add the following new static methods
|
|     Convert\Strings::stripUTF8BomBytes: removes the UTF8 BOM bytes from the beginning of a line
|     Used for CSV files created in Excel for the first header entry (line 0/row 0)
|
|     Get\Systen::getIpAddresses: gets all IP addresses for the the current access user
|     and returns an array
|
|     Moved the frontend folder detection from the first load config to the config.path.php
|
|     Cleaned up the translations JS scripts
|
|  4dev/bin/create_mo.sh                           |  9 +++++----
|  4dev/bin/mo_to_js.sh                            | 63 +++++++++++++++++++++++++++++++++++----------------------------
|  www/configs/config.path.php                     | 16 +++++++++++++++-
|  www/configs/config.php                          | 15 +--------------
|  www/lib/CoreLibs/Convert/Strings.php            | 12 ++++++++++++
|  www/lib/CoreLibs/DB/IO.php                      |  2 +-
|  www/lib/CoreLibs/Get/System.php                 | 23 +++++++++++++++++++++++
|  www/lib/CoreLibs/Template/HtmlBuilder/Block.php | 37 ++++++++++++++++++++++++++-----------
|  8 files changed, 118 insertions(+), 59 deletions(-)
|
* commit 2d71e760e8fb7b4b0a5552a2f62bedffad928f4f
| log size 120
| Author: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
| Date:   2024-08-21 11:45:17 +0900
|
|     Composer update
|
|  www/composer.lock                          | 12 ++++++------
|  www/lib/CoreLibs/Template/SmartyExtend.php |  3 ++-
|  www/vendor/composer/installed.json         | 14 +++++++-------
|  www/vendor/composer/installed.php          |  6 +++---
|  www/vendor/gullevek/dotenv/Readme.md       | 23 +++++++++++++++++++++++
|  www/vendor/gullevek/dotenv/src/DotEnv.php  | 13 ++++++++++---
|  6 files changed, 51 insertions(+), 20 deletions(-)
|
* commit a8d07634ffaf961a37557437aac1f202ae18fa6e
| log size 182
| Author: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
| Date:   2024-08-07 13:41:09 +0900
|
|     Add soba.egplusww.jp as local development host, jshint esversion update to 11
|
|  www/admin/layout/javascript/edit.jq.js |  2 +-
|  www/configs/config.host.php            | 28 +++++++++++-----------------
|  2 files changed, 12 insertions(+), 18 deletions(-)
|

.github/workflows-disabled/ci.yml

@@ -0,0 +1,33 @@
+name: CI
+run-name: ${{ github.actor}} runs CI
+
+on: [push]
+
+jobs:
+  phpstan:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      # - uses: php-actions/composer@v6
+        # env:
+        #   COMPOSER_ROOT_VERSION: dev-master
+      - name: "Restore result cache"
+        uses: actions/cache/restore@v4
+        with:
+          path: ./tmp
+          key: "result-cache-v1-${{ matrix.php-version }}-${{ github.run_id }}"
+          restore-keys: |
+            result-cache-v1-${{ matrix.php-version }}-
+      - name: PHPStan Static Analysis
+        uses: php-actions/phpstan@v3
+        with:
+          path: src/
+      - name: "Save result cache"
+        uses: actions/cache/save@v4
+        if: always()
+        with:
+          path: ./tmp
+          key: "result-cache-v1-${{ matrix.php-version }}-${{ github.run_id }}"
+      # - name: PHPunit Tests
+      #   run: |
+      #     vendor/bin/phpunit

.gitignore

@@ -1,2 +1,3 @@
-vendor
+vendor/
 composer.lock
+tools/

.phive/phars.xml

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

.shellcheckrc

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

ReadMe.md

@@ -9,20 +9,45 @@ For local install only
 - Template\SmartyExtended
 - Admin\EditBase
 
-## Setup from central composer
+## Publish to gitea or gitlab server
 
-Setup from gitea internal servers
+Currently there are only gitea and gitlab supported, github does not have support for composer packages
 
-```sh
+`publish\publish.sh go` will run the publish script
-composer config repositories.git.egplusww.jp.Composer composer https://git.egplusww.jp/api/packages/Composer/composer
+
+All the configuration is done in the `publish\.env.deploy` file
+
+```ini
+# downlaod file name is "Repository name" "-" "version" where
+# version is "vN.N.N"
+GITEA_PUBLISH=1
+GITEA_UPLOAD_FILENAME="Upload-File-Name";
+GITEA_USER=gitea-user
+GITEA_TOKEN=gitea-tokek
+GITEA_URL_DL=https://[gitea.hostname]/[to/package/folder]/archive
+GITEA_URL_PUSH=https://[gitea.hostname]/api/packages/[organization]/composer
+
+GITLAB_PUBLISH=1
+GITLAB_URL=gitlab URl to repository
+GITLAB_DEPLOY_TOKEN=gitlab-token
 ```
 
-Alternative setup composer local zip file repot:
+At the moment there is only one gitea or gitlab target setable
-`composer config repositories.composer.egplusww.jp composer http://composer.egplusww.jp`
+
+## Setup from central composer
+
+Setup from gitea servers
+
+[hostname] is the hostname for your gitea server (or wherever this is published)
+[OrgName] is the organization name where the composer packages are hosted
+
+```sh
+composer config repositories.[hostname].Composer composer https://[hostname]/api/packages/[OrgName]/composer
+```
 
 ## Install package
 
-`composer require egrajp/corelibs-composer-all:^8.0`
+`composer require egrajp/corelibs-composer-all:^9.0`
 
 ## Tests
 

composer.json

@@ -21,7 +21,8 @@
     },
     "require-dev": {
         "egrajp/smarty-extended": "^4.3",
-        "gullevek/dotenv": "dev-master"
+        "gullevek/dotenv": "dev-master",
+        "phpunit/phpunit": "^9"
     },
     "repositories": {
         "git.egplusww.jp.Composer": {

phpcs.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<ruleset name="MyStandard">
+	<description>PSR12 override rules (strict, standard). Switch spaces indent to tab.</description>
+	<arg name="tab-width" value="4"/>
+	<rule ref="PSR1"/>
+	<rule ref="PSR12">
+		<!-- turn off white space check for tab -->
+		<exclude name="Generic.WhiteSpace.DisallowTabIndent"/>
+	</rule>
+	<!-- no space indent, must be tab, 4 is tab iwdth -->
+	<rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
+	<rule ref="Generic.WhiteSpace.ScopeIndent">
+		<properties>
+			<property name="indent" value="4"/>
+			<property name="tabIndent" value="true"/>
+		</properties>
+	</rule>
+</ruleset>

phpstan.neon

@@ -2,7 +2,7 @@
 includes:
 	- phpstan-conditional.php
 parameters:
-	tmpDir: /tmp/phpstan-corelibs-composer
+	tmpDir: %currentWorkingDirectory%/tmp/phpstan-corelibs-composer
 	level: 8 # max is now 9
 	checkMissingCallableSignature: true
 	treatPhpDocTypesAsCertain: false

publish/last.published

@@ -1 +1 @@
-9.10.1
+9.17.1

publish/publish.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BASE_FOLDER=$(dirname $(readlink -f $0))"/";
+BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/";
 PACKAGE_DOWNLOAD="${BASE_FOLDER}package-download/";
 if [ ! -d "${PACKAGE_DOWNLOAD}" ]; then
      mkdir "${PACKAGE_DOWNLOAD}";
@@ -15,30 +15,35 @@ if [ -z "${VERSION}" ]; then
 fi;
 # compare version, if different or newer, deploy
 if [ -f "${file_last_published}" ]; then
-     LAST_PUBLISHED_VERSION=$(cat ${file_last_published});
+     LAST_PUBLISHED_VERSION=$(cat "${file_last_published}");
-     if $(dpkg --compare-versions "${VERSION}" le "${LAST_PUBLISHED_VERSION}"); then
+     if dpkg --compare-versions "${VERSION}" le "${LAST_PUBLISHED_VERSION}"; then
           echo "git tag version ${VERSION} is not newer than previous published version ${LAST_PUBLISHED_VERSION}";
           exit;
      fi;
 fi;
 
 # read in the .env.deploy file and we must have
+# for gitea
+# GITEA_PUBLISH: must be set with a value to trigger publish run
 # GITEA_UPLOAD_FILENAME
-# GITLAB_USER
-# GITLAB_TOKEN
-# GITLAB_URL
 # GITEA_USER
 # GITEA_DEPLOY_TOKEN
 # GITEA_URL_DL
 # GITEA_URL_PUSH
+# for gitlab
+# GITLAB_PUBLISH: must be set with a value to trigger publish run
+# GITLAB_USER
+# GITLAB_TOKEN
+# GITLAB_URL
 if [ ! -f "${BASE_FOLDER}.env.deploy" ]; then
      echo "Deploy enviroment file .env.deploy is missing";
      exit;
 fi;
 set -o allexport;
-cd ${BASE_FOLDER};
+cd "${BASE_FOLDER}" || exit;
+# shellcheck source=.env.deploy
 source .env.deploy;
-cd -;
+cd - || exit;
 set +o allexport;
 
 if [ "${go_flag}" != "go" ]; then
@@ -50,31 +55,42 @@ fi;
 
 echo "[START]";
 # gitea
-if [ ! -z "${GITEA_UPLOAD_FILENAME}" ] &&
+# skip iof
-     [ ! -z "${GITEA_URL_DL}" ] && [ ! -z "${GITEA_URL_PUSH}" ] &&
+if [ -n "${GITEA_PUBLISH}" ]; then
-     [ ! -z "${GITEA_USER}" ] && [ ! -z "${GITEA_TOKEN}" ]; then
+     if [ -n "${GITEA_UPLOAD_FILENAME}" ] &&
-     curl -LJO \
+          [ -n "${GITEA_URL_DL}" ] && [ -n "${GITEA_URL_PUSH}" ] &&
-          --output-dir "${PACKAGE_DOWNLOAD}" \
+          [ -n "${GITEA_USER}" ] && [ -n "${GITEA_TOKEN}" ]; then
-          ${GITEA_URL_DL}/v${VERSION}.zip;
+          if [ ! -f "${PACKAGE_DOWNLOAD}${GITEA_UPLOAD_FILENAME}-v${VERSION}.zip" ]; then
-     curl --user ${GITEA_USER}:${GITEA_TOKEN} \
+               curl -LJO \
-          --upload-file "${PACKAGE_DOWNLOAD}${GITEA_UPLOAD_FILENAME}-v${VERSION}.zip" \
+                    --output-dir "${PACKAGE_DOWNLOAD}" \
-          ${GITEA_URL_PUSH}?version=${VERSION};
+                    "${GITEA_URL_DL}"/v"${VERSION}".zip;
-     echo "${VERSION}" > "${file_last_published}";
+          fi;
-else
+          if [ ! -f "${PACKAGE_DOWNLOAD}${GITEA_UPLOAD_FILENAME}-v${VERSION}.zip" ]; then
-     echo "Missing either GITEA_UPLOAD_FILENAME, GITEA_URL_DL, GITEA_URL_PUSH, GITEA_USER or GITEA_TOKEN environment variable";
+               echo "Version file does not exist for ${VERSION}";
+          else
+               curl --user "${GITEA_USER}":"${GITEA_TOKEN}" \
+                    --upload-file "${PACKAGE_DOWNLOAD}${GITEA_UPLOAD_FILENAME}-v${VERSION}.zip" \
+                    "${GITEA_URL_PUSH}"?version="${VERSION}";
+               echo "${VERSION}" > "${file_last_published}";
+          fi;
+     else
+          echo "Missing either GITEA_UPLOAD_FILENAME, GITEA_URL_DL, GITEA_URL_PUSH, GITEA_USER or GITEA_TOKEN environment variable";
+     fi;
 fi;
 
 # gitlab
-if [ ! -z "${GITLAB_URL}" ] && [ ! -z  "${GITLAB_DEPLOY_TOKEN}" ]; then
+if [ -n "${GITLAB_PUBLISH}" ]; then
-     curl --data tag=v${VERSION} \
+     if  [ -n "${GITLAB_URL}" ] && [ -n  "${GITLAB_DEPLOY_TOKEN}" ]; then
-          --header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \
+          curl --data tag=v"${VERSION}" \
-          "${GITLAB_URL}";
+               --header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \
-     curl --data branch=master \
+               "${GITLAB_URL}";
-          --header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \
+          curl --data branch=master \
-          "${GITLAB_URL}";
+               --header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \
-     echo "${VERSION}" > "${file_last_published}";
+               "${GITLAB_URL}";
-else
+          echo "${VERSION}" > "${file_last_published}";
-     echo "Missing GITLAB_DEPLOY_TOKEN environment variable";
+     else
+          echo "Missing GITLAB_URL or GITLAB_DEPLOY_TOKEN environment variable";
+     fi;
 fi;
 echo "";
 echo "[DONE]";

src/Admin/Backend.php

@@ -117,18 +117,20 @@ class Backend
 	/**
 	 * main class constructor
 	 *
-	 * @param \CoreLibs\DB\IO          $db      Database connection class
+	 * @param \CoreLibs\DB\IO           $db      Database connection class
-	 * @param \CoreLibs\Logging\Logging  $log     Logging class
+	 * @param \CoreLibs\Logging\Logging $log     Logging class
-	 * @param \CoreLibs\Create\Session $session Session interface class
+	 * @param \CoreLibs\Create\Session  $session Session interface class
-	 * @param \CoreLibs\Language\L10n  $l10n    l10n language class
+	 * @param \CoreLibs\Language\L10n   $l10n    l10n language class
-	 * @param int|null                 $set_default_acl_level Default ACL level
+	 * @param int|null                  $set_default_acl_level [default=null] Default ACL level
+	 * @param bool                      $init_action_vars [default=true] If the action vars should be set
 	 */
 	public function __construct(
 		\CoreLibs\DB\IO $db,
 		\CoreLibs\Logging\Logging $log,
 		\CoreLibs\Create\Session $session,
 		\CoreLibs\Language\L10n $l10n,
-		?int $set_default_acl_level = null
+		?int $set_default_acl_level = null,
+		bool $init_action_vars = true
 	) {
 		// attach db class
 		$this->db = $db;
@@ -151,9 +153,9 @@ class Backend
 		// set the page name
 		$this->page_name = \CoreLibs\Get\System::getPageName();
 
-		// set the action ids
+		// NOTE: if any of the "action" vars are used somewhere, it is recommended to NOT set them here
-		foreach ($this->action_list as $_action) {
+		if ($init_action_vars) {
-			$this->$_action = $_POST[$_action] ?? '';
+			$this->adbSetActionVars();
 		}
 
 		if ($set_default_acl_level === null) {
@@ -170,7 +172,7 @@ class Backend
 		}
 
 		// queue key
-		if (preg_match("/^(add|save|delete|remove|move|up|down|push_live)$/", $this->action)) {
+		if (preg_match("/^(add|save|delete|remove|move|up|down|push_live)$/", $this->action ?? '')) {
 			$this->queue_key = \CoreLibs\Create\RandomKey::randomKeyGen(3);
 		}
 	}
@@ -195,6 +197,29 @@ class Backend
 		$this->acl = $acl;
 	}
 
+	/**
+	 * Return current set ACL
+	 *
+	 * @return array<mixed>
+	 */
+	public function adbGetAcl(): array
+	{
+		return $this->acl;
+	}
+
+	/**
+	 * Set _POST action vars if needed
+	 *
+	 * @return void
+	 */
+	public function adbSetActionVars()
+	{
+		// set the action ids
+		foreach ($this->action_list as $_action) {
+			$this->$_action = $_POST[$_action] ?? '';
+		}
+	}
+
 	/**
 	 * writes all action vars plus other info into edit_log table
 	 *
@@ -257,14 +282,14 @@ class Backend
 				"NULL" :
 				"'" . $this->session->getSessionId() . "'")
 			. ", "
-			. "'" . $this->db->dbEscapeString($this->action) . "', "
+			. "'" . $this->db->dbEscapeString($this->action ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($this->action_id) . "', "
+			. "'" . $this->db->dbEscapeString($this->action_id ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($this->action_yes) . "', "
+			. "'" . $this->db->dbEscapeString($this->action_yes ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($this->action_flag) . "', "
+			. "'" . $this->db->dbEscapeString($this->action_flag ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($this->action_menu) . "', "
+			. "'" . $this->db->dbEscapeString($this->action_menu ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($this->action_loaded) . "', "
+			. "'" . $this->db->dbEscapeString($this->action_loaded ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($this->action_value) . "', "
+			. "'" . $this->db->dbEscapeString($this->action_value ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($this->action_error) . "')";
+			. "'" . $this->db->dbEscapeString($this->action_error ?? '') . "')";
 		$this->db->dbExec($q, 'NULL');
 	}
 
@@ -504,9 +529,9 @@ class Backend
 		string $data,
 		string $key_name,
 		string $key_value,
-		string $associate = null,
+		?string $associate = null,
-		string $file = null,
+		?string $file = null,
-		string $db_schema = null,
+		?string $db_schema = null,
 	): void {
 		/** @var string $DB_SCHEMA check schema */
 		$DB_SCHEMA = 'public';

src/Basic.php

@@ -90,7 +90,7 @@ class Basic
 	 * @deprecated DO NOT USE Class\Basic anymore. Use dedicated logger and sub classes
 	 */
 	public function __construct(
-		\CoreLibs\Logging\Logging $log = null,
+		?\CoreLibs\Logging\Logging $log = null,
 		?string $session_name = null
 	) {
 		trigger_error('Class \CoreLibs\Basic is deprected', E_USER_DEPRECATED);

src/Check/File.php

@@ -51,6 +51,23 @@ class File
 		// return lines in file
 		return $lines;
 	}
+
+	/**
+	 * get the mime type of a file via finfo
+	 * if file not found, throws exception
+	 * else returns '' for any other finfo read problem
+	 *
+	 * @param  string $read_file File to read, relative or absolute path
+	 * @return string
+	 */
+	public static function getMimeType(string $read_file): string
+	{
+		$finfo = new \finfo(FILEINFO_MIME_TYPE);
+		if (!is_file($read_file)) {
+			throw new \UnexpectedValueException('[getMimeType] File not found: ' . $read_file);
+		}
+		return $finfo->file($read_file) ?: '';
+	}
 }
 
 // __END__

src/Combined/DateTime.php

@@ -385,7 +385,7 @@ class DateTime
 		} else {
 			$str = implode(', ', array_slice($formatted, 0, -1));
 			if (!empty($formatted[count($formatted) - 1])) {
-				$str .= ' and ' . $formatted[count($formatted) - 1];
+				$str .= ' and ' . (string)array_pop($formatted);
 			}
 			return $negative . $str;
 		}
@@ -675,9 +675,9 @@ class DateTime
 		foreach ($period as $dt) {
 			$curr = $dt->format('D');
 			if ($curr == 'Sat' || $curr == 'Sun') {
-				$days[2] ++;
+				$days[2]++;
 			} else {
-				$days[1] ++;
+				$days[1]++;
 			}
 		}
 		if ($return_named === true) {

src/Convert/Extends/SetVarTypeMain.php

@@ -52,7 +52,7 @@ class SetVarTypeMain
 	 */
 	protected static function makeStrMain(
 		mixed $val,
-		string $default = null,
+		?string $default = null,
 		bool $to_null = false
 	): ?string {
 		// int/float/string/bool/null, everything else is ignored
@@ -113,7 +113,7 @@ class SetVarTypeMain
 	 */
 	protected static function makeIntMain(
 		mixed $val,
-		int $default = null,
+		?int $default = null,
 		bool $to_null = false
 	): ?int {
 		// if we can filter it to a valid int, we can convert it
@@ -167,7 +167,7 @@ class SetVarTypeMain
 	 */
 	protected static function makeFloatMain(
 		mixed $val,
-		float $default = null,
+		?float $default = null,
 		bool $to_null = false
 	): ?float {
 		if (

src/Convert/Html.php

@@ -16,16 +16,22 @@ class Html
 	/**
 	 * full wrapper for html entities
 	 *
+	 * uses default params as: ENT_QUOTES | ENT_HTML5
+	 * switches from ENT_HTML401 to ENT_HTML5 as we assume all our pages have <!DOCTYPE html>
+	 * removed: ENT_SUBSTITUTE -> wrong characters will be replaced with space
+	 * encodes in UTF-8
+	 * does not double encode
+	 *
 	 * @param  mixed $string string to html encode
+	 * @param  int   $flags [default: ENT_QUOTES | ENT_HTML5]
 	 * @return mixed         if string, encoded, else as is (eg null)
 	 */
-	public static function htmlent(mixed $string): mixed
+	public static function htmlent(mixed $string, int $flags = ENT_QUOTES | ENT_HTML5): mixed
 	{
 		if (is_string($string)) {
-			return htmlentities($string, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+			return htmlentities($string, $flags, 'UTF-8', false);
-		} else {
-			return $string;
 		}
+		return $string;
 	}
 
 	/**
@@ -54,14 +60,10 @@ class Html
 	 */
 	public static function checked(array|string $haystack, string $needle, int $type = 0): ?string
 	{
-		if (is_array($haystack)) {
+		if (is_array($haystack) && in_array($needle, $haystack)) {
-			if (in_array($needle, $haystack)) {
+			return $type ? 'checked' : 'selected';
-				return $type ? 'checked' : 'selected';
+		} elseif (!is_array($haystack) && $haystack == $needle) {
-			}
+			return $type ? 'checked' : 'selected';
-		} else {
-			if ($haystack == $needle) {
-				return $type ? 'checked' : 'selected';
-			}
 		}
 		return null;
 	}

src/Convert/MimeEncode.php

@@ -15,6 +15,7 @@ class MimeEncode
 	/**
 	 * wrapper function for mb mime convert
 	 * for correct conversion with long strings
+	 * NOTE: This is only a wrapper for mb_encode_mimeheader to stay compatible
 	 *
 	 * @param  string $string     string to encode
 	 * @param  string $encoding   target encoding
@@ -29,38 +30,9 @@ class MimeEncode
 		$current_internal_encoding = mb_internal_encoding();
 		// set internal encoding, so the mimeheader encode works correctly
 		mb_internal_encoding($encoding);
-		// if a subject, make a work around for the broken mb_mimencode
+		// use the internal convert to mime header
-		$pos = 0;
+		// it works from PHP 8.2 on
-		// after 36 single bytes characters,
+		$string = mb_encode_mimeheader($string, $encoding, 'B', $line_break);
-		// if then comes MB, it is broken
-		// has to 2 x 36 < 74 so the mb_encode_mimeheader
-		// 74 hardcoded split does not get triggered
-		$split = 36;
-		$_string = '';
-		while ($pos < mb_strlen($string, $encoding)) {
-			$output = mb_strimwidth($string, $pos, $split, "", $encoding);
-			$pos += mb_strlen($output, $encoding);
-			// if the strinlen is 0 here, get out of the loop
-			if (!mb_strlen($output, $encoding)) {
-				$pos += mb_strlen($string, $encoding);
-			}
-			$_string_encoded = mb_encode_mimeheader($output, $encoding);
-			// only make linebreaks if we have mime encoded code inside
-			// the space only belongs in the second line
-			if ($_string && preg_match("/^=\?/", $_string_encoded)) {
-				$_string .= $line_break . " ";
-			} elseif (
-				// hack for plain text with space at the end
-				mb_strlen($output, $encoding) == $split &&
-				mb_substr($output, -1, 1, $encoding) == " "
-			) {
-				// if output ends with space, add one more
-				$_string_encoded .= " ";
-			}
-			$_string .= $_string_encoded;
-		}
-		// strip out any spaces BEFORE a line break
-		$string = str_replace(" " . $line_break, $line_break, $_string);
 		// before we end, reset internal encoding
 		mb_internal_encoding($current_internal_encoding);
 		// return mime encoded string

src/Convert/SetVarTypeNull.php

@@ -35,7 +35,7 @@ class SetVarTypeNull extends Extends\SetVarTypeMain
 	 * @param  string|null $default Default override value
 	 * @return string|null          Input value as string or default as string/null
 	 */
-	public static function makeStr(mixed $val, string $default = null): ?string
+	public static function makeStr(mixed $val, ?string $default = null): ?string
 	{
 		return SetVarTypeMain::makeStrMain($val, $default, true);
 	}
@@ -60,7 +60,7 @@ class SetVarTypeNull extends Extends\SetVarTypeMain
 	 * @param  int|null $default Default override value
 	 * @return int|null          Input value as int or default as int/null
 	 */
-	public static function makeInt(mixed $val, int $default = null): ?int
+	public static function makeInt(mixed $val, ?int $default = null): ?int
 	{
 		return SetVarTypeMain::makeIntMain($val, $default, true);
 	}
@@ -84,7 +84,7 @@ class SetVarTypeNull extends Extends\SetVarTypeMain
 	 * @param  float|null $default Default override value
 	 * @return float|null          Input value as float or default as float/null
 	 */
-	public static function makeFloat(mixed $val, float $default = null): ?float
+	public static function makeFloat(mixed $val, ?float $default = null): ?float
 	{
 		return SetVarTypeMain::makeFloatMain($val, $default, true);
 	}

src/Convert/Strings.php

@@ -118,6 +118,34 @@ class Strings
 			return $value;
 		}
 	}
+
+	/**
+	 * Strip any duplicated slahes from a path
+	 * eg: //foo///bar/foo.inc -> /foo/bar/foo.inc
+	 *
+	 * @param  string $path Path to strip slashes from
+	 * @return string       Clean path, on error returns original path
+	 */
+	public static function stripMultiplePathSlashes(string $path): string
+	{
+		return preg_replace(
+			'#/+#',
+			'/',
+			$path
+		) ?? $path;
+	}
+
+	/**
+	 * Remove UTF8 BOM Byte string from line
+	 * Note: this is often found in CSV files exported from Excel at the first row, first element
+	 *
+	 * @param  string $text
+	 * @return string
+	 */
+	public static function stripUTF8BomBytes(string $text): string
+	{
+		return trim($text, pack('H*', 'EFBBBF'));
+	}
 }
 
 // __END__

src/DB/Extended/ArrayIO.php

@@ -236,7 +236,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	 */
 	public function getPkId(): int|string|null
 	{
-		return $this->pk_id;
+		return $this->pk_id ?? null;
 	}
 
 	/**

src/DB/IO.php

@@ -1302,7 +1302,7 @@ class IO
 				}
 			}
 		}
-		$this->cursor_ext[$query_hash]['pos'] ++;
+		$this->cursor_ext[$query_hash]['pos']++;
 		return $return;
 	}
 
@@ -1318,14 +1318,18 @@ class IO
 		// regex for params: only stand alone $number allowed
 		// exclude all '' enclosed strings, ignore all numbers [note must start with digit]
 		// can have space/tab/new line
-		// must have = , ( [equal, comma, opening round bracket]
+		// must have <> = , ( [not equal, equal, comma, opening round bracket]
 		// can have space/tab/new line
 		// $ number with 1-9 for first and 0-9 for further digits
 		// /s for matching new line in . list
 		// [disabled, we don't used ^ or $] /m for multi line match
 		// Matches in 1:, must be array_filtered to remove empty, count with array_unique
+		$query_split = '[(=,?-]|->|->>|#>|#>>|@>|<@|\?\|\?\&|\|\||#-';
 		preg_match_all(
-			'/(?:\'.*?\')?\s*(?:\?\?|[(=,])\s*(?:\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))/s',
+			'/'
+			. '(?:\'.*?\')?\s*(?:\?\?|<>|' . $query_split . ')\s*'
+			. '(?:\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))'
+			. '/s',
 			$query,
 			$match
 		);
@@ -1519,7 +1523,7 @@ class IO
 				]);
 				return false;
 		}
-		$this->query_called[$query_hash] ++;
+		$this->query_called[$query_hash]++;
 		// return hash
 		return $query_hash;
 	}
@@ -1892,7 +1896,12 @@ class IO
 		$matches = [];
 		// compare has =, >, < prefix, and gets stripped
 		// if the rest is not X.Y format then error
-		preg_match("/^([<>=]{1,})(\d{1,})\.(\d{1,})/", $compare, $matches);
+		if (!preg_match("/^([<>=]{1,})(\d{1,})\.(\d{1,})/", $compare, $matches)) {
+			$this->log->error('Could not regex match compare version string', [
+				"compare" => $compare
+			]);
+			return false;
+		}
 		$compare = $matches[1];
 		$to_master = $matches[2];
 		$to_minor = $matches[3];
@@ -1904,11 +1913,18 @@ class IO
 		}
 		// db_version can return X.Y.Z
 		// we only compare the first two
-		preg_match(
+		if (
-			"/^(\d{1,})\.(\d{1,})\.?(\d{1,})?/",
+			!preg_match(
-			$this->dbVersion(),
+				"/^(\d{1,})\.(\d{1,})\.?(\d{1,})?/",
-			$matches
+				$this->dbVersion(),
-		);
+				$matches
+			)
+		) {
+			$this->log->error('Could not regex match dbVersion string', [
+				"dbVersion" => $this->dbVersion()
+			]);
+			return false;
+		}
 		$master = $matches[1];
 		$minor = $matches[2];
 		$version = $master . ($minor < 10 ? '0' : '') . $minor;
@@ -2398,7 +2414,7 @@ class IO
 				// flag if we have cache data stored at the moment
 				'cached' => false,
 				// when fetch array or cache read returns false
-				// in loop read that means dbReturn retuns false without erro
+				// in loop read that means dbReturn retuns false without error
 				'finished' => false,
 				 // read from cache/db (pos == rows)
 				'read_finished' => false,
@@ -2469,7 +2485,7 @@ class IO
 				return false;
 			}
 		} else {
-			$this->cursor_ext[$query_hash]['log_pos'] ++;
+			$this->cursor_ext[$query_hash]['log_pos']++;
 		}
 		// reset log for each read
 		$this->cursor_ext[$query_hash]['log'] = [];
@@ -2668,8 +2684,8 @@ class IO
 				if ($return) {
 					$this->cursor_ext[$query_hash]['log'][] = 'Return Data';
 					// internal position counter
-					$this->cursor_ext[$query_hash]['pos'] ++;
+					$this->cursor_ext[$query_hash]['pos']++;
-					$this->cursor_ext[$query_hash]['read_rows'] ++;
+					$this->cursor_ext[$query_hash]['read_rows']++;
 					// read is finished
 					if (
 						$this->cursor_ext[$query_hash]['read_rows'] ==

src/DB/Support/ConvertPlaceholder.php

@@ -39,9 +39,11 @@ class ConvertPlaceholder
 	): array {
 		$convert_to = strtolower($convert_to);
 		$matches = [];
+		$query_split = '[(=,?-]|->|->>|#>|#>>|@>|<@|\?\|\?\&|\|\||#-';
 		$pattern = '/'
 			// prefix string part, must match towards
-			. '(?:\'.*?\')?\s*(?:\?\?|[(=,])\s*'
+			// seperator for ( = , ? - [and json/jsonb in pg doc section 9.15]
+			. '(?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\s*'
 			// match for replace part
 			. '(?:'
 			// digit -> ignore
@@ -96,7 +98,10 @@ class ConvertPlaceholder
 			$type = 'named';
 			$matches_return = $named_matches;
 			// only check for :named
-			$pattern_replace = '/((?:\'.*?\')?\s*(?:\?\?|[(=,])\s*)(\d+|(?:\'.*?\')|(:\w+))/s';
+			$pattern_replace = '/'
+				. '((?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\s*)'
+				. '(\d+|(?:\'.*?\')|(:\w+))'
+				. '/s';
 			// 0: full
 			// 1: pre part
 			// 2: keep part UNLESS '3' is set
@@ -134,7 +139,10 @@ class ConvertPlaceholder
 			// order and data stays the same
 			$params_new = $params;
 			// only check for ?
-			$pattern_replace = '/((?:\'.*?\')?\s*(?:\?\?|[(=,])\s*)(\d+|(?:\'.*?\')|(?:(?:\?\?)?\s*(\?{1})))/s';
+			$pattern_replace = '/'
+				. '((?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\s*)'
+				. '(\d+|(?:\'.*?\')|(?:(?:\?\?)?\s*(\?{1})))'
+				. '/s';
 			// 0: full
 			// 1: pre part
 			// 2: keep part UNLESS '3' is set
@@ -163,7 +171,10 @@ class ConvertPlaceholder
 			$type = 'numbered';
 			$matches_return = $numbered_matches;
 			// only check for $n
-			$pattern_replace = '/((?:\'.*?\')?\s*(?:\?\?|[(=,])\s*)(\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))/s';
+			$pattern_replace = '/'
+				. '((?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\s*)'
+				. '(\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))'
+				. '/s';
 			// 0: full
 			// 1: pre part
 			// 2: keep part UNLESS '3' is set

src/Get/System.php

@@ -116,6 +116,29 @@ class System
 			3
 		) === 'cli' ? true : false;
 	}
+
+	/**
+	 * Collect all IP addresses
+	 * REMOTE_ADDR, HTTP_X_FORWARD_FOR, CLIENT_IP
+	 * and retuns them in an array with index of io source
+	 * if address source has addresses with "," will add "-array" with these as array block
+	 *
+	 * @return array<string,string|array<string>>
+	 */
+	public static function getIpAddresses(): array
+	{
+		$ip_addr = [];
+		foreach (['REMOTE_ADDR', 'HTTP_X_FORWARDED_FOR', 'CLIENT_IP'] as $_ip_source) {
+			if (!empty($_SERVER[$_ip_source])) {
+				$ip_addr[$_ip_source] = $_SERVER[$_ip_source];
+				// same level as ARRAY IF there is a , inside
+				if (strstr($_SERVER[$_ip_source], ',') !== false) {
+					$ip_addr[$_ip_source . '-array'] = explode(',', $_SERVER[$_ip_source]);
+				}
+			}
+		}
+		return $ip_addr;
+	}
 }
 
 // __END__

src/Language/Core/CachedFileReader.php

@@ -46,7 +46,7 @@ class CachedFileReader extends \CoreLibs\Language\Core\StringReader
 			if (!is_resource($fd)) {
 				$this->error = 3; // Cannot read file, probably permissions
 			} else {
-				$this->fd_str = fread($fd, filesize($filename) ?: 0) ?: '';
+				$this->fd_str = fread($fd, filesize($filename) ?: 1) ?: '';
 				fclose($fd);
 			}
 		} else {

src/Language/GetLocale.php

@@ -128,7 +128,7 @@ class GetLocale
 				$matches
 			)
 		) {
-			$lang = ($matches['lang'] ?? 'en')
+			$lang = $matches['lang']
 				// add country only if set
 				. (!empty($matches['country']) ? '_' . $matches['country'] : '');
 		} else {
@@ -235,7 +235,7 @@ class GetLocale
 				$matches
 			)
 		) {
-			$lang = ($matches['lang'] ?? 'en')
+			$lang = $matches['lang']
 				// add country only if set
 				. (!empty($matches['country']) ? '_' . $matches['country'] : '');
 		} else {

src/Logging/ErrorMessage.php

@@ -24,16 +24,20 @@ class ErrorMessage
 
 	/** @var bool $log_error global flag to log error level message */
 	private bool $log_error = false;
+	/** @var bool $log_warning global flat to log warning level messages */
+	private bool $log_warning = false;
 
 	/**
 	 * init ErrorMessage
 	 *
 	 * @param  \CoreLibs\Logging\Logging $log
 	 * @param  null|bool                 $log_error [=null], defaults to false if log is not level debug
+	 * @param  null|bool                 $log_warning [=null], defaults to false if log is not level debug
 	 */
 	public function __construct(
 		\CoreLibs\Logging\Logging $log,
-		?bool $log_error = null
+		?bool $log_error = null,
+		?bool $log_warning = null
 	) {
 		$this->log = $log;
 		// if log default logging is debug then log_error is default set to true
@@ -43,6 +47,13 @@ class ErrorMessage
 			$log_error = $log_error ?? false;
 		}
 		$this->log_error = $log_error;
+		// if log default logging is debug then log_warning is default set to true
+		if ($this->log->loggingLevelIsDebug() && $log_warning === null) {
+			$log_warning = true;
+		} else {
+			$log_warning = $log_warning ?? false;
+		}
+		$this->log_warning = $log_warning;
 	}
 
 	/**
@@ -81,6 +92,8 @@ class ErrorMessage
 	 * @param  array<mixed>  $context      Additionl info for abort/crash messages
 	 * @param  bool|null     $log_error    [=null] log level 'error' to error, if null use global,
 	 *                                     else set for this call only
+	 * @param  bool|null     $log_warning  [=null] log level 'warning' to warning, if null use global,
+	 *                                     else set for this call only
 	 */
 	public function setErrorMsg(
 		string $error_id,
@@ -93,10 +106,14 @@ class ErrorMessage
 		?string $message = null,
 		array $context = [],
 		?bool $log_error = null,
+		?bool $log_warning = null,
 	): void {
 		if ($log_error === null) {
 			$log_error = $this->log_error;
 		}
+		if ($log_warning === null) {
+			$log_warning = $this->log_warning;
+		}
 		$original_level = $level;
 		$level = MessageLevel::fromName($level)->name;
 		// if not string set, write message string if set, else level/error id
@@ -121,6 +138,14 @@ class ErrorMessage
 					'level' => $original_level,
 				], $context));
 				break;
+			case 'warn':
+				if ($log_warning) {
+					$this->log->warning($message ?? $str, array_merge([
+						'id' => $error_id,
+						'level' => $original_level,
+					], $context));
+				}
+				break;
 			case 'error':
 				if ($log_error) {
 					$this->log->error($message ?? $str, array_merge([
@@ -169,6 +194,8 @@ class ErrorMessage
 	 * @param  array<mixed>  $context      Additionl info for abort/crash messages
 	 * @param  bool|null     $log_error    [=null] log level 'error' to error, if null use global,
 	 *                                     else set for this call only
+	 * @param  bool|null     $log_warning  [=null] log level 'warning' to warning, if null use global,
+	 *                                     else set for this call only
 	 */
 	public function setMessage(
 		string $level,
@@ -181,6 +208,7 @@ class ErrorMessage
 		?string $message = null,
 		array $context = [],
 		?bool $log_error = null,
+		?bool $log_warning = null,
 	): void {
 		$this->setErrorMsg(
 			$error_id ?? '',
@@ -192,7 +220,8 @@ class ErrorMessage
 			$jump_target,
 			$message,
 			$context,
-			$log_error
+			$log_error,
+			$log_warning
 		);
 	}
 
@@ -314,6 +343,27 @@ class ErrorMessage
 	{
 		return $this->log_error;
 	}
+
+	/**
+	 * Set the log warning flag
+	 *
+	 * @param  bool $flag True to log level warning too, False for do not (Default)
+	 * @return void
+	 */
+	public function setFlagLogWarning(bool $flag): void
+	{
+		$this->log_warning = $flag;
+	}
+
+	/**
+	 * Get the current log error flag
+	 *
+	 * @return bool
+	 */
+	public function getFlagLogWarning(): bool
+	{
+		return $this->log_warning;
+	}
 }
 
 // __END__

src/Logging/Logger/MessageLevel.php

@@ -14,6 +14,7 @@ namespace CoreLibs\Logging\Logger;
 enum MessageLevel: int
 {
 	case ok = 100;
+	case success = 150; // special for file uploads
 	case info = 200;
 	case notice = 250;
 	case warn = 300;
@@ -30,6 +31,7 @@ enum MessageLevel: int
 	{
 		return match (strtolower($name)) {
 			'ok' => self::ok,
+			'success' => self::success,
 			'info' => self::info,
 			'notice' => self::notice,
 			'warn', 'warning' => self::warn,

src/Output/Form/Elements.php

@@ -194,13 +194,13 @@ class Elements
 			"/(mailto:)?(\>)?\b([\w\.-]+)@([\w\.\-]+)\.([a-zA-Z]{2,4})\b(\|([^\||^#]+)(#([^\|]+))?\|)?/",
 			function ($matches) {
 				return self::createEmail(
-					$matches[1] ?? '',
+					$matches[1],
-					$matches[2] ?? '',
+					$matches[2],
-					$matches[3] ?? '',
+					$matches[3],
-					$matches[4] ?? '',
+					$matches[4],
-					$matches[5] ?? '',
+					$matches[5],
 					$matches[7] ?? '',
-					$matches[9] ?? ''
+					$matches[9] ?? '',
 				);
 			},
 			$output

src/Output/Form/Generate.php

@@ -826,27 +826,28 @@ class Generate
 				$pk_selected = $res[$this->int_pk_name];
 			}
 			$t_string = '';
-			foreach ($this->field_array as $i => $field_array) {
+			foreach ($this->field_array as $field_array) {
 				if ($t_string) {
 					$t_string .= ', ';
 				}
-				if (isset($field_array['before_value'])) {
+				if (!empty($field_array['before_value'])) {
-					$t_string .= $field_array['before_value'];
+					$t_string .= $this->l->__($field_array['before_value']);
 				}
 				// must have res element set
 				if (
-					isset($field_array['name']) &&
+					!empty($field_array['name']) &&
 					isset($res[$field_array['name']])
 				) {
-					if (isset($field_array['binary'])) {
+					$_t_value = '';
-						if (isset($field_array['binary'][0])) {
+					// if we have a binary set, where 0 = YES and 1 = NO
-							$t_string .= $field_array['binary'][0];
+					if (!empty($field_array['binary'])) {
-						} elseif (isset($field_array['binary'][1])) {
+						$_t_value = !empty($res[$field_array['name']]) ?
-							$t_string .= $field_array['binary'][1];
+							($field_array['binary'][0] ?? 'Yes') :
-						}
+							($field_array['binary'][1] ?? 'No');
 					} else {
-						$t_string .= $res[$field_array['name']];
+						$_t_value = $res[$field_array['name']];
 					}
+					$t_string .= $this->l->__($_t_value);
 				}
 			}
 			$pk_names[] = $t_string;
@@ -1506,7 +1507,7 @@ class Generate
 			}
 			if (
 				!empty($this->reference_array[$key]['mandatory']) &&
-				!$this->reference_array[$key]['selected'][0]
+				empty($this->reference_array[$key]['selected'][0])
 			) {
 				$this->msg .= sprintf(
 					$this->l->__('Please select at least one Element from field <b>%s</b>!<br>'),

src/Output/Form/TableArrays/EditPages.php

@@ -53,6 +53,7 @@ class EditPages implements Interface\TableArraysInterface
 					'value' => $_POST['name'] ?? '',
 					'output_name' => 'Page name',
 					'mandatory' => 1,
+					'error_check' => 'unique',
 					'type' => 'text'
 				],
 				'order_number' => [

src/Output/Image.php

@@ -204,11 +204,11 @@ class Image
 				E_USER_DEPRECATED
 			);
 			// NOTE: we need to depracte this
-			$cache_folder = BASE . LAYOUT . CONTENT_PATH . CACHE . IMAGES;
+			$cache_folder = BASE . CONTENT_PATH . LAYOUT . CACHE . IMAGES;
 			$web_folder = LAYOUT . CACHE . IMAGES;
 			if (!is_dir($cache_folder)) {
 				if (false === mkdir($cache_folder)) {
-					$cache_folder = BASE . LAYOUT . CONTENT_PATH . CACHE;
+					$cache_folder = BASE . CONTENT_PATH . LAYOUT . CACHE;
 					$web_folder = LAYOUT . CACHE;
 				}
 			}

src/Output/ProgressBar.php

@@ -156,7 +156,7 @@ class ProgressBar
 	{
 		// avoid divison through 0
 		if ($this->max - $this->min == 0) {
-			$this->max ++;
+			$this->max++;
 		}
 		$percent = round(($step - $this->min) / ($this->max - $this->min) * 100);
 		if ($percent > 100) {
@@ -186,7 +186,7 @@ class ProgressBar
 		}
 		// avoid divison through 0
 		if ($this->max - $this->min == 0) {
-			$this->max ++;
+			$this->max++;
 		}
 		$pixel = round(($step - $this->min) * ($bar - ($this->pedding * 2)) / ($this->max - $this->min));
 		if ($step <= $this->min) {

src/Security/SymmetricEncryption.php

@@ -21,58 +21,82 @@ use SodiumException;
 
 class SymmetricEncryption
 {
+	/** @var SymmetricEncryption self instance */
+	private static SymmetricEncryption $instance;
+
+	/** @var string bin hex key */
+	private string $key = '';
+
 	/**
-	 * Encrypt a message
+	 * init class
+	 * if key not passed, key must be set with createKey
 	 *
-	 * @param  string $message Message to encrypt
+	 * @param  string|null|null $key
-	 * @param  string $key     Encryption key (as hex string)
-	 * @return string
-	 * @throws \Exception
-	 * @throws \RangeException
 	 */
-	public static function encrypt(string $message, string $key): string
+	public function __construct(
+		string|null $key = null
+	) {
+		if ($key != null) {
+			$this->setKey($key);
+		}
+	}
+
+	/**
+	 * Returns the singleton self object.
+	 * For function wrapper use
+	 *
+	 * @return SymmetricEncryption object
+	 */
+	public static function getInstance(string|null $key = null): self
+	{
+		if (empty(self::$instance)) {
+			self::$instance = new self($key);
+		}
+		return self::$instance;
+	}
+
+	/* ************************************************************************
+	 * MARK: PRIVATE
+	 * *************************************************************************/
+
+	/**
+	 * create key and check validity
+	 *
+	 * @param  string $key The key from which the binary key will be created
+	 * @return string      Binary key string
+	 */
+	private function createKey(string $key): string
 	{
 		try {
 			$key = CreateKey::hex2bin($key);
 		} catch (SodiumException $e) {
-			throw new \UnexpectedValueException('Invalid hex key');
+			throw new \UnexpectedValueException('Invalid hex key: ' . $e->getMessage());
 		}
 		if (mb_strlen($key, '8bit') !== SODIUM_CRYPTO_SECRETBOX_KEYBYTES) {
 			throw new \RangeException(
 				'Key is not the correct size (must be '
-					. 'SODIUM_CRYPTO_SECRETBOX_KEYBYTES bytes long).'
+					. SODIUM_CRYPTO_SECRETBOX_KEYBYTES . ' bytes long).'
 			);
 		}
-		$nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+		return $key;
-
-		$cipher = base64_encode(
-			$nonce
-			. sodium_crypto_secretbox(
-				$message,
-				$nonce,
-				$key
-			)
-		);
-		sodium_memzero($message);
-		sodium_memzero($key);
-		return $cipher;
 	}
 
 	/**
-	 * Decrypt a message
+	 * Decryption call
 	 *
-	 * @param  string $encrypted Message encrypted with safeEncrypt()
+	 * @param  string  $encrypted Text to decrypt
-	 * @param  string $key       Encryption key (as hex string)
+	 * @param  ?string $key       Mandatory encryption key, will throw exception if empty
-	 * @return string
+	 * @return string             Plain text
-	 * @throws \Exception
+	 * @throws \RangeException
+	 * @throws \UnexpectedValueException
+	 * @throws \UnexpectedValueException
 	 */
-	public static function decrypt(string $encrypted, string $key): string
+	private function decryptData(string $encrypted, ?string $key): string
 	{
-		try {
+		if (empty($key)) {
-			$key = CreateKey::hex2bin($key);
+			throw new \UnexpectedValueException('Key not set');
-		} catch (SodiumException $e) {
-			throw new \Exception('Invalid hex key');
 		}
+		$key = $this->createKey($key);
 		$decoded = base64_decode($encrypted);
 		$nonce = mb_substr($decoded, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
 		$ciphertext = mb_substr($decoded, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
@@ -85,7 +109,7 @@ class SymmetricEncryption
 				$key
 			);
 		} catch (SodiumException $e) {
-			throw new \UnexpectedValueException('Invalid ciphertext (too short)');
+			throw new \UnexpectedValueException('Decipher message failed: ' . $e->getMessage());
 		}
 		if (!is_string($plain)) {
 			throw new \UnexpectedValueException('Invalid Key');
@@ -94,6 +118,117 @@ class SymmetricEncryption
 		sodium_memzero($key);
 		return $plain;
 	}
+
+	/**
+	 * Encrypt a message
+	 *
+	 * @param  string  $message Message to encrypt
+	 * @param  ?string $key     Mandatory encryption key, will throw exception if empty
+	 * @return string
+	 * @throws \Exception
+	 * @throws \RangeException
+	 */
+	private function encryptData(string $message, ?string $key): string
+	{
+		if (empty($this->key) || $key === null) {
+			throw new \UnexpectedValueException('Key not set');
+		}
+		$key = $this->createKey($key);
+		$nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+		try {
+			$cipher = base64_encode(
+				$nonce
+				. sodium_crypto_secretbox(
+					$message,
+					$nonce,
+					$key,
+				)
+			);
+		} catch (SodiumException $e) {
+			throw new \UnexpectedValueException("Create encrypted message failed: " . $e->getMessage());
+		}
+		sodium_memzero($message);
+		sodium_memzero($key);
+		return $cipher;
+	}
+
+	/* ************************************************************************
+	 * MARK: PUBLIC
+	 * *************************************************************************/
+
+
+	/**
+	 * set a new key for encryption
+	 *
+	 * @param  string $key
+	 * @return void
+	 */
+	public function setKey(string $key)
+	{
+		if (empty($key)) {
+			throw new \UnexpectedValueException('Key cannot be empty');
+		}
+		$this->key = $key;
+	}
+
+	/**
+	 * Decrypt a message
+	 * static version
+	 *
+	 * @param  string $encrypted Message encrypted with safeEncrypt()
+	 * @param  string $key       Encryption key (as hex string)
+	 * @return string
+	 * @throws \Exception
+	 * @throws \RangeException
+	 * @throws \UnexpectedValueException
+	 * @throws \UnexpectedValueException
+	 */
+	public static function decryptKey(string $encrypted, string $key): string
+	{
+		return self::getInstance()->decryptData($encrypted, $key);
+	}
+
+	/**
+	 * Decrypt a message
+	 *
+	 * @param  string $encrypted Message encrypted with safeEncrypt()
+	 * @return string
+	 * @throws \RangeException
+	 * @throws \UnexpectedValueException
+	 * @throws \UnexpectedValueException
+	 */
+	public function decrypt(string $encrypted): string
+	{
+		return $this->decryptData($encrypted, $this->key);
+	}
+
+	/**
+	 * Encrypt a message
+	 * static version
+	 *
+	 * @param  string $message Message to encrypt
+	 * @param  string $key     Encryption key (as hex string)
+	 * @return string
+	 * @throws \Exception
+	 * @throws \RangeException
+	 */
+	public static function encryptKey(string $message, string $key): string
+	{
+		return self::getInstance()->encryptData($message, $key);
+	}
+
+	/**
+	 * Encrypt a message
+	 *
+	 * @param  string $message Message to encrypt
+	 * @return string
+	 * @throws \Exception
+	 * @throws \RangeException
+	 */
+	public function encrypt(string $message): string
+	{
+		return $this->encryptData($message, $this->key);
+	}
 }
 
 // __END__

src/Template/HtmlBuilder/Block.php

@@ -19,7 +19,7 @@ use CoreLibs\Template\HtmlBuilder\General\HtmlBuilderExcpetion;
 class Block
 {
 	/**
-	 * Undocumented function
+	 * Create Element
 	 *
 	 * @param  string $tag
 	 * @param  string $id
@@ -86,7 +86,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Add multiple elements to the base element
 	 *
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $base
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} ...$attach
@@ -101,7 +101,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Add multiple sub elements to the base element
 	 *
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $element
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $sub
@@ -117,7 +117,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Remove all sub element entries
 	 *
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $element
 	 * @return array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>}
@@ -131,7 +131,7 @@ class Block
 	// CSS Elements
 
 	/**
-	 * Undocumented function
+	 * Add css entry to the css entries
 	 *
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $element
 	 * @param  string ...$css
@@ -144,7 +144,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Remove a css entry entry from the css array
 	 *
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $element
 	 * @param  string ...$css
@@ -157,7 +157,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Switch CSS entries
 	 * scssel (switch) is not supported
 	 * use rcssel -> acssel
 	 *
@@ -175,7 +175,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Build HTML from the content tree
 	 * alias phfo
 	 *
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $tree
@@ -231,7 +231,19 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Alias for phfo
+	 *
+	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $tree
+	 * @param  bool         $add_nl [default=false]
+	 * @return string
+	 */
+	public static function phfo(array $tree, bool $add_nl = false): string
+	{
+		return self::buildHtml($tree, $add_nl);
+	}
+
+	/**
+	 * Build HTML elements from an array of elements
 	 * alias phfa
 	 *
 	 * @param  array<array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>}> $list
@@ -248,8 +260,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * alias for buildHtmlFromList
-	 * wrapper for buildHtmlFromList
 	 *
 	 * @param  array<array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>}> $list                   array of Elements to build string from
 	 * @param  bool           $add_nl [default=false] Optional output string line break

src/Template/HtmlBuilder/Element.php

@@ -401,7 +401,7 @@ class Element
 	 * @param  bool         $add_nl [default=false] Optional output string line breaks
 	 * @return string                               HTML as string
 	 */
-	public function buildHtml(Element $tree = null, bool $add_nl = false): string
+	public function buildHtml(?Element $tree = null, bool $add_nl = false): string
 	{
 		// print "D01: " . microtime(true) . "<br>";
 		if ($tree === null) {
@@ -533,7 +533,7 @@ class Element
 	 * @return string                           build html as string
 	 * @deprecated Do not use, use Element->buildHtml() instead
 	 */
-	public static function printHtmlFromObject(Element $tree = null, bool $add_nl = false): string
+	public static function printHtmlFromObject(?Element $tree = null, bool $add_nl = false): string
 	{
 		// nothing ->bad
 		if ($tree === null) {

src/Template/SmartyExtend.php

@@ -185,7 +185,7 @@ class SmartyExtend extends \Smarty
 		// call basic smarty
 		// or Smarty::__construct();
 		parent::__construct();
-		// iinit lang
+		// init lang
 		$this->l10n = $l10n;
 		// parse and read, legacy stuff
 		$locale = $this->l10n->getLocaleAsArray();
@@ -203,7 +203,8 @@ class SmartyExtend extends \Smarty
 		_bind_textdomain_codeset($this->domain, $this->encoding);
 
 		// register smarty variable
-		$this->registerPlugin('modifier', 'getvar', [&$this, 'getTemplateVars']);
+		// $this->registerPlugin(\Smarty\Smarty::PLUGIN_MODIFIER, 'getvar', [&$this, 'getTemplateVars']);
+		$this->registerPlugin(self::PLUGIN_MODIFIER, 'getvar', [&$this, 'getTemplateVars']);
 
 		$this->page_name = \CoreLibs\Get\System::getPageName();
 

test/checking/phan.sh

@@ -1,2 +1,2 @@
 base="/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All/";
-vendor/bin/phan --progress-bar -C --analyze-twice
+tools/phan --progress-bar -C --analyze-twice

test/checking/phpstan.sh

@@ -1,2 +1,2 @@
 base="/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All/";
-vendor/bin/phpstan
+tools/phpstan

test/checking/phpunit.sh

@@ -15,25 +15,27 @@ php_bin="";
 if [ ! -z "${1}" ]; then
 	case "${1}" in
 		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
-		"7.4") php_bin="/usr/bin/php7.4 "; ;;
+		#"7.4") php_bin="/usr/bin/php7.4 "; ;;
-		"8.0") php_bin="/usr/bin/php8.0 "; ;;
+		#"8.0") php_bin="/usr/bin/php8.0 "; ;;
-		"8.1") php_bin="/usr/bin/php8.1 "; ;;
+		#"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;
 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 "; ;;
+		#"7.4") php_bin="/usr/bin/php7.4 "; ;;
-		"8.0") php_bin="/usr/bin/php8.0 "; ;;
+		#"8.0") php_bin="/usr/bin/php8.0 "; ;;
-		"8.1") php_bin="/usr/bin/php8.1 "; ;;
+		#"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;
 
-phpunit_call="${php_bin}${base}vendor/bin/phpunit ${opt_testdox} -c ${base}phpunit.xml ${base}test/phpunit/";
+phpunit_call="${php_bin}${base}tools/phpunit ${opt_testdox} -c ${base}phpunit.xml ${base}test/phpunit/";
 
 ${phpunit_call};
 

test/phpunit/Check/CoreLibsCheckFileTest.php

@@ -28,10 +28,10 @@ final class CoreLibsCheckFileTest extends TestCase
 	public function filesList(): array
 	{
 		return [
-			['filename.txt', 'txt', 5],
+			['filename.txt', 'txt', 5, 'text/plain'],
-			['filename.csv', 'csv', 15],
+			['filename.csv', 'csv', 15, 'text/csv'],
-			['filename.tsv', 'tsv', 0],
+			['filename.tsv', 'tsv', 0, 'text/plain'],
-			['file_does_not_exits', '', -1],
+			['file_does_not_exits', '', -1, ''],
 		];
 	}
 
@@ -63,6 +63,15 @@ 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
 	 *
@@ -115,6 +124,51 @@ 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__

test/phpunit/Convert/CoreLibsConvertMimeEncodeTest.php

@@ -33,15 +33,14 @@ 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 '
+				"The quick brown fox jumps over the lazy sheep that sleeps in the ravine and\r\n"
-					. 'and has no idea what is going on here'
+					. ' 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?='
+				"This is =?UTF-8?B?w7xtbMOkw59044Go5ryi5a2X44KC44Kr44K/44Kr44OK77yBIV4k?=\r\n"
-					. "\r\n"
+					. ' =?UTF-8?B?JSY=?='
-					. ' =?UTF-8?B?JQ==?=&'
 			],
 			'35 chars and space at the end UTF-8' => [
 				'12345678901234567890123456789012345 '
@@ -62,9 +61,8 @@ final class CoreLibsConvertMimeEncodeTest extends TestCase
 					. 'is there a space?',
 				'UTF-8',
 				"=?UTF-8?B?44Kr44K/44Kr44OK44Kr44K/44Kr44OK44GL44Gq44Kr44K/44Kr44OK44Kr?=\r\n"
-					. " =?UTF-8?B?44K/44Kr44OK?=\r\n"
+					. " =?UTF-8?B?44K/44Kr44OK44GL44Gq44Kr44K/44Kr44OK44Kr44K/44Kr44OK44GL44Gq?=\r\n"
-					. " =?UTF-8?B?44GL44Gq44Kr44K/44Kr44OK44Kr44K/44Kr44OK44GL44Gq44Kr44K/44Kr?=\r\n"
+					. " =?UTF-8?B?44Kr44K/44Kr44OK44Kr44K/IGlzIHRoZXJlIGEgc3BhY2U/?="
-					. " =?UTF-8?B?44OK44Kr44K/?= is there a =?UTF-8?B?c3BhY2U/?="
 			]
 		];
 	}
@@ -85,16 +83,28 @@ final class CoreLibsConvertMimeEncodeTest extends TestCase
 		// print "MIME: -" . $encoded . "-\n";
 		$this->assertEquals(
 			$expected,
-			$encoded
+			$encoded,
+			"__mbMimeEncode"
 		);
 		$decoded = mb_decode_mimeheader($encoded);
-		// print "INPUT  : " . $input . "\n";
+		// print "ENCODED: " . $encoded . "\n";
-		// print "DECODED: " . $decoded . "\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";
 		// back compare decoded
 		$this->assertEquals(
 			$input,
-			$decoded
+			$decoded,
+			"mb_decode_mimeheader"
 		);
+
+		// $this->assertEquals(
+		// 	$input,
+		// 	$test_dec,
+		// 	'mb_encode_to_decode'
+		// );
 	}
 }
 

test/phpunit/Convert/CoreLibsConvertStringsTest.php

@@ -13,6 +13,8 @@ use PHPUnit\Framework\TestCase;
  */
 final class CoreLibsConvertStringsTest extends TestCase
 {
+	private const DATA_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR;
+
 	/**
 	 * Undocumented function
 	 *
@@ -256,6 +258,126 @@ 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__

test/phpunit/Convert/data/UTF8.csv

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

test/phpunit/Convert/data/UTF8BOM.csv

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

test/phpunit/Get/CoreLibsGetSystemTest.php

@@ -216,6 +216,29 @@ 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__

test/phpunit/Logging/CoreLibsLoggingErrorMessagesTest.php

@@ -39,6 +39,11 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				'str' => 'OK',
 				'expected' => 'ok',
 			],
+			'success' => [
+				'level' => 'success',
+				'str' => 'SUCCESS',
+				'expected' => 'success',
+			],
 			'info' => [
 				'level' => 'info',
 				'str' => 'INFO',
@@ -225,6 +230,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				'str' => 'ERROR MESSAGE',
 				'message' => null,
 				'log_error' => null,
+				'log_warning' => null,
 				'expected' => '<ERROR> ERROR MESSAGE',
 			],
 			'error, logged' => [
@@ -233,6 +239,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				'str' => 'ERROR MESSAGE',
 				'message' => null,
 				'log_error' => true,
+				'log_warning' => null,
 				'expected' => '<ERROR> ERROR MESSAGE',
 			],
 			'error, logged, message' => [
@@ -241,14 +248,43 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				'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' => [
@@ -257,6 +293,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				'str' => 'NOTICE MESSAGE',
 				'message' => 'OTHER NOTICE MESSAGE',
 				'log_error' => null,
+				'log_warning' => null,
 				'expected' => '<NOTICE> OTHER NOTICE MESSAGE',
 			],
 			'crash' => [
@@ -265,6 +302,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				'str' => 'CRASH MESSAGE',
 				'message' => null,
 				'log_error' => null,
+				'log_warning' => null,
 				'expected' => '<ALERT> CRASH MESSAGE',
 			],
 			'crash, message' => [
@@ -273,6 +311,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				'str' => 'CRASH MESSAGE',
 				'message' => 'OTHER CRASH MESSAGE',
 				'log_error' => null,
+				'log_warning' => null,
 				'expected' => '<ALERT> OTHER CRASH MESSAGE',
 			],
 			'abort' => [
@@ -281,6 +320,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				'str' => 'ABORT MESSAGE',
 				'message' => null,
 				'log_error' => null,
+				'log_warning' => null,
 				'expected' => '<CRITICAL> ABORT MESSAGE',
 			],
 			'abort, message' => [
@@ -289,6 +329,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				'str' => 'ABORT MESSAGE',
 				'message' => 'OTHER ABORT MESSAGE',
 				'log_error' => null,
+				'log_warning' => null,
 				'expected' => '<CRITICAL> OTHER ABORT MESSAGE',
 			],
 			'unknown' => [
@@ -297,6 +338,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				'str' => 'WRONG LEVEL MESSAGE',
 				'message' => null,
 				'log_error' => null,
+				'log_warning' => null,
 				'expected' => '<EMERGENCY> WRONG LEVEL MESSAGE',
 			],
 			'unknown, message' => [
@@ -305,6 +347,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				'str' => 'WRONG LEVEL MESSAGE',
 				'message' => 'OTHER WRONG LEVEL MESSAGE',
 				'log_error' => null,
+				'log_warning' => null,
 				'expected' => '<EMERGENCY> OTHER WRONG LEVEL MESSAGE',
 			],
 		];
@@ -321,6 +364,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 	 * @param  string      $str
 	 * @param  string|null $message
 	 * @param  bool|null   $log_error
+	 * @param  bool|null   $log_warning
 	 * @param  string      $expected
 	 * @return void
 	 */
@@ -330,6 +374,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 		string $str,
 		?string $message,
 		?bool $log_error,
+		?bool $log_warning,
 		string $expected
 	): void {
 		$log = new \CoreLibs\Logging\Logging([
@@ -344,7 +389,8 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 			$level,
 			$str,
 			message: $message,
-			log_error: $log_error
+			log_error: $log_error,
+			log_warning: $log_warning
 		);
 		$file_content = '';
 		if (is_file($log->getLogFolder() . $log->getLogFile())) {
@@ -358,6 +404,11 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				$expected,
 				$file_content
 			);
+		} elseif ($level == 'warn' && ($log_warning === null || $log_warning === false)) {
+			$this->assertStringNotContainsString(
+				$expected,
+				$file_content
+			);
 		} else {
 			$this->assertStringContainsString(
 				$expected,
@@ -377,6 +428,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 	 * @param  string      $str
 	 * @param  string|null $message
 	 * @param  bool|null   $log_error
+	 * @param  bool|null   $log_warning
 	 * @param  string      $expected
 	 * @return void
 	 */
@@ -386,6 +438,7 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 		string $str,
 		?string $message,
 		?bool $log_error,
+		?bool $log_warning,
 		string $expected
 	): void {
 		$log = new \CoreLibs\Logging\Logging([
@@ -400,7 +453,8 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 			$level,
 			$str,
 			message: $message,
-			log_error: $log_error
+			log_error: $log_error,
+			log_warning: $log_warning
 		);
 		$file_content = '';
 		if (is_file($log->getLogFolder() . $log->getLogFile())) {
@@ -414,6 +468,11 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				$expected,
 				$file_content
 			);
+		} elseif ($level == 'warn' && $log_warning === false) {
+			$this->assertStringNotContainsString(
+				$expected,
+				$file_content
+			);
 		} else {
 			$this->assertStringContainsString(
 				$expected,

test/phpunit/Security/CoreLibsSecuritySymmetricEncryptionTest.php

@@ -46,12 +46,34 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 	public function testEncryptDecryptSuccess(string $input, string $expected): void
 	{
 		$key = CreateKey::generateRandomKey();
-		$encrypted = SymmetricEncryption::encrypt($input, $key);
+
-		$decrypted = SymmetricEncryption::decrypt($encrypted, $key);
+		// test class
+		$crypt = new SymmetricEncryption($key);
+		$encrypted = $crypt->encrypt($input);
+		$decrypted = $crypt->decrypt($encrypted);
+		$this->assertEquals(
+			$expected,
+			$decrypted,
+			'Class call',
+		);
+
+		// test indirect
+		$encrypted = SymmetricEncryption::getInstance($key)->encrypt($input);
+		$decrypted = SymmetricEncryption::getInstance($key)->decrypt($encrypted);
+		$this->assertEquals(
+			$expected,
+			$decrypted,
+			'Class Instance call',
+		);
+
+		// test static
+		$encrypted = SymmetricEncryption::encryptKey($input, $key);
+		$decrypted = SymmetricEncryption::decryptKey($encrypted, $key);
 
 		$this->assertEquals(
 			$expected,
-			$decrypted
+			$decrypted,
+			'Static call',
 		);
 	}
 
@@ -86,10 +108,24 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 	public function testEncryptFailed(string $input, string $exception_message): void
 	{
 		$key = CreateKey::generateRandomKey();
-		$encrypted = SymmetricEncryption::encrypt($input, $key);
 		$wrong_key = CreateKey::generateRandomKey();
+
+		// wrong key in class call
+		$crypt = new SymmetricEncryption($key);
+		$encrypted = $crypt->encrypt($input);
 		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::decrypt($encrypted, $wrong_key);
+		$crypt->setKey($key);
+		$crypt->decrypt($encrypted);
+
+		// class instance
+		$encrypted = SymmetricEncryption::getInstance($key)->encrypt($input);
+		$this->expectExceptionMessage($exception_message);
+		SymmetricEncryption::getInstance($wrong_key)->decrypt($encrypted);
+
+		// class static
+		$encrypted = SymmetricEncryption::encryptKey($input, $key);
+		$this->expectExceptionMessage($exception_message);
+		SymmetricEncryption::decryptKey($encrypted, $wrong_key);
 	}
 
 	/**
@@ -107,7 +143,6 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 			'too short hex key' => [
 				'key' => '1cabd5cba9e042f12522f4ff2de5c31d233b',
 				'excpetion_message' => 'Key is not the correct size (must be '
-					. 'SODIUM_CRYPTO_SECRETBOX_KEYBYTES bytes long).'
 			],
 		];
 	}
@@ -126,13 +161,33 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 	 */
 	public function testWrongKey(string $key, string $exception_message): void
 	{
-		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::encrypt('test', $key);
-		// we must encrypt valid thing first so we can fail with the wrong kjey
 		$enc_key = CreateKey::generateRandomKey();
-		$encrypted = SymmetricEncryption::encrypt('test', $enc_key);
+
+		// class
+		$crypt = new SymmetricEncryption($key);
 		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::decrypt($encrypted, $key);
+		$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);
 	}
 
 	/**
@@ -145,7 +200,7 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 		return [
 			'too short ciphertext' => [
 				'input' => 'short',
-				'exception_message' => 'Invalid ciphertext (too short)'
+				'exception_message' => 'Decipher message failed: '
 			],
 		];
 	}
@@ -164,8 +219,18 @@ final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
 	public function testWrongCiphertext(string $input, string $exception_message): void
 	{
 		$key = CreateKey::generateRandomKey();
+		// class
+		$crypt = new SymmetricEncryption($key);
 		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::decrypt($input, $key);
+		$crypt->decrypt($input);
+
+		// class instance
+		$this->expectExceptionMessage($exception_message);
+		SymmetricEncryption::getInstance($key)->decrypt($input);
+
+		// class static
+		$this->expectExceptionMessage($exception_message);
+		SymmetricEncryption::decryptKey($input, $key);
 	}
 }
 

tmp/.gitignore

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

tools/phan

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

tools/phpcbf

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

tools/phpcs

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

tools/phpstan

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

tools/phpunit

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

tools/psalm

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