Add phpunit tests for header key/value exceptions

Removed the parseHeaders public call, headers must be set as array

Throw errors on invalid headers before sending them: Key/Value check
Add headers invalid check in phpunit

Auth headers can be set per call and will override global settings if matching

.gitignore

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

.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.19" location="./tools/phpunit" copy="false"/>
-  <phar name="phpcbf" version="^3.7.2" installed="3.10.0" location="./tools/phpcbf" copy="false"/>
-  <phar name="phpcs" version="^3.7.2" installed="3.10.0" location="./tools/phpcs" copy="false"/>
-  <phar name="phpstan" version="^1.10.37" installed="1.11.1" location="./tools/phpstan" copy="false"/>
+  <phar name="phpunit" version="^9.6" installed="9.6.21" location="./tools/phpunit" copy="false"/>
+  <phar name="phpcbf" version="^3.7.2" installed="3.10.3" location="./tools/phpcbf" copy="false"/>
+  <phar name="phpcs" version="^3.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"/>

4dev/bin/create_mo.sh

@@ -1,19 +1,20 @@
 #!/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 $(ls -1 ${base_folder}../4dev/locale/*.po); do
-	file=$(basename $file .po);
+for file in "${base_folder}"../4dev/locale/*.po; do
+	[[ -e "$file" ]] || break
+	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,16 +2,18 @@
 
 # read source mo files and writes target js files in object form
 
-# 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
+# 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
 	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/'
@@ -26,7 +28,7 @@ if [ "${target}" == '' ]; then
 	echo "*** Non smarty ***";
 	TEXTDOMAINDIR=${base_folder}${mo_folder}.
 	# default is admin
-	TEXTDOMAIN=admin;
+	TEXTDOMAIN="admin";
 fi;
 js_folder="${TEXTDOMAIN}/layout/javascript/";
 
@@ -44,15 +46,16 @@ if [ ${error} -eq 1 ]; then
 fi;
 
 # locale gettext po to mo translator master
-for file in $(ls -1 ${base_folder}../4dev/locale/*.po); do
-	file=$(basename $file .po);
-	echo "Translate language ${file}";
+for file in "${base_folder}"../4dev/locale/*.po; do
+	[[ -e "$file" ]] || break
+	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}${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 \"\"";
@@ -62,7 +65,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)
@@ -79,7 +82,8 @@ 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=$(echo ${template_file} | sed -e 's/\.TMP//g');
+	original_file=${template_file//.TMP/};
 	if [ "${FILE_MOVE}" -eq 0 ]; then
 		file=${target_folder}${template_file};
 	else
@@ -88,16 +92,18 @@ 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}" >> $file;
-	echo "// Translation strings in the format" >> $file;
-	echo "// \"Original\":\"Translated\""$'\n' >> $file;
-	echo "var i18n = {" >> $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"
 	# 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 str; do
+	while read -r str; do
 		# echo "S: ${str}";
 		# skip empty
 		if [[ "${str}" =~ ${rx_msgid_empty} ]]; then
@@ -112,12 +118,13 @@ 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=$(echo "${str_source}" | sed -e 's/"/\\"/g');
+			str_source=${str_source//\"/\\\"}
 			# 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)
@@ -128,8 +135,8 @@ for language in ${language_list[*]}; do
 		fi;
 	done;
 
-	echo "" >> $file;
-	echo "};" >> $file;
+	echo "" >> "$file";
+	echo "};" >> "$file";
 	echo " [DONE]";
 
 	# on no move
@@ -140,19 +147,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}";
+				cd "${target_folder}" || exit;
 				ln -sf "${original_file}" "${template_file}";
-				cd - >/dev/null;
+				cd - >/dev/null || exit;
 			fi;
 		done;
 	done;

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

@@ -0,0 +1,51 @@
+<?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
+{
+	return json_encode([
+		'HEADERS' => $http_headers,
+		"REQUEST_TYPE" => $_SERVER['REQUEST_METHOD'],
+		"PARAMS" => $_GET,
+		"BODY" => json_decode($body, true)
+	]);
+}
+
+$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 (($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/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
 	 *
@@ -330,6 +332,52 @@ final class CoreLibsConvertStringsTest extends TestCase
 			\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/Convert/data/UTF8.csv

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

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

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

4dev/tests/DB/CoreLibsDBExtendedArrayIOTest.php

@@ -10,7 +10,6 @@ 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/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__

4dev/tests/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,

composer.json

@@ -3,9 +3,21 @@
     "version": "dev-master",
     "description": "CoreLibs: Development package",
     "type": "library",
-    "config": {
-    },
     "require": {
-        "php": ">=8.1"
+        "php": ">=8.3"
+    },
+    "require-dev": {
+        "phpstan/phpstan": "^1.12",
+        "phan/phan": "^5.4",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan-strict-rules": "^1.6",
+        "phpunit/phpunit": "^9",
+        "phpstan/phpstan-deprecation-rules": "^1.2",
+        "yamadashy/phpstan-friendly-formatter": "^1.1"
+    },
+    "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     }
 }

composer.lock

@@ -1,20 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "3c37bd2878b371840fc0d7d4a249ea4c",
-    "packages": [],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=8.1"
-    },
-    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
-}

phpstan.neon

@@ -1,9 +1,16 @@
 # PHP Stan Config
 includes:
 	- phpstan-conditional.php
+	#- ./vendor/yamadashy/phpstan-friendly-formatter/extension.neon
 parameters:
 	tmpDir: %currentWorkingDirectory%/tmp/phpstan-corelibs
+	#errorFormat: friendly
+	#friendly:
+	#	lineBefore: 3
+	#	lineAfter: 3
 	level: 8 # max is now 9
+	# strictRules:
+	#	allRules: true
 	checkMissingCallableSignature: true
 	treatPhpDocTypesAsCertain: false
 	paths:
@@ -53,6 +60,6 @@ parameters:
 		#	paths:
 		#		- ...
 		#		- ...
-		#-
-		#	message: "#^Call to deprecated method #"
-		#	path: www/admin/class_test*.php
+		# -
+		# 	message: "#^Call to deprecated method #"
+		# 	path: www/admin/class_test*.php

tools/phan

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

tools/php-cs-fixer

@@ -1 +0,0 @@
-/home/clemens/.phive/phars/php-cs-fixer-3.57.2.phar

tools/phpDocumentor

@@ -1 +0,0 @@
-/home/clemens/.phive/phars/phpdocumentor-3.4.3.phar

tools/phpcbf

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

tools/phpcs

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

tools/phpdox

@@ -1 +0,0 @@
-/home/clemens/.phive/phars/phpdox-0.12.0.phar

tools/phpstan

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

tools/phpunit

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

tools/psalm

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

vendor/autoload.php

@@ -1,25 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-if (PHP_VERSION_ID < 50600) {
-    if (!headers_sent()) {
-        header('HTTP/1.1 500 Internal Server Error');
-    }
-    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    if (!ini_get('display_errors')) {
-        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, $err);
-        } elseif (!headers_sent()) {
-            echo $err;
-        }
-    }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
-}
-
-require_once __DIR__ . '/composer/autoload_real.php';
-
-return ComposerAutoloaderInitdd705c6e8ab22e0d642372dec7767718::getLoader();

vendor/composer/ClassLoader.php

@@ -1,581 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer\Autoload;
-
-/**
- * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
- *
- *     $loader = new \Composer\Autoload\ClassLoader();
- *
- *     // register classes with namespaces
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- *     // to enable searching the include path (eg. for PEAR packages)
- *     $loader->setUseIncludePath(true);
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * This class is loosely based on the Symfony UniversalClassLoader.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    https://www.php-fig.org/psr/psr-0/
- * @see    https://www.php-fig.org/psr/psr-4/
- */
-class ClassLoader
-{
-    /** @var \Closure(string):void */
-    private static $includeFile;
-
-    /** @var ?string */
-    private $vendorDir;
-
-    // PSR-4
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, int>>
-     */
-    private $prefixLengthsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<int, string>>
-     */
-    private $prefixDirsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, string[]>>
-     */
-    private $prefixesPsr0 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
-    private $fallbackDirsPsr0 = array();
-
-    /** @var bool */
-    private $useIncludePath = false;
-
-    /**
-     * @var string[]
-     * @psalm-var array<string, string>
-     */
-    private $classMap = array();
-
-    /** @var bool */
-    private $classMapAuthoritative = false;
-
-    /**
-     * @var bool[]
-     * @psalm-var array<string, bool>
-     */
-    private $missingClasses = array();
-
-    /** @var ?string */
-    private $apcuPrefix;
-
-    /**
-     * @var self[]
-     */
-    private static $registeredLoaders = array();
-
-    /**
-     * @param ?string $vendorDir
-     */
-    public function __construct($vendorDir = null)
-    {
-        $this->vendorDir = $vendorDir;
-        self::initializeIncludeClosure();
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
-        }
-
-        return array();
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return array<string, array<int, string>>
-     */
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    /**
-     * @return string[] Array of classname => path
-     * @psalm-return array<string, string>
-     */
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param string[] $classMap Class to filename map
-     * @psalm-param array<string, string> $classMap
-     *
-     * @return void
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string          $prefix  The prefix
-     * @param string[]|string $paths   The PSR-0 root directories
-     * @param bool            $prepend Whether to prepend the directories
-     *
-     * @return void
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string          $prefix  The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths   The PSR-4 base directories
-     * @param bool            $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return void
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string          $prefix The prefix
-     * @param string[]|string $paths  The PSR-0 base directories
-     *
-     * @return void
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string          $prefix The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return void
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     *
-     * @return void
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     *
-     * @return void
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     *
-     * @return void
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     *
-     * @return void
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-
-        if (null === $this->vendorDir) {
-            return;
-        }
-
-        if ($prepend) {
-            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
-        } else {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-            self::$registeredLoaders[$this->vendorDir] = $this;
-        }
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     *
-     * @return void
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-
-        if (null !== $this->vendorDir) {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-        }
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return true|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            (self::$includeFile)($file);
-
-            return true;
-        }
-
-        return null;
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
-            return false;
-        }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
-            // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
-        }
-
-        return $file;
-    }
-
-    /**
-     * Returns the currently registered loaders indexed by their corresponding vendor directories.
-     *
-     * @return self[]
-     */
-    public static function getRegisteredLoaders()
-    {
-        return self::$registeredLoaders;
-    }
-
-    /**
-     * @param  string       $class
-     * @param  string       $ext
-     * @return string|false
-     */
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-
-        return false;
-    }
-
-    private static function initializeIncludeClosure(): void
-    {
-        if (self::$includeFile !== null) {
-            return;
-        }
-
-        /**
-         * Scope isolated include.
-         *
-         * Prevents access to $this/self from included files.
-         *
-         * @param  string $file
-         * @return void
-         */
-        self::$includeFile = static function($file) {
-            include $file;
-        };
-    }
-}

vendor/composer/InstalledVersions.php

@@ -1,352 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer;
-
-use Composer\Autoload\ClassLoader;
-use Composer\Semver\VersionParser;
-
-/**
- * This class is copied in every Composer installed project and available to all
- *
- * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
- *
- * To require its presence, you can require `composer-runtime-api ^2.0`
- *
- * @final
- */
-class InstalledVersions
-{
-    /**
-     * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
-     */
-    private static $installed;
-
-    /**
-     * @var bool|null
-     */
-    private static $canGetVendors;
-
-    /**
-     * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
-    private static $installedByVendor = array();
-
-    /**
-     * Returns a list of all package names which are present, either by being installed, replaced or provided
-     *
-     * @return string[]
-     * @psalm-return list<string>
-     */
-    public static function getInstalledPackages()
-    {
-        $packages = array();
-        foreach (self::getInstalled() as $installed) {
-            $packages[] = array_keys($installed['versions']);
-        }
-
-        if (1 === \count($packages)) {
-            return $packages[0];
-        }
-
-        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
-    }
-
-    /**
-     * Returns a list of all package names with a specific type e.g. 'library'
-     *
-     * @param  string   $type
-     * @return string[]
-     * @psalm-return list<string>
-     */
-    public static function getInstalledPackagesByType($type)
-    {
-        $packagesByType = array();
-
-        foreach (self::getInstalled() as $installed) {
-            foreach ($installed['versions'] as $name => $package) {
-                if (isset($package['type']) && $package['type'] === $type) {
-                    $packagesByType[] = $name;
-                }
-            }
-        }
-
-        return $packagesByType;
-    }
-
-    /**
-     * Checks whether the given package is installed
-     *
-     * This also returns true if the package name is provided or replaced by another package
-     *
-     * @param  string $packageName
-     * @param  bool   $includeDevRequirements
-     * @return bool
-     */
-    public static function isInstalled($packageName, $includeDevRequirements = true)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks whether the given package satisfies a version constraint
-     *
-     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
-     *
-     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
-     *
-     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
-     * @param  string        $packageName
-     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
-     * @return bool
-     */
-    public static function satisfies(VersionParser $parser, $packageName, $constraint)
-    {
-        $constraint = $parser->parseConstraints($constraint);
-        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
-
-        return $provided->matches($constraint);
-    }
-
-    /**
-     * Returns a version constraint representing all the range(s) which are installed for a given package
-     *
-     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
-     * whether a given version of a package is installed, and not just whether it exists
-     *
-     * @param  string $packageName
-     * @return string Version constraint usable with composer/semver
-     */
-    public static function getVersionRanges($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            $ranges = array();
-            if (isset($installed['versions'][$packageName]['pretty_version'])) {
-                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
-            }
-            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
-            }
-            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
-            }
-            if (array_key_exists('provided', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
-            }
-
-            return implode(' || ', $ranges);
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
-     */
-    public static function getVersion($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['version'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['version'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
-     */
-    public static function getPrettyVersion($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['pretty_version'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
-     */
-    public static function getReference($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['reference'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['reference'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
-     */
-    public static function getInstallPath($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @return array
-     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
-     */
-    public static function getRootPackage()
-    {
-        $installed = self::getInstalled();
-
-        return $installed[0]['root'];
-    }
-
-    /**
-     * Returns the raw installed.php data for custom implementations
-     *
-     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
-     * @return array[]
-     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
-     */
-    public static function getRawData()
-    {
-        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
-
-        if (null === self::$installed) {
-            // only require the installed.php file if this file is loaded from its dumped location,
-            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = include __DIR__ . '/installed.php';
-            } else {
-                self::$installed = array();
-            }
-        }
-
-        return self::$installed;
-    }
-
-    /**
-     * Returns the raw data of all installed.php which are currently loaded for custom implementations
-     *
-     * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
-    public static function getAllRawData()
-    {
-        return self::getInstalled();
-    }
-
-    /**
-     * Lets you reload the static array from another file
-     *
-     * This is only useful for complex integrations in which a project needs to use
-     * this class but then also needs to execute another project's autoloader in process,
-     * and wants to ensure both projects have access to their version of installed.php.
-     *
-     * A typical case would be PHPUnit, where it would need to make sure it reads all
-     * the data it needs from this class, then call reload() with
-     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
-     * the project in which it runs can then also use this class safely, without
-     * interference between PHPUnit's dependencies and the project's dependencies.
-     *
-     * @param  array[] $data A vendor/composer/installed.php data set
-     * @return void
-     *
-     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
-     */
-    public static function reload($data)
-    {
-        self::$installed = $data;
-        self::$installedByVendor = array();
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
-    private static function getInstalled()
-    {
-        if (null === self::$canGetVendors) {
-            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
-        }
-
-        $installed = array();
-
-        if (self::$canGetVendors) {
-            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-                if (isset(self::$installedByVendor[$vendorDir])) {
-                    $installed[] = self::$installedByVendor[$vendorDir];
-                } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
-                    }
-                }
-            }
-        }
-
-        if (null === self::$installed) {
-            // only require the installed.php file if this file is loaded from its dumped location,
-            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = require __DIR__ . '/installed.php';
-            } else {
-                self::$installed = array();
-            }
-        }
-        $installed[] = self::$installed;
-
-        return $installed;
-    }
-}

vendor/composer/LICENSE

@@ -1,21 +0,0 @@
-
-Copyright (c) Nils Adermann, Jordi Boggiano
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-

vendor/composer/autoload_classmap.php

@@ -1,10 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(__DIR__);
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-);

vendor/composer/autoload_namespaces.php

@@ -1,9 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(__DIR__);
-$baseDir = dirname($vendorDir);
-
-return array(
-);

vendor/composer/autoload_psr4.php

@@ -1,9 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(__DIR__);
-$baseDir = dirname($vendorDir);
-
-return array(
-);

vendor/composer/autoload_real.php

@@ -1,38 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInitdd705c6e8ab22e0d642372dec7767718
-{
-    private static $loader;
-
-    public static function loadClassLoader($class)
-    {
-        if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
-        }
-    }
-
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
-    public static function getLoader()
-    {
-        if (null !== self::$loader) {
-            return self::$loader;
-        }
-
-        require __DIR__ . '/platform_check.php';
-
-        spl_autoload_register(array('ComposerAutoloaderInitdd705c6e8ab22e0d642372dec7767718', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitdd705c6e8ab22e0d642372dec7767718', 'loadClassLoader'));
-
-        require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitdd705c6e8ab22e0d642372dec7767718::getInitializer($loader));
-
-        $loader->register(true);
-
-        return $loader;
-    }
-}

vendor/composer/autoload_static.php

@@ -1,20 +0,0 @@
-<?php
-
-// autoload_static.php @generated by Composer
-
-namespace Composer\Autoload;
-
-class ComposerStaticInitdd705c6e8ab22e0d642372dec7767718
-{
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-    );
-
-    public static function getInitializer(ClassLoader $loader)
-    {
-        return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInitdd705c6e8ab22e0d642372dec7767718::$classMap;
-
-        }, null, ClassLoader::class);
-    }
-}

vendor/composer/installed.json

@@ -1,5 +0,0 @@
-{
-    "packages": [],
-    "dev": true,
-    "dev-package-names": []
-}

vendor/composer/installed.php

@@ -1,23 +0,0 @@
-<?php return array(
-    'root' => array(
-        'name' => 'egrajp/development-corelibs-dev',
-        'pretty_version' => 'dev-master',
-        'version' => 'dev-master',
-        'reference' => NULL,
-        'type' => 'library',
-        'install_path' => __DIR__ . '/../../',
-        'aliases' => array(),
-        'dev' => true,
-    ),
-    'versions' => array(
-        'egrajp/development-corelibs-dev' => array(
-            'pretty_version' => 'dev-master',
-            'version' => 'dev-master',
-            'reference' => NULL,
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../../',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
-    ),
-);

vendor/composer/platform_check.php

@@ -1,26 +0,0 @@
-<?php
-
-// platform_check.php @generated by Composer
-
-$issues = array();
-
-if (!(PHP_VERSION_ID >= 80100)) {
-    $issues[] = 'Your Composer dependencies require a PHP version ">= 8.1.0". You are running ' . PHP_VERSION . '.';
-}
-
-if ($issues) {
-    if (!headers_sent()) {
-        header('HTTP/1.1 500 Internal Server Error');
-    }
-    if (!ini_get('display_errors')) {
-        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
-        } elseif (!headers_sent()) {
-            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
-        }
-    }
-    trigger_error(
-        'Composer detected issues in your platform: ' . implode(' ', $issues),
-        E_USER_ERROR
-    );
-}

www/admin/UrlRequests.target.php

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

www/admin/class_test.admin.backend.php

@@ -46,7 +46,7 @@ use CoreLibs\Debug\Support;
 
 $PAGE_NAME = 'TEST CLASS: ADMIN BACKEND';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
@@ -55,7 +55,25 @@ print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 print "SETACL[]: <br>";
 $backend->setACL(['EMPTY' => 'EMPTY']);
 print "ADBEDITLOG: <br>";
-$backend->adbEditLog('CLASSTEST-ADMIN', 'Some info string');
+$backend->adbEditLog('CLASSTEST-ADMIN-BINARY', 'Some info string', 'BINARY');
+$backend->adbEditLog('CLASSTEST-ADMIN-ZLIB', 'Some info string', 'ZLIB');
+$backend->adbEditLog('CLASSTEST-ADMIN-SERIAL', 'Some info string', 'SERIAL');
+$backend->adbEditLog('CLASSTEST-ADMIN-INVALID', 'Some info string', 'INVALID');
+// test with various
+$backend->action = 'TEST ACTION';
+$backend->action_id = 'TEST ACTION ID';
+$backend->action_yes = 'TEST ACTION YES';
+$backend->action_flag = 'TEST ACTION FLAG';
+$backend->action_menu = 'TEST ACTION MENU';
+$backend->action_loaded = 'TEST ACTION LOADED';
+$backend->action_value = 'TEST ACTION VALUE';
+$backend->action_type = 'TEST ACTION TYPE';
+$backend->action_error = 'TEST ACTION ERROR';
+$backend->adbEditLog('CLASSTEST-ADMIN-JSON', [
+	"_GET" => $_GET,
+	"_POST" => $_POST,
+], 'JSON');
+
 print "ADBTOPMENU(0): " . Support::printAr($backend->adbTopMenu(CONTENT_PATH)) . "<br>";
 print "ADBMSG: <br>";
 $backend->adbMsg('info', 'Message: %1$d', [1]);

www/admin/class_test.array.php

@@ -33,7 +33,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: ARRAY HANDLER';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.autoloader.php

@@ -23,7 +23,7 @@ use CoreLibs\Convert\Byte;
 
 $PAGE_NAME = 'TEST CLASS: AUTOLOADER';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.byte.php

@@ -29,7 +29,7 @@ $byte_class = 'CoreLibs\Convert\Byte';
 
 $PAGE_NAME = 'TEST CLASS: BYTE CONVERT';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.check.colors.php

@@ -29,7 +29,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: CHECK COLORS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.class-calls.php

@@ -28,7 +28,7 @@ $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
 
 $PAGE_NAME = 'TEST CLASS: CLASS CALLS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.config.direct.php

@@ -26,7 +26,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: CONFIG DIRECT';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.config.link.php

@@ -26,7 +26,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: CONFIG LINK';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.convert.colors.php

@@ -31,7 +31,7 @@ $color_class = 'CoreLibs\Convert\Colors';
 
 $PAGE_NAME = 'TEST CLASS: CONVERT COLORS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.create_email.php

@@ -33,7 +33,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: CREATE EMAIL';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.datetime.php

@@ -30,7 +30,7 @@ $datetime_class = 'CoreLibs\Combined\DateTime';
 
 $PAGE_NAME = 'TEST CLASS: DATE/TIME';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.db.dbReturn.php

@@ -34,7 +34,7 @@ $db->log->debug('START', '=============================>');
 
 $PAGE_NAME = 'TEST CLASS: DB dbReturn';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><a href="class_test.db.php">Class Test DB</a></div>';

www/admin/class_test.db.php

@@ -35,7 +35,7 @@ $db->log->debug('START', '=============================>');
 
 $PAGE_NAME = 'TEST CLASS: DB';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><a href="class_test.db.type.php">Class Test DB row type convert to PHP type</a></div>';

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

@@ -33,7 +33,7 @@ $db->log->debug('START', '=============================>');
 
 $PAGE_NAME = 'TEST CLASS: DB QUERY PLACEHOLDER';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
@@ -204,6 +204,20 @@ WHERE string_a = $1
 SQL, []);
 print "PL: " . Support::PrAr($db->dbGetPlaceholderConverted()) . "<br>";
 
+echo "dbReturn read LIKE: <br>";
+while (
+	is_array($res = $db->dbReturnParams(
+		<<<SQL
+SELECT test, string_a, number_a
+FROM test_foo
+WHERE string_a LIKE ?
+SQL,
+		['%A-1%']
+	))
+) {
+	print "RES: " . Support::prAr($res) . "<br>";
+}
+
 print "</body></html>";
 $db->log->debug('DEBUGEND', '==================================== [END]');
 

www/admin/class_test.db.single.php

@@ -32,7 +32,7 @@ $db->log->debug('START', '=============================>');
 
 $PAGE_NAME = 'TEST CLASS: DB QUERY PLACEHOLDERS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.db.types.php

@@ -33,7 +33,7 @@ $db->log->debug('START', '=============================>');
 
 $PAGE_NAME = 'TEST CLASS: DB COLUMN TYPES';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.debug.php

@@ -43,7 +43,7 @@ $debug_logging_class = 'CoreLibs\Debug\LoggingLegacy';
 
 $PAGE_NAME = 'TEST CLASS: DEBUG';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.email.php

@@ -29,7 +29,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: HTML/ELEMENTS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.encoding.php

@@ -35,7 +35,7 @@ $chk_enc = 'CoreLibs\Check\Encoding';
 
 $PAGE_NAME = 'TEST CLASS: ENCODING (CHECK/CONVERT/MIME)';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.encryption.php

@@ -31,7 +31,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: ENCRYPTION';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.error_msg.php

@@ -28,7 +28,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: ERROR MSG';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
@@ -45,6 +45,8 @@ $em->setErrorMsg('123', 'error', 'msg this is bad, auto logged if debug');
 $em->setErrorMsg('123', 'error', 'msg this is bad, auto logged if debug', 'target-id', 'other-style');
 $em->setErrorMsg('123', 'error', 'msg this is bad, logged always', log_error:true);
 $em->setErrorMsg('123', 'error', 'msg this is bad, never logged', log_error:false);
+$em->setErrorMsg('500', 'warning', 'This is perhaps not super good, logged_always', log_warning:true);
+$em->setErrorMsg('500', 'warning', 'This is perhaps not super good, logged_never', log_warning:false);
 $em->setErrorMsg('1000', 'info', 'This is good');
 $em->setErrorMsg('9999', 'abort', 'BAD: This is critical (abort)');
 $em->setErrorMsg('10-1000', 'wrong', 'Wrong level: This is emergency');
@@ -59,6 +61,8 @@ print "ErrorsIds: <pre>" . $log->prAr($em->getErrorIds()) . "</pre>";
 print "Errors: <pre>" . $log->prAr($em->getErrorMsg()) . "</pre>";
 print "JumpTargets: <pre>" . $log->prAr($em->getJumpTarget()) . "</pre>";
 
+print "IS info > ok: " . ml::fromName('info')->isHigherThan(ml::ok) . "<br>";
+
 print "</body></html>";
 
 $log->debug('[END]', '==========================================>');

www/admin/class_test.file.php

@@ -28,7 +28,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: FILE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.hash.php

@@ -31,7 +31,7 @@ $hash_class = 'CoreLibs\Create\Hash';
 
 $PAGE_NAME = 'TEST CLASS: HASH';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.html.php

@@ -35,19 +35,21 @@ $elements_class = 'CoreLibs\Output\Form\Elements';
 
 $PAGE_NAME = 'TEST CLASS: HTML/ELEMENTS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
-$string = "Something < = > Other <br> Next line";
-print "HTMLENT: " . Html::htmlent($string) . ": " . $_html->htmlent($string) . "<br>";
+$string = "Something < = > Other <br> Next line and Quotes '\"";
+echo "String: <pre>$string</pre><br>";
+$log->debug('HTMLENT', Html::htmlent($string));
+print "HTMLENT: " . Html::htmlent($string) . ": " . $_html->htmlent($string) . " (" . htmlentities($string) . ")<br>";
 print "REMOVELB: " . Html::htmlent($string) . ": " . $_html->removeLB($string) . "<br>";
 $date_str = [2021, 5, 1, 11, 10];
 print "PRINTDATETIME: "
 	. $_elements->printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4]) . "<br>";
 // STATIC
-$string = "Something < = > Other <br> Next line";
+// $string = "Something < = > Other <br> Next line and Quotes '\"";
 print "S::HTMLENT: " . Html::htmlent($string) . ": " . $html_class::htmlent($string) . "<br>";
 print "S::REMOVELB: " . Html::htmlent($string) . ": " . $html_class::removeLB($string) . "<br>";
 $date_str = [2021, 5, 1, 11, 10];
@@ -67,8 +69,10 @@ $checked_list = [
 	['foo', ['bar']],
 ];
 foreach ($checked_list as $check) {
-	print "CHECKED(0): $check[0]: " . Html::checked($check[1], $check[0]) . "<br>";
-	print "CHECKED(1): $check[0]: " . Html::checked($check[1], $check[0], Html::CHECKED) . "<br>";
+	print "CHECKED(0): " . $check[0] . " -> " . print_r($check[1], true) . ": "
+		. Html::checked($check[1], $check[0]) . "<br>";
+	print "CHECKED(1): " . $check[0] . " -> " . print_r($check[1], true) . ": "
+		. Html::checked($check[1], $check[0], Html::CHECKED) . "<br>";
 }
 
 // magic link creation test

www/admin/class_test.html_build.block.php

@@ -30,7 +30,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: HTML BUILD: BLOCK';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.html_build.element.php

@@ -33,7 +33,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: HTML BUILD';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.html_build.replace.php

@@ -30,7 +30,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: HTML BUILD: STRING REPLACE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.image.php

@@ -32,7 +32,7 @@ $image_class = 'CoreLibs\Output\Image';
 
 $PAGE_NAME = 'TEST CLASS: IMAGE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.json.php

@@ -32,7 +32,7 @@ $json_class = 'CoreLibs\Convert\Json';
 
 $PAGE_NAME = 'TEST CLASS: JSON';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.lang.php

@@ -20,7 +20,7 @@ ob_end_flush();
 
 $PAGE_NAME = 'TEST CLASS: LANG';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.logging.php

@@ -38,7 +38,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: LOGGING';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.login.php

@@ -44,7 +44,7 @@ $login->loginMainCall();
 
 $PAGE_NAME = 'TEST CLASS: LOGIN';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.math.php

@@ -30,7 +30,7 @@ $math_class = 'CoreLibs\Convert\Math';
 
 $PAGE_NAME = 'TEST CLASS: MATH';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.memoryusage.php

@@ -29,7 +29,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: MEMORY USAGE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.mime.php

@@ -27,7 +27,7 @@ $_mime = new CoreLibs\Convert\MimeAppName();
 
 $PAGE_NAME = 'TEST CLASS: MIME';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.output.form.php

@@ -74,7 +74,7 @@ $form = new CoreLibs\Output\Form\Generate(
 
 $PAGE_NAME = 'TEST CLASS: FORM GENERATE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.password.php

@@ -32,7 +32,7 @@ $password_class = 'CoreLibs\Security\Password';
 
 $PAGE_NAME = 'TEST CLASS: PASSWORD';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.php

@@ -63,7 +63,7 @@ $backend->db->dbInfo(true);
 ob_end_flush();
 
 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS</title><head>";
+print "<html><head><title>TEST CLASS</title></head>";
 print "<body>";
 
 // key: file name, value; name
@@ -117,6 +117,7 @@ $test_files = [
 	'class_test.config.direct.php' => 'Class Test: CONFIG DIRECT',
 	'class_test.class-calls.php' => 'Class Test: CLASS CALLS',
 	'class_test.error_msg.php' => 'Class Test: ERROR MSG',
+	'class_test.url-requests.curl.php' => 'Class Test: URL REQUESTS: CURL',
 	'subfolder/class_test.config.direct.php' => 'Class Test: CONFIG DIRECT SUB',
 ];
 
@@ -178,7 +179,7 @@ $log->debug('SOME MARK', 'Some error output');
 print "EDIT ACCESS ID: " . $backend->edit_access_id . "<br>";
 if (is_object($login)) {
 	//	print "ACL: <br>".$backend->print_ar($login->loginGetAcl())."<br>";
-	$log->debug('ACL', "ACL: " . \CoreLibs\Debug\Support::dumpVar($login->loginGetAcl()));
+	// $log->debug('ACL', "ACL: " . \CoreLibs\Debug\Support::dumpVar($login->loginGetAcl()));
 	//	print "DEFAULT ACL: <br>".$backend->print_ar($login->default_acl_list)."<br>";
 	//	print "DEFAULT ACL: <br>".$backend->print_ar($login->default_acl_list)."<br>";
 	// $result = array_flip(

www/admin/class_test.phpv.php

@@ -32,7 +32,7 @@ $phpv_class = 'CoreLibs\Check\PhpVersion';
 
 $PAGE_NAME = 'TEST CLASS: PHP VERSION';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.randomkey.php

@@ -29,7 +29,7 @@ $array_class = 'CoreLibs\Create\RandomKey';
 
 $PAGE_NAME = 'TEST CLASS: RANDOM KEY';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.readenvfile.php

@@ -27,7 +27,7 @@ $ref_class = 'CoreLibs\Get\ReadEnvFile';
 
 $PAGE_NAME = 'TEST CLASS: READ ENV FILE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.runningtime.php

@@ -28,7 +28,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: RUNNING TIME';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.session.php

@@ -50,7 +50,7 @@ $session = new Session();
 
 $PAGE_NAME = 'TEST CLASS: SESSION';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.session.read.php

@@ -50,7 +50,7 @@ $session = new Session();
 
 $PAGE_NAME = 'TEST CLASS: SESSION (READ)';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.smarty.php

@@ -47,7 +47,7 @@ $adm->DATA['adm_set'] = 'SET from admin class';
 
 $PAGE_NAME = 'TEST CLASS: SMARTY';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.strings.php

@@ -23,7 +23,7 @@ $byte_class = 'CoreLibs\Convert\Strings';
 
 $PAGE_NAME = 'TEST CLASS: STRINGS CONVERT';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.system.php

@@ -29,7 +29,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: SYSTEM';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
@@ -41,7 +41,7 @@ print "GETPAGENAME(0): " . System::getPageName() . "<br>";
 print "GETPAGENAME(1): " . System::getPageName(System::NO_EXTENSION) . "<br>";
 print "GETPAGENAME(2): " . System::getPageName(System::FULL_PATH) . "<br>";
 print "System::getPageNameArray():<br>";
-print "GETPAGENAMEARRAY: " . \CoreLibs\Debug\Support::printAr(System::getPageNameArray()) . "<br>";
+print "GETPAGENAMEARRAY: " . DgS::printAr(System::getPageNameArray()) . "<br>";
 // seting errro codes file upload
 print "System::fileUploadErrorMessage():<br>";
 print "FILEUPLOADERRORMESSAGE(): " . System::fileUploadErrorMessage(-1) . "<br>";
@@ -51,4 +51,6 @@ print "FILEUPLOADERRORMESSAGE(UPLOAD_ERR_CANT_WRITE): "
 print "System::checkCLI():<br>";
 print "Are we in an CLI: " . (System::checkCLI() ? 'Yes' : 'No') . "<br>";
 
+print "Get Addresses: " . DgS::printAr(System::getIpAddresses()) . "<br>";
+
 print "</body></html>";

www/admin/class_test.token.php

@@ -28,7 +28,7 @@ $token_class = 'CoreLibs\Output\Form\Token';
 
 $PAGE_NAME = 'TEST CLASS: FORM TOKEN';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/class_test.uids.php

@@ -29,7 +29,7 @@ $uids_class = 'CoreLibs\Create\Uids';
 
 $PAGE_NAME = 'TEST CLASS: UIDS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

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

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

www/admin/class_test.varistype.php

@@ -30,7 +30,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: CONVERT\VARISTYPE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/layout/javascript/edit.jq.js

@@ -1,7 +1,7 @@
 /* general edit javascript */
 /* jquery version */
 
-/* jshint esversion: 6 */
+/* jshint esversion: 11 */
 
 /* global i18n */
 
@@ -931,7 +931,7 @@ function rel(base) // eslint-disable-line no-unused-vars
 /**
  * searches and removes style from css array
  * @param  {Object} _element element to work one
- * @param  {String css      style sheet to remove (name)
+ * @param  {String} css      style sheet to remove (name)
  * @return {Object}          returns full element
  */
 function rcssel(_element, css)

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

@@ -26,7 +26,7 @@ $log = new CoreLibs\Logging\Logging([
 
 $PAGE_NAME = 'TEST CLASS: CONFIG DIRECT SUB';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="../class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

www/admin/test_edit_base.php

@@ -47,7 +47,7 @@ $l10n = new \CoreLibs\Language\L10n(
 );
 
 print "<!DOCTYPE html>";
-print "<html><head><title>GROUP TESTER</title><head>";
+print "<html><head><title>GROUP TESTER</title></head>";
 print "<body>";
 
 print '<form method="post" name="loginlogout">';

www/composer.lock

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

www/configs/config.host.php

@@ -24,39 +24,34 @@ declare(strict_types=1);
 // ];
 
 $__LOCAL_CONFIG = [
+	// db config selection
 	'db_host' => 'test',
+	// other db connections
+	// 'db_host_target' => '',
+	// 'db_host_other' => '',
+	// location flagging (test/dev/live) for debug output
 	'location' => 'test',
+	// show DEBUG override
 	'debug_level' => 'debug',
+	// site locale
 	'site_locale' => 'en_US.UTF-8',
+	// site encoding
 	'site_encoding' => 'UTF-8',
+	// enable/disable login override
 	'login_enabled' => true
 ];
 
 // each host has a different db_host
 $SITE_CONFIG = [
 	// development host
-	'soba.tokyo.tequila.jp' => [
-		// db config selection
-		'db_host' => 'test',
-		// other db connections
-		// 'db_host_target' => '',
-		// 'db_host_other' => '',
-		// location flagging (test/dev/live) for debug output
-		'location' => 'test',
-		// show DEBUG override
-		'debug_level' => 'debug',
-		// site locale
-		'site_locale' => 'en_US.UTF-8',
-		// site encoding
-		'site_encoding' => 'UTF-8',
-		// enable/disable login override
-		'login_enabled' => true
-	],
+	'soba.tokyo.tequila.jp' => $__LOCAL_CONFIG,
 	// 'other.host.com' => $__LOCAL_CONFIG
+	'soba.egplusww.jp' => $__LOCAL_CONFIG,
 	'soba-dev.tequila.jp' => $__LOCAL_CONFIG,
 	'soba.tequila.jp' => $__LOCAL_CONFIG,
 	'soba.teq.jp' => $__LOCAL_CONFIG,
 	'soba-local.tokyo.tequila.jp' => $__LOCAL_CONFIG,
+	'localhost' => $__LOCAL_CONFIG,
 ];
 
 // __END__

www/configs/config.path.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore PSR1.Files.SideEffects
 
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
@@ -11,6 +11,20 @@
 
 declare(strict_types=1);
 
+// find trigger name "admin/" or "frontend/" in the getcwd() folder
+$folder = '';
+foreach (['admin', 'frontend'] as $_folder) {
+	if (strstr(getcwd() ?: '', DIRECTORY_SEPARATOR . $_folder)) {
+		$folder = $_folder;
+		break;
+	}
+}
+// if content path is empty, fallback is default
+if (empty($folder)) {
+	$folder = 'default';
+}
+define('CONTENT_PATH', $folder . DIRECTORY_SEPARATOR);
+
 // File and Folder paths
 // ID is TARGET (first array element)
 /*$PATHS = [

www/configs/config.php

@@ -1,4 +1,4 @@
-<?php // phpcs:ignore warning
+<?php // phpcs:ignore PSR1.Files.SideEffects
 
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
@@ -53,19 +53,6 @@ for (
 		\gullevek\dotEnv\DotEnv::readEnvFile(
 			$__DIR__PATH . $CONFIG_PATH_PREFIX . CONFIG_PATH
 		);
-		// find trigger name "admin/" or "frontend/" in the getcwd() folder
-		$folder = '';
-		foreach (['admin', 'frontend'] as $_folder) {
-			if (strstr(getcwd() ?: '', DIRECTORY_SEPARATOR . $_folder)) {
-				$folder = $_folder;
-				break;
-			}
-		}
-		// if content path is empty, fallback is default
-		if (empty($folder)) {
-			$folder = 'default';
-		}
-		define('CONTENT_PATH', $folder . DIRECTORY_SEPARATOR);
 		// load master config file that loads all other config files
 		require $__DIR__PATH . $CONFIG_PATH_PREFIX . CONFIG_PATH . 'config.master.php';
 		break;

www/lib/CoreLibs/Admin/Backend.php

@@ -31,6 +31,8 @@ declare(strict_types=1);
 
 namespace CoreLibs\Admin;
 
+use CoreLibs\Convert\Json;
+
 class Backend
 {
 	// page name
@@ -42,7 +44,7 @@ class Backend
 	/** @var array<string> */
 	public array $action_list = [
 		'action', 'action_id', 'action_sub_id', 'action_yes', 'action_flag',
-		'action_menu', 'action_value', 'action_error', 'action_loaded'
+		'action_menu', 'action_value', 'action_type', 'action_error', 'action_loaded'
 	];
 	/** @var string */
 	public string $action;
@@ -61,20 +63,31 @@ class Backend
 	/** @var string */
 	public string $action_value;
 	/** @var string */
+	public string $action_type;
+	/** @var string */
 	public string $action_error;
+
 	// ACL array variable if we want to set acl data from outisde
 	/** @var array<mixed> */
 	public array $acl = [];
 	/** @var int */
 	public int $default_acl;
+
 	// queue key
 	/** @var string */
 	public string $queue_key;
+
+	/** @var array<string> list of allowed types for edit log write */
+	private const WRITE_TYPES = ['BINARY', 'BZIP2', 'LZIP', 'STRING', 'SERIAL', 'JSON'];
+	/** @var array<string> list of available write types for log */
+	private array $write_types_available = [];
+
 	// the current active edit access id
 	/** @var int|null */
 	public int|null $edit_access_id;
 	/** @var string */
 	public string $page_name;
+
 	// error/warning/info messages
 	/** @var array<mixed> */
 	public array $messages = [];
@@ -84,6 +97,7 @@ class Backend
 	public bool $warning = false;
 	/** @var bool */
 	public bool $info = false;
+
 	// internal lang & encoding vars
 	/** @var string */
 	public string $lang_dir = '';
@@ -95,6 +109,7 @@ class Backend
 	public string $domain;
 	/** @var string */
 	public string $encoding;
+
 	/** @var \CoreLibs\Logging\Logging logger */
 	public \CoreLibs\Logging\Logging $log;
 	/** @var \CoreLibs\DB\IO database */
@@ -103,6 +118,7 @@ class Backend
 	public \CoreLibs\Language\L10n $l;
 	/** @var \CoreLibs\Create\Session session class */
 	public \CoreLibs\Create\Session $session;
+
 	// smarty publics [end processing in smarty class]
 	/** @var array<mixed> */
 	public array $DATA = [];
@@ -117,18 +133,20 @@ class Backend
 	/**
 	 * main class constructor
 	 *
-	 * @param \CoreLibs\DB\IO          $db      Database connection class
-	 * @param \CoreLibs\Logging\Logging  $log     Logging class
-	 * @param \CoreLibs\Create\Session $session Session interface class
-	 * @param \CoreLibs\Language\L10n  $l10n    l10n language class
-	 * @param int|null                 $set_default_acl_level Default ACL level
+	 * @param \CoreLibs\DB\IO           $db      Database connection class
+	 * @param \CoreLibs\Logging\Logging $log     Logging class
+	 * @param \CoreLibs\Create\Session  $session Session interface class
+	 * @param \CoreLibs\Language\L10n   $l10n    l10n language class
+	 * @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 +169,9 @@ class Backend
 		// set the page name
 		$this->page_name = \CoreLibs\Get\System::getPageName();
 
-		// set the action ids
-		foreach ($this->action_list as $_action) {
-			$this->$_action = $_POST[$_action] ?? '';
+		// NOTE: if any of the "action" vars are used somewhere, it is recommended to NOT set them here
+		if ($init_action_vars) {
+			$this->adbSetActionVars();
 		}
 
 		if ($set_default_acl_level === null) {
@@ -170,9 +188,12 @@ 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);
 		}
+
+		// check what edit log data write types are allowed
+		$this->adbSetEditLogWriteTypeAvailable();
 	}
 
 	/**
@@ -183,7 +204,26 @@ class Backend
 		// NO OP
 	}
 
-	// PUBLIC METHODS |=================================================>
+	// MARK: PRIVATE METHODS
+
+	/**
+	 * set the write types that are allowed
+	 *
+	 * @return void
+	 */
+	private function adbSetEditLogWriteTypeAvailable()
+	{
+		// check what edit log data write types are allowed
+		$this->write_types_available = self::WRITE_TYPES;
+		if (!function_exists('bzcompress')) {
+			$this->write_types_available = array_diff($this->write_types_available, ['BINARY', 'BZIP']);
+		}
+		if (!function_exists('gzcompress')) {
+			$this->write_types_available = array_diff($this->write_types_available, ['LZIP']);
+		}
+	}
+
+	// MARK: PUBLIC METHODS |=================================================>
 
 	/**
 	 * set internal ACL from login ACL
@@ -195,30 +235,95 @@ 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
 	 *
-	 * @param  string              $event      any kind of event description,
-	 * @param  string|array<mixed> $data       any kind of data related to that event
-	 * @param  string              $write_type write type can bei STRING or BINARY
-	 * @param  string|null         $db_schema  override target schema
+	 * @param  string              $event [default='']        any kind of event description,
+	 * @param  string|array<mixed> $data [default='']         any kind of data related to that event
+	 * @param  string              $write_type [default=JSON] write type can be
+	 *                                                        JSON, STRING/SERIEAL, BINARY/BZIP or ZLIB
+	 * @param  string|null         $db_schema [default=null]  override target schema
 	 * @return void
 	 */
 	public function adbEditLog(
 		string $event = '',
 		string|array $data = '',
-		string $write_type = 'STRING',
+		string $write_type = 'JSON',
 		?string $db_schema = null
 	): void {
 		$data_binary = '';
 		$data_write = '';
-		if ($write_type == 'BINARY') {
-			$data_binary = $this->db->dbEscapeBytea((string)bzcompress(serialize($data)));
-			$data_write = 'see bzip compressed data_binary field';
+		// check if write type is valid, if not fallback to JSON
+		if (!in_array($write_type, $this->write_types_available)) {
+			$this->log->warning('Write type not in allowed array, fallback to JSON', context:[
+				"write_type" => $write_type,
+				"write_list" => $this->write_types_available,
+			]);
+			$write_type = 'JSON';
 		}
-		if ($write_type == 'STRING') {
-			$data_binary = '';
-			$data_write = $this->db->dbEscapeString(serialize($data));
+		switch ($write_type) {
+			case 'BINARY':
+			case 'BZIP':
+				$data_binary = $this->db->dbEscapeBytea((string)bzcompress(serialize($data)));
+				$data_write = Json::jsonConvertArrayTo([
+					'type' => 'BZIP',
+					'message' => 'see bzip compressed data_binary field'
+				]);
+				break;
+			case 'ZLIB':
+				$data_binary = $this->db->dbEscapeBytea((string)gzcompress(serialize($data)));
+				$data_write = Json::jsonConvertArrayTo([
+					'type' => 'ZLIB',
+					'message' => 'see zlib compressed data_binary field'
+				]);
+				break;
+			case 'STRING':
+			case 'SERIAL':
+				$data_binary = $this->db->dbEscapeBytea(Json::jsonConvertArrayTo([
+					'type' => 'SERIAL',
+					'message' => 'see serial string data field'
+				]));
+				$data_write = serialize($data);
+				break;
+			case 'JSON':
+				$data_binary = $this->db->dbEscapeBytea(Json::jsonConvertArrayTo([
+					'type' => 'JSON',
+					'message' => 'see json string data field'
+				]));
+				// must be converted to array
+				if (!is_array($data)) {
+					$data = ["data" => $data];
+				}
+				$data_write = Json::jsonConvertArrayTo($data);
+				break;
+			default:
+				$this->log->alert('Invalid type for data compression was set', context:[
+					"write_type" => $write_type
+				]);
+				break;
 		}
 
 		/** @var string $DB_SCHEMA check schema */
@@ -228,44 +333,62 @@ class Backend
 		} elseif (!empty($this->db->dbGetSchema())) {
 			$DB_SCHEMA = $this->db->dbGetSchema();
 		}
-		$q = "INSERT INTO " . $DB_SCHEMA . ".edit_log "
-			. "(euid, event_date, event, data, data_binary, page, "
-			. "ip, user_agent, referer, script_name, query_string, server_name, http_host, "
-			. "http_accept, http_accept_charset, http_accept_encoding, session_id, "
-			. "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) "
-			. "VALUES "
-			. "(" . $this->db->dbEscapeString(isset($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ?
-				$_SESSION['EUID'] :
-				'NULL')
-			. ", "
-			. "NOW(), "
-			. "'" . $this->db->dbEscapeString((string)$event) . "', "
-			. "'" . $data_write . "', "
-			. "'" . $data_binary . "', "
-			. "'" . $this->db->dbEscapeString((string)$this->page_name) . "', "
-			. "'" . ($_SERVER["REMOTE_ADDR"] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_USER_AGENT'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_REFERER'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['SCRIPT_FILENAME'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['QUERY_STRING'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['SERVER_NAME'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_HOST'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_ACCEPT'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_ACCEPT_CHARSET'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_ACCEPT_ENCODING'] ?? '') . "', "
-			. ($this->session->getSessionId() === false ?
-				"NULL" :
-				"'" . $this->session->getSessionId() . "'")
-			. ", "
-			. "'" . $this->db->dbEscapeString($this->action) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_id) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_yes) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_flag) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_menu) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_loaded) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_value) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_error) . "')";
-		$this->db->dbExec($q, 'NULL');
+		$q = <<<SQL
+		INSERT INTO {DB_SCHEMA}.edit_log (
+			euid, event_date, event, data, data_binary, page,
+			ip, user_agent, referer, script_name, query_string, server_name, http_host,
+			http_accept, http_accept_charset, http_accept_encoding, session_id,
+			action, action_id, action_yes, action_flag, action_menu, action_loaded,
+			action_value, action_type, action_error
+		) VALUES (
+			$1, NOW(), $2, $3, $4, $5,
+			$6, $7, $8, $9, $10, $11, $12,
+			$13, $14, $15, $16,
+			$17, $18, $19, $20, $21, $22,
+			$23, $24, $25
+		)
+		SQL;
+		$this->db->dbExecParams(
+			str_replace(
+				['{DB_SCHEMA}'],
+				[$DB_SCHEMA],
+				$q
+			),
+			[
+				// row 1
+				isset($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ?
+					$_SESSION['EUID'] : null,
+				(string)$event,
+				$data_write,
+				$data_binary,
+				(string)$this->page_name,
+				// row 2
+				$_SERVER["REMOTE_ADDR"] ?? '',
+				$_SERVER['HTTP_USER_AGENT'] ?? '',
+				$_SERVER['HTTP_REFERER'] ?? '',
+				$_SERVER['SCRIPT_FILENAME'] ?? '',
+				$_SERVER['QUERY_STRING'] ?? '',
+				$_SERVER['SERVER_NAME'] ?? '',
+				$_SERVER['HTTP_HOST'] ?? '',
+				// row 3
+				$_SERVER['HTTP_ACCEPT'] ?? '',
+				$_SERVER['HTTP_ACCEPT_CHARSET'] ?? '',
+				$_SERVER['HTTP_ACCEPT_ENCODING'] ?? '',
+				$this->session->getSessionId() !== false ?
+					$this->session->getSessionId() : null,
+				// row 4
+				$this->action ?? '',
+				$this->action_id ?? '',
+				$this->action_yes ?? '',
+				$this->action_flag ?? '',
+				$this->action_menu ?? '',
+				$this->action_loaded ?? '',
+				$this->action_value ?? '',
+				$this->action_type ?? '',
+				$this->action_error ?? '',
+			],
+			'NULL'
+		);
 	}
 
 	/**
@@ -504,9 +627,9 @@ class Backend
 		string $data,
 		string $key_name,
 		string $key_value,
-		string $associate = null,
-		string $file = null,
-		string $db_schema = null,
+		?string $associate = null,
+		?string $file = null,
+		?string $db_schema = null,
 	): void {
 		/** @var string $DB_SCHEMA check schema */
 		$DB_SCHEMA = 'public';
@@ -515,16 +638,30 @@ class Backend
 		} elseif (!empty($this->db->dbGetSchema())) {
 			$DB_SCHEMA = $this->db->dbGetSchema();
 		}
-		$q = "INSERT INTO " . $DB_SCHEMA . ".live_queue ("
-			. "queue_key, key_value, key_name, type, target, data, group_key, action, associate, file"
-			. ") VALUES ("
-			. "'" . $this->db->dbEscapeString($queue_key) . "', '" . $this->db->dbEscapeString($key_value) . "', "
-			. "'" . $this->db->dbEscapeString($key_name) . "', '" . $this->db->dbEscapeString($type) . "', "
-			. "'" . $this->db->dbEscapeString($target) . "', '" . $this->db->dbEscapeString($data) . "', "
-			. "'" . $this->queue_key . "', '" . $this->action . "', "
-			. "'" . $this->db->dbEscapeString((string)$associate) . "', "
-			. "'" . $this->db->dbEscapeString((string)$file) . "')";
-		$this->db->dbExec($q);
+		$q = <<<SQL
+		INSERT INTO {DB_SCHEMA}.live_queue (
+			queue_key, key_value, key_name, type,
+			target, data, group_key, action, associate, file
+		) VALUES (
+			$1, $2, $3, $4,
+			$5, $6, $7, $8, $9, $10
+		)
+		SQL;
+		// $this->db->dbExec($q);
+		$this->db->dbExecParams(
+			str_replace(
+				['{DB_SCHEMA}'],
+				[$DB_SCHEMA],
+				$q
+			),
+			[
+				$queue_key, $key_value,
+				$key_name, $type,
+				$target, $data,
+				$this->queue_key, $this->action,
+				(string)$associate, (string)$file
+			]
+		);
 	}
 
 	/**

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

www/lib/CoreLibs/Combined/ArrayHandler.php

@@ -509,6 +509,22 @@ class ArrayHandler
 		}
 		return $array;
 	}
+
+	/**
+	 * Remove entries from a simple array, will not keep key order
+	 *
+	 * any array content is allowed
+	 *
+	 * https://stackoverflow.com/a/369608
+	 *
+	 * @param  array<mixed> $array  Array where elements are located
+	 * @param  array<mixed> $remove Elements to remove
+	 * @return array<mixed>         Array with $remove elements removed
+	 */
+	public static function arrayRemoveEntry(array $array, array $remove): array
+	{
+		return array_diff($array, $remove);
+	}
 }
 
 // __END__

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

www/lib/CoreLibs/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);
-		} else {
-			return $string;
+			return htmlentities($string, $flags, 'UTF-8', false);
 		}
+		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 (in_array($needle, $haystack)) {
-				return $type ? 'checked' : 'selected';
-			}
-		} else {
-			if ($haystack == $needle) {
-				return $type ? 'checked' : 'selected';
-			}
+		if (is_array($haystack) && in_array($needle, $haystack)) {
+			return $type ? 'checked' : 'selected';
+		} elseif (!is_array($haystack) && $haystack == $needle) {
+			return $type ? 'checked' : 'selected';
 		}
 		return null;
 	}