Moved minimum php version to 8.1

All PostgreSQL calls are now Connection/Resource object types and not
resource
All methods have parameter type set

.phan/config.php

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

4dev/checking/phpunit.sh

@@ -1,9 +1,11 @@
+#!/bin/env bash
+
 base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
 # -c phpunit.xml
 # --testdox
 # call with "t" to give verbose testdox output
 # SUPPORTED: https://www.php.net/supported-versions.php
-# call with 7.4, 8.0, 8.1 to force a certain php version
+# call with php version number to force a certain php version
 
 opt_testdox="";
 if [ "${1}" = "t" ] || [ "${2}" = "t" ]; then
@@ -13,8 +15,8 @@ php_bin="";
 if [ ! -z "${1}" ]; then
 	case "${1}" in
 		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
-		"7.4") php_bin="/usr/bin/php7.4 "; ;;
-		"8.0") php_bin="/usr/bin/php8.0 "; ;;
+		# "7.4") php_bin="/usr/bin/php7.4 "; ;;
+		# "8.0") php_bin="/usr/bin/php8.0 "; ;;
 		"8.1") php_bin="/usr/bin/php8.1 "; ;;
 		"8.2") php_bin="/usr/bin/php8.2 "; ;;
 		*) echo "Not support PHP: ${1}"; exit; ;;
@@ -23,8 +25,8 @@ fi;
 if [ ! -z "${2}" ] && [ -z "${php_bin}" ]; then
 	case "${2}" in
 		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
-		"7.4") php_bin="/usr/bin/php7.4 "; ;;
-		"8.0") php_bin="/usr/bin/php8.0 "; ;;
+		# "7.4") php_bin="/usr/bin/php7.4 "; ;;
+		# "8.0") php_bin="/usr/bin/php8.0 "; ;;
 		"8.1") php_bin="/usr/bin/php8.1 "; ;;
 		"8.2") php_bin="/usr/bin/php8.2 "; ;;
 		*) echo "Not support PHP: ${1}"; exit; ;;

4dev/tests/CoreLibsACLLoginTest.php

@@ -1729,7 +1729,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				],
 				20
 			],
-			'invalud search' => [
+			'invalid search' => [
 				12,
 				'foo',
 				[],

4dev/tests/CoreLibsCombinedArrayHandlerTest.php

@@ -107,6 +107,13 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 */
 	public function arraySearchRecursiveAllProvider(): array
 	{
+		/*
+		0: $needle,
+		1: array $input,
+		2: ?string $key_search_for,
+		3: bool $flag,
+		4: array $expected
+		*/
 		return [
 			'find value' => [
 				0 => 'bar',
@@ -172,6 +179,13 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 */
 	public function arraySearchSimpleProvider(): array
 	{
+		/*
+		0: array $input,
+		1: $key,
+		2: $value,
+		3: bool $flag,
+		4: bool $expected
+		*/
 		return [
 			'key/value exist' => [
 				0 => self::$array,
@@ -665,7 +679,7 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 *
 	 * @param array $input
 	 * @param string|int $key
-	 * @param string|int $value
+	 * @param string|int|bool $value
 	 * @param bool $expected
 	 * @return void
 	 */
@@ -712,12 +726,23 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 */
 	public function testArrayMergeRecursiveWarningA(): void
 	{
+		set_error_handler(
+			static function (int $errno, string $errstr): never {
+				throw new Exception($errstr, $errno);
+			},
+			E_USER_WARNING
+		);
+
 		$arrays = func_get_args();
 		// first is expected warning
 		$warning = array_shift($arrays);
-		$this->expectWarning();
-		$this->expectWarningMessage($warning);
+
+		// phpunit 10.0 compatible
+		$this->expectExceptionMessage(($warning));
+
 		\CoreLibs\Combined\ArrayHandler::arrayMergeRecursive(...$arrays);
+
+		restore_error_handler();
 	}
 
 	/**

4dev/tests/CoreLibsConvertSetVarTypeNullTest.php

@@ -5,14 +5,14 @@ declare(strict_types=1);
 namespace tests;
 
 use PHPUnit\Framework\TestCase;
-use CoreLibs\Convert\VarSetTypeNull;
+use CoreLibs\Convert\SetVarTypeNull;
 
 /**
  * Test class for Convert\Strings
- * @coversDefaultClass \CoreLibs\Convert\VarSetTypeNull
- * @testdox \CoreLibs\Convert\VarSetTypeNull method tests
+ * @coversDefaultClass \CoreLibs\Convert\SetVarTypeNull
+ * @testdox \CoreLibs\Convert\SetVarTypeNull method tests
  */
-final class CoreLibsConvertVarSetTypeNullTest extends TestCase
+final class CoreLibsConvertSetVarTypeNullTest extends TestCase
 {
 	/**
 	 * Undocumented function
@@ -66,7 +66,7 @@ final class CoreLibsConvertVarSetTypeNullTest extends TestCase
 	 */
 	public function testSetString(mixed $input, ?string $default, ?string $expected): void
 	{
-		$set_var = VarSetTypeNull::setStr($input, $default);
+		$set_var = SetVarTypeNull::setStr($input, $default);
 		if ($expected !== null) {
 			$this->assertIsString($set_var);
 		} else {
@@ -155,7 +155,7 @@ final class CoreLibsConvertVarSetTypeNullTest extends TestCase
 	 */
 	public function testMakeString(mixed $input, ?string $default, ?string $expected): void
 	{
-		$set_var = VarSetTypeNull::makeStr($input, $default);
+		$set_var = SetVarTypeNull::makeStr($input, $default);
 		if ($expected !== null) {
 			$this->assertIsString($set_var);
 		} else {
@@ -219,7 +219,7 @@ final class CoreLibsConvertVarSetTypeNullTest extends TestCase
 	 */
 	public function testSetInt(mixed $input, ?int $default, ?int $expected): void
 	{
-		$set_var = VarSetTypeNull::setInt($input, $default);
+		$set_var = SetVarTypeNull::setInt($input, $default);
 		if ($expected !== null) {
 			$this->assertIsInt($set_var);
 		} else {
@@ -303,7 +303,7 @@ final class CoreLibsConvertVarSetTypeNullTest extends TestCase
 	 */
 	public function testMakeInt(mixed $input, ?int $default, ?int $expected): void
 	{
-		$set_var = VarSetTypeNull::makeInt($input, $default);
+		$set_var = SetVarTypeNull::makeInt($input, $default);
 		if ($expected !== null) {
 			$this->assertIsInt($set_var);
 		} else {
@@ -367,7 +367,7 @@ final class CoreLibsConvertVarSetTypeNullTest extends TestCase
 	 */
 	public function testSetFloat(mixed $input, ?float $default, ?float $expected): void
 	{
-		$set_var = VarSetTypeNull::setFloat($input, $default);
+		$set_var = SetVarTypeNull::setFloat($input, $default);
 		if ($expected !== null) {
 			$this->assertIsFloat($set_var);
 		} else {
@@ -452,7 +452,7 @@ final class CoreLibsConvertVarSetTypeNullTest extends TestCase
 	 */
 	public function testMakeFloat(mixed $input, ?float $default, ?float $expected): void
 	{
-		$set_var = VarSetTypeNull::makeFloat($input, $default);
+		$set_var = SetVarTypeNull::makeFloat($input, $default);
 		if ($expected !== null) {
 			$this->assertIsFloat($set_var);
 		} else {
@@ -511,7 +511,7 @@ final class CoreLibsConvertVarSetTypeNullTest extends TestCase
 	 */
 	public function testSetArray(mixed $input, ?array $default, ?array $expected): void
 	{
-		$set_var = VarSetTypeNull::setArray($input, $default);
+		$set_var = SetVarTypeNull::setArray($input, $default);
 		if ($expected !== null) {
 			$this->assertIsArray($set_var);
 		} else {
@@ -570,7 +570,7 @@ final class CoreLibsConvertVarSetTypeNullTest extends TestCase
 	 */
 	public function testSetBool(mixed $input, ?bool $default, ?bool $expected): void
 	{
-		$set_var = VarSetTypeNull::setBool($input, $default);
+		$set_var = SetVarTypeNull::setBool($input, $default);
 		if ($expected !== null) {
 			$this->assertIsBool($set_var);
 		} else {
@@ -636,7 +636,7 @@ final class CoreLibsConvertVarSetTypeNullTest extends TestCase
 	 */
 	public function testMakeBool(mixed $input, ?bool $expected): void
 	{
-		$set_var = VarSetTypeNull::makeBool($input);
+		$set_var = SetVarTypeNull::makeBool($input);
 		if ($expected !== null) {
 			$this->assertIsBool($set_var);
 		} else {

4dev/tests/CoreLibsConvertSetVarTypeTest.php

@@ -5,14 +5,14 @@ declare(strict_types=1);
 namespace tests;
 
 use PHPUnit\Framework\TestCase;
-use CoreLibs\Convert\VarSetType;
+use CoreLibs\Convert\SetVarType;
 
 /**
  * Test class for Convert\Strings
- * @coversDefaultClass \CoreLibs\Convert\VarSetType
- * @testdox \CoreLibs\Convert\VarSetType method tests
+ * @coversDefaultClass \CoreLibs\Convert\SetVarType
+ * @testdox \CoreLibs\Convert\SetVarType method tests
  */
-final class CoreLibsConvertVarSetTypeTest extends TestCase
+final class CoreLibsConvertSetVarTypeTest extends TestCase
 {
 	/**
 	 * Undocumented function
@@ -67,9 +67,9 @@ final class CoreLibsConvertVarSetTypeTest extends TestCase
 	public function testSetString(mixed $input, ?string $default, string $expected): void
 	{
 		if ($default === null) {
-			$set_var = VarSetType::setStr($input);
+			$set_var = SetVarType::setStr($input);
 		} else {
-			$set_var = VarSetType::setStr($input, $default);
+			$set_var = SetVarType::setStr($input, $default);
 		}
 		$this->assertIsString($set_var);
 		$this->assertEquals(
@@ -144,9 +144,9 @@ final class CoreLibsConvertVarSetTypeTest extends TestCase
 	public function testMakeString(mixed $input, ?string $default, string $expected): void
 	{
 		if ($default === null) {
-			$set_var = VarSetType::makeStr($input);
+			$set_var = SetVarType::makeStr($input);
 		} else {
-			$set_var = VarSetType::makeStr($input, $default);
+			$set_var = SetVarType::makeStr($input, $default);
 		}
 		$this->assertIsString($set_var);
 		$this->assertEquals(
@@ -208,9 +208,9 @@ final class CoreLibsConvertVarSetTypeTest extends TestCase
 	public function testSetInt(mixed $input, ?int $default, int $expected): void
 	{
 		if ($default === null) {
-			$set_var = VarSetType::setInt($input);
+			$set_var = SetVarType::setInt($input);
 		} else {
-			$set_var = VarSetType::setInt($input, $default);
+			$set_var = SetVarType::setInt($input, $default);
 		}
 		$this->assertIsInt($set_var);
 		$this->assertEquals(
@@ -285,9 +285,9 @@ final class CoreLibsConvertVarSetTypeTest extends TestCase
 	public function testMakeInt(mixed $input, ?int $default, int $expected): void
 	{
 		if ($default === null) {
-			$set_var = VarSetType::makeInt($input);
+			$set_var = SetVarType::makeInt($input);
 		} else {
-			$set_var = VarSetType::makeInt($input, $default);
+			$set_var = SetVarType::makeInt($input, $default);
 		}
 		$this->assertIsInt($set_var);
 		$this->assertEquals(
@@ -349,9 +349,9 @@ final class CoreLibsConvertVarSetTypeTest extends TestCase
 	public function testSetFloat(mixed $input, ?float $default, float $expected): void
 	{
 		if ($default === null) {
-			$set_var = VarSetType::setFloat($input);
+			$set_var = SetVarType::setFloat($input);
 		} else {
-			$set_var = VarSetType::setFloat($input, $default);
+			$set_var = SetVarType::setFloat($input, $default);
 		}
 		$this->assertIsFloat($set_var);
 		$this->assertEquals(
@@ -426,9 +426,9 @@ final class CoreLibsConvertVarSetTypeTest extends TestCase
 	public function testMakeFloat(mixed $input, ?float $default, float $expected): void
 	{
 		if ($default === null) {
-			$set_var = VarSetType::makeFloat($input);
+			$set_var = SetVarType::makeFloat($input);
 		} else {
-			$set_var = VarSetType::makeFloat($input, $default);
+			$set_var = SetVarType::makeFloat($input, $default);
 		}
 		$this->assertIsFloat($set_var);
 		$this->assertEquals(
@@ -485,9 +485,9 @@ final class CoreLibsConvertVarSetTypeTest extends TestCase
 	public function testSetArray(mixed $input, ?array $default, array $expected): void
 	{
 		if ($default === null) {
-			$set_var = VarSetType::setArray($input);
+			$set_var = SetVarType::setArray($input);
 		} else {
-			$set_var = VarSetType::setArray($input, $default);
+			$set_var = SetVarType::setArray($input, $default);
 		}
 		$this->assertIsArray($set_var);
 		$this->assertEquals(
@@ -544,9 +544,9 @@ final class CoreLibsConvertVarSetTypeTest extends TestCase
 	public function testSetBool(mixed $input, ?bool $default, bool $expected): void
 	{
 		if ($default === null) {
-			$set_var = VarSetType::setBool($input);
+			$set_var = SetVarType::setBool($input);
 		} else {
-			$set_var = VarSetType::setBool($input, $default);
+			$set_var = SetVarType::setBool($input, $default);
 		}
 		$this->assertIsBool($set_var);
 		$this->assertEquals(
@@ -617,9 +617,9 @@ final class CoreLibsConvertVarSetTypeTest extends TestCase
 	public function testMakeBool(mixed $input, ?bool $default, bool $expected): void
 	{
 		if ($default === null) {
-			$set_var = VarSetType::makeBool($input);
+			$set_var = SetVarType::makeBool($input);
 		} else {
-			$set_var = VarSetType::makeBool($input, $default);
+			$set_var = SetVarType::makeBool($input, $default);
 		}
 		$this->assertIsBool($set_var);
 		$this->assertEquals(

4dev/tests/CoreLibsDBIOTest.php

@@ -1253,10 +1253,14 @@ final class CoreLibsDBIOTest extends TestCase
 			'string value literal' => ['string literal', 'tl', '\'string literal\'',],
 			'empty string value literal' => ['', 'tl', '\'\'',],
 			'null string value literal' => [null, 'tl', 'NULL',],
-			// ?d (I have no idea what that does, is like string)
+			// escape string, but set all empty strings to null ('' is null)
 			'string value d' => ['string d', 'd', '\'string d\'',],
 			'empty string value d' => ['', 'd', 'NULL',],
 			'null string value d' => [null, 'd', 'NULL',],
+			// escape literal string, but set all empty strings to null ('' is null)
+			'string value literal d' => ['string d', 'dl', '\'string d\'',],
+			'empty string value literal d' => ['', 'dl', 'NULL',],
+			'null string value literal d' => [null, 'dl', 'NULL',],
 			// by bytea
 			'string value d' => ['string d', 'by', '\x737472696e672064',],
 			'empty string value d' => ['', 'by', 'NULL',],
@@ -1281,7 +1285,7 @@ final class CoreLibsDBIOTest extends TestCase
 	 * @dataProvider sqlEscapeProvider
 	 * @testdox Input value $input as $flag to $expected [$_dataName]
 	 *
-	 * @param int|float|string|null $input
+	 * @param int|float|string|bool|null $input
 	 * @param string $flag
 	 * @param int|float|string $expected
 	 * @return void
@@ -3456,7 +3460,7 @@ final class CoreLibsDBIOTest extends TestCase
 					'id' => '51',
 					'error' => 'Max query call needs to be set to at least 1',
 					// run:: can be +1 if called in set and not direct
-					'source' => "/^main::run::run::run::run::run::run::(run::)?runBare::runTest::testDbErrorHandling::dbSetMaxQueryCall$/",
+					'source' => "/^include::main::run::run::run::run::run::run::(run::)?runBare::runTest::testDbErrorHandling::dbSetMaxQueryCall$/",
 					'pg_error' => '',
 					'msg' => '',
 				]

4dev/tests/CoreLibsDebugSupportTest.php

@@ -393,7 +393,7 @@ final class CoreLibsDebugSupportTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @cover ::getCallerMethodList
-	 * @testWith [["main", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"],["main", "run", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"]]
+	 * @testWith [["main", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"],["include", "main", "run", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"]]
 	 * @testdox getCallerMethodList check if it returns $expected [$_dataName]
 	 *
 	 * @param array $expected

4dev/tests/CoreLibsGetSystemTest.php

@@ -99,7 +99,7 @@ final class CoreLibsGetSystemTest extends TestCase
 				1 => 'phpunit',
 				2 => 'phpunit',
 				// NOTE: this can change, so it is a regex check
-				3 => "/^(\/?.*\/?)?www\/vendor\/bin\/phpunit$/",
+				3 => "/^(\/?.*\/?)?vendor\/bin\/phpunit$/",
 			],
 			'some path with extension' => [
 				0 => '/some/path/to/file.txt',

ReadMe.composer-release.md

@@ -0,0 +1,21 @@
+# CoreLibs Composer release flow
+
+- run local phan/phptan/phunit tests
+- commit and sync to master branch
+- create a version tag in master branch
+- checkout development on CoreLibs-composer-all branch
+- sync `php_libraries/trunk/www/lib/CoreLibs/*` to c`omposer-packages/CoreLibs-Composer-All/src/`
+- if phpunit files have been changed/updated sync them to `composer-packages/CoreLibs-Composer-All/test/phpunit/`
+- run phan/phpstan/phpunit tests in composer branch
+- commit and sync to master
+- create the same version tag as before in the trunk/master
+- GITEA
+  - download ZIP file from TAG
+  - `curl --user clemens.schwaighofer:KEY \
+     --upload-file ~/Documents/Composer/CoreLibs-Composer-All-vX.Y.Z.zip \
+     https://git.egplusww.jp/api/packages/Composer/composer?version=X.Y.Z`
+- GitLab
+  - `curl --data tag=vX-Y-Z --header "Deploy-Token: TOKENr" "https://gitlab-na.factory.tools/api/v4/projects/950/packages/composer"`
+- Composer Packagest local
+  - update pacakges.json file with new version and commit
+  - `git pull egra-gitea master`

composer.json

@@ -1,6 +1,19 @@
 {
+    "name": "egrajp/development-corelibs-dev",
+    "version": "dev-master",
+    "description": "CoreLibs: Development package",
+    "type": "library",
+    "require-dev": {
+        "phpstan/phpstan": "^1.10",
+        "phan/phan": "^5.4",
+        "phpstan/extension-installer": "^1.2"
+    },
+    "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
+    },
     "require": {
-        "phpstan/phpstan": "^1.9",
-        "phan/phan": "^5.4"
+        "php": ">=8.1"
     }
 }

composer.lock

@@ -4,8 +4,9 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3a7069a2572f7105a202bb7bdc8956df",
-    "packages": [
+    "content-hash": "e0be39c8d67ae1599bb76d055debab50",
+    "packages": [],
+    "packages-dev": [
         {
             "name": "composer/pcre",
             "version": "3.1.0",
@@ -610,17 +611,61 @@
             "time": "2022-10-14T12:47:21+00:00"
         },
         {
-            "name": "phpstan/phpstan",
-            "version": "1.9.16",
+            "name": "phpstan/extension-installer",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "922e2689bb180575d0f57de0443c431a5a698e8f"
+                "url": "https://github.com/phpstan/extension-installer.git",
+                "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/922e2689bb180575d0f57de0443c431a5a698e8f",
-                "reference": "922e2689bb180575d0f57de0443c431a5a698e8f",
+                "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f06dbb052ddc394e7896fcd1cfcd533f9f6ace40",
+                "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^2.0",
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpstan": "^1.8.0"
+            },
+            "require-dev": {
+                "composer/composer": "^2.0",
+                "php-parallel-lint/php-parallel-lint": "^1.2.0",
+                "phpstan/phpstan-strict-rules": "^0.11 || ^0.12 || ^1.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "PHPStan\\ExtensionInstaller\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\ExtensionInstaller\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Composer plugin for automatic installation of PHPStan extensions",
+            "support": {
+                "issues": "https://github.com/phpstan/extension-installer/issues",
+                "source": "https://github.com/phpstan/extension-installer/tree/1.2.0"
+            },
+            "time": "2022-10-17T12:59:16+00:00"
+        },
+        {
+            "name": "phpstan/phpstan",
+            "version": "1.10.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "5419375b5891add97dc74be71e6c1c34baaddf64"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5419375b5891add97dc74be71e6c1c34baaddf64",
+                "reference": "5419375b5891add97dc74be71e6c1c34baaddf64",
                 "shasum": ""
             },
             "require": {
@@ -650,7 +695,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.9.16"
+                "source": "https://github.com/phpstan/phpstan/tree/1.10.3"
             },
             "funding": [
                 {
@@ -666,7 +711,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-07T10:42:21+00:00"
+            "time": "2023-02-25T14:47:13+00:00"
         },
         {
             "name": "psr/container",
@@ -1705,7 +1750,6 @@
             "time": "2022-06-03T18:03:27+00:00"
         }
     ],
-    "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],

phpstan.neon

@@ -5,6 +5,7 @@ parameters:
 	tmpDir: /tmp/phpstan-corelibs
 	level: 8 # max is now 9
 	checkMissingCallableSignature: true
+	treatPhpDocTypesAsCertain: false
 	paths:
 		- %currentWorkingDirectory%/www
 	bootstrapFiles:
@@ -12,14 +13,13 @@ parameters:
 		# - %currentWorkingDirectory%/www/lib/autoloader.php
 		- %currentWorkingDirectory%/www/vendor/autoload.php
 	scanDirectories:
-		- www/lib/Smarty
+		- www/vendor
 	scanFiles:
 		- www/configs/config.php
 		- www/configs/config.master.php
 		# if composer.json autoloader defined, this is not needed
 		# - www/lib/autoloader.php
 		- www/vendor/autoload.php
-		- www/lib/Smarty/Autoloader.php
 	excludePaths:
 		# do not check old qq file uploader tests
 		- www/admin/qq_file_upload_*.php
@@ -30,6 +30,10 @@ parameters:
 		- www/admin/error_test.php
 		# admin synlink files
 		- www/admin/edit_*.php
+		# config symlinks
+		- www/admin/config.php
+		- www/frontend/config.php
+		- www/frontend/*/config.php
 		# ignore admin header stuff
 		# - www/includes/admin_header.php # ignore the admin include stuff
 		- www/includes/admin_footer.php # ignore the admin include stuff
@@ -43,9 +47,6 @@ parameters:
 		- www/log
 		- www/media
 		- www/tmp
-		# external libs are not checked
-		- www/lib/Smarty/
-		- www/lib/smarty-*/
 		# ignore composer
 		- www/vendor
 	# ignore errores with
@@ -53,9 +54,9 @@ parameters:
 		#- # this error is ignore because of the PHP 8.0 to 8.1 change for pg_*, only for 8.0 or lower
 			# message: "#^Parameter \\#1 \\$(result|connection) of function pg_\\w+ expects resource(\\|null)?, object\\|resource(\\|bool)? given\\.$#"
 			# path: %currentWorkingDirectory%/www/lib/CoreLibs/DB/SQL/PgSQL.php
-		- # this is for 8.1 or newer
-			message: "#^Parameter \\#1 \\$(result|connection) of function pg_\\w+ expects PgSql\\\\(Result|Connection(\\|string)?(\\|null)?), object\\|resource given\\.$#"
-			path: %currentWorkingDirectory%/www/lib/CoreLibs/DB/SQL/PgSQL.php
+		# - # this is for 8.1 or newer
+		# 	message: "#^Parameter \\#1 \\$(result|connection) of function pg_\\w+ expects PgSql\\\\(Result|Connection(\\|string)?(\\|null)?), object\\|resource given\\.$#"
+		# 	path: %currentWorkingDirectory%/www/lib/CoreLibs/DB/SQL/PgSQL.php
 		# this is ignored for now
 		# - '#Expression in empty\(\) is always falsy.#'
 		# -

vendor/composer/autoload_files.php

@@ -12,10 +12,10 @@ return array(
     'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
     '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
     'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
+    '9b38cf48e83f5d8f60375221cd213eee' => $vendorDir . '/phpstan/phpstan/bootstrap.php',
     '2b9d0f43f9552984cfa82fee95491826' => $vendorDir . '/sabre/event/lib/coroutine.php',
     'd81bab31d3feb45bfe2f283ea3c8fdf7' => $vendorDir . '/sabre/event/lib/Loop/functions.php',
     'a1cce3d26cc15c00fcd0b3354bd72c88' => $vendorDir . '/sabre/event/lib/Promise/functions.php',
     'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
     '6714be961f4a45ae8b9a99d5d55c5d07' => $vendorDir . '/tysonandre/var_representation_polyfill/src/var_representation.php',
-    '9b38cf48e83f5d8f60375221cd213eee' => $vendorDir . '/phpstan/phpstan/bootstrap.php',
 );

vendor/composer/autoload_psr4.php

@@ -6,7 +6,7 @@ $vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
-    'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-common/src', $vendorDir . '/phpdocumentor/type-resolver/src', $vendorDir . '/phpdocumentor/reflection-docblock/src'),
+    'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-common/src', $vendorDir . '/phpdocumentor/reflection-docblock/src', $vendorDir . '/phpdocumentor/type-resolver/src'),
     'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'),
     'VarRepresentation\\' => array($vendorDir . '/tysonandre/var_representation_polyfill/src/VarRepresentation'),
     'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'),
@@ -21,6 +21,7 @@ return array(
     'Psr\\Log\\' => array($vendorDir . '/psr/log/src'),
     'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
     'Phan\\' => array($vendorDir . '/phan/phan/src/Phan'),
+    'PHPStan\\ExtensionInstaller\\' => array($vendorDir . '/phpstan/extension-installer/src'),
     'Microsoft\\PhpParser\\' => array($vendorDir . '/microsoft/tolerant-php-parser/src'),
     'Composer\\XdebugHandler\\' => array($vendorDir . '/composer/xdebug-handler/src'),
     'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'),

vendor/composer/autoload_real.php

@@ -22,8 +22,6 @@ class ComposerAutoloaderInitdd705c6e8ab22e0d642372dec7767718
             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'));

vendor/composer/autoload_static.php

@@ -13,12 +13,12 @@ class ComposerStaticInitdd705c6e8ab22e0d642372dec7767718
         'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
         '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
         'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
+        '9b38cf48e83f5d8f60375221cd213eee' => __DIR__ . '/..' . '/phpstan/phpstan/bootstrap.php',
         '2b9d0f43f9552984cfa82fee95491826' => __DIR__ . '/..' . '/sabre/event/lib/coroutine.php',
         'd81bab31d3feb45bfe2f283ea3c8fdf7' => __DIR__ . '/..' . '/sabre/event/lib/Loop/functions.php',
         'a1cce3d26cc15c00fcd0b3354bd72c88' => __DIR__ . '/..' . '/sabre/event/lib/Promise/functions.php',
         'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
         '6714be961f4a45ae8b9a99d5d55c5d07' => __DIR__ . '/..' . '/tysonandre/var_representation_polyfill/src/var_representation.php',
-        '9b38cf48e83f5d8f60375221cd213eee' => __DIR__ . '/..' . '/phpstan/phpstan/bootstrap.php',
     );
 
     public static $prefixLengthsPsr4 = array (
@@ -51,6 +51,7 @@ class ComposerStaticInitdd705c6e8ab22e0d642372dec7767718
             'Psr\\Log\\' => 8,
             'Psr\\Container\\' => 14,
             'Phan\\' => 5,
+            'PHPStan\\ExtensionInstaller\\' => 27,
         ),
         'M' => 
         array (
@@ -72,8 +73,8 @@ class ComposerStaticInitdd705c6e8ab22e0d642372dec7767718
         'phpDocumentor\\Reflection\\' => 
         array (
             0 => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src',
-            1 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src',
-            2 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src',
+            1 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src',
+            2 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src',
         ),
         'Webmozart\\Assert\\' => 
         array (
@@ -131,6 +132,10 @@ class ComposerStaticInitdd705c6e8ab22e0d642372dec7767718
         array (
             0 => __DIR__ . '/..' . '/phan/phan/src/Phan',
         ),
+        'PHPStan\\ExtensionInstaller\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/phpstan/extension-installer/src',
+        ),
         'Microsoft\\PhpParser\\' => 
         array (
             0 => __DIR__ . '/..' . '/microsoft/tolerant-php-parser/src',

vendor/composer/installed.json

@@ -634,18 +634,65 @@
             "install-path": "../phpdocumentor/type-resolver"
         },
         {
-            "name": "phpstan/phpstan",
-            "version": "1.9.16",
-            "version_normalized": "1.9.16.0",
+            "name": "phpstan/extension-installer",
+            "version": "1.2.0",
+            "version_normalized": "1.2.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "922e2689bb180575d0f57de0443c431a5a698e8f"
+                "url": "https://github.com/phpstan/extension-installer.git",
+                "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/922e2689bb180575d0f57de0443c431a5a698e8f",
-                "reference": "922e2689bb180575d0f57de0443c431a5a698e8f",
+                "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f06dbb052ddc394e7896fcd1cfcd533f9f6ace40",
+                "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^2.0",
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpstan": "^1.8.0"
+            },
+            "require-dev": {
+                "composer/composer": "^2.0",
+                "php-parallel-lint/php-parallel-lint": "^1.2.0",
+                "phpstan/phpstan-strict-rules": "^0.11 || ^0.12 || ^1.0"
+            },
+            "time": "2022-10-17T12:59:16+00:00",
+            "type": "composer-plugin",
+            "extra": {
+                "class": "PHPStan\\ExtensionInstaller\\Plugin"
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\ExtensionInstaller\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Composer plugin for automatic installation of PHPStan extensions",
+            "support": {
+                "issues": "https://github.com/phpstan/extension-installer/issues",
+                "source": "https://github.com/phpstan/extension-installer/tree/1.2.0"
+            },
+            "install-path": "../phpstan/extension-installer"
+        },
+        {
+            "name": "phpstan/phpstan",
+            "version": "1.10.3",
+            "version_normalized": "1.10.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "5419375b5891add97dc74be71e6c1c34baaddf64"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5419375b5891add97dc74be71e6c1c34baaddf64",
+                "reference": "5419375b5891add97dc74be71e6c1c34baaddf64",
                 "shasum": ""
             },
             "require": {
@@ -654,7 +701,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2023-02-07T10:42:21+00:00",
+            "time": "2023-02-25T14:47:13+00:00",
             "bin": [
                 "phpstan",
                 "phpstan.phar"
@@ -677,7 +724,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.9.16"
+                "source": "https://github.com/phpstan/phpstan/tree/1.10.3"
             },
             "funding": [
                 {
@@ -1775,5 +1822,32 @@
         }
     ],
     "dev": true,
-    "dev-package-names": []
+    "dev-package-names": [
+        "composer/pcre",
+        "composer/semver",
+        "composer/xdebug-handler",
+        "felixfbecker/advanced-json-rpc",
+        "microsoft/tolerant-php-parser",
+        "netresearch/jsonmapper",
+        "phan/phan",
+        "phpdocumentor/reflection-common",
+        "phpdocumentor/reflection-docblock",
+        "phpdocumentor/type-resolver",
+        "phpstan/extension-installer",
+        "phpstan/phpstan",
+        "psr/container",
+        "psr/log",
+        "sabre/event",
+        "symfony/console",
+        "symfony/deprecation-contracts",
+        "symfony/polyfill-ctype",
+        "symfony/polyfill-intl-grapheme",
+        "symfony/polyfill-intl-normalizer",
+        "symfony/polyfill-mbstring",
+        "symfony/polyfill-php80",
+        "symfony/service-contracts",
+        "symfony/string",
+        "tysonandre/var_representation_polyfill",
+        "webmozart/assert"
+    ]
 }

vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '53eef033877e7f16329dfbea26623533281856de',
+        'reference' => '44f37b7f74e1fcbfbbdf26036117d14404011abd',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '53eef033877e7f16329dfbea26623533281856de',
+            'reference' => '44f37b7f74e1fcbfbbdf26036117d14404011abd',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -26,7 +26,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/./pcre',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'composer/semver' => array(
             'pretty_version' => '3.3.2',
@@ -35,7 +35,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/./semver',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'composer/xdebug-handler' => array(
             'pretty_version' => '3.0.3',
@@ -44,7 +44,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/./xdebug-handler',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'felixfbecker/advanced-json-rpc' => array(
             'pretty_version' => 'v3.2.1',
@@ -53,7 +53,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../felixfbecker/advanced-json-rpc',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'microsoft/tolerant-php-parser' => array(
             'pretty_version' => 'v0.1.1',
@@ -62,7 +62,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../microsoft/tolerant-php-parser',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'netresearch/jsonmapper' => array(
             'pretty_version' => 'v4.1.0',
@@ -71,7 +71,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../netresearch/jsonmapper',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'phan/phan' => array(
             'pretty_version' => '5.4.1',
@@ -80,7 +80,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../phan/phan',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'phpdocumentor/reflection-common' => array(
             'pretty_version' => '2.2.0',
@@ -89,7 +89,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpdocumentor/reflection-common',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'phpdocumentor/reflection-docblock' => array(
             'pretty_version' => '5.3.0',
@@ -98,7 +98,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpdocumentor/reflection-docblock',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'phpdocumentor/type-resolver' => array(
             'pretty_version' => '1.6.2',
@@ -107,16 +107,25 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpdocumentor/type-resolver',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
+        ),
+        'phpstan/extension-installer' => array(
+            'pretty_version' => '1.2.0',
+            'version' => '1.2.0.0',
+            'reference' => 'f06dbb052ddc394e7896fcd1cfcd533f9f6ace40',
+            'type' => 'composer-plugin',
+            'install_path' => __DIR__ . '/../phpstan/extension-installer',
+            'aliases' => array(),
+            'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.9.16',
-            'version' => '1.9.16.0',
-            'reference' => '922e2689bb180575d0f57de0443c431a5a698e8f',
+            'pretty_version' => '1.10.3',
+            'version' => '1.10.3.0',
+            'reference' => '5419375b5891add97dc74be71e6c1c34baaddf64',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'psr/container' => array(
             'pretty_version' => '2.0.2',
@@ -125,7 +134,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/container',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'psr/log' => array(
             'pretty_version' => '3.0.0',
@@ -134,10 +143,10 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/log',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'psr/log-implementation' => array(
-            'dev_requirement' => false,
+            'dev_requirement' => true,
             'provided' => array(
                 0 => '1.0|2.0|3.0',
             ),
@@ -149,7 +158,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabre/event',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'symfony/console' => array(
             'pretty_version' => 'v6.2.5',
@@ -158,7 +167,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/console',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'symfony/deprecation-contracts' => array(
             'pretty_version' => 'v3.2.0',
@@ -167,7 +176,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/deprecation-contracts',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'symfony/polyfill-ctype' => array(
             'pretty_version' => 'v1.27.0',
@@ -176,7 +185,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'symfony/polyfill-intl-grapheme' => array(
             'pretty_version' => 'v1.27.0',
@@ -185,7 +194,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-grapheme',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'symfony/polyfill-intl-normalizer' => array(
             'pretty_version' => 'v1.27.0',
@@ -194,7 +203,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'symfony/polyfill-mbstring' => array(
             'pretty_version' => 'v1.27.0',
@@ -203,7 +212,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'symfony/polyfill-php80' => array(
             'pretty_version' => 'v1.27.0',
@@ -212,7 +221,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php80',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'symfony/service-contracts' => array(
             'pretty_version' => 'v3.2.0',
@@ -221,7 +230,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/service-contracts',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'symfony/string' => array(
             'pretty_version' => 'v6.2.5',
@@ -230,7 +239,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/string',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'tysonandre/var_representation_polyfill' => array(
             'pretty_version' => '0.1.3',
@@ -239,7 +248,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../tysonandre/var_representation_polyfill',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
         'webmozart/assert' => array(
             'pretty_version' => '1.11.0',
@@ -248,7 +257,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../webmozart/assert',
             'aliases' => array(),
-            'dev_requirement' => false,
+            'dev_requirement' => true,
         ),
     ),
 );

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
-    );
-}

vendor/phpstan/extension-installer/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Ondřej Mirtes
+
+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/phpstan/extension-installer/README.md

@@ -0,0 +1,77 @@
+# PHPStan Extension Installer
+
+[![Build](https://github.com/phpstan/extension-installer/workflows/Build/badge.svg)](https://github.com/phpstan/extension-installer/actions)
+[![Latest Stable Version](https://poser.pugx.org/phpstan/extension-installer/v/stable)](https://packagist.org/packages/phpstan/extension-installer)
+[![License](https://poser.pugx.org/phpstan/extension-installer/license)](https://packagist.org/packages/phpstan/extension-installer)
+
+Composer plugin for automatic installation of [PHPStan](https://phpstan.org/) extensions.
+
+# Motivation
+
+```diff
+diff --git a/phpstan.neon b/phpstan.neon
+index db4e3df32e..2ca30fa20a 100644
+--- a/phpstan.neon
++++ b/phpstan.neon
+@@ -1,12 +1,3 @@
+-includes:
+-	- vendor/phpstan/phpstan-doctrine/extension.neon
+-	- vendor/phpstan/phpstan-doctrine/rules.neon
+-	- vendor/phpstan/phpstan-nette/extension.neon
+-	- vendor/phpstan/phpstan-nette/rules.neon
+-	- vendor/phpstan/phpstan-phpunit/extension.neon
+-	- vendor/phpstan/phpstan-phpunit/rules.neon
+-	- vendor/phpstan/phpstan-strict-rules/rules.neon
+-
+ parameters:
+ 	autoload_directories:
+ 		- %rootDir%/../../../build/SlevomatSniffs
+diff --git a/composer.json b/composer.json
+index 1b578dd624..f6ebf6e477 100644
+--- a/composer.json
++++ b/composer.json
+@@ -142,6 +142,7 @@
+ 		"jakub-onderka/php-parallel-lint": "1.0.0",
+ 		"justinrainbow/json-schema": "5.2.8",
+ 		"ondrejmirtes/mocktainer": "0.8",
++		"phpstan/extension-installer": "^1.0",
+ 		"phpstan/phpstan": "^0.11.7",
+ 		"phpstan/phpstan-doctrine": "^0.11.3",
+ 		"phpstan/phpstan-nette": "^0.11.1",
+```
+
+## Usage
+
+```bash
+composer require --dev phpstan/extension-installer
+```
+
+Starting from Composer 2.2.0 you'll get the following question:
+```
+phpstan/extension-installer contains a Composer plugin which is currently not in your allow-plugins config. See https://getcomposer.org/allow-plugins
+Do you trust "phpstan/extension-installer" to execute code and wish to enable it now? (writes "allow-plugins" to composer.json) [y,n,d,?]
+```
+
+Answer with `y` to allow the plugin.
+
+## Instructions for extension developers
+
+It's best (but optional) to set the extension's composer package [type](https://getcomposer.org/doc/04-schema.md#type) to `phpstan-extension` for this plugin to be able to recognize it and to be [discoverable on Packagist](https://packagist.org/explore/?type=phpstan-extension).
+
+Add `phpstan` key in the extension `composer.json`'s `extra` section:
+
+```json
+{
+  "extra": {
+    "phpstan": {
+      "includes": [
+        "extension.neon"
+      ]
+    }
+  }
+}
+```
+
+## Limitations
+
+The extension installer depends on Composer script events, therefore you cannot use `--no-scripts` flag.

vendor/phpstan/extension-installer/build-cs/composer.json

@@ -0,0 +1,12 @@
+{
+	"require-dev": {
+		"consistence-community/coding-standard": "^3.10",
+		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+		"slevomat/coding-standard": "^7.0"
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
+	}
+}

vendor/phpstan/extension-installer/build-cs/composer.lock

@@ -0,0 +1,322 @@
+{
+    "_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": "4485bbedba7bcc71ace5f69dbb9b6c47",
+    "packages": [],
+    "packages-dev": [
+        {
+            "name": "consistence-community/coding-standard",
+            "version": "3.11.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consistence-community/coding-standard.git",
+                "reference": "4632fead8c9ee8f50044fcbce9f66c797b34c0df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consistence-community/coding-standard/zipball/4632fead8c9ee8f50044fcbce9f66c797b34c0df",
+                "reference": "4632fead8c9ee8f50044fcbce9f66c797b34c0df",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4",
+                "slevomat/coding-standard": "~7.0",
+                "squizlabs/php_codesniffer": "~3.6.0"
+            },
+            "replace": {
+                "consistence/coding-standard": "3.10.*"
+            },
+            "require-dev": {
+                "phing/phing": "2.16.4",
+                "php-parallel-lint/php-parallel-lint": "1.3.0",
+                "phpunit/phpunit": "9.5.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Consistence\\": [
+                        "Consistence"
+                    ]
+                },
+                "classmap": [
+                    "Consistence"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Vašek Purchart",
+                    "email": "me@vasekpurchart.cz",
+                    "homepage": "http://vasekpurchart.cz"
+                }
+            ],
+            "description": "Consistence - Coding Standard - PHP Code Sniffer rules",
+            "keywords": [
+                "Coding Standard",
+                "PHPCodeSniffer",
+                "codesniffer",
+                "coding",
+                "cs",
+                "phpcs",
+                "ruleset",
+                "sniffer",
+                "standard"
+            ],
+            "support": {
+                "issues": "https://github.com/consistence-community/coding-standard/issues",
+                "source": "https://github.com/consistence-community/coding-standard/tree/3.11.1"
+            },
+            "time": "2021-05-03T18:13:22+00:00"
+        },
+        {
+            "name": "dealerdirect/phpcodesniffer-composer-installer",
+            "version": "v0.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
+                "reference": "1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db",
+                "reference": "1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0 || ^2.0",
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0"
+            },
+            "require-dev": {
+                "composer/composer": "*",
+                "php-parallel-lint/php-parallel-lint": "^1.3.1",
+                "phpcompatibility/php-compatibility": "^9.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Franck Nijhof",
+                    "email": "franck.nijhof@dealerdirect.com",
+                    "homepage": "http://www.frenck.nl",
+                    "role": "Developer / IT Manager"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer/graphs/contributors"
+                }
+            ],
+            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
+            "homepage": "http://www.dealerdirect.com",
+            "keywords": [
+                "PHPCodeSniffer",
+                "PHP_CodeSniffer",
+                "code quality",
+                "codesniffer",
+                "composer",
+                "installer",
+                "phpcbf",
+                "phpcs",
+                "plugin",
+                "qa",
+                "quality",
+                "standard",
+                "standards",
+                "style guide",
+                "stylecheck",
+                "tests"
+            ],
+            "support": {
+                "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues",
+                "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer"
+            },
+            "time": "2022-02-04T12:51:07+00:00"
+        },
+        {
+            "name": "phpstan/phpdoc-parser",
+            "version": "1.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpdoc-parser.git",
+                "reference": "981cc368a216c988e862a75e526b6076987d1b50"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/981cc368a216c988e862a75e526b6076987d1b50",
+                "reference": "981cc368a216c988e862a75e526b6076987d1b50",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^1.5",
+                "phpstan/phpstan-strict-rules": "^1.0",
+                "phpunit/phpunit": "^9.5",
+                "symfony/process": "^5.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\PhpDocParser\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPDoc parser with support for nullable, intersection and generic types",
+            "support": {
+                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.5.1"
+            },
+            "time": "2022-05-05T11:32:40+00:00"
+        },
+        {
+            "name": "slevomat/coding-standard",
+            "version": "7.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/slevomat/coding-standard.git",
+                "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/aff06ae7a84e4534bf6f821dc982a93a5d477c90",
+                "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90",
+                "shasum": ""
+            },
+            "require": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpdoc-parser": "^1.5.1",
+                "squizlabs/php_codesniffer": "^3.6.2"
+            },
+            "require-dev": {
+                "phing/phing": "2.17.3",
+                "php-parallel-lint/php-parallel-lint": "1.3.2",
+                "phpstan/phpstan": "1.4.10|1.7.1",
+                "phpstan/phpstan-deprecation-rules": "1.0.0",
+                "phpstan/phpstan-phpunit": "1.0.0|1.1.1",
+                "phpstan/phpstan-strict-rules": "1.2.3",
+                "phpunit/phpunit": "7.5.20|8.5.21|9.5.20"
+            },
+            "type": "phpcodesniffer-standard",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "SlevomatCodingStandard\\": "SlevomatCodingStandard"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.",
+            "support": {
+                "issues": "https://github.com/slevomat/coding-standard/issues",
+                "source": "https://github.com/slevomat/coding-standard/tree/7.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/kukulich",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/slevomat/coding-standard",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-25T10:58:12+00:00"
+        },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "3.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "bin": [
+                "bin/phpcs",
+                "bin/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
+            "time": "2021-12-12T21:44:58+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "plugin-api-version": "2.3.0"
+}

vendor/phpstan/extension-installer/composer.json

@@ -0,0 +1,32 @@
+{
+    "name": "phpstan/extension-installer",
+    "type": "composer-plugin",
+    "description": "Composer plugin for automatic installation of PHPStan extensions",
+    "license": [
+        "MIT"
+    ],
+    "require": {
+        "php": "^7.2 || ^8.0",
+        "composer-plugin-api": "^2.0",
+        "phpstan/phpstan": "^1.8.0"
+    },
+    "require-dev": {
+        "composer/composer": "^2.0",
+        "php-parallel-lint/php-parallel-lint": "^1.2.0",
+        "phpstan/phpstan-strict-rules": "^0.11 || ^0.12 || ^1.0"
+    },
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "ocramius/package-versions": true
+        }
+    },
+    "extra": {
+        "class": "PHPStan\\ExtensionInstaller\\Plugin"
+    },
+    "autoload": {
+        "psr-4": {
+            "PHPStan\\ExtensionInstaller\\": "src/"
+        }
+    }
+}

vendor/phpstan/extension-installer/src/GeneratedConfig.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\ExtensionInstaller;
+
+/**
+ * This is a stub class: it is in place only for scenarios where Composer
+ * is run with a `--no-scripts` flag, in which scenarios this stub class
+ * is not being replaced.
+ *
+ * If you are reading this docBlock inside your `vendor/` dir, then this means
+ * that phpstan/extension-installer didn't correctly install.
+ *
+ * @internal
+ */
+final class GeneratedConfig
+{
+
+	public const EXTENSIONS = [];
+
+	public const NOT_INSTALLED = [];
+
+	private function __construct()
+	{
+	}
+
+}

vendor/phpstan/extension-installer/src/Plugin.php

@@ -0,0 +1,159 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\ExtensionInstaller;
+
+use Composer\Composer;
+use Composer\EventDispatcher\EventSubscriberInterface;
+use Composer\IO\IOInterface;
+use Composer\Plugin\PluginInterface;
+use Composer\Script\Event;
+use Composer\Script\ScriptEvents;
+use Composer\Util\Filesystem;
+use function array_keys;
+use function dirname;
+use function file_exists;
+use function file_put_contents;
+use function getcwd;
+use function in_array;
+use function is_file;
+use function ksort;
+use function md5;
+use function md5_file;
+use function sprintf;
+use function strpos;
+use function var_export;
+use const DIRECTORY_SEPARATOR;
+
+final class Plugin implements PluginInterface, EventSubscriberInterface
+{
+
+	/** @var string */
+	private static $generatedFileTemplate = <<<'PHP'
+<?php declare(strict_types = 1);
+
+namespace PHPStan\ExtensionInstaller;
+
+/**
+ * This class is generated by phpstan/extension-installer.
+ * @internal
+ */
+final class GeneratedConfig
+{
+
+	public const EXTENSIONS = %s;
+
+	public const NOT_INSTALLED = %s;
+
+	private function __construct()
+	{
+	}
+
+}
+
+PHP;
+
+	public function activate(Composer $composer, IOInterface $io): void
+	{
+		// noop
+	}
+
+	public function deactivate(Composer $composer, IOInterface $io): void
+	{
+		// noop
+	}
+
+	public function uninstall(Composer $composer, IOInterface $io): void
+	{
+		// noop
+	}
+
+	/**
+	 * @return array<string, string>
+	 */
+	public static function getSubscribedEvents(): array
+	{
+		return [
+			ScriptEvents::POST_INSTALL_CMD => 'process',
+			ScriptEvents::POST_UPDATE_CMD => 'process',
+		];
+	}
+
+	public function process(Event $event): void
+	{
+		$io = $event->getIO();
+
+		if (!file_exists(__DIR__)) {
+			$io->write('<info>phpstan/extension-installer:</info> Package not found (probably scheduled for removal); extensions installation skipped.');
+			return;
+		}
+
+		$composer = $event->getComposer();
+		$installationManager = $composer->getInstallationManager();
+
+		$generatedConfigFilePath = __DIR__ . '/GeneratedConfig.php';
+		$oldGeneratedConfigFileHash = null;
+		if (is_file($generatedConfigFilePath)) {
+			$oldGeneratedConfigFileHash = md5_file($generatedConfigFilePath);
+		}
+		$notInstalledPackages = [];
+		$installedPackages = [];
+
+		$data = [];
+		$fs = new Filesystem();
+		foreach ($composer->getRepositoryManager()->getLocalRepository()->getPackages() as $package) {
+			if (
+				$package->getType() !== 'phpstan-extension'
+				&& !isset($package->getExtra()['phpstan'])
+			) {
+				if (
+					strpos($package->getName(), 'phpstan') !== false
+					&& !in_array($package->getName(), [
+						'phpstan/phpstan',
+						'phpstan/phpstan-shim',
+						'phpstan/phpdoc-parser',
+						'phpstan/extension-installer',
+					], true)
+				) {
+					$notInstalledPackages[$package->getName()] = $package->getFullPrettyVersion();
+				}
+				continue;
+			}
+
+			$installPath = $installationManager->getInstallPath($package);
+
+			$absoluteInstallPath = $fs->isAbsolutePath($installPath)
+				? $installPath
+				: getcwd() . DIRECTORY_SEPARATOR . $installPath;
+
+			$data[$package->getName()] = [
+				'install_path' => $absoluteInstallPath,
+				'relative_install_path' => $fs->findShortestPath(dirname($generatedConfigFilePath), $absoluteInstallPath, true),
+				'extra' => $package->getExtra()['phpstan'] ?? null,
+				'version' => $package->getFullPrettyVersion(),
+			];
+
+			$installedPackages[$package->getName()] = true;
+		}
+
+		ksort($data);
+		ksort($installedPackages);
+		ksort($notInstalledPackages);
+
+		$generatedConfigFileContents = sprintf(self::$generatedFileTemplate, var_export($data, true), var_export($notInstalledPackages, true));
+		file_put_contents($generatedConfigFilePath, $generatedConfigFileContents);
+		$io->write('<info>phpstan/extension-installer:</info> Extensions installed');
+
+		if ($oldGeneratedConfigFileHash === md5($generatedConfigFileContents)) {
+			return;
+		}
+
+		foreach (array_keys($installedPackages) as $name) {
+			$io->write(sprintf('> <info>%s:</info> installed', $name));
+		}
+
+		foreach (array_keys($notInstalledPackages) as $name) {
+			$io->write(sprintf('> <comment>%s:</comment> not supported', $name));
+		}
+	}
+
+}

vendor/phpstan/phpstan/README.md

@@ -86,7 +86,6 @@ PHPStan Pro is a paid add-on on top of open-source PHPStan Static Analysis Tool
 
 * Web UI for browsing found errors, you can click and open your editor of choice on the offending line.
 * Continuous analysis (watch mode): scans changed files in the background, refreshes the UI automatically.
-* Interactive fixer: lets you choose the right fix for found errors :blush:
 
 Try it on PHPStan 0.12.45 or later by running it with the `--pro` option. You can create an account either by following the on-screen instructions, or by visiting [account.phpstan.com](https://account.phpstan.com/).
 

vendor/phpstan/phpstan/phpstan.phar.asc

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmPiKvUACgkQzxoQjQ56
-5yCMJRAAi1z4OEeZTgkcoElOBQ4bY4rgf0fmETn0PIrOW/cSwLdFIgNMN+TBadqa
-AAmnH5f+n59AORpWgvbzouDXp76WN8G4yh7tyhW7aI3H7EWf5bIqYD9H8DjK5gI/
-a/BLPa+GrXbkSFgmgao/54b4axKmyj9hBRoG7hPnce3Z0nVswUYeauNcaO0b1KV9
-hin9huA0S+Ed/oXeAPUbs1FU0NGCVfynFplhY4d5KyAm6yLij/8pyiqEHlpW4/LI
-7z5ZJZXEUpvLywSD7o99RqXhHPs2ODItR1uzhg1EEyW2bqUf6bdrb1ikXG67pNtd
-vtkOPuJ9VUbRKjKvlKeWC194c5KzM7a3nEDtNsDvKwo1rPWR6hIf3VukSEsv08Wd
-us65DDFQrWVbLDPN9yROqS70KAEe7leO65NJzbtnzjtNWHF+FbHnz3sl63X9mAqz
-guNtjjJJjZG5EGPCOotG0E90Fmgs9aD5i2dZoQTH4Yno3Rq5qJpjlGenjEjW8cu6
-xFRxP+fGbqeDaw3wLe7niBXHrZQ3eKUpXZaxaFVVSoIzO9RxqpVyjnq3oUX2d+ti
-MRA1Smr6Fu8TWxoBJGLWDBIOtwARcAmz5NBUolzAXb6gb3XDR8W9w4aV8hELEAwb
-bPtDupKyAqCO+hiPTaOp0Z5TVCOo6YZUGSaHr88JFeFTGvAdeP0=
-=NZJU
+iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmP6H1oACgkQzxoQjQ56
+5yCVhxAAlXqhfvKCITSAJjkaIhncEBHpT5Ogby65BX1O5+SkKyc/OO7JnjlN8cLB
+DKbJpdc8P2Dbfo/uBHVR5YiNX5CWYzgdMzCpLQI20Ffa7qkeRbA5ZS2AfdIfLqhD
+PswlQIYxg0F3lj0L+joTxfBiHgmR5wnOUx1sLXnEbqGtFzzGstPGDg9gjKKh5EnO
+g207jrm1we05+k3kKzr233/ENvQD6bBWLr2yngyMoirOuDpurAuPjkBL7vN6PDbx
+DlyGDazsgU/R7aE2FtqmFC8KIU/BgnpbCSWTHBEJAqtncHbwTgneyEm+88lT6cUt
+YM72Rh1+QTvS3WgJ/q7AQRik2aE83Kz2rc3XOl1ADd45J3Oan1rqQXdnKtH6qZeT
+wMk6PE8SQPJ8NMHy3LT048PfMOakAtgBL5xonbVqX0IFAvKAMRijwBCNKat2yRsB
+0VGnoeH7klf1fSSo0xOD20Pd0uIILAWZlBjb2e/1NRytFQkokAr1bsLD/VJHiNYh
+lPQ4OztCT/uumJOAgTKm10T56CK1u0VxhIVtQ+/NkTvAwrmpX0KKqbYPP/1hZqVO
+vFaWJR4iLFNt+il7dlv56jmTAneUrGrWkQdVFbz5FVpqz7abIo+/cevbSSndFZCI
+K1mn42aFdYXSqVTFpkzeOQeJPPysEYDysFk7ClhE+F48HN7WAtw=
+=A7BG
 -----END PGP SIGNATURE-----

www/admin/class_test.db.dbReturn.php

@@ -23,6 +23,7 @@ ob_end_flush();
 
 use CoreLibs\Debug\Support;
 use CoreLibs\Debug\RunningTime;
+use CoreLibs\Convert\SetVarType;
 
 $log = new CoreLibs\Debug\Logging([
 	'log_folder' => BASE . LOG,
@@ -78,7 +79,9 @@ for ($i = 1; $i <= 6; $i++) {
 			(is_array($res) ?
 				"Array: " . $db->log->prBl(is_array($res)) : '{-}')
 		) . ", "
-		. "cursor_ext: <pre>" . Support::printAr($db->dbGetCursorExt($q_db_ret)) . "</pre>";
+		. "cursor_ext: <pre>" . Support::printAr(
+			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))
+		) . "</pre>";
 	print "Run time: " .  RunningTime::hrRunningTime() . "<br>";
 }
 // reset all read data
@@ -95,7 +98,9 @@ for ($i = 1; $i <= 6; $i++) {
 			(is_array($res) ?
 				"Array: " . $db->log->prBl(is_array($res)) : '{-}')
 		) . ", "
-		. "cursor_ext: <pre>" . Support::printAr($db->dbGetCursorExt($q_db_ret)) . "</pre>";
+		. "cursor_ext: <pre>" . Support::printAr(
+			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))
+		) . "</pre>";
 	print "Run time: " .  RunningTime::hrRunningTime() . "<br>";
 }
 // reset all read data
@@ -112,7 +117,9 @@ for ($i = 1; $i <= 6; $i++) {
 			(is_array($res) ?
 				"Array: " . $db->log->prBl(is_array($res)) : '{-}')
 		) . ", "
-		. "cursor_ext: <pre>" . Support::printAr($db->dbGetCursorExt($q_db_ret)) . "</pre>";
+		. "cursor_ext: <pre>" . Support::printAr(
+			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))
+		) . "</pre>";
 	print "Run time: " .  RunningTime::hrRunningTime() . "<br>";
 }
 // reset all read data
@@ -129,7 +136,9 @@ for ($i = 1; $i <= 6; $i++) {
 			(is_array($res) ?
 				"Array: " . $db->log->prBl(is_array($res)) : '{-}')
 		) . ", "
-		. "cursor_ext: <pre>" . Support::printAr($db->dbGetCursorExt($q_db_ret)) . "</pre>";
+		. "cursor_ext: <pre>" . Support::printAr(
+			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))
+		) . "</pre>";
 	print "Run time: " .  RunningTime::hrRunningTime() . "<br>";
 }
 // reset all data

www/admin/class_test.db.php

@@ -62,7 +62,11 @@ print "VERSION LONG DB: " . $db->dbVersionInfo('server', false) . "<br>";
 print "VERSION NUMERIC DB: " . $db->dbVersionNumeric() . "<br>";
 print "SERVER ENCODING: " . $db->dbVersionInfo('server_encoding') . "<br>";
 print "ALL PG VERSION PARAMETERS: <pre>" . print_r($db->dbVersionInfoParameters(), true) . "</pre><br>";
-print "ALL OUTPUT [TEST]: <pre>" . print_r(pg_version($db->dbGetDbh()), true) . "</pre><br>";
+if (($dbh = $db->dbGetDbh()) instanceof \PgSql\Connection) {
+	print "ALL OUTPUT [TEST]: <pre>" . print_r(pg_version($dbh), true) . "</pre><br>";
+} else {
+	print "NO DB HANDLER<br>";
+}
 print "DB Version smaller $to_db_version: " . $db->dbCompareVersion('<' . $to_db_version) . "<br>";
 print "DB Version smaller than $to_db_version: " . $db->dbCompareVersion('<=' . $to_db_version) . "<br>";
 print "DB Version equal $to_db_version: " . $db->dbCompareVersion('=' . $to_db_version) . "<br>";
@@ -108,7 +112,11 @@ print "<br>";
 
 print "<pre>";
 
-print "SOCKET: " . pg_socket($db->dbGetDbh()) . "<br>";
+if (($dbh = $db->dbGetDbh()) instanceof \PgSql\Connection) {
+	print "SOCKET: " . pg_socket($dbh) . "<br>";
+} else {
+	print "NO SOCKET<br>";
+}
 
 // truncate test_foo table before testing
 print "<b>TRUNCATE test_foo</b><br>";

www/admin/class_test.output.form.php

@@ -67,7 +67,7 @@ $log = new CoreLibs\Debug\Logging([
 	'echo_all' => $ECHO_ALL ?? false,
 	'print_all' => $PRINT_ALL ?? false,
 ]);
-$form = new CoreLibs\Output\Form\Generate(DB_CONFIG, $log);
+$form = new CoreLibs\Output\Form\Generate(DB_CONFIG, $log, table_arrays: $table_arrays);
 
 $PAGE_NAME = 'TEST CLASS: FORM GENERATE';
 print "<!DOCTYPE html>";

www/admin/class_test.php

@@ -84,6 +84,7 @@ print '<div><a href="class_test.debug.php">Class Test: DEBUG</a></div>';
 print '<div><a href="class_test.output.form.php">Class Test: OUTPUT FORM</a></div>';
 print '<div><a href="class_test.admin.backend.php">Class Test: BACKEND ADMIN CLASS</a></div>';
 print '<div><a href="class_test.lang.php">Class Test: LANG/L10n</a></div>';
+print '<div><a href="class_test.varistype.php">Class Test: SET VAR TYPE</a></div>';
 print '<div><a href="class_test.session.php">Class Test: SESSION</a></div>';
 print '<div><a href="class_test.session.read.php">Class Test: SESSION: READ</a></div>';
 print '<div><a href="class_test.smarty.php">Class Test: SMARTY</a></div>';

www/admin/class_test.varistype.php

@@ -25,8 +25,8 @@ require 'config.php';
 $LOG_FILE_ID = 'classTest-VarIsType';
 ob_end_flush();
 
-use CoreLibs\Convert\VarSetType;
-use CoreLibs\Convert\VarSetTypeNull;
+use CoreLibs\Convert\SetVarType;
+use CoreLibs\Convert\SetVarTypeNull;
 use CoreLibs\Debug\Support;
 
 $log = new CoreLibs\Debug\Logging([
@@ -48,28 +48,28 @@ print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 
-print "Test A str set: " . VarSetType::setStr(5, 'set int') . "<br>";
-print "Test A str make int: " . VarSetType::makeStr(5, 'make int') . "<br>";
-print "Test A str make object: " . VarSetType::makeStr($log, 'Object') . "<br>";
-print "Test A str make null: " . VarSetType::makeStr(null, 'null') . "<br>";
-print "Test B int set: " . VarSetType::setInt("5", -1) . "<br>";
-print "Test B int make string: " . VarSetType::makeInt("5", -1) . "<br>";
-print "Test B' int make float: " . VarSetType::makeInt("5.5", -1) . "<br>";
-print "Test B'' int make class: " . VarSetType::makeInt($log, -1) . "<br>";
-print "Test B''' int make hex: " . VarSetType::makeInt("0x55", -1) . "<br>";
-print "Test B''' int make hex: " . VarSetType::makeInt(0x55, -1) . "<br>";
-print "Test C float make: " . VarSetType::makeFloat("13,232.95", -1) . "<br>";
+print "Test A str set: " . SetVarType::setStr(5, 'set int') . "<br>";
+print "Test A str make int: " . SetVarType::makeStr(5, 'make int') . "<br>";
+print "Test A str make object: " . SetVarType::makeStr($log, 'Object') . "<br>";
+print "Test A str make null: " . SetVarType::makeStr(null, 'null') . "<br>";
+print "Test B int set: " . SetVarType::setInt("5", -1) . "<br>";
+print "Test B int make string: " . SetVarType::makeInt("5", -1) . "<br>";
+print "Test B' int make float: " . SetVarType::makeInt("5.5", -1) . "<br>";
+print "Test B'' int make class: " . SetVarType::makeInt($log, -1) . "<br>";
+print "Test B''' int make hex: " . SetVarType::makeInt("0x55", -1) . "<br>";
+print "Test B''' int make hex: " . SetVarType::makeInt(0x55, -1) . "<br>";
+print "Test C float make: " . SetVarType::makeFloat("13,232.95", -1) . "<br>";
 print "Test D floatval: " . floatval("13,232.95") . "<br>";
 print "Test E filter_var: "
 	. filter_var("13,232.95", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION) . "<br>";
 print "Test F filter_var: "
 	. filter_var("string", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION) . "<br>";
 
-print "Test G make bool: " . VarSetType::makeBool("on") . "<br>";
-print "Test G make bool: " . VarSetType::makeBool(null) . "<br>";
-print "Test G make bool: " . VarSetType::makeBool("null") . "<br>";
-print "Test G make bool: " . VarSetType::makeBool($log) . "<br>";
-print "Test G make bool: " . VarSetTypeNull::makeBool($log) . "<br>";
+print "Test G make bool: " . SetVarType::makeBool("on") . "<br>";
+print "Test G make bool: " . SetVarType::makeBool(null) . "<br>";
+print "Test G make bool: " . SetVarType::makeBool("null") . "<br>";
+print "Test G make bool: " . SetVarType::makeBool($log) . "<br>";
+print "Test G make bool: " . SetVarTypeNull::makeBool($log) . "<br>";
 
 print "<hr>";
 
@@ -84,30 +84,30 @@ $checks = [
 foreach ($checks as $string) {
 	print "** SET NOT NULL: (" . gettype($string) . ")<br>";
 	print "Str: " . Support::printToString($string) . ": -"
-		. Support::printToString(VarSetType::setStr($string)) . "-<br>";
+		. Support::printToString(SetVarType::setStr($string)) . "-<br>";
 	print "Int: " . Support::printToString($string) . ": -"
-		. Support::printToString(VarSetType::setInt($string)) . "-<br>";
+		. Support::printToString(SetVarType::setInt($string)) . "-<br>";
 	print "Float: " . Support::printToString($string) . ": -"
-		. Support::printToString(VarSetType::setFloat($string)) . "-<br>";
+		. Support::printToString(SetVarType::setFloat($string)) . "-<br>";
 	print "Bool: " . Support::printToString($string) . ": -"
-		. Support::printToString(VarSetType::setBool($string)) . "-<br>";
+		. Support::printToString(SetVarType::setBool($string)) . "-<br>";
 	print "Array: " . Support::printToString($string) . ": -"
-		. Support::printToString(VarSetType::setArray($string)) . "-<br>";
+		. Support::printToString(SetVarType::setArray($string)) . "-<br>";
 	print "<hr>";
 }
 
 foreach ($checks as $string) {
 	print "** SET NULL: (" . gettype($string) . ")<br>";
 	print "Str: " . Support::printToString($string) . ": -"
-		. Support::printToString(VarSetTypeNull::setStr($string)) . "-<br>";
+		. Support::printToString(SetVarTypeNull::setStr($string)) . "-<br>";
 	print "Int: " . Support::printToString($string) . ": -"
-		. Support::printToString(VarSetTypeNull::setInt($string)) . "-<br>";
+		. Support::printToString(SetVarTypeNull::setInt($string)) . "-<br>";
 	print "Float: " . Support::printToString($string) . ": -"
-		. Support::printToString(VarSetTypeNull::setFloat($string)) . "-<br>";
+		. Support::printToString(SetVarTypeNull::setFloat($string)) . "-<br>";
 	print "Bool: " . Support::printToString($string) . ": -"
-		. Support::printToString(VarSetTypeNull::setBool($string)) . "-<br>";
+		. Support::printToString(SetVarTypeNull::setBool($string)) . "-<br>";
 	print "Array: " . Support::printToString($string) . ": -"
-		. Support::printToString(VarSetTypeNull::setArray($string)) . "-<br>";
+		. Support::printToString(SetVarTypeNull::setArray($string)) . "-<br>";
 	print "<hr>";
 }
 

www/composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "gullevek/corelibs-dev",
+    "name": "egrajp/corelibs-dev",
     "version": "dev-master",
     "description": "CoreLibs: Development package",
     "type": "library",
@@ -16,5 +16,15 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9"
+    },
+    "repositories": {
+        "git.egplusww.jp.Composer": {
+            "type": "composer",
+            "url": "https://git.egplusww.jp/api/packages/Composer/composer"
+        }
+    },
+    "require": {
+        "egrajp/smarty-extended": "^4.3",
+        "php": ">=8.1"
     }
 }

www/composer.lock

@@ -4,35 +4,66 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a71e6f4fbc06f0efb6ad34538b515c53",
-    "packages": [],
+    "content-hash": "5b803d9f077cbb1b28dcb383f5e89b0a",
+    "packages": [
+        {
+            "name": "egrajp/smarty-extended",
+            "version": "4.3.0",
+            "dist": {
+                "type": "zip",
+                "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.3.0/egrajp-smarty-extended.4.3.0.zip",
+                "shasum": "d41bda35c0d52da35cf911ab0b018655a09f072b"
+            },
+            "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": "2023-02-17T14:14:10+09:00"
+        }
+    ],
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.5.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^11",
+                "doctrine/coding-standard": "^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.16 || ^1",
-                "phpstan/phpstan": "^1.4",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.30 || ^5.4"
+                "phpbench/phpbench": "^1.2",
+                "phpstan/phpstan": "^1.9.4",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5.27",
+                "vimeo/psalm": "^5.4"
             },
             "type": "library",
             "autoload": {
@@ -59,7 +90,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
+                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
             },
             "funding": [
                 {
@@ -75,7 +106,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-30T00:15:36+00:00"
+            "time": "2022-12-30T00:23:10+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -138,16 +169,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.2",
+            "version": "v4.15.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
                 "shasum": ""
             },
             "require": {
@@ -188,9 +219,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
             },
-            "time": "2022-11-12T15:38:23+00:00"
+            "time": "2023-01-16T22:05:37+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -305,16 +336,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.23",
+            "version": "9.2.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c"
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
-                "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2cf940ebc6355a9d430462811b5aaa308b174bed",
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed",
                 "shasum": ""
             },
             "require": {
@@ -370,7 +401,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.24"
             },
             "funding": [
                 {
@@ -378,7 +409,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-12-28T12:41:10+00:00"
+            "time": "2023-01-26T08:26:55+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -623,20 +654,20 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.27",
+            "version": "9.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38"
+                "reference": "e7b1615e3e887d6c719121c6d4a44b0ab9645555"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38",
-                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e7b1615e3e887d6c719121c6d4a44b0ab9645555",
+                "reference": "e7b1615e3e887d6c719121c6d4a44b0ab9645555",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1",
+                "doctrine/instantiator": "^1.3.1 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
@@ -674,7 +705,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.5-dev"
+                    "dev-master": "9.6-dev"
                 }
             },
             "autoload": {
@@ -705,7 +736,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.3"
             },
             "funding": [
                 {
@@ -721,7 +752,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-09T07:31:23+00:00"
+            "time": "2023-02-04T13:37:15+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1089,16 +1120,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.4",
+            "version": "5.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
                 "shasum": ""
             },
             "require": {
@@ -1140,7 +1171,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
             },
             "funding": [
                 {
@@ -1148,7 +1179,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-04-03T09:37:03+00:00"
+            "time": "2023-02-03T06:03:51+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -1462,16 +1493,16 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
                 "shasum": ""
             },
             "require": {
@@ -1510,10 +1541,10 @@
                 }
             ],
             "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
             },
             "funding": [
                 {
@@ -1521,7 +1552,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:17:30+00:00"
+            "time": "2023-02-03T06:07:39+00:00"
         },
         {
             "name": "sebastian/resource-operations",
@@ -1580,16 +1611,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "3.2.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
                 "shasum": ""
             },
             "require": {
@@ -1624,7 +1655,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
             },
             "funding": [
                 {
@@ -1632,7 +1663,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-12T14:47:03+00:00"
+            "time": "2023-02-03T06:13:03+00:00"
         },
         {
             "name": "sebastian/version",
@@ -1745,5 +1776,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.3.0"
 }

www/configs/config.php

@@ -63,13 +63,14 @@ if (!defined('DIR')) {
 	exit('Base config could not be loaded');
 }
 // find trigger name "admin/" or "frontend/" in the getcwd() folder
-foreach (['admin', 'frontend'] as $folder) {
-	if (strstr(getcwd() ?: '', DIRECTORY_SEPARATOR . $folder)) {
+$folder = '';
+foreach (['admin', 'frontend'] as $_folder) {
+	if (strstr(getcwd() ?: '', DIRECTORY_SEPARATOR . $_folder)) {
+		$folder = $_folder;
 		break;
 	}
 }
 // if content path is empty, fallback is default
-/** @phpstan-ignore-next-line can be empty */
 if (empty($folder)) {
 	$folder = 'default';
 }

www/lib/CoreLibs/ACL/Login.php

@@ -157,7 +157,7 @@ class Login
 	private $acl = [];
 	/** @var array<mixed> */
 	private $default_acl_list = [];
-	/** @var array<int|string,mixed> Reverse list to lookup level from type */
+	/** @var array<string,int> Reverse list to lookup level from type */
 	private $default_acl_list_type = [];
 	/** @var int default ACL level to be based on if nothing set */
 	private $default_acl_level = 0;
@@ -332,7 +332,7 @@ class Login
 				'type' => $res['type'],
 				'name' => $res['name']
 			];
-			$this->default_acl_list_type[$res['type']] = $res['level'];
+			$this->default_acl_list_type[(string)$res['type']] = (int)$res['level'];
 		}
 		// write that into the session
 		$_SESSION['DEFAULT_ACL_LIST'] = $this->default_acl_list;
@@ -986,7 +986,7 @@ class Login
 	 * @param  string $password the new password
 	 * @return bool             true or false if valid password or not
 	 */
-	private function loginPasswordChangeValidPassword($password): bool
+	private function loginPasswordChangeValidPassword(string $password): bool
 	{
 		$is_valid_password = true;
 		// check for valid in regex arrays in list
@@ -1048,7 +1048,7 @@ class Login
 				$res = $this->db->dbReturnRow($q);
 				if (
 					!is_array($res) ||
-					(is_array($res) && empty($res['edit_user_id']))
+					empty($res['edit_user_id'])
 				) {
 					// username wrong
 					$this->login_error = 201;
@@ -1068,9 +1068,11 @@ class Login
 				}
 				if (
 					!is_array($res) ||
-					(is_array($res) &&
-					(empty($res['edit_user_id']) ||
-					!$this->loginPasswordCheck($res['old_password_hash'], $this->pw_old_password)))
+					empty($res['edit_user_id']) ||
+					!$this->loginPasswordCheck(
+						$res['old_password_hash'],
+						$this->pw_old_password
+					)
 				) {
 					// old password wrong
 					$this->login_error = 202;
@@ -1124,7 +1126,7 @@ class Login
 	 *
 	 * @return string|null html data for login page, or null for nothing
 	 */
-	private function loginCreateLoginHTML()
+	private function loginCreateLoginHTML(): ?string
 	{
 		$html_string = null;
 		// if permission is ok, return null
@@ -1421,8 +1423,12 @@ EOM;
 	 * @param  string     $username login user username
 	 * @return void                 has no return
 	 */
-	private function writeLog(string $event, string $data, $error = '', string $username = ''): void
-	{
+	private function writeLog(
+		string $event,
+		string $data,
+		string|int $error = '',
+		string $username = ''
+	): void {
 		if ($this->login) {
 				$this->action = 'Login';
 		} elseif ($this->logout) {
@@ -1794,7 +1800,6 @@ EOM;
 		// check that numeric, positive numeric, not longer than max input string lenght
 		// and not short than min password length
 		if (
-			is_numeric($length) &&
 			$length >= $this->password_min_length_max &&
 			$length <= $this->password_max_length &&
 			$length <= 255
@@ -2069,9 +2074,12 @@ EOM;
 	 * @param  string   $type Type name to look in the acl list
 	 * @return int|bool       Either int level or false for not found
 	 */
-	public function loginGetAclListFromType(string $type)
+	public function loginGetAclListFromType(string $type): int|bool
 	{
-		return $this->default_acl_list_type[$type] ?? false;
+		if (!isset($this->default_acl_list_type[$type])) {
+			return false;
+		}
+		return (int)$this->default_acl_list_type[$type];
 	}
 
 	/**
@@ -2081,7 +2089,7 @@ EOM;
 	 * @return bool                     true/false: if the edit access is not
 	 *                                  in the valid list: false
 	 */
-	public function loginCheckEditAccess($edit_access_id): bool
+	public function loginCheckEditAccess(?int $edit_access_id): bool
 	{
 		if ($edit_access_id === null) {
 			return false;
@@ -2122,8 +2130,10 @@ EOM;
 	 * @param  string|int $data_key       key value to search for
 	 * @return bool|string                false for not found or string for found data
 	 */
-	public function loginGetEditAccessData(int $edit_access_id, $data_key)
-	{
+	public function loginGetEditAccessData(
+		int $edit_access_id,
+		string|int $data_key
+	): bool|string {
 		if (!isset($_SESSION['UNIT'][$edit_access_id]['data'][$data_key])) {
 			return false;
 		}
@@ -2137,9 +2147,12 @@ EOM;
 	 * @param  string   $uid Edit Access UID to look for
 	 * @return int|bool      Either primary key in int or false in bool for not found
 	 */
-	public function loginGetEditAccessIdFromUid(string $uid)
+	public function loginGetEditAccessIdFromUid(string $uid): int|bool
 	{
-		return $_SESSION['UNIT_UID'][$uid] ?? false;
+		if (!isset($_SESSION['UNIT_UID'][$uid])) {
+			return false;
+		}
+		return (int)$_SESSION['UNIT_UID'][$uid];
 	}
 
 	/**
@@ -2204,8 +2217,10 @@ EOM;
 	 * @param  string|int  $data_key
 	 * @return bool|string
 	 */
-	public function loginSetEditAccessData(int $edit_access_id, $data_key)
-	{
+	public function loginSetEditAccessData(
+		int $edit_access_id,
+		string|int $data_key
+	): bool|string {
 		return $this->loginGetEditAccessData($edit_access_id, $data_key);
 	}
 }

www/lib/CoreLibs/Admin/Backend.php

@@ -194,7 +194,7 @@ class Backend
 	 */
 	public function adbEditLog(
 		string $event = '',
-		$data = '',
+		string|array $data = '',
 		string $write_type = 'STRING'
 	): void {
 		$data_binary = '';
@@ -262,7 +262,7 @@ class Backend
 	 * @param string|int $menu_show_flag
 	 * @return string|int
 	 */
-	public function adbSetMenuShowFlag($menu_show_flag)
+	public function adbSetMenuShowFlag(string|int $menu_show_flag): string|int
 	{
 		// must be string or int
 		$this->menu_show_flag = $menu_show_flag;
@@ -274,7 +274,7 @@ class Backend
 	 *
 	 * @return string|int
 	 */
-	public function adbGetMenuShowFlag()
+	public function adbGetMenuShowFlag(): string|int
 	{
 		return $this->menu_show_flag;
 	}
@@ -437,7 +437,7 @@ class Backend
 	 * @return array<mixed>              associative array
 	 * @deprecated \CoreLibs\Combined\ArrayHandler::genAssocArray()
 	 */
-	public function adbAssocArray(array $db_array, $key, $value): array
+	public function adbAssocArray(array $db_array, string|int|bool $key, string|int|bool $value): array
 	{
 		trigger_error(
 			'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Combined\ArrayHandler::genAssocArray',
@@ -453,7 +453,7 @@ class Backend
 	 * @return string                   formatted string
 	 * @deprecated \CoreLibs\Convert\Byte::humanReadableByteFormat()
 	 */
-	public function adbByteStringFormat($number): string
+	public function adbByteStringFormat(string|int|float $number): string
 	{
 		trigger_error(
 			'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Convert\Byte::humanReadableByteFormat()',
@@ -482,7 +482,7 @@ class Backend
 		string $dummy = '',
 		string $path = '',
 		string $cache = ''
-	) {
+	): string|bool {
 		trigger_error(
 			'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Output\Image::createThumbnail()',
 			E_USER_DEPRECATED
@@ -569,28 +569,28 @@ class Backend
 	 * Basic class holds exact the same, except the Year/Month/Day/etc strings
 	 * are translated in this call
 	 *
-	 * @param  int    $year          year YYYY
-	 * @param  int    $month         month m
-	 * @param  int    $day           day d
-	 * @param  int    $hour          hour H
-	 * @param  int    $min           min i
-	 * @param  string $suffix        additional info printed after the date time
-	 *                               variable in the drop down
-	 *                               also used for ID in the on change JS call
-	 * @param  int    $min_steps     default is 1 (minute), can set to anything,
-	 *                               is used as sum up from 0
-	 * @param  bool   $name_pos_back default false, if set to true,
-	 *                               the name will be printend
-	 *                               after the drop down and not before the drop down
-	 * @return string                HTML formated strings for drop down lists
-	 *                               of date and time
+	 * @param  int|string $year          year YYYY
+	 * @param  int|string $month         month m
+	 * @param  int|string $day           day d
+	 * @param  int|string $hour          hour H
+	 * @param  int|string $min           min i
+	 * @param  string     $suffix        additional info printed after the date time
+	 *                                   variable in the drop down
+	 *                                   also used for ID in the on change JS call
+	 * @param  int        $min_steps     default is 1 (minute), can set to anything,
+	 *                                   is used as sum up from 0
+	 * @param  bool       $name_pos_back default false, if set to true,
+	 *                                   the name will be printend
+	 *                                   after the drop down and not before the drop down
+	 * @return string                    HTML formated strings for drop down lists
+	 *                                   of date and time
 	 */
 	public function adbPrintDateTime(
-		$year,
-		$month,
-		$day,
-		$hour,
-		$min,
+		int|string $year,
+		int|string $month,
+		int|string $day,
+		int|string $hour,
+		int|string $min,
 		string $suffix = '',
 		int $min_steps = 1,
 		bool $name_pos_back = false

www/lib/CoreLibs/Admin/EditBase.php

@@ -414,6 +414,8 @@ class EditBase
 					$elements[] = $this->form->formCreateElement('additional_acl');
 					break;
 				case 'edit_schemes':
+					// @deprecated Will be removed
+				case 'edit_schemas':
 					$elements[] = $this->form->formCreateElement('enabled');
 					$elements[] = $this->form->formCreateElement('name');
 					$elements[] = $this->form->formCreateElement('header_color');
@@ -532,7 +534,7 @@ class EditBase
 	 * @throws Exception
 	 * @throws SmartyException
 	 */
-	public function editBaseRun()
+	public function editBaseRun(): void
 	{
 		// set the template dir
 		// WARNING: this has a special check for the mailing tool layout (old layout)

www/lib/CoreLibs/Basic.php

@@ -672,9 +672,6 @@ class Basic
 	public static function arrayToString(array $array, string $connect_char): string
 	{
 		trigger_error('Method ' . __METHOD__ . ' is deprecated, use join()', E_USER_DEPRECATED);
-		if (!is_array($array)) {
-			$array = [];
-		}
 		return join($connect_char, $array);
 	}
 

www/lib/CoreLibs/Check/Colors.php

@@ -42,8 +42,11 @@ class Colors
 	 * @param  int|false $hsl_flag flag to check for hsl type
 	 * @return bool                True if no error, False if error
 	 */
-	private static function rgbHslContentCheck(string $color, $rgb_flag, $hsl_flag): bool
-	{
+	private static function rgbHslContentCheck(
+		string $color,
+		int|false $rgb_flag,
+		int|false $hsl_flag
+	): bool {
 		// extract string between () and split into elements
 		preg_match("/\((.*)\)/", $color, $matches);
 		if (

www/lib/CoreLibs/Check/Encoding.php

@@ -25,7 +25,7 @@ class Encoding
 	 *                                 if null is set then "none"
 	 * @return void
 	 */
-	public static function setErrorChar($string): void
+	public static function setErrorChar(string|int|null $string): void
 	{
 		if (empty($string)) {
 			$string = 'none';
@@ -52,7 +52,7 @@ class Encoding
 	 *                                      directly
 	 * @return string|int Set error character
 	 */
-	public static function getErrorChar(bool $return_substitute_func = false)
+	public static function getErrorChar(bool $return_substitute_func = false): string|int
 	{
 		// return mb_substitute_character();
 		if ($return_substitute_func === true) {
@@ -78,14 +78,14 @@ class Encoding
 	 * @param  string     $string        string to test
 	 * @param  string     $from_encoding encoding of string to test
 	 * @param  string     $to_encoding   target encoding
-	 * @return bool|array<string>        false if no error or
+	 * @return array<string>|false       false if no error or
 	 *                                   array with failed characters
 	 */
 	public static function checkConvertEncoding(
 		string $string,
 		string $from_encoding,
 		string $to_encoding
-	) {
+	): array|false {
 		// convert to target encoding and convert back
 		$temp = mb_convert_encoding($string, $to_encoding, $from_encoding);
 		$compare = mb_convert_encoding($temp, $from_encoding, $to_encoding);

www/lib/CoreLibs/Check/Jason.php

@@ -32,7 +32,7 @@ class Jason
 	 *                                     or error string ('' for no error)
 	 * @deprecated Use Json::jsonGetLastError()
 	 */
-	public static function jsonGetLastError(bool $return_string = false)
+	public static function jsonGetLastError(bool $return_string = false): int|string
 	{
 		return Json::jsonGetLastError($return_string);
 	}

www/lib/CoreLibs/Combined/ArrayHandler.php

@@ -21,12 +21,12 @@ class ArrayHandler
 	 *                                      the needle can be found in the
 	 *                                      haystack array
 	 */
-	public static function arraySearchRecursive($needle, array $haystack, ?string $key_search_for = null): array
-	{
+	public static function arraySearchRecursive(
+		string|int $needle,
+		array $haystack,
+		?string $key_search_for = null
+	): array {
 		$path = [];
-		if (!is_array($haystack)) {
-			$haystack = [];
-		}
 		if (
 			$key_search_for != null &&
 			array_key_exists($key_search_for, $haystack) &&
@@ -72,7 +72,7 @@ class ArrayHandler
 	 *
 	 * @param  string|int        $needle         needle (search for)
 	 * @param  array<mixed>      $haystack       haystack (search in)
-	 * @param  string|int        $key_search_for the key to look for in
+	 * @param  string|int|null   $key_search_for the key to look for in
 	 * @param  bool              $old            [true], if set to false will
 	 *                                           return new flat layout
 	 * @param  array<mixed>|null $path           recursive call for previous path
@@ -80,9 +80,9 @@ class ArrayHandler
 	 *                                           the element was found
 	 */
 	public static function arraySearchRecursiveAll(
-		$needle,
+		string|int $needle,
 		array $haystack,
-		$key_search_for,
+		string|int|null $key_search_for,
 		bool $old = true,
 		?array $path = null
 	): ?array {
@@ -101,10 +101,6 @@ class ArrayHandler
 				$path['work'] = [];
 			}
 		}
-		// should not be needed because it would trigger a php mehtod error
-		if (!is_array($haystack)) {
-			$haystack = [];
-		}
 
 		// go through the array,
 		foreach ($haystack as $_key => $_value) {
@@ -152,17 +148,18 @@ class ArrayHandler
 	 * array search simple. looks for key, value combination, if found, returns true
 	 * on default does not strict check, so string '4' will match int 4 and vica versa
 	 *
-	 * @param  array<mixed> $array search in as array
-	 * @param  string|int  $key    key (key to search in)
-	 * @param  string|int  $value  value (what to find)
-	 * @param  bool        $strict [false], if set to true, will strict check key/value
-	 * @return bool                true on found, false on not found
+	 * @param  array<mixed>    $array search in as array
+	 * @param  string|int      $key    key (key to search in)
+	 * @param  string|int|bool $value  value (what to find)
+	 * @param  bool            $strict [false], if set to true, will strict check key/value
+	 * @return bool            true on found, false on not found
 	 */
-	public static function arraySearchSimple(array $array, $key, $value, bool $strict = false): bool
-	{
-		if (!is_array($array)) {
-			$array = [];
-		}
+	public static function arraySearchSimple(
+		array $array,
+		string|int $key,
+		string|int|bool $value,
+		bool $strict = false
+	): bool {
 		foreach ($array as $_key => $_value) {
 			// if value is an array, we search
 			if (is_array($_value)) {
@@ -189,9 +186,9 @@ class ArrayHandler
 	 *         bool  key flag: true: handle keys as string or int
 	 *               default false: all keys are string
 	 *
-	 * @return array<mixed>|bool merged array
+	 * @return array<mixed>|false merged array
 	 */
-	public static function arrayMergeRecursive()
+	public static function arrayMergeRecursive(): array|false
 	{
 		// croak on not enough arguemnts (we need at least two)
 		if (func_num_args() < 2) {
@@ -264,10 +261,10 @@ class ArrayHandler
 	 * @param  array<mixed> $needle   elements to search for
 	 * @param  array<mixed> $haystack array where the $needle elements should
 	 *                                be searched int
-	 * @return array<mixed>|bool      either the found elements or
+	 * @return array<mixed>|false     either the found elements or
 	 *                                false for nothing found or error
 	 */
-	public static function inArrayAny(array $needle, array $haystack)
+	public static function inArrayAny(array $needle, array $haystack): array|false
 	{
 		$found = [];
 		foreach ($needle as $element) {
@@ -291,8 +288,12 @@ class ArrayHandler
 	 * @param  bool            $set_only flag to return all (default), or set only
 	 * @return array<mixed>              associative array
 	 */
-	public static function genAssocArray(array $db_array, $key, $value, bool $set_only = false): array
-	{
+	public static function genAssocArray(
+		array $db_array,
+		string|int|bool $key,
+		string|int|bool $value,
+		bool $set_only = false
+	): array {
 		$ret_array = [];
 		// do this to only run count once
 		for ($i = 0, $iMax = count($db_array); $i < $iMax; $i++) {
@@ -385,11 +386,8 @@ class ArrayHandler
 	 *                              and will be pushed up
 	 * @return array<mixed>         modified, flattened array
 	 */
-	public static function arrayFlatForKey(array $array, $search): array
+	public static function arrayFlatForKey(array $array, string|int $search): array
 	{
-		if (!is_array($array)) {
-			$array = [];
-		}
 		foreach ($array as $key => $value) {
 			// if it is not an array do just nothing
 			if (!is_array($value)) {

www/lib/CoreLibs/Combined/DateTime.php

@@ -74,7 +74,7 @@ class DateTime
 	 * @return string                    formated date+time in Y-M-D h:m:s ms
 	 */
 	public static function dateStringFormat(
-		$timestamp,
+		int|float $timestamp,
 		bool $show_micro = false,
 		bool $micro_as_float = false
 	): string {
@@ -100,8 +100,10 @@ class DateTime
 	 * @param  bool             $show_micro show micro seconds, default true
 	 * @return string                       interval formatted string or string as is
 	 */
-	public static function timeStringFormat($timestamp, bool $show_micro = true): string
-	{
+	public static function timeStringFormat(
+		string|int|float $timestamp,
+		bool $show_micro = true
+	): string {
 		// check if the timestamp has any h/m/s/ms inside, if yes skip
 		if (!preg_match("/(h|m|s|ms)/", (string)$timestamp)) {
 			list($timestamp, $ms) = array_pad(explode('.', (string)round((float)$timestamp, 4)), 2, null);
@@ -157,7 +159,7 @@ class DateTime
 	 * @param  string|int|float $timestring formatted interval
 	 * @return string|int|float             converted float interval, or string as is
 	 */
-	public static function stringToTime($timestring)
+	public static function stringToTime(string|int|float $timestring): string|int|float
 	{
 		$timestamp = 0;
 		if (preg_match("/(d|h|m|s|ms)/", (string)$timestring)) {
@@ -247,9 +249,9 @@ class DateTime
 	 * @param  string $date a date string in the format YYYY-MM-DD
 	 * @return bool         true if valid date, false if date not valid
 	 */
-	public static function checkDate($date): bool
+	public static function checkDate(string $date): bool
 	{
-		if (!$date) {
+		if (empty($date)) {
 			return false;
 		}
 		list ($year, $month, $day) = array_pad(
@@ -324,7 +326,7 @@ class DateTime
 	 * @return int|bool           false on error
 	 *                            or int -1 (s<e)/0 (s=e)/1 (s>e) as difference
 	 */
-	public static function compareDate($start_date, $end_date)
+	public static function compareDate(string $start_date, string $end_date): int|bool
 	{
 		// pre check for empty or wrong
 		if ($start_date == '--' || $end_date == '--' || !$start_date || !$end_date) {
@@ -367,7 +369,7 @@ class DateTime
 	 * @return int|bool               false for error
 	 *                                or -1 (s<e)/0 (s=e)/1 (s>e) as difference
 	 */
-	public static function compareDateTime($start_datetime, $end_datetime)
+	public static function compareDateTime(string $start_datetime, string $end_datetime): int|bool
 	{
 		// pre check for empty or wrong
 		if ($start_datetime == '--' || $end_datetime == '--' || !$start_datetime || !$end_datetime) {
@@ -402,8 +404,11 @@ class DateTime
 	 * @param  bool   $return_named return array type, false (default), true for named
 	 * @return array<mixed>         0/overall, 1/weekday, 2/weekend
 	 */
-	public static function calcDaysInterval($start_date, $end_date, bool $return_named = false): array
-	{
+	public static function calcDaysInterval(
+		string $start_date,
+		string $end_date,
+		bool $return_named = false
+	): array {
 		// pos 0 all, pos 1 weekday, pos 2 weekend
 		$days = [];
 		// if anything invalid, return 0,0,0

www/lib/CoreLibs/Convert/Byte.php

@@ -39,7 +39,7 @@ class Byte
 	 * @return string                  converted byte number (float) with suffix
 	 * @throws \Exception               1: no valid flag set
 	 */
-	public static function humanReadableByteFormat($bytes, int $flags = 0): string
+	public static function humanReadableByteFormat(string|int|float $bytes, int $flags = 0): string
 	{
 		// if not numeric, return as is
 		if (is_numeric($bytes)) {
@@ -121,7 +121,7 @@ class Byte
 	 * @return string|int|float         converted value or original value
 	 * @throws \Exception                1: no valid flag set
 	 */
-	public static function stringByteFormat($number, int $flags = 0)
+	public static function stringByteFormat(string|int|float $number, int $flags = 0): string|int|float
 	{
 		// use SI 1000 mod and not 1024 mod
 		if ($flags & self::BYTE_FORMAT_SI) {

www/lib/CoreLibs/Convert/Colors.php

@@ -31,8 +31,12 @@ class Colors
 	 * @return string|bool        rgb in hex values with leading # if set,
 	 *                            false for invalid color
 	 */
-	public static function rgb2hex(int $red, int $green, int $blue, bool $hex_prefix = true)
-	{
+	public static function rgb2hex(
+		int $red,
+		int $green,
+		int $blue,
+		bool $hex_prefix = true
+	): string|bool {
 		$hex_color = '';
 		if ($hex_prefix === true) {
 			$hex_color = '#';
@@ -61,7 +65,7 @@ class Colors
 		string $hexStr,
 		bool $return_as_string = false,
 		string $seperator = ','
-	) {
+	): string|array|bool {
 		$hexStr = preg_replace("/[^0-9A-Fa-f]/", '', $hexStr); // Gets a proper hex string
 		if (!is_string($hexStr)) {
 			return false;
@@ -99,7 +103,7 @@ class Colors
 	 * @return array<int|float>|bool Hue, Sat, Brightness/Value
 	 *                               false for input value error
 	 */
-	public static function rgb2hsb(int $red, int $green, int $blue)
+	public static function rgb2hsb(int $red, int $green, int $blue): array|bool
 	{
 		// check that rgb is from 0 to 255
 		foreach (['red', 'green', 'blue'] as $c) {
@@ -146,7 +150,7 @@ class Colors
 	 * @return array<int>|bool 0 red/1 green/2 blue array as 0-255
 	 *                         false for input value error
 	 */
-	public static function hsb2rgb(float $H, float $S, float $V)
+	public static function hsb2rgb(float $H, float $S, float $V): array|bool
 	{
 		// check that H is 0 to 359, 360 = 0
 		// and S and V are 0 to 1
@@ -232,7 +236,7 @@ class Colors
 	 * @return array<float>|bool hue/sat/luminance
 	 *                           false for input value error
 	 */
-	public static function rgb2hsl(int $red, int $green, int $blue)
+	public static function rgb2hsl(int $red, int $green, int $blue): array|bool
 	{
 		// check that rgb is from 0 to 255
 		foreach (['red', 'green', 'blue'] as $c) {
@@ -285,11 +289,8 @@ class Colors
 	 * @param  float $lum                luminance: 0-100
 	 * @return array<int,float|int>|bool red/blue/green 0-255 each
 	 */
-	public static function hsl2rgb(float $hue, float $sat, float $lum)
+	public static function hsl2rgb(float $hue, float $sat, float $lum): array|bool
 	{
-		if (!is_numeric($hue)) {
-			return false;
-		}
 		if ($hue == 360) {
 			$hue = 0;
 		}

www/lib/CoreLibs/Convert/Extends/SetVarTypeMain.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace CoreLibs\Convert\Extends;
 
-class VarSetTypeMain
+class SetVarTypeMain
 {
 	/**
 	 * If input variable is string then returns it, else returns default set

www/lib/CoreLibs/Convert/Html.php

@@ -19,7 +19,7 @@ class Html
 	 * @param  mixed $string string to html encode
 	 * @return mixed         if string, encoded, else as is (eg null)
 	 */
-	public static function htmlent($string)
+	public static function htmlent(mixed $string): mixed
 	{
 		if (is_string($string)) {
 			return htmlentities($string, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
@@ -52,7 +52,7 @@ class Html
 	 * @return ?string                       returns checked or selected,
 	 *                                       else returns null
 	 */
-	public static function checked($haystack, string $needle, int $type = 0): ?string
+	public static function checked(array|string $haystack, string $needle, int $type = 0): ?string
 	{
 		if (is_array($haystack)) {
 			if (in_array($needle, $haystack)) {

www/lib/CoreLibs/Convert/Json.php

@@ -51,13 +51,13 @@ class Json
 	/**
 	 * returns human readable string for json errors thrown in jsonConvertToArray
 	 *
-	 * @param  bool|boolean $return_string [default=false] if set to true
-	 *                                     it will return the message string and not
-	 *                                     the error number
-	 * @return int|string                  Either error number (0 for no error)
-	 *                                     or error string ('' for no error)
+	 * @param  bool       $return_string [default=false] if set to true
+	 *                                   it will return the message string and not
+	 *                                   the error number
+	 * @return int|string                Either error number (0 for no error)
+	 *                                   or error string ('' for no error)
 	 */
-	public static function jsonGetLastError(bool $return_string = false)
+	public static function jsonGetLastError(bool $return_string = false): int|string
 	{
 		$json_error_string = '';
 		// valid errors as of php 8.0

www/lib/CoreLibs/Convert/Math.php

@@ -48,7 +48,7 @@ class Math
 	 * @param  string|int|float $number string or number to check
 	 * @return float                    if not number, then returns 0, else original input
 	 */
-	public static function initNumeric($number): float
+	public static function initNumeric(string|int|float $number): float
 	{
 		if (!is_numeric($number)) {
 			return 0;

www/lib/CoreLibs/Convert/SetVarType.php

@@ -11,9 +11,9 @@ declare(strict_types=1);
 
 namespace CoreLibs\Convert;
 
-use CoreLibs\Convert\Extends\VarSetTypeMain;
+use CoreLibs\Convert\Extends\SetVarTypeMain;
 
-class VarSetType extends Extends\VarSetTypeMain
+class SetVarType extends Extends\SetVarTypeMain
 {
 	/**
 	 * Check is input is string, if not return default string.
@@ -25,7 +25,7 @@ class VarSetType extends Extends\VarSetTypeMain
 	 */
 	public static function setStr(mixed $val, string $default = ''): string
 	{
-		return (string)VarSetTypeMain::setStrMain($val, $default, false);
+		return (string)SetVarTypeMain::setStrMain($val, $default, false);
 	}
 
 	/**
@@ -39,7 +39,7 @@ class VarSetType extends Extends\VarSetTypeMain
 	 */
 	public static function makeStr(mixed $val, string $default = ''): string
 	{
-		return (string)VarSetTypeMain::makeStrMain($val, $default, false);
+		return (string)SetVarTypeMain::makeStrMain($val, $default, false);
 	}
 
 	/**
@@ -52,7 +52,7 @@ class VarSetType extends Extends\VarSetTypeMain
 	 */
 	public static function setInt(mixed $val, int $default = 0): int
 	{
-		return (int)VarSetTypeMain::setIntMain($val, $default, false);
+		return (int)SetVarTypeMain::setIntMain($val, $default, false);
 	}
 
 	/**
@@ -65,7 +65,7 @@ class VarSetType extends Extends\VarSetTypeMain
 	 */
 	public static function makeInt(mixed $val, int $default = 0): int
 	{
-		return (int)VarSetTypeMain::makeIntMain($val, $default, false);
+		return (int)SetVarTypeMain::makeIntMain($val, $default, false);
 	}
 
 	/**
@@ -78,7 +78,7 @@ class VarSetType extends Extends\VarSetTypeMain
 	 */
 	public static function setFloat(mixed $val, float $default = 0.0): float
 	{
-		return (float)VarSetTypeMain::setFloatMain($val, $default, false);
+		return (float)SetVarTypeMain::setFloatMain($val, $default, false);
 	}
 
 	/**
@@ -91,7 +91,7 @@ class VarSetType extends Extends\VarSetTypeMain
 	 */
 	public static function makeFloat(mixed $val, float $default = 0.0): float
 	{
-		return (float)VarSetTypeMain::makeFloatMain($val, $default, false);
+		return (float)SetVarTypeMain::makeFloatMain($val, $default, false);
 	}
 
 	/**
@@ -104,7 +104,7 @@ class VarSetType extends Extends\VarSetTypeMain
 	 */
 	public static function setArray(mixed $val, array $default = []): array
 	{
-		return (array)VarSetTypeMain::setArrayMain($val, $default, false);
+		return (array)SetVarTypeMain::setArrayMain($val, $default, false);
 	}
 
 	/**
@@ -117,7 +117,7 @@ class VarSetType extends Extends\VarSetTypeMain
 	 */
 	public static function setBool(mixed $val, bool $default = false): bool
 	{
-		return (bool)VarSetTypeMain::setBoolMain($val, $default, false);
+		return (bool)SetVarTypeMain::setBoolMain($val, $default, false);
 	}
 
 	/**
@@ -129,7 +129,7 @@ class VarSetType extends Extends\VarSetTypeMain
 	 */
 	public static function makeBool(mixed $val, bool $default = false): bool
 	{
-		return (bool)VarSetTypeMain::makeBoolMain($val, $default, false);
+		return (bool)SetVarTypeMain::makeBoolMain($val, $default, false);
 	}
 }
 

www/lib/CoreLibs/Convert/SetVarTypeNull.php

@@ -9,9 +9,9 @@ declare(strict_types=1);
 
 namespace CoreLibs\Convert;
 
-use CoreLibs\Convert\Extends\VarSetTypeMain;
+use CoreLibs\Convert\Extends\SetVarTypeMain;
 
-class VarSetTypeNull extends Extends\VarSetTypeMain
+class SetVarTypeNull extends Extends\SetVarTypeMain
 {
 	/**
 	 * Check is input is string, if not return default string.
@@ -23,7 +23,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
 	 */
 	public static function setStr(mixed $val, ?string $default = null): ?string
 	{
-		return VarSetTypeMain::setStrMain($val, $default, true);
+		return SetVarTypeMain::setStrMain($val, $default, true);
 	}
 
 	/**
@@ -37,7 +37,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
 	 */
 	public static function makeStr(mixed $val, string $default = null): ?string
 	{
-		return VarSetTypeMain::makeStrMain($val, $default, true);
+		return SetVarTypeMain::makeStrMain($val, $default, true);
 	}
 
 
@@ -50,7 +50,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
 	 */
 	public static function setInt(mixed $val, ?int $default = null): ?int
 	{
-		return VarSetTypeMain::setIntMain($val, $default, true);
+		return SetVarTypeMain::setIntMain($val, $default, true);
 	}
 
 	/**
@@ -62,7 +62,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
 	 */
 	public static function makeInt(mixed $val, int $default = null): ?int
 	{
-		return VarSetTypeMain::makeIntMain($val, $default, true);
+		return SetVarTypeMain::makeIntMain($val, $default, true);
 	}
 
 	/**
@@ -74,7 +74,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
 	 */
 	public static function setFloat(mixed $val, ?float $default = null): ?float
 	{
-		return VarSetTypeMain::setFloatMain($val, $default, true);
+		return SetVarTypeMain::setFloatMain($val, $default, true);
 	}
 
 	/**
@@ -86,7 +86,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
 	 */
 	public static function makeFloat(mixed $val, float $default = null): ?float
 	{
-		return VarSetTypeMain::makeFloatMain($val, $default, true);
+		return SetVarTypeMain::makeFloatMain($val, $default, true);
 	}
 
 	/**
@@ -98,7 +98,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
 	 */
 	public static function setArray(mixed $val, ?array $default = null): ?array
 	{
-		return VarSetTypeMain::setArrayMain($val, $default, true);
+		return SetVarTypeMain::setArrayMain($val, $default, true);
 	}
 
 	/**
@@ -110,7 +110,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
 	 */
 	public static function setBool(mixed $val, ?bool $default = null): ?bool
 	{
-		return VarSetTypeMain::setBoolMain($val, $default, true);
+		return SetVarTypeMain::setBoolMain($val, $default, true);
 	}
 
 	/**
@@ -123,7 +123,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
 	{
 		// note that the default value here is irrelevant, we return null
 		// on unsetable string var
-		return VarSetTypeMain::makeBoolMain($val, false, true);
+		return SetVarTypeMain::makeBoolMain($val, false, true);
 	}
 }
 

www/lib/CoreLibs/Create/RandomKey.php

@@ -32,7 +32,7 @@ class RandomKey
 	 *
 	 * @return void has no return
 	 */
-	private static function initRandomKeyData()
+	private static function initRandomKeyData(): void
 	{
 		// random key generation base string
 		self::$key_range = join('', array_merge(
@@ -52,7 +52,6 @@ class RandomKey
 	private static function validateRandomKeyLenght(int $key_length): bool
 	{
 		if (
-			is_numeric($key_length) &&
 			$key_length > 0 &&
 			$key_length <= self::$max_key_length
 		) {

www/lib/CoreLibs/Create/Session.php

@@ -18,19 +18,6 @@ class Session
 	/** @var string list for errors */
 	private $session_intern_error_str = '';
 
-	/**
-	 * Start session
-	 * startSession should be called for complete check
-	 * If this is called without any name set before the php.ini name is
-	 * used.
-	 *
-	 * @return void
-	 */
-	protected function startSessionCall(): void
-	{
-		session_start();
-	}
-
 	/**
 	 * init a session, if array is empty or array does not have session_name set
 	 * then no auto init is run
@@ -44,6 +31,19 @@ class Session
 		}
 	}
 
+	/**
+	 * Start session
+	 * startSession should be called for complete check
+	 * If this is called without any name set before the php.ini name is
+	 * used.
+	 *
+	 * @return void
+	 */
+	protected function startSessionCall(): void
+	{
+		session_start();
+	}
+
 	/**
 	 * check if we are in CLI, we set this, so we can mock this
 	 * Not this is just a wrapper for the static System::checkCLI call
@@ -116,7 +116,7 @@ class Session
 	 * @param string|null $session_name
 	 * @return string|bool
 	 */
-	public function startSession(?string $session_name = null)
+	public function startSession(?string $session_name = null): string|bool
 	{
 		// we can't start sessions on command line
 		if ($this->checkCliStatus()) {
@@ -163,7 +163,7 @@ class Session
 	 *
 	 * @return string|bool
 	 */
-	public function getSessionId()
+	public function getSessionId(): string|bool
 	{
 		return session_id();
 	}
@@ -173,7 +173,7 @@ class Session
 	 *
 	 * @return string|bool
 	 */
-	public function getSessionName()
+	public function getSessionName(): string|bool
 	{
 		return session_name();
 	}
@@ -275,7 +275,7 @@ class Session
 	 * @param  mixed      $value value to set (can be anything)
 	 * @return void
 	 */
-	public function setS($name, $value): void
+	public function setS(string|int $name, mixed $value): void
 	{
 		$_SESSION[$name] = $value;
 	}
@@ -286,7 +286,7 @@ class Session
 	 * @param  string|int $name value key to get from _SESSION
 	 * @return mixed            value stored in _SESSION
 	 */
-	public function getS($name)
+	public function getS(string|int $name): mixed
 	{
 		return $_SESSION[$name] ?? '';
 	}
@@ -297,7 +297,7 @@ class Session
 	 * @param  string|int $name Name to check for
 	 * @return bool             True for set, False fornot set
 	 */
-	public function issetS($name): bool
+	public function issetS(string|int $name): bool
 	{
 		return isset($_SESSION[$name]);
 	}
@@ -308,7 +308,7 @@ class Session
 	 * @param  string|int $name _SESSION key name to remove
 	 * @return void
 	 */
-	public function unsetS($name): void
+	public function unsetS(string|int $name): void
 	{
 		if (isset($_SESSION[$name])) {
 			unset($_SESSION[$name]);
@@ -325,7 +325,7 @@ class Session
 	 * @param  mixed      $value
 	 * @return void
 	 */
-	public function __set($name, $value): void
+	public function __set(string|int $name, mixed $value): void
 	{
 		$_SESSION[$name] = $value;
 	}
@@ -334,13 +334,14 @@ class Session
 	 * Undocumented function
 	 *
 	 * @param  string|int $name
-	 * @return mixed
+	 * @return mixed            If name is not found, it will return null
 	 */
-	public function __get($name)
+	public function __get(string|int $name): mixed
 	{
 		if (isset($_SESSION[$name])) {
 			return $_SESSION[$name];
 		}
+		return null;
 	}
 
 	/**
@@ -349,7 +350,7 @@ class Session
 	 * @param  string|int $name
 	 * @return bool
 	 */
-	public function __isset($name): bool
+	public function __isset(string|int $name): bool
 	{
 		return isset($_SESSION[$name]);
 	}
@@ -360,7 +361,7 @@ class Session
 	 * @param  string|int $name
 	 * @return void
 	 */
-	public function __unset($name): void
+	public function __unset(string|int $name): void
 	{
 		if (isset($_SESSION[$name])) {
 			unset($_SESSION[$name]);

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

@@ -137,7 +137,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	 * @param  string $text any html encoded string
 	 * @return string       decoded html string
 	 */
-	public function convertData($text): string
+	public function convertData(string $text): string
 	{
 		$text = str_replace('&lt;b&gt;', '<b>', $text);
 		$text = str_replace('&lt;/b&gt;', '</b>', $text);
@@ -156,7 +156,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	 * @param  string $text encoded html string
 	 * @return string       decoded html string
 	 */
-	public function convertEntities($text): string
+	public function convertEntities(string $text): string
 	{
 		$text = str_replace('&lt;', '<', $text);
 		$text = str_replace('&gt;', '>', $text);
@@ -172,7 +172,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	 * @param  bool   $write write to error message, default false
 	 * @return string        the array data as html string entry
 	 */
-	public function dbDumpArray($write = false): string
+	public function dbDumpArray(bool $write = false): string
 	{
 		reset($this->table_array);
 		$string = '';
@@ -192,7 +192,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	 *
 	 * @return bool true if pk value is set, else false
 	 */
-	public function dbCheckPkSet()
+	public function dbCheckPkSet(): bool
 	{
 		// if pk_id is set, overrule ...
 		if ($this->pk_id) {
@@ -210,10 +210,10 @@ class ArrayIO extends \CoreLibs\DB\IO
 
 	/**
 	 * resets the whole array values
-	 * @param  boolean $reset_pk true if we want to reset the pk too
+	 * @param  bool $reset_pk true if we want to reset the pk too
 	 * @return void              has no return
 	 */
-	public function dbResetArray($reset_pk = false): void
+	public function dbResetArray(bool $reset_pk = false): void
 	{
 		reset($this->table_array);
 		foreach (array_keys($this->table_array) as $column) {
@@ -230,10 +230,10 @@ class ArrayIO extends \CoreLibs\DB\IO
 	 *
 	 * @param  array<mixed> $table_array optional override for table array set
 	 *                                   set this as new table array too
-	 * @param  boolean      $acl_limit   [false], if set to true, well do ACL limit check
+	 * @param  bool      $acl_limit   [false], if set to true, well do ACL limit check
 	 * @return array<mixed>              returns the table array that was deleted
 	 */
-	public function dbDelete($table_array = [], $acl_limit = false)
+	public function dbDelete(array $table_array = [], bool $acl_limit = false): array
 	{
 		// is array and has values, override set and set new
 		if (is_array($table_array) && count($table_array)) {
@@ -294,12 +294,12 @@ class ArrayIO extends \CoreLibs\DB\IO
 	/**
 	 * reads one row into the array
 	 *
-	 * @param  boolean      $edit        on true convert data, else as is
+	 * @param  bool      $edit        on true convert data, else as is
 	 * @param  array<mixed> $table_array optional table array, overwrites
 	 *                                   internal set array
 	 * @return array<mixed>              set table array with values
 	 */
-	public function dbRead($edit = false, $table_array = [])
+	public function dbRead(bool $edit = false, array $table_array = []): array
 	{
 		// if array give, overrules internal array
 		if (is_array($table_array) && count($table_array)) {
@@ -381,9 +381,9 @@ class ArrayIO extends \CoreLibs\DB\IO
 	/**
 	 * writes one set into DB or updates one set (if PK exists)
 	 *
-	 * @param  boolean      $addslashes  old convert entities and set set escape
+	 * @param  bool      $addslashes  old convert entities and set set escape
 	 * @param  array<mixed> $table_array optional table array, overwrites internal one
-	 * @param  boolean      $acl_limit   [false], if set to true, well do ACL limit check
+	 * @param  bool      $acl_limit   [false], if set to true, well do ACL limit check
 	 * @return array<mixed>              table array or null
 	 */
 	public function dbWrite(
@@ -391,7 +391,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 		array $table_array = [],
 		bool $acl_limit = false
 	): array {
-		if (is_array($table_array) && count($table_array)) {
+		if (count($table_array)) {
 			$this->table_array = $table_array;
 		}
 		// PK ID check
@@ -475,13 +475,12 @@ class ArrayIO extends \CoreLibs\DB\IO
 				$this->table_array[$column]['type'] != 'view' &&
 				strlen($column) > 0 &&
 				// no acl limiter
-				($acl_limit === false ||
 				(
+					$acl_limit === false ||
 					// acl limit is true, min edit must be at larger than set
-					$acl_limit === true &&
 					$this->base_acl_level >=
 						($this->table_array[$column]['min_edit_acl'] ?? 100)
-				))
+				)
 			) {
 				// for password use hidden value if main is not set
 				if (
@@ -528,7 +527,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 					}
 					$q_data .= $_value;
 				} elseif (isset($this->table_array[$column]['bool'])) {
-					// boolean storeage (reverse check on ifset)
+					// bool storage (reverse check on ifset)
 					$q_data .= "'" . $this->dbBoolean($this->table_array[$column]['value'], true) . "'";
 				} elseif (
 					isset($this->table_array[$column]['interval']) ||

www/lib/CoreLibs/DB/IO.php

@@ -12,7 +12,7 @@
 *   2013/10/10, prepare/excute were added, including auto RETURNING primary key if
 *   possible for any INSERT query in exec or prepare/execute, better debugging and
 *   data dumping. Proper string escape wrapper, special db exec writer for complex
-*   array inserts in auto calls. boolean converter from postresql to php
+*   array inserts in auto calls. bool converter from postresql to php
 *
 *   2003/12/08, one major change: renamed db_exec_ext to db_return, as it has not
 *   much in common with the normal db_exec wrapper, as it was written only for
@@ -168,7 +168,7 @@
 *     - all HTML from the query data (color codes, etc) via flag to debug call
 *
 * HISTORY:
-* 2008/10/25 (cs) add db_boolean to fix the postgres to php boolean var problem
+* 2008/10/25 (cs) add db_boolean to fix the postgres to php bool var problem
 *                 (TODO: implement this in any select return)
 * 2008/07/03 (cs) add db_write_data function, original written for inventory tool "invSQLWriteData"
 * 2008/04/16 (cs) add db_escape_string function for correct string escape
@@ -288,7 +288,7 @@ class IO
 	private $query; // the query string at the moment
 	// only inside
 	// basic vars
-	/** @var object|resource|bool|int|null */ // replace object with PgSql\Connection|
+	/** @var \PgSql\Connection|false|null */ // replace object with PgSql\Connection|
 	private $dbh; // the dbh handler, if disconnected by command is null, bool:false/int:-1 on error,
 	/** @var bool */
 	private $db_debug = false; // DB_DEBUG ... (if set prints out debug msgs)
@@ -315,7 +315,7 @@ class IO
 	/** @var array<mixed,mixed> */
 	private $cursor_ext; // hash of hashes
 	// per query vars
-	/** @var object|resource|bool */ // replace object with PgSql\Result
+	/** @var \PgSql\Result|false */ // replace object with PgSql\Result
 	private $cursor; // actual cursor (DBH)
 	/** @var int */
 	private $num_rows; // how many rows have been found
@@ -495,15 +495,15 @@ class IO
 	 * OTOH this whole class is so PgSQL specific
 	 * that non PgSQL doesn't make much sense anymore
 	 *
-	 * @return \CoreLibs\DB\SQL\PgSQL|null DB functions object or false on error
+	 * @return SQL\PgSQL|null DB functions object or false on error
 	 */
-	private function __loadDBFunctions()
+	private function __loadDBFunctions(): SQL\PgSQL|null
 	{
 		$db_functions = null;
 		switch ($this->db_type) {
 			// list of valid DB function objects
 			case 'pgsql':
-				$db_functions = new \CoreLibs\DB\SQL\PgSQL();
+				$db_functions = new SQL\PgSQL();
 				break;
 			// if non set or none matching abort
 			default:
@@ -566,7 +566,7 @@ class IO
 	 */
 	private function __closeDB(): void
 	{
-		if (!empty($this->dbh) && $this->dbh !== false) {
+		if (!empty($this->dbh)) {
 			$this->db_functions->__dbClose();
 			$this->dbh = null;
 		}
@@ -632,9 +632,6 @@ class IO
 	private function __printArray(array $array): string
 	{
 		$string = '';
-		if (!is_array($array)) {
-			$array = [];
-		}
 		foreach ($array as $key => $value) {
 			$string .= $this->nbsp . '<b>' . $key . '</b> => ';
 			if (is_array($value)) {
@@ -701,7 +698,7 @@ class IO
 
 	/**
 	 * Check if there is a cursor and write this cursors error info
-	 * @param object|resource|bool $cursor current cursor for pg_result_error,
+	 * @param \PgSql\Result|false $cursor current cursor for pg_result_error,
 	 *                             pg_last_error too, but pg_result_error
 	 *                             is more accurate (PgSql\Result)
 	 * @return array<mixed> Pos 0: if we could get the method where it was called
@@ -709,7 +706,7 @@ class IO
 	 *                      Pos 1: if we have the pg_error_string from last error
 	 *                             if nothing then empty string
 	 */
-	private function __dbErrorPreprocessor($cursor = false): array
+	private function __dbErrorPreprocessor(\PgSql\Result|false $cursor = false): array
 	{
 		$pg_error_string = '';
 		// 1 = self/__dbErrorPreprocessor, 2 = __dbError, __dbWarning,
@@ -774,12 +771,15 @@ class IO
 	/**
 	 * write an error
 	 * @param integer $error_id            Any Error ID, used in debug message string
-	 * @param object|resource|bool $cursor Optional cursor, passed on to preprocessor
+	 * @param \PgSql\Result|false $cursor Optional cursor, passed on to preprocessor
 	 * @param string $msg                  optional message added to debug
 	 * @return void
 	 */
-	protected function __dbError(int $error_id, $cursor = false, string $msg = ''): void
-	{
+	protected function __dbError(
+		int $error_id,
+		\PgSql\Result|false $cursor = false,
+		string $msg = ''
+	): void {
 		$error_id = (string)$error_id;
 		[$where_called, $pg_error_string] = $this->__dbErrorPreprocessor($cursor);
 		// write error msg ...
@@ -798,12 +798,15 @@ class IO
 	/**
 	 * write a warning
 	 * @param integer $warning_id          Integer warning id added to debug
-	 * @param object|resource|bool $cursor Optional cursor, passed on to preprocessor
+	 * @param \PgSql\Result|false $cursor Optional cursor, passed on to preprocessor
 	 * @param string $msg                  optional message added to debug
 	 * @return void
 	 */
-	protected function __dbWarning(int $warning_id, $cursor = false, string $msg = ''): void
-	{
+	protected function __dbWarning(
+		int $warning_id,
+		\PgSql\Result|false $cursor = false,
+		string $msg = ''
+	): void {
 		$warning_id = (string)$warning_id;
 		[$where_called, $pg_error_string] = $this->__dbErrorPreprocessor($cursor);
 		$this->__dbDebug(
@@ -821,18 +824,18 @@ class IO
 	/**
 	 * if there is the 'to_encoding' var set,
 	 * and the field is in the wrong encoding converts it to the target
-	 * @param  array<mixed>|bool|null $row Array from fetch_row
-	 * @return array<mixed>|bool           Convert fetch_row array, or false
+	 * @param  array<mixed>|false $row Array from fetch_row
+	 * @return array<mixed>|false      Convert fetch_row array, or false
 	 */
-	private function __dbConvertEncoding($row)
+	private function __dbConvertEncoding(array|false $row): array|false
 	{
-		if ($row === null) {
+		if (is_bool($row)) {
 			return false;
 		}
 		// only do if array, else pass through row (can be false)
 		if (
 			!is_array($row) ||
-			empty($this->to_encoding)// || empty($this->db_encoding)
+			empty($this->to_encoding)
 		) {
 			return $row;
 		}
@@ -914,7 +917,7 @@ class IO
 	 * check if there is another query running, or do we hang after a
 	 * PHP error
 	 * @param  integer $timeout_seconds For complex timeout waits, default 3 seconds
-	 * @return boolean                  True for connection OK, else false
+	 * @return bool                  True for connection OK, else false
 	 */
 	private function __dbCheckConnectionOk(int $timeout_seconds = 3): bool
 	{
@@ -932,7 +935,7 @@ class IO
 	 * dbReturn
 	 * Read data from previous written data cache
 	 * @param  string  $query_hash The hash for the current query
-	 * @param  boolean $assoc_only Only return assoc value (key named)
+	 * @param  bool $assoc_only Only return assoc value (key named)
 	 * @return array<mixed>        Current position query data from cache
 	 */
 	private function __dbReturnCacheRead(string $query_hash, bool $assoc_only): array
@@ -983,10 +986,11 @@ class IO
 	 * - sets internal hash for query
 	 * - checks multiple call count
 	 * @param  string      $query   query string
-	 * @param  string      $pk_name primary key [if set to NULL no returning will be added]
-	 * @return string|bool          queryt hash OR boolean false on error
+	 * @param  string      $pk_name primary key
+	 *                              [if set to NULL no returning will be added]
+	 * @return string|false         queryt hash OR bool false on error
 	 */
-	private function __dbPrepareExec(string $query, string $pk_name)
+	private function __dbPrepareExec(string $query, string $pk_name): string|false
 	{
 		// reset current cursor before exec
 		$this->cursor = false;
@@ -1152,10 +1156,10 @@ class IO
 	 * insert_id_ext [DEPRECATED, all in insert_id_arr]
 	 * - holds all returning as array
 	 * TODO: Only use insert_id_arr and use functions to get ok array or single
-	 * @param boolean         $returning_id
+	 * @param bool         $returning_id
 	 * @param string          $query
 	 * @param string|null     $pk_name
-	 * @param object|resource|bool $cursor       (PgSql\Result)
+	 * @param \PgSql\Result|false $cursor       (PgSql\Result)
 	 * @param string|null     $stm_name     If not null, is dbExecutre run
 	 * @return void
 	 */
@@ -1163,7 +1167,7 @@ class IO
 		bool $returning_id,
 		string $query,
 		?string $pk_name,
-		$cursor,
+		\PgSql\Result|false $cursor,
 		?string $stm_name = null
 	): void {
 		// $this->log->debug('DB SET INSERT ID', 'Ret: ' . ($returning_id ? 'Y' : 'N')
@@ -1271,10 +1275,10 @@ class IO
 
 	/**
 	 * get certain settings like username, db name
-	 * @param  string $name what setting to query
-	 * @return mixed        setting value, if not allowed name return false
+	 * @param  string          $name what setting to query
+	 * @return int|string|bool       setting value, if not allowed name return false
 	 */
-	public function dbGetSetting(string $name)
+	public function dbGetSetting(string $name): int|string|bool
 	{
 		$setting = '';
 		switch ($name) {
@@ -1373,7 +1377,7 @@ class IO
 	 * extended version info, can access all additional information data
 	 * @param  string  $parameter Array parameter name, if not valid returns
 	 *                            empty string
-	 * @param  boolean $strip     Strip extended server info string, default true
+	 * @param  bool $strip     Strip extended server info string, default true
 	 *                            eg nn.n (other info) will only return nn.n
 	 * @return string             Parameter value
 	 */
@@ -1392,14 +1396,15 @@ class IO
 	}
 
 	/**
-	 * returns boolean true or false if the string matches the database version
+	 * returns bool true or false if the string matches the database version
 	 * @param  string $compare string to match in type =X.Y, >X.Y, <X.Y, <=X.Y, >=X.Y
 	 * @return bool            true for ok, false on not ok
 	 */
 	public function dbCompareVersion(string $compare): bool
 	{
 		$matches = [];
-		// compare has =, >, < prefix, and gets stripped, if the rest is not X.Y format then error
+		// compare has =, >, < prefix, and gets stripped
+		// if the rest is not X.Y format then error
 		preg_match("/^([<>=]{1,})(\d{1,})\.(\d{1,})/", $compare, $matches);
 		$compare = $matches[1];
 		$to_master = $matches[2];
@@ -1464,7 +1469,7 @@ class IO
 	 *                       else current cursor
 	 * @return string        Formated string with all the data in the array
 	 */
-	public function dbDumpData($query = ''): string
+	public function dbDumpData(string $query = ''): string
 	{
 		// set start array
 		if ($query) {
@@ -1490,7 +1495,7 @@ class IO
 	 * @param  string|int|float|bool $string string to escape
 	 * @return string                        escaped string
 	 */
-	public function dbEscapeString($string): string
+	public function dbEscapeString(string|int|float|bool $string): string
 	{
 		return $this->db_functions->__dbEscapeString($string);
 	}
@@ -1501,7 +1506,7 @@ class IO
 	 * @param  string|int|float|bool $string string to escape
 	 * @return string                        escaped string
 	 */
-	public function dbEscapeLiteral($string): string
+	public function dbEscapeLiteral(string|int|float|bool $string): string
 	{
 		return $this->db_functions->__dbEscapeLiteral($string);
 	}
@@ -1538,11 +1543,11 @@ class IO
 
 	/**
 	 * clear up any data for valid DB insert
-	 * @param  int|float|string|null $value to escape data
-	 * @param  string           $kbn   escape trigger type
-	 * @return string                  escaped value
+	 * @param  int|float|string|bool|null $value to escape data
+	 * @param  string                     $kbn   escape trigger type
+	 * @return string                            escaped value
 	 */
-	public function dbSqlEscape($value, string $kbn = '')
+	public function dbSqlEscape(int|float|string|bool|null $value, string $kbn = ''): string
 	{
 		switch ($kbn) {
 			case 'i':
@@ -1551,24 +1556,35 @@ class IO
 			case 'f':
 				$value = empty($value) ? 'NULL' : floatval($value);
 				break;
+			// string (null is null, else is string)
 			case 't':
 				$value = $value === null ?
 					'NULL' :
 					"'" . $this->dbEscapeString($value) . "'";
 				break;
+			// string litereal (null is null, else is stirng)
 			case 'tl':
 				$value = $value === null ?
 					'NULL' :
 					$this->dbEscapeLiteral($value);
 				break;
-			// what is d?
+			// escape string, set empty to null
 			case 'd':
-				$value = empty($value) ? 'NULL' : "'" . $this->dbEscapeString($value) . "'";
+				$value = empty($value) ?
+					'NULL' :
+					"'" . $this->dbEscapeString($value) . "'";
+				break;
+			// escape string literal, set empty to null
+			case 'dl':
+				$value = empty($value) ?
+					'NULL' :
+					$this->dbEscapeLiteral($value);
 				break;
 			// bytea data
 			case 'by':
 				$value = empty($value) ? 'NULL' : $this->dbEscapeBytea((string)$value);
 				break;
+			// bool
 			case 'b':
 				if (is_float($value)) {
 					$value = (int)$value;
@@ -1577,6 +1593,7 @@ class IO
 					'NULL' :
 					"'" . $this->dbBoolean($value, true) . "'";
 				break;
+			// int, but with empty value is 0
 			case 'i2':
 				$value = empty($value) ? 0 : intval($value);
 				break;
@@ -1590,14 +1607,14 @@ class IO
 
 	/**
 	 * if the input is a single char 't' or 'f
-	 * it will return the boolean value instead
+	 * it will return the bool value instead
 	 * also converts smallint 1/0 to true false
 	 * @param  string|bool|int $string 't' / 'f' or any string, or bool true/false
-	 * @param  boolean         $rev    do reverse (bool to string)
-	 * @return bool|string             correct php boolean true/false
+	 * @param  bool            $rev    do reverse (bool to string)
+	 * @return bool|string             correct php bool true/false
 	 *                                 or postgresql 't'/'f'
 	 */
-	public function dbBoolean($string, $rev = false)
+	public function dbBoolean(string|bool|int $string, bool $rev = false): bool|string
 	{
 		if (!$rev) {
 			if ($string == 't' || $string == 'true') {
@@ -1696,9 +1713,9 @@ class IO
 	 * returns an array of the table with columns and values. FALSE on no table found
 	 * @param  string     $table  table name
 	 * @param  string     $schema optional schema name
-	 * @return array<mixed>|bool  array of table data, false on error (table not found)
+	 * @return array<mixed>|false array of table data, false on error (table not found)
 	 */
-	public function dbShowTableMetaData(string $table, string $schema = '')
+	public function dbShowTableMetaData(string $table, string $schema = ''): array|false
 	{
 		$this->__dbErrorReset();
 		$table = (!empty($schema) ? $schema . '.' : '') . $table;
@@ -1736,14 +1753,14 @@ class IO
 	 *                            NO_CACHE/3: don't write cache
 	 * @param  bool   $assoc_only True to only returned the named and not
 	 *                            index position ones
-	 * @return array<mixed>|bool  return array data or false on error/end
+	 * @return array<mixed>|false return array data or false on error/end
 	 * @#suppress PhanTypeMismatchDimFetch
 	 */
 	public function dbReturn(
 		string $query,
 		int $cache = self::USE_CACHE,
 		bool $assoc_only = false
-	) {
+	): array|false {
 		$this->__dbErrorReset();
 		if (!$query) {
 			$this->__dbError(11);
@@ -1754,7 +1771,7 @@ class IO
 		// pre declare array
 		if (!isset($this->cursor_ext[$query_hash])) {
 			$this->cursor_ext[$query_hash] = [
-				// cursor, null: unset, 1: finished read/cache, 2: object/resource reading
+				// cursor, null: unset, 1: finished read/cache, 2: object reading
 				'cursor' => null,
 				// cached data
 				'data' => [],
@@ -1851,7 +1868,6 @@ class IO
 
 		// if cursor exists ...
 		if ($this->cursor_ext[$query_hash]['cursor']) {
-			/** @phpstan-ignore-next-line claims this is always false, but can be true */
 			if ($first_call === true) {
 				$this->cursor_ext[$query_hash]['log'][] = 'First call';
 				// count the rows returned (if select)
@@ -2001,9 +2017,9 @@ class IO
 	 *                         if pk name is table name and _id, pk_name
 	 *                         is not needed to be set
 	 *                         if NULL is given here, no RETURNING will be auto added
-	 * @return object|resource|bool    cursor for this query or false on error (PgSql\Result)
+	 * @return \PgSql\Result|false    cursor for this query or false on error
 	 */
-	public function dbExec(string $query = '', string $pk_name = '')
+	public function dbExec(string $query = '', string $pk_name = ''): \PgSql\Result|false
 	{
 		$this->__dbErrorReset();
 		// prepare and check if we can actually run it
@@ -2032,7 +2048,7 @@ class IO
 
 	/**
 	 * executes a cursor and returns the data, if no more data 0 will be returned
-	 * @param  object|resource|bool $cursor the cursor from db_exec or
+	 * @param  \PgSql\Result|false $cursor the cursor from db_exec or
 	 *                                       pg_query/pg_exec/mysql_query
 	 *                                       if not set will use internal cursor,
 	 *                                       if not found, stops with 0 (error)
@@ -2040,9 +2056,9 @@ class IO
 	 * @param  bool             $assoc_only  false is default,
 	 *                                       if true only named rows,
 	 *                                       not numbered index rows
-	 * @return array<mixed>|bool             row array or false on error
+	 * @return array<mixed>|false            row array or false on error
 	 */
-	public function dbFetchArray($cursor = false, bool $assoc_only = false)
+	public function dbFetchArray(\PgSql\Result|false $cursor = false, bool $assoc_only = false): array|false
 	{
 		$this->__dbErrorReset();
 		// set last available cursor if none set or false
@@ -2065,9 +2081,9 @@ class IO
 	 * returns the FIRST row of the given query
 	 * @param  string $query      the query to be executed
 	 * @param  bool   $assoc_only if true, only return assoc entry (default false)
-	 * @return array<mixed>|bool  row array or false on error
+	 * @return array<mixed>|false row array or false on error
 	 */
-	public function dbReturnRow(string $query, bool $assoc_only = false)
+	public function dbReturnRow(string $query, bool $assoc_only = false): array|false
 	{
 		$this->__dbErrorReset();
 		if (!$query) {
@@ -2092,9 +2108,9 @@ class IO
 	 * createds an array of hashes of the query (all data)
 	 * @param  string $query      the query to be executed
 	 * @param  bool   $assoc_only if true, only name ref are returned (default true)
-	 * @return array<mixed>|bool  array of hashes (row -> fields), false on error
+	 * @return array<mixed>|false array of hashes (row -> fields), false on error
 	 */
-	public function dbReturnArray(string $query, bool $assoc_only = true)
+	public function dbReturnArray(string $query, bool $assoc_only = true): array|false
 	{
 		$this->__dbErrorReset();
 		if (!$query) {
@@ -2152,41 +2168,44 @@ class IO
 	 * returns the full array for cursor ext
 	 * or cursor for one query
 	 * or detail data fonr one query cursor data
-	 * @param  string|null $query Query string, if not null convert to hash
-	 *                            and return set cursor ext for only this
-	 *                            if not found or null return null
-	 * @return array<mixed>|string|int|resource|object|null
-	 *                            Cursor Extended array full if no parameter
-	 *                            Key is hash string from query run
-	 *                            Or cursor data entry if query field is set
-	 *                            If nothing found return null
+	 * @param  string|null $query       Query string, if not null convert to hash
+	 *                                  and return set cursor ext for only this
+	 *                                  if not found or null return null
+	 * @param  string      $query_field [=''] optional query field to get
+	 * @return array<mixed>|string|int|\PgSql\Result|null
+	 *                                  Cursor Extended array full if no parameter
+	 *                                  Key is hash string from query run
+	 *                                  Or cursor data entry if query field is set
+	 *                                  If nothing found return null
 	 */
-	public function dbGetCursorExt($query = null, string $query_field = '')
-	{
-		if ($query !== null) {
-			$query_hash = $this->dbGetQueryHash($query);
-			if (
-				is_array($this->cursor_ext) &&
-				isset($this->cursor_ext[$query_hash])
-			) {
-				if (empty($query_field)) {
-					return $this->cursor_ext[$query_hash];
-				} else {
-					return $this->cursor_ext[$query_hash][$query_field] ?? null;
-				}
-			} else {
-				return null;
-			}
+	public function dbGetCursorExt(
+		$query = null,
+		string $query_field = ''
+	): array|string|int|\PgSql\Result|null {
+		if ($query === null) {
+			return $this->cursor_ext;
+		}
+		$query_hash = $this->dbGetQueryHash($query);
+		if (
+			is_array($this->cursor_ext) &&
+			isset($this->cursor_ext[$query_hash])
+		) {
+			if (empty($query_field)) {
+				return $this->cursor_ext[$query_hash];
+			} else {
+				return $this->cursor_ext[$query_hash][$query_field] ?? null;
+			}
+		} else {
+			return null;
 		}
-		return $this->cursor_ext;
 	}
 
 	/**
 	 * returns the current position the read out
 	 * @param  string   $query query to find in cursor_ext
-	 * @return int|bool        query position (row pos), false on error
+	 * @return int|false       query position (row pos), false on error
 	 */
-	public function dbGetCursorPos(string $query)
+	public function dbGetCursorPos(string $query): int|false
 	{
 		$this->__dbErrorReset();
 		if (!$query) {
@@ -2200,9 +2219,9 @@ class IO
 	/**
 	 * returns the number of rows for the current select query
 	 * @param  string   $query query to find in cursor_ext
-	 * @return int|bool        query position (row pos), false on error
+	 * @return int|false       query position (row pos), false on error
 	 */
-	public function dbGetCursorNumRows(string $query)
+	public function dbGetCursorNumRows(string $query): int|false
 	{
 		$this->__dbErrorReset();
 		if (!$query) {
@@ -2254,11 +2273,14 @@ class IO
 	 * @param  string        $stm_name statement name
 	 * @param  string        $query    queryt string to run
 	 * @param  string        $pk_name  optional primary key
-	 * @return bool|object|resource    false on error, true on warning or
-	 *                                 result on full ok (PgSql\Result)
+	 * @return \PgSql\Result|bool      false on error, true on warning or
+	 *                                 result on full ok
 	 */
-	public function dbPrepare(string $stm_name, string $query, string $pk_name = '')
-	{
+	public function dbPrepare(
+		string $stm_name,
+		string $query,
+		string $pk_name = ''
+	): \PgSql\Result|bool {
 		$this->__dbErrorReset();
 		$matches = [];
 		if (!$query) {
@@ -2362,9 +2384,9 @@ class IO
 	 * runs a prepare query
 	 * @param  string       $stm_name statement name for the query to run
 	 * @param  array<mixed> $data     data to run for this query, empty array for none
-	 * @return mixed                  false on error, or result on OK
+	 * @return \PgSql\Result|false     false on error, or result on OK
 	 */
-	public function dbExecute(string $stm_name, array $data = [])
+	public function dbExecute(string $stm_name, array $data = []): \PgSql\Result|false
 	{
 		$this->__dbErrorReset();
 		// if no DB Handler drop out
@@ -2484,11 +2506,10 @@ class IO
 	/**
 	 * checks a previous async query and returns data if finished
 	 * NEEDS : dbExecAsync
-	 * @return bool|object|resource cursor resource if the query is still running,
-	 *                              false if an error occured or cursor of that query
-	 *                              (PgSql\Result)
+	 * @return \PgSql\Result|bool cursor resource if the query is still running,
+	 *                            false if an error occured or cursor of that query
 	 */
-	public function dbCheckAsync()
+	public function dbCheckAsync(): \PgSql\Result|bool
 	{
 		$this->__dbErrorReset();
 		// if there is actually a async query there
@@ -2548,7 +2569,7 @@ class IO
 	 * @param  int          $primary_key     id key to decide if we write insert or update
 	 * @param  string       $table           name for the target table
 	 * @param  array<mixed> $data            data array to override _POST data
-	 * @return int|bool                      primary key
+	 * @return int|false                     primary key
 	 */
 	public function dbWriteData(
 		array $write_array,
@@ -2556,13 +2577,7 @@ class IO
 		int $primary_key,
 		string $table,
 		array $data = []
-	) {
-		if (!is_array($write_array)) {
-			$write_array = [];
-		}
-		if (!is_array($not_write_array)) {
-			$not_write_array = [];
-		}
+	): int|false {
 		$not_write_update_array = [];
 		return $this->dbWriteDataExt(
 			$write_array,
@@ -2587,16 +2602,16 @@ class IO
 	 *                                                         to write during update (optional)
 	 * @param  array<mixed>            $data            optional array with data
 	 *                                                  if not _POST vars are used
-	 * @return int|bool                                 primary key
+	 * @return int|false                                primary key
 	 */
 	public function dbWriteDataExt(
 		array $write_array,
-		$primary_key,
+		int|string|array $primary_key,
 		string $table,
 		array $not_write_array = [],
 		array $not_write_update_array = [],
 		array $data = []
-	) {
+	): int|false {
 		if (!is_array($primary_key)) {
 			$primary_key = [
 				'row' => $table . '_id',
@@ -2712,7 +2727,10 @@ class IO
 			$primary_key['value'] = $this->dbGetInsertPK();
 		}
 		// if there is not priamry key value field return false
-		return $primary_key['value'] ?? false;
+		if (!is_numeric($primary_key['value'])) {
+			return false;
+		}
+		return (int)$primary_key['value'];
 	}
 
 	// ***************************
@@ -2725,7 +2743,7 @@ class IO
 	 * @param  bool|null $debug true/false or null for just getting current set
 	 * @return bool             Current debug flag as set
 	 */
-	public function dbSetDebug($debug = null): bool
+	public function dbSetDebug(?bool $debug = null): bool
 	{
 		if ($debug !== null) {
 			$this->db_debug = $debug;
@@ -2806,7 +2824,7 @@ class IO
 	 * @return bool              False on failure to find schema value or set schema,
 	 *                           True on successful set
 	 */
-	public function dbSetSchema(string $db_schema)
+	public function dbSetSchema(string $db_schema): bool
 	{
 		$this->__dbErrorReset();
 		if (empty($db_schema)) {
@@ -2935,9 +2953,9 @@ class IO
 
 	/**
 	 * Return current database handler
-	 * @return object|resource|bool|int|null
+	 * @return \PgSql\Connection|false|null
 	 */
-	public function dbGetDbh()
+	public function dbGetDbh(): \PgSql\Connection|false|null
 	{
 		return $this->dbh;
 	}
@@ -2993,7 +3011,7 @@ class IO
 	 *
 	 * @return array<mixed>|string|int|null Current insert query primary key
 	 */
-	public function dbGetInsertPK()
+	public function dbGetInsertPK(): array|string|int|null
 	{
 		if (empty($this->insert_id_pk_name)) {
 			return null;
@@ -3017,7 +3035,7 @@ class IO
 	 * @param  integer|null $pos
 	 * @return array<mixed>|string|int|null
 	 */
-	public function dbGetReturningExt(?string $key = null, ?int $pos = null)
+	public function dbGetReturningExt(?string $key = null, ?int $pos = null): array|string|int|null
 	{
 		// return as is if key is null
 		if ($key === null) {
@@ -3048,7 +3066,6 @@ class IO
 			} else {
 				// find in all inside the array
 				$__arr = array_column($this->insert_id_arr, $key);
-				/** @phpstan-ignore-next-line [Why is this always true?] */
 				if (count($__arr)) {
 					return $__arr;
 				} else {
@@ -3112,7 +3129,7 @@ class IO
 	 *                          Not ethat returnin_id also can return false
 	 *                          but will not set an error entry
 	 */
-	public function dbGetPrepareCursorValue(string $stm_name, string $key)
+	public function dbGetPrepareCursorValue(string $stm_name, string $key): null|string|int|bool
 	{
 		// if no statement name
 		if (empty($stm_name)) {
@@ -3161,8 +3178,8 @@ class IO
 	 * Sets error number that was last
 	 * So we always have the last error number stored even if a new
 	 * one is created
-	 * @param  boolean $transform Set to true to transform into id + error message
-	 * @return string             Last error number as string or error message
+	 * @param  bool   $transform Set to true to transform into id + error message
+	 * @return string            Last error number as string or error message
 	 */
 	public function dbGetLastError(bool $transform = false): string
 	{
@@ -3182,10 +3199,10 @@ class IO
 	/**
 	 * Sets warning number that was last
 	 * So we always have the last warning number stored even if a new one is created
-	 * @param  boolean $transform Set to true to transform into id + warning message
-	 * @return string             Last Warning number as string or warning message
+	 * @param  bool   $transform Set to true to transform into id + warning message
+	 * @return string            Last Warning number as string or warning message
 	 */
-	public function dbGetLastWarning(bool $transform = false)
+	public function dbGetLastWarning(bool $transform = false): string
 	{
 		// if no warning, return empty
 		if (empty($this->warning_id)) {
@@ -3223,7 +3240,7 @@ class IO
 	 *                                           Null for error
 	 * @deprecated Use ->dbGetInsertPK();
 	 */
-	public function dbGetReturning()
+	public function dbGetReturning(): array|string|int|bool|null
 	{
 		return $this->dbGetInsertPK();
 	}
@@ -3273,7 +3290,7 @@ class IO
 	 * @return array<mixed>|string|int|bool|null      See above
 	 * @deprecated use getReturningExt($key = null) instead
 	 */
-	public function getInsertReturn($key = null)
+	public function getInsertReturn(?string $key = null): array|string|int|bool|null
 	{
 		trigger_error('Method ' . __METHOD__ . ' is deprecated, use getReturningExt($key = null)', E_USER_DEPRECATED);
 		return $this->dbGetReturningExt($key);
@@ -3284,7 +3301,7 @@ class IO
 	 * @return array<mixed>|string|int|bool|null [DEPRECATED]
 	 * @deprecated use dbGetReturning() instead
 	 */
-	public function getReturning()
+	public function getReturning(): array|string|int|bool|null
 	{
 		trigger_error('Method ' . __METHOD__ . ' is deprecated, use dbGetReturning()', E_USER_DEPRECATED);
 		return $this->dbGetInsertPK();
@@ -3295,7 +3312,7 @@ class IO
 	 * @return array<mixed>|string|int|bool|null [DEPRECATED]
 	 * @deprecated use dbGetInsertPK() instead
 	 */
-	public function getInsertPK()
+	public function getInsertPK(): array|string|int|bool|null
 	{
 		trigger_error('Method ' . __METHOD__ . ' is deprecated, use dbGetInsertPK()', E_USER_DEPRECATED);
 		return $this->dbGetInsertPK();
@@ -3307,7 +3324,7 @@ class IO
 	 * @return array<mixed>|string|bool|int|null [DEPRECATED]
 	 * @deprecated use dbGetReturningExt($key = null) instead
 	 */
-	public function getReturningExt($key = null)
+	public function getReturningExt(?string $key = null): array|string|int|bool|null
 	{
 		trigger_error('Method ' . __METHOD__ . ' is deprecated, use dbGetReturningExt($key = null)', E_USER_DEPRECATED);
 		return $this->dbGetReturningExt($key);
@@ -3316,10 +3333,10 @@ class IO
 	/**
 	 * DEPRECATED: getCursorExt
 	 * @param  string|null $q [DEPRECATED]
-	 * @return array<mixed>|string|int|resource|object|null [DEPRECATED]
+	 * @return array<mixed>|string|int|\PgSql\Result|null [DEPRECATED]
 	 * @deprecated use dbGetCursorExt($q = null) instead
 	 */
-	public function getCursorExt($q = null)
+	public function getCursorExt(?string $q = null): array|string|int|\PgSql\Result|null
 	{
 		trigger_error('Method ' . __METHOD__ . ' is deprecated, use dbGetCursorExt($q = null)', E_USER_DEPRECATED);
 		return $this->dbGetCursorExt($q);
@@ -3330,7 +3347,7 @@ class IO
 	 * @return int|null [DEPRECATED]
 	 * @deprecated use dbGetNumRows() instead
 	 */
-	public function getNumRows()
+	public function getNumRows(): ?int
 	{
 		trigger_error('Method ' . __METHOD__ . ' is deprecated, use dbGetNumRows()', E_USER_DEPRECATED);
 		return $this->dbGetNumRows();

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

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace CoreLibs\DB\SQL\SqlInterface;
+namespace CoreLibs\DB\SQL\Interface;
 
 interface SqlFunctions
 {
@@ -21,33 +21,33 @@ interface SqlFunctions
 	 * Undocumented function
 	 *
 	 * @param string $query
-	 * @return object|resource|bool
+	 * @return \PgSql\Result|false
 	 */
-	public function __dbQuery(string $query);
+	public function __dbQuery(string $query): \PgSql\Result|false;
 
 	/**
 	 * Undocumented function
 	 *
 	 * @param string $query
 	 * @param array<mixed> $params
-	 * @return object|resource|bool
+	 * @return \PgSql\Result|false
 	 */
-	public function __dbQueryParams(string $query, array $params);
+	public function __dbQueryParams(string $query, array $params): \PgSql\Result|false;
 
 	/**
 	 * Undocumented function
 	 *
 	 * @param string $query
-	 * @return boolean
+	 * @return bool
 	 */
 	public function __dbSendQuery(string $query): bool;
 
 	/**
 	 * Undocumented function
 	 *
-	 * @return object|resource|bool
+	 * @return \PgSql\Result|false
 	 */
-	public function __dbGetResult();
+	public function __dbGetResult(): \PgSql\Result|false;
 
 	/**
 	 * Undocumented function
@@ -61,85 +61,85 @@ interface SqlFunctions
 	 *
 	 * @param string $name
 	 * @param string $query
-	 * @return object|resource|bool
+	 * @return \PgSql\Result|false
 	 */
-	public function __dbPrepare(string $name, string $query);
+	public function __dbPrepare(string $name, string $query): \PgSql\Result|false;
 
 	/**
 	 * Undocumented function
 	 *
 	 * @param string $name
 	 * @param array<mixed> $data
-	 * @return object|resource|bool
+	 * @return \PgSql\Result|false
 	 */
-	public function __dbExecute(string $name, array $data);
+	public function __dbExecute(string $name, array $data): \PgSql\Result|false;
 
 	/**
 	 * Undocumented function
 	 *
-	 * @param object|resource|bool $cursor
-	 * @return integer
+	 * @param \PgSql\Result|false $cursor
+	 * @return int
 	 */
-	public function __dbNumRows($cursor): int;
+	public function __dbNumRows(\PgSql\Result|false $cursor): int;
 
 	/**
 	 * Undocumented function
 	 *
-	 * @param object|resource|bool $cursor
-	 * @return integer
+	 * @param \PgSql\Result|false $cursor
+	 * @return int
 	 */
-	public function __dbNumFields($cursor): int;
+	public function __dbNumFields(\PgSql\Result|false $cursor): int;
 
 	/**
 	 * Undocumented function
 	 *
-	 * @param object|resource|bool $cursor
+	 * @param \PgSql\Result|false $cursor
 	 * @param int $i
-	 * @return string|bool
+	 * @return string|false
 	 */
-	public function __dbFieldName($cursor, int $i);
+	public function __dbFieldName(\PgSql\Result|false $cursor, int $i): string|false;
 
 	/**
 	 * Undocumented function
 	 *
-	 * @param object|resource|bool $cursor
+	 * @param \PgSql\Result|false $cursor
 	 * @param int $result_type
 	 * @return array<mixed>|bool
 	 */
-	public function __dbFetchArray($cursor, int $result_type = PGSQL_BOTH);
+	public function __dbFetchArray(\PgSql\Result|false $cursor, int $result_type = PGSQL_BOTH);
 
 	/**
 	 * Undocumented function
 	 *
-	 * @param boolean $assoc_type
-	 * @return integer
+	 * @param bool $assoc_type
+	 * @return int
 	 */
 	public function __dbResultType(bool $assoc_type = true): int;
 
 	/**
 	 * Undocumented function
 	 *
-	 * @param object|resource|bool $cursor
+	 * @param \PgSql\Result|false $cursor
 	 * @return array<mixed>|bool
 	 */
-	public function __dbFetchAll($cursor);
+	public function __dbFetchAll(\PgSql\Result|false $cursor): array|bool;
 
 	/**
 	 * Undocumented function
 	 *
-	 * @param object|resource|bool $cursor
-	 * @return integer
+	 * @param \PgSql\Result|false $cursor
+	 * @return int
 	 */
-	public function __dbAffectedRows($cursor): int;
+	public function __dbAffectedRows(\PgSql\Result|false $cursor): int;
 
 	/**
 	 * Undocumented function
 	 *
 	 * @param string $query
 	 * @param string|null $pk_name
-	 * @return string|integer|false
+	 * @return string|int|false
 	 */
-	public function __dbInsertId(string $query, ?string $pk_name);
+	public function __dbInsertId(string $query, ?string $pk_name): string|int|false;
 
 	/**
 	 * Undocumented function
@@ -148,7 +148,7 @@ interface SqlFunctions
 	 * @param string $schema
 	 * @return string|bool
 	 */
-	public function __dbPrimaryKey(string $table, string $schema = '');
+	public function __dbPrimaryKey(string $table, string $schema = ''): string|bool;
 
 	/**
 	 * Undocumented function
@@ -157,9 +157,9 @@ interface SqlFunctions
 	 * @param string $db_user
 	 * @param string $db_pass
 	 * @param string $db_name
-	 * @param integer $db_port
+	 * @param int $db_port
 	 * @param string $db_ssl
-	 * @return object|resource|bool
+	 * @return \PgSql\Connection|false
 	 */
 	public function __dbConnect(
 		string $db_host,
@@ -168,24 +168,24 @@ interface SqlFunctions
 		string $db_name,
 		int $db_port,
 		string $db_ssl = 'allow'
-	);
+	): \PgSql\Connection|false;
 
 	/**
 	 * Undocumented function
 	 *
-	 * @param object|resource|bool $cursor
+	 * @param \PgSql\Result|false $cursor
 	 * @return string
 	 */
-	public function __dbPrintError($cursor = false): string;
+	public function __dbPrintError(\PgSql\Result|false $cursor = false): string;
 
 	/**
 	 * Undocumented function
 	 *
 	 * @param string $table
-	 * @param boolean $extended
+	 * @param bool $extended
 	 * @return array<mixed>|bool
 	 */
-	public function __dbMetaData(string $table, $extended = true);
+	public function __dbMetaData(string $table, bool $extended = true): array|bool;
 
 	/**
 	 * Undocumented function
@@ -193,7 +193,7 @@ interface SqlFunctions
 	 * @param string|int|float|bool $string
 	 * @return string
 	 */
-	public function __dbEscapeString($string): string;
+	public function __dbEscapeString(string|int|float|bool $string): string;
 
 	/**
 	 * Undocumented function
@@ -201,7 +201,7 @@ interface SqlFunctions
 	 * @param string|int|float|bool $string
 	 * @return string
 	 */
-	public function __dbEscapeLiteral($string): string;
+	public function __dbEscapeLiteral(string|int|float|bool $string): string;
 
 	/**
 	 * Undocumented function
@@ -230,15 +230,15 @@ interface SqlFunctions
 	/**
 	 * Undocumented function
 	 *
-	 * @return boolean
+	 * @return bool
 	 */
 	public function __dbConnectionBusy(): bool;
 
 	/**
 	 * Undocumented function
 	 *
-	 * @param integer $timeout_seconds
-	 * @return boolean
+	 * @param int $timeout_seconds
+	 * @return bool
 	 */
 	public function __dbConnectionBusySocketWait(int $timeout_seconds = 3): bool;
 
@@ -253,8 +253,8 @@ interface SqlFunctions
 	 * Undocumented function
 	 *
 	 * @param string $array_text
-	 * @param integer $start
-	 * @param integer|null $end
+	 * @param int $start
+	 * @param int|null $end
 	 * @return array<mixed>|null
 	 */
 	public function __dbArrayParse(
@@ -275,7 +275,7 @@ interface SqlFunctions
 	 * Undocumented function
 	 *
 	 * @param string $db_schema
-	 * @return integer
+	 * @return int
 	 */
 	public function __dbSetSchema(string $db_schema): int;
 
@@ -290,7 +290,7 @@ interface SqlFunctions
 	 * Undocumented function
 	 *
 	 * @param string $db_encoding
-	 * @return integer
+	 * @return int
 	 */
 	public function __dbSetEncoding(string $db_encoding): int;
 

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

@@ -51,12 +51,11 @@ namespace CoreLibs\DB\SQL;
 // as main system. Currently all @var sets are written as object
 /** @#phan-file-suppress PhanUndeclaredTypeProperty,PhanUndeclaredTypeParameter,PhanUndeclaredTypeReturnType */
 
-class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
+class PgSQL implements Interface\SqlFunctions
 {
 	/** @var string */
 	private $last_error_query;
-	// NOTE for PHP 8.1 this is no longer a resource
-	/** @var object|resource|bool */ // replace object with PgSql\Connection
+	/** @var \PgSql\Connection|false */
 	private $dbh;
 
 	/**
@@ -77,12 +76,12 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 * wrapper for pg_query, catches error and stores it in class var
 	 *
 	 * @param  string $query Query string
-	 * @return object|resource|bool query result (PgSql\Result)
+	 * @return \PgSql\Result|false query result
 	 */
-	public function __dbQuery(string $query)
+	public function __dbQuery(string $query): \PgSql\Result|false
 	{
 		$this->last_error_query = '';
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return false;
 		}
 		// read out the query status and save the query if needed
@@ -100,12 +99,12 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 *
 	 * @param  string       $query  Query string with placeholders $1, ..
 	 * @param  array<mixed> $params Matching parameters for each placerhold
-	 * @return object|resource|bool Query result (PgSql\Result)
+	 * @return \PgSql\Result|false Query result
 	 */
-	public function __dbQueryParams(string $query, array $params)
+	public function __dbQueryParams(string $query, array $params): \PgSql\Result|false
 	{
 		$this->last_error_query = '';
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return false;
 		}
 		// parse query and get all $n entries
@@ -126,7 +125,7 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 */
 	public function __dbSendQuery(string $query): bool
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return false;
 		}
 		$result = pg_send_query($this->dbh, $query);
@@ -136,12 +135,12 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	/**
 	 * wrapper for pg_get_result
 	 *
-	 * @return object|resource|bool resource handler or false for error (PgSql\Result)
+	 * @return \PgSql\Result|false resource handler or false for error
 	 */
-	public function __dbGetResult()
+	public function __dbGetResult(): \PgSql\Result|false
 	{
 		$this->last_error_query = '';
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return false;
 		}
 		$result = pg_get_result($this->dbh);
@@ -161,7 +160,7 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 */
 	public function __dbClose(): void
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return;
 		}
 		if (pg_connection_status($this->dbh) === PGSQL_CONNECTION_OK) {
@@ -175,12 +174,12 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 *
 	 * @param  string $name  statement name
 	 * @param  string $query query string
-	 * @return object|resource|bool prepare statement handler or
-	 *                              false for error (PgSql\Result)
+	 * @return \PgSql\Result|false prepare statement handler or
+	 *                              false for error
 	 */
-	public function __dbPrepare(string $name, string $query)
+	public function __dbPrepare(string $name, string $query): \PgSql\Result|false
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return false;
 		}
 		$result = pg_prepare($this->dbh, $name, $query);
@@ -195,11 +194,11 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 *
 	 * @param  string        $name statement name
 	 * @param  array<mixed>  $data data array
-	 * @return object|resource|bool returns status or false for error (PgSql\Result)
+	 * @return \PgSql\Result|false returns status or false for error
 	 */
-	public function __dbExecute(string $name, array $data)
+	public function __dbExecute(string $name, array $data): \PgSql\Result|false
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return false;
 		}
 		$result = pg_execute($this->dbh, $name, $data);
@@ -212,12 +211,12 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	/**
 	 * wrapper for pg_num_rows
 	 *
-	 * @param  object|resource|bool $cursor cursor PgSql\Result (former resource)
-	 * @return int                  number of rows, -1 on error
+	 * @param  \PgSql\Result|false $cursor cursor
+	 * @return int                         number of rows, -1 on error
 	 */
-	public function __dbNumRows($cursor): int
+	public function __dbNumRows(\PgSql\Result|false $cursor): int
 	{
-		if ($cursor === false || is_bool($cursor)) {
+		if (is_bool($cursor)) {
 			return -1;
 		}
 		return pg_num_rows($cursor);
@@ -226,12 +225,12 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	/**
 	 * wrapper for pg_num_fields
 	 *
-	 * @param  object|resource|bool $cursor cursor PgSql\Result (former resource)
-	 * @return int                  number for fields in result, -1 on error
+	 * @param  \PgSql\Result|false $cursor cursor
+	 * @return int                         number for fields in result, -1 on error
 	 */
-	public function __dbNumFields($cursor): int
+	public function __dbNumFields(\PgSql\Result|false $cursor): int
 	{
-		if ($cursor === false || is_bool($cursor)) {
+		if (is_bool($cursor)) {
 			return -1;
 		}
 		return pg_num_fields($cursor);
@@ -240,13 +239,13 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	/**
 	 * wrapper for pg_field_name
 	 *
-	 * @param  object|resource|bool $cursor cursor PgSql\Result (former resource)
-	 * @param  int                  $i      field position
-	 * @return string|bool          name or false on error
+	 * @param  \PgSql\Result|false $cursor cursor
+	 * @param  int                 $i      field position
+	 * @return string|false                name or false on error
 	 */
-	public function __dbFieldName($cursor, int $i)
+	public function __dbFieldName(\PgSql\Result|false $cursor, int $i): string|false
 	{
-		if ($cursor === false || is_bool($cursor)) {
+		if (is_bool($cursor)) {
 			return false;
 		}
 		return pg_field_name($cursor, $i);
@@ -256,13 +255,13 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 * wrapper for pg_fetch_array
 	 * if through/true false, use __dbResultType(true)
 	 *
-	 * @param  object|resource|bool $cursor      cursor PgSql\Result (former resource)
-	 * @param  int                  $result_type result type as int number
-	 * @return array<mixed>|bool    array result data or false on end/error
+	 * @param  \PgSql\Result|false $cursor      cursor
+	 * @param  int                 $result_type result type as int number
+	 * @return array<mixed>|false               array result data or false on end/error
 	 */
-	public function __dbFetchArray($cursor, int $result_type = PGSQL_BOTH)
+	public function __dbFetchArray(\PgSql\Result|false $cursor, int $result_type = PGSQL_BOTH): array|false
 	{
-		if ($cursor === false || is_bool($cursor)) {
+		if (is_bool($cursor)) {
 			return false;
 		}
 		// result type is passed on as is [should be checked]
@@ -287,12 +286,12 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	/**
 	 * wrapper for pg_fetch_all
 	 *
-	 * @param  object|resource|bool $cursor cursor PgSql\Result (former resource)
-	 * @return array<mixed>|bool    data array or false for end/error
+	 * @param  \PgSql\Result|false $cursor cursor
+	 * @return array<mixed>|false          data array or false for end/error
 	 */
-	public function __dbFetchAll($cursor)
+	public function __dbFetchAll(\PgSql\Result|false $cursor): array|false
 	{
-		if ($cursor === false || is_bool($cursor)) {
+		if (is_bool($cursor)) {
 			return false;
 		}
 		return pg_fetch_all($cursor);
@@ -301,12 +300,12 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	/**
 	 * wrapper for pg_affected_rows
 	 *
-	 * @param object|resource|bool $cursor cursor PgSql\Result (former resource)
-	 * @return int                 affected rows, 0 for none, -1 for error
+	 * @param \PgSql\Result|false $cursor cursor
+	 * @return int                        affected rows, 0 for none, -1 for error
 	 */
-	public function __dbAffectedRows($cursor): int
+	public function __dbAffectedRows(\PgSql\Result|false $cursor): int
 	{
-		if ($cursor === false || is_bool($cursor)) {
+		if (is_bool($cursor)) {
 			return -1;
 		}
 		return pg_affected_rows($cursor);
@@ -323,7 +322,7 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 * @param  string|null      $pk_name primary key name, if '' then auto detect
 	 * @return string|int|false          primary key value
 	 */
-	public function __dbInsertId(string $query, ?string $pk_name)
+	public function __dbInsertId(string $query, ?string $pk_name): string|int|false
 	{
 		// only if an insert has been done
 		if (preg_match("/^insert /i", $query)) {
@@ -371,7 +370,7 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 * @param  string      $schema optional schema name, '' for default
 	 * @return string|bool         primary key name or false if not found
 	 */
-	public function __dbPrimaryKey(string $table, string $schema = '')
+	public function __dbPrimaryKey(string $table, string $schema = ''): string|bool
 	{
 		if ($table) {
 			// check if schema set is different from schema given,
@@ -426,7 +425,7 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 * @param  string  $db_name databse name
 	 * @param  integer $db_port port (int, 5432 is default)
 	 * @param  string  $db_ssl  SSL (allow is default)
-	 * @return object|resource|bool db handler PgSql\Connection or false on error
+	 * @return \PgSql\Connection|false db handler or false on error
 	 */
 	public function __dbConnect(
 		string $db_host,
@@ -435,7 +434,7 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 		string $db_name,
 		int $db_port,
 		string $db_ssl = 'allow'
-	) {
+	): \PgSql\Connection|false {
 		if (empty($db_name)) {
 			return false;
 		}
@@ -470,22 +469,22 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 * reads the last error for this cursor and returns
 	 * html formatted string with error name
 	 *
-	 * @param  bool|object|resource $cursor cursor PgSql\Result (former resource)
+	 * @param  \PgSql\Result|false $cursor cursor
 	 *                              or null
 	 * @return string               error string
 	 */
-	public function __dbPrintError($cursor = false): string
+	public function __dbPrintError(\PgSql\Result|false $cursor = false): string
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return '';
 		}
 		// run the query again for the error result here
-		if (($cursor === false || is_bool($cursor)) && $this->last_error_query) {
+		if ((is_bool($cursor)) && $this->last_error_query) {
 			pg_send_query($this->dbh, $this->last_error_query);
 			$this->last_error_query = '';
 			$cursor = pg_get_result($this->dbh);
 		}
-		if ($cursor && !is_bool($cursor) && $error_str = pg_result_error($cursor)) {
+		if ($cursor && $error_str = pg_result_error($cursor)) {
 			return '-PostgreSQL-Error- '
 				. $error_str;
 		} else {
@@ -500,9 +499,9 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 * @param  bool   $extended  show extended info (default true)
 	 * @return array<mixed>|bool array data for the table info or false on error
 	 */
-	public function __dbMetaData(string $table, $extended = true)
+	public function __dbMetaData(string $table, bool $extended = true): array|bool
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return false;
 		}
 		// needs to prefixed with @ or it throws a warning on not existing table
@@ -515,9 +514,9 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 * @param  string|int|float|bool $string any string/int/float/bool
 	 * @return string                excaped string
 	 */
-	public function __dbEscapeString($string): string
+	public function __dbEscapeString(string|int|float|bool $string): string
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return '';
 		}
 		return pg_escape_string($this->dbh, (string)$string);
@@ -531,9 +530,9 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 * @param  string|int|float|bool $string any string/int/float/bool
 	 * @return string                excaped string including quites
 	 */
-	public function __dbEscapeLiteral($string): string
+	public function __dbEscapeLiteral(string|int|float|bool $string): string
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return (string)'';
 		}
 		// for phpstan, thinks this is string|false?
@@ -549,7 +548,7 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 */
 	public function __dbEscapeIdentifier(string $string): string
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return '';
 		}
 		// for phpstan, thinks this is string|false?
@@ -564,7 +563,7 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 */
 	public function __dbEscapeBytea(string $data): string
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return '';
 		}
 		return pg_escape_bytea($this->dbh, $data);
@@ -584,11 +583,12 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	/**
 	 * wrapper for pg_connection_busy
 	 *
-	 * @return bool True if connection is busy, False if not or no db connection at all
+	 * @return bool True if connection is busy
+	 *              False if not or no db connection at all
 	 */
 	public function __dbConnectionBusy(): bool
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return false;
 		}
 		return pg_connection_busy($this->dbh);
@@ -597,13 +597,13 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	/**
 	 * Experimental wrapper with scoket timetout
 	 *
-	 * @param integer $timeout_seconds Wait how many seconds on timeout
-	 * @return boolean                 True if connection is busy, or false on
-	 *                                 not busy or no db connection at all
+	 * @param  integer $timeout_seconds Wait how many seconds on timeout
+	 * @return bool                     True if connection is busy, or false on
+	 *                                  not busy or no db connection at all
 	 */
 	public function __dbConnectionBusySocketWait(int $timeout_seconds = 3): bool
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return false;
 		}
 		$busy = pg_connection_busy($this->dbh);
@@ -626,14 +626,14 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 * On default 'version' will be stripped of any space attached info
 	 * eg 13.5 (other info) will return only 13.5
 	 *
-	 * @param  string  $parameter Parameter string to extract from array
-	 * @param  boolean $strip     If parameter is server strip out on default
-	 *                            Set to false to get original string AS is
-	 * @return string             The parameter value
+	 * @param  string $parameter Parameter string to extract from array
+	 * @param  bool    $strip    If parameter is server strip out on default
+	 *                           Set to false to get original string AS is
+	 * @return string            The parameter value
 	 */
 	public function __dbVersionInfo(string $parameter, bool $strip = true): string
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return '';
 		}
 		// extract element
@@ -655,7 +655,7 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 */
 	public function __dbVersionInfoParameterList(): array
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return [];
 		}
 		return array_keys(pg_version($this->dbh));
@@ -670,7 +670,7 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 */
 	public function __dbVersion(): string
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return '';
 		}
 		// array has client, protocol, server, we just return server stripped
@@ -762,9 +762,9 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 	 * @param  string      $parameter Parameter to query
 	 * @return string|bool            Settings value as string
 	 */
-	public function __dbParameter(string $parameter)
+	public function __dbParameter(string $parameter): string|bool
 	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
+		if (is_bool($this->dbh)) {
 			return false;
 		}
 		if (empty($parameter)) {

www/lib/CoreLibs/Debug/Logging.php

@@ -413,7 +413,7 @@ class Logging
 	 * @param  string $name what variable to return
 	 * @return mixed        can be anything, bool, string, int, array
 	 */
-	public function getSetting(string $name) //:mixed DOES not work with PHP 7.4
+	public function getSetting(string $name): mixed
 	{
 		// for debug purpose only
 		return $this->{$name};
@@ -550,9 +550,9 @@ class Logging
 	 * @param  string      $flag  on/off
 	 * @param  string|null $level if not null then check if this array entry is set
 	 *                            else return false
-	 * @return bool|array<mixed>  if $level is null, return array, else boolean true/false
+	 * @return array<mixed>|bool  if $level is null, return array, else boolean true/false
 	 */
-	public function getLogLevel(string $type, string $flag, ?string $level = null)
+	public function getLogLevel(string $type, string $flag, ?string $level = null): array|bool
 	{
 		// abort if not valid type
 		if (!in_array($type, ['debug', 'echo', 'print'])) {

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

@@ -122,7 +122,7 @@ class GetTextReader
 	* @param bool            $enable_cache Enable or disable caching
 	*                                      of strings (default on)
 	*/
-	public function __construct($Reader, bool $enable_cache = true)
+	public function __construct(FileReader|bool $Reader, bool $enable_cache = true)
 	{
 		// If there isn't a StreamReader, turn on short circuit mode.
 		if ((!is_object($Reader) && !$Reader) || (is_object($Reader) && $Reader->error)) {

www/lib/CoreLibs/Language/Encoding.php

@@ -46,7 +46,7 @@ class Encoding
 	 * @return void
 	 * @deprecated Use \CoreLibs\Check\Encoding::setErrorChar();
 	 */
-	public static function setErrorChar($string): void
+	public static function setErrorChar(string|int|null $string): void
 	{
 		\CoreLibs\Check\Encoding::setErrorChar($string);
 	}
@@ -60,7 +60,7 @@ class Encoding
 	 * @return string|int Set error character
 	 * @deprecated Use \CoreLibs\Check\Encoding::getErrorChar();
 	 */
-	public static function getErrorChar(bool $return_substitute_func = false)
+	public static function getErrorChar(bool $return_substitute_func = false): string|int
 	{
 		return \CoreLibs\Check\Encoding::getErrorChar($return_substitute_func);
 	}
@@ -81,7 +81,7 @@ class Encoding
 	 * @param  string     $string        string to test
 	 * @param  string     $from_encoding encoding of string to test
 	 * @param  string     $to_encoding   target encoding
-	 * @return bool|array<string>        false if no error or
+	 * @return array<string>|false       false if no error or
 	 *                                   array with failed characters
 	 * @deprecated Use \CoreLibs\Check\Encoding::checkConvertEncoding();
 	 */
@@ -89,7 +89,7 @@ class Encoding
 		string $string,
 		string $from_encoding,
 		string $to_encoding
-	) {
+	): array|false {
 		return \CoreLibs\Check\Encoding::checkConvertEncoding($string, $from_encoding, $to_encoding);
 	}
 

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

@@ -13,27 +13,27 @@ class Elements
 	/**
 	 * print the date/time drop downs, used in any queue/send/insert at date/time place
 	 *
-	 * @param  int    $year          year YYYY
-	 * @param  int    $month         month m
-	 * @param  int    $day           day d
-	 * @param  int    $hour          hour H
-	 * @param  int    $min           min i
-	 * @param  string $suffix        additional info printed after the date time
-	 *                               variable in the drop down
-	 *                               also used for ID in the on change JS call
-	 * @param  int    $min_steps     default is 1 (minute), can set to anything,
-	 *                               is used as sum up from 0
-	 * @param  bool   $name_pos_back default false, if set to true,
-	 *                               the name will be printend after the drop down
-	 *                               and not before the drop down
-	 * @return string                HTML formated strings for drop down lists of date and time
+	 * @param  int|string $year          year YYYY
+	 * @param  int|string $month         month m
+	 * @param  int|string $day           day d
+	 * @param  int|string $hour          hour H
+	 * @param  int|string $min           min i
+	 * @param  string     $suffix        additional info printed after the date time
+	 *                                   variable in the drop down
+	 *                                   also used for ID in the on change JS call
+	 * @param  int        $min_steps     default is 1 (minute), can set to anything,
+	 *                                   is used as sum up from 0
+	 * @param  bool       $name_pos_back default false, if set to true,
+	 *                                   the name will be printend after the drop down
+	 *                                   and not before the drop down
+	 * @return string                    HTML formated strings for drop down lists of date and time
 	 */
 	public static function printDateTime(
-		$year,
-		$month,
-		$day,
-		$hour,
-		$min,
+		int|string $year,
+		int|string $month,
+		int|string $day,
+		int|string $hour,
+		int|string $min,
 		string $suffix = '',
 		int $min_steps = 1,
 		bool $name_pos_back = false

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

@@ -366,7 +366,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			$config_array = $table_arrays[System::getPageName(1)];
 		} else {
 			// primary try to load the class
-			/** @var \CoreLibs\Output\Form\TableArraysInterface|false $content_class */
+			/** @var TableArrays\Interface\TableArraysInterface|false $content_class */
 			$content_class = $this->loadTableArray();
 			if (is_object($content_class)) {
 				$config_array = $content_class->setTableArray();
@@ -468,9 +468,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	/**
 	* load table array class based on my page name converted to camel case
 	* class files are in \TableArrays folder in \Output\Form
-	* @return object|bool Return class object or false on failure
+	* @return TableArrays\Interface\TableArraysInterface|false Return class object or false on failure
 	*/
-	private function loadTableArray()
+	private function loadTableArray(): TableArrays\Interface\TableArraysInterface|false
 	{
 		// note: it schould be Schemas but an original type made it to this
 		//       this file is kept for the old usage, new one should be EditSchemas
@@ -489,7 +489,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 					$page_name_camel_case
 			);
 		try {
-			/** @var \CoreLibs\Output\Form\TableArraysInterface|false $class */
+			/** @var TableArrays\Interface\TableArraysInterface|false $class */
 			$class = new $class_string($this);
 		} catch (\Throwable $t) {
 			$this->log->debug('CLASS LOAD', 'Failed loading: ' . $class_string . ' => ' . $t->getMessage());
@@ -651,7 +651,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			$this->base_acl_level >= $this->security_level['new']
 		) {
 			if ($this->really_new == 'yes') {
-				$this->formUnsetTablearray();
+				$this->formUnsetTableArray();
 			} else {
 				$this->msg .= $this->l->__('You have to select the <b>Checkbox for New</b>!<br>');
 				$this->error = 2;
@@ -731,9 +731,6 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			empty($this->table_array['protected']['value']) &&
 			!$this->error
 		) {
-			if (!is_array($element_list)) {
-				$element_list = [];
-			}
 			for ($i = 0, $i_max = count($element_list); $i < $i_max; $i++) {
 				// $this->log->debug('form_error', 'Array: '
 				//	. is_array($this->element_list[$element_list[$i]]['read_data']) . ' | '
@@ -2294,11 +2291,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 				}
 			}
 		}
-		if (is_array($hidden_array)) {
-			reset($hidden_array);
-			foreach ($hidden_array as $key => $value) {
-				$hidden[] = ['key' => $key, 'value' => $value];
-			}
+		reset($hidden_array);
+		foreach ($hidden_array as $key => $value) {
+			$hidden[] = ['key' => $key, 'value' => $value];
 		}
 		return $hidden;
 	}

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

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CoreLibs\Output\Form\TableArrays;
 
-class EditAccess implements \CoreLibs\Output\Form\TableArraysInterface
+class EditAccess implements Interface\TableArraysInterface
 {
 	/** @var \CoreLibs\Output\Form\Generate */
 	private $form;
@@ -87,7 +87,9 @@ class EditAccess implements \CoreLibs\Output\Form\TableArraysInterface
 				],
 			],
 			'table_name' => 'edit_access',
-			"load_query" => "SELECT edit_access_id, name FROM edit_access ORDER BY name",
+			"load_query" => "SELECT edit_access_id, name "
+				. "FROM edit_access "
+				. "ORDER BY name",
 			'show_fields' => [
 				[
 					'name' => 'name'

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

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CoreLibs\Output\Form\TableArrays;
 
-class EditGroups implements \CoreLibs\Output\Form\TableArraysInterface
+class EditGroups implements Interface\TableArraysInterface
 {
 	/** @var \CoreLibs\Output\Form\Generate */
 	private $form;
@@ -55,14 +55,19 @@ class EditGroups implements \CoreLibs\Output\Form\TableArraysInterface
 					'mandatory' => 1,
 					'int' => 1,
 					'type' => 'drop_down_db',
-					'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
+					'query' => "SELECT edit_access_right_id, name "
+						. "FROM edit_access_right "
+						. "ORDER BY level"
 				],
 				'edit_scheme_id' => [
 					'value' => $_POST['edit_scheme_id'] ?? '',
 					'output_name' => 'Group Scheme',
 					'int_null' => 1,
 					'type' => 'drop_down_db',
-					'query' => "SELECT edit_scheme_id, name FROM edit_scheme WHERE enabled = 1 ORDER BY name"
+					'query' => "SELECT edit_scheme_id, name "
+						. "FROM edit_scheme "
+						. "WHERE enabled = 1 "
+						. "ORDER BY name"
 				],
 				'additional_acl' => [
 					'value' => $_POST['additional_acl'] ?? '',
@@ -73,7 +78,9 @@ class EditGroups implements \CoreLibs\Output\Form\TableArraysInterface
 					'cols' => 60
 				],
 			],
-			'load_query' => "SELECT edit_group_id, name, enabled FROM edit_group ORDER BY name",
+			'load_query' => "SELECT edit_group_id, name, enabled "
+				. "FROM edit_group "
+				. "ORDER BY name",
 			'table_name' => 'edit_group',
 			'show_fields' => [
 				[
@@ -115,7 +122,9 @@ class EditGroups implements \CoreLibs\Output\Form\TableArraysInterface
 							'output_name' => 'Access Level',
 							'int' => 1,
 							'preset' => 1, // first of the select
-							'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
+							'query' => "SELECT edit_access_right_id, name "
+								. "FROM edit_access_right "
+								. "ORDER BY level"
 						],
 						'edit_page_id' => [
 							'int' => 1,

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

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CoreLibs\Output\Form\TableArrays;
 
-class EditLanguages implements \CoreLibs\Output\Form\TableArraysInterface
+class EditLanguages implements Interface\TableArraysInterface
 {
 	/** @var \CoreLibs\Output\Form\Generate */
 	private $form;

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

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CoreLibs\Output\Form\TableArrays;
 
-class EditMenuGroup implements \CoreLibs\Output\Form\TableArraysInterface
+class EditMenuGroup implements Interface\TableArraysInterface
 {
 	/** @var \CoreLibs\Output\Form\Generate */
 	private $form;
@@ -55,7 +55,9 @@ class EditMenuGroup implements \CoreLibs\Output\Form\TableArraysInterface
 				],
 			],
 			'table_name' => 'edit_menu_group',
-			'load_query' => "SELECT edit_menu_group_id, name FROM edit_menu_group ORDER BY name",
+			'load_query' => "SELECT edit_menu_group_id, name "
+				. "FROM edit_menu_group "
+				. "ORDER BY name",
 			'show_fields' => [
 				[
 					'name' => 'name'

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

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CoreLibs\Output\Form\TableArrays;
 
-class EditPages implements \CoreLibs\Output\Form\TableArraysInterface
+class EditPages implements Interface\TableArraysInterface
 {
 	/** @var \CoreLibs\Output\Form\Generate */
 	private $form;
@@ -140,7 +140,10 @@ class EditPages implements \CoreLibs\Output\Form\TableArraysInterface
 				],
 			],
 			'load_query' => "SELECT edit_page_id, "
-				. "CASE WHEN hostname IS NOT NULL THEN hostname ELSE ''::VARCHAR END || filename AS filename, "
+				. "CASE "
+				. "WHEN hostname IS NOT NULL THEN hostname "
+				. "ELSE ''::VARCHAR "
+				. "END || filename AS filename, "
 				. "name, online, menu, popup "
 				. "FROM edit_page "
 				. "ORDER BY order_number",
@@ -178,7 +181,8 @@ class EditPages implements \CoreLibs\Output\Form\TableArraysInterface
 					'select_size' => 10,
 					'selected' => $_POST['edit_visible_group_id'] ?? '',
 					'query' => "SELECT edit_visible_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag "
-						. "FROM edit_visible_group ORDER BY name"
+						. "FROM edit_visible_group "
+						. "ORDER BY name"
 				],
 				'edit_menu_group' => [
 					'table_name' => 'edit_page_menu_group',
@@ -188,7 +192,8 @@ class EditPages implements \CoreLibs\Output\Form\TableArraysInterface
 					'select_size' => 10,
 					'selected' => $_POST['edit_menu_group_id'] ?? '',
 					'query' => "SELECT edit_menu_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag "
-						. "FROM edit_menu_group ORDER BY order_number"
+						. "FROM edit_menu_group "
+						. "ORDER BY order_number"
 				],
 			],
 			'element_list' => [
@@ -259,7 +264,9 @@ class EditPages implements \CoreLibs\Output\Form\TableArraysInterface
 							'output_name' => 'Access Level',
 							'int' => 1,
 							'preset' => 1, // first of the select
-							'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
+							'query' => "SELECT edit_access_right_id, name "
+								. "FROM edit_access_right "
+								. "ORDER BY level"
 						],
 						'edit_page_content_id' => [
 							'type' => 'hidden',

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

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CoreLibs\Output\Form\TableArrays;
 
-class EditSchemas implements \CoreLibs\Output\Form\TableArraysInterface
+class EditSchemas implements Interface\TableArraysInterface
 {
 	/** @var \CoreLibs\Output\Form\Generate */
 	private $form;
@@ -68,7 +68,9 @@ class EditSchemas implements \CoreLibs\Output\Form\TableArraysInterface
 				],
 			],
 			'table_name' => 'edit_scheme',
-			'load_query' => "SELECT edit_scheme_id, name, enabled FROM edit_scheme ORDER BY name",
+			'load_query' => "SELECT edit_scheme_id, name, enabled "
+				. "FROM edit_scheme "
+				. "ORDER BY name",
 			'show_fields' => [
 				[
 					'name' => 'name'

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

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CoreLibs\Output\Form\TableArrays;
 
-class EditUsers implements \CoreLibs\Output\Form\TableArraysInterface
+class EditUsers implements Interface\TableArraysInterface
 {
 	/** @var \CoreLibs\Output\Form\Generate */
 	private $form;
@@ -274,7 +274,7 @@ class EditUsers implements \CoreLibs\Output\Form\TableArraysInterface
 					'type' => 'drop_down_db',
 					'query' => "SELECT edit_language_id, long_name "
 						. "FROM edit_language "
-						. "WHERE enabled = 1"
+						. "WHERE enabled = 1 "
 						. "ORDER BY order_number",
 					'min_edit_acl' => '100',
 					'min_show_acl' => '100',
@@ -284,7 +284,10 @@ class EditUsers implements \CoreLibs\Output\Form\TableArraysInterface
 					'output_name' => 'Scheme',
 					'int_null' => 1,
 					'type' => 'drop_down_db',
-					'query' => "SELECT edit_scheme_id, name FROM edit_scheme WHERE enabled = 1 ORDER BY name",
+					'query' => "SELECT edit_scheme_id, name "
+						. "FROM edit_scheme "
+						. "WHERE enabled = 1 "
+						. "ORDER BY name",
 					'min_edit_acl' => '100',
 					'min_show_acl' => '100',
 				],
@@ -293,7 +296,10 @@ class EditUsers implements \CoreLibs\Output\Form\TableArraysInterface
 					'output_name' => 'Group',
 					'int' => 1,
 					'type' => 'drop_down_db',
-					'query' => "SELECT edit_group_id, name FROM edit_group WHERE enabled = 1 ORDER BY name",
+					'query' => "SELECT edit_group_id, name "
+						. "FROM edit_group "
+						. "WHERE enabled = 1 "
+						. "ORDER BY name",
 					'mandatory' => 1,
 					'min_edit_acl' => '100',
 					'min_show_acl' => '100',
@@ -304,7 +310,9 @@ class EditUsers implements \CoreLibs\Output\Form\TableArraysInterface
 					'mandatory' => 1,
 					'int' => 1,
 					'type' => 'drop_down_db',
-					'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level",
+					'query' => "SELECT edit_access_right_id, name "
+						. "FROM edit_access_right "
+						. "ORDER BY level",
 					'min_edit_acl' => '100',
 					'min_show_acl' => '100',
 				],
@@ -434,7 +442,9 @@ class EditUsers implements \CoreLibs\Output\Form\TableArraysInterface
 							'output_name' => 'Access Level',
 							'preset' => 1, // first of the select
 							'int' => 1,
-							'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
+							'query' => "SELECT edit_access_right_id, name "
+								. "FROM edit_access_right "
+								. "ORDER BY level"
 						],
 						'edit_default' => [
 							'type' => 'radio_group',

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

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CoreLibs\Output\Form\TableArrays;
 
-class EditVisibleGroup implements \CoreLibs\Output\Form\TableArraysInterface
+class EditVisibleGroup implements Interface\TableArraysInterface
 {
 	/** @var \CoreLibs\Output\Form\Generate */
 	private $form;
@@ -48,7 +48,9 @@ class EditVisibleGroup implements \CoreLibs\Output\Form\TableArraysInterface
 				],
 			],
 			'table_name' => 'edit_visible_group',
-			'load_query' => "SELECT edit_visible_group_id, name FROM edit_visible_group ORDER BY name",
+			'load_query' => "SELECT edit_visible_group_id, name "
+				. "FROM edit_visible_group "
+				. "ORDER BY name",
 			'show_fields' => [
 				[
 					'name' => 'name'

www/lib/CoreLibs/Output/Form/TableArrays/Interface/TableArraysInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CoreLibs\Output\Form;
+namespace CoreLibs\Output\Form\TableArrays\Interface;
 
 interface TableArraysInterface
 {

www/lib/CoreLibs/Output/Image.php

@@ -22,7 +22,7 @@ class Image
 	 *                                   if empty ROOT is choosen
 	 * @param  string      $cache_source cache path, if not given TMP is used
 	 * @param  bool        $clear_cache  if set to true, will create thumb all the tame
-	 * @return string|bool               thumbnail name, or false for error
+	 * @return string|false              thumbnail name, or false for error
 	 */
 	public static function createThumbnail(
 		string $pic,
@@ -32,7 +32,7 @@ class Image
 		string $path = '',
 		string $cache_source = '',
 		bool $clear_cache = false
-	) {
+	): string|false {
 		// get image type flags
 		$image_types = [
 			1 => 'gif',
@@ -73,7 +73,7 @@ class Image
 			$create_file = false;
 			$delete_filename = '';
 			// check if we can skip the PDF creation: if we have size, if do not have type, we assume type png
-			if (!$type && is_numeric($size_x) && is_numeric($size_y)) {
+			if (!$type) {
 				$check_thumb = $tmp_src . 'thumb_' . $pic . '_' . $size_x . 'x' . $size_y . '.' . $image_types[3];
 				if (!is_file($check_thumb)) {
 					$create_file = true;
@@ -100,10 +100,10 @@ class Image
 				[$width, $height, $type] = getimagesize($filename) ?: [];
 			}
 			// if no size given, set size to original
-			if (!$size_x || $size_x < 1 || !is_numeric($size_x)) {
+			if (!$size_x || $size_x < 1) {
 				$size_x = $width;
 			}
-			if (!$size_y || $size_y < 1 || !is_numeric($size_y)) {
+			if (!$size_y || $size_y < 1) {
 				$size_y = $height;
 			}
 			$thumb = 'thumb_' . $pic . '_' . $size_x . 'x' . $size_y . '.' . $image_types[$type];
@@ -170,7 +170,7 @@ class Image
 	 *                                     set to false to not use (default true)
 	 *                                     to use quick but less nice version
 	 * @param  int         $jpeg_quality   default 80, set image quality for jpeg only
-	 * @return string|bool                 thumbnail with path
+	 * @return string|false                thumbnail with path
 	 */
 	public static function createThumbnailSimple(
 		string $filename,
@@ -181,7 +181,7 @@ class Image
 		bool $use_cache = true,
 		bool $high_quality = true,
 		int $jpeg_quality = 80
-	) {
+	): string|false {
 		$thumbnail = false;
 		// $this->debug('IMAGE PREPARE', "FILE: $filename (exists "
 		//	.(string)file_exists($filename)."), WIDTH: $thumb_width, HEIGHT: $thumb_height");
@@ -425,7 +425,7 @@ class Image
 	 * @param  string $filename path + filename to rotate. This file must be writeable
 	 * @return void
 	 */
-	public static function correctImageOrientation($filename): void
+	public static function correctImageOrientation(string $filename): void
 	{
 		// function exists & file is writeable, else do nothing
 		if (!function_exists('exif_read_data') || !is_writeable($filename)) {

www/lib/CoreLibs/Template/SmartyExtend.php

@@ -453,7 +453,7 @@ class SmartyExtend extends \Smarty
 				$this->DATA['nav_menu_count'] = count($this->DATA['nav_menu']);
 				// messages = ['msg' =>, 'class' => 'error/warning/...']
 				$this->DATA['messages'] = $cms->messages;
-			} else { /** @phpstan-ignore-line Because I assume object for phpstan */
+			} else {
 				$this->DATA['show_ea_extra'] = false;
 				$this->DATA['ADMIN'] = 0;
 				$this->DATA['nav_menu'] = [];

www/lib/Smarty

@@ -1 +0,0 @@
-smarty-4.3.0/libs/

www/vendor/bin/php-parse

@@ -1 +0,0 @@
-../nikic/php-parser/bin/php-parse

www/vendor/bin/php-parse

@@ -0,0 +1,120 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * Proxy PHP file generated by Composer
+ *
+ * This file includes the referenced bin path (../nikic/php-parser/bin/php-parse)
+ * using a stream wrapper to prevent the shebang from being output on PHP<8
+ *
+ * @generated
+ */
+
+namespace Composer;
+
+$GLOBALS['_composer_bin_dir'] = __DIR__;
+$GLOBALS['_composer_autoload_path'] = __DIR__ . '/..'.'/autoload.php';
+
+if (PHP_VERSION_ID < 80000) {
+    if (!class_exists('Composer\BinProxyWrapper')) {
+        /**
+         * @internal
+         */
+        final class BinProxyWrapper
+        {
+            private $handle;
+            private $position;
+            private $realpath;
+
+            public function stream_open($path, $mode, $options, &$opened_path)
+            {
+                // get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
+                $opened_path = substr($path, 17);
+                $this->realpath = realpath($opened_path) ?: $opened_path;
+                $opened_path = $this->realpath;
+                $this->handle = fopen($this->realpath, $mode);
+                $this->position = 0;
+
+                return (bool) $this->handle;
+            }
+
+            public function stream_read($count)
+            {
+                $data = fread($this->handle, $count);
+
+                if ($this->position === 0) {
+                    $data = preg_replace('{^#!.*\r?\n}', '', $data);
+                }
+
+                $this->position += strlen($data);
+
+                return $data;
+            }
+
+            public function stream_cast($castAs)
+            {
+                return $this->handle;
+            }
+
+            public function stream_close()
+            {
+                fclose($this->handle);
+            }
+
+            public function stream_lock($operation)
+            {
+                return $operation ? flock($this->handle, $operation) : true;
+            }
+
+            public function stream_seek($offset, $whence)
+            {
+                if (0 === fseek($this->handle, $offset, $whence)) {
+                    $this->position = ftell($this->handle);
+                    return true;
+                }
+
+                return false;
+            }
+
+            public function stream_tell()
+            {
+                return $this->position;
+            }
+
+            public function stream_eof()
+            {
+                return feof($this->handle);
+            }
+
+            public function stream_stat()
+            {
+                return array();
+            }
+
+            public function stream_set_option($option, $arg1, $arg2)
+            {
+                return true;
+            }
+
+            public function url_stat($path, $flags)
+            {
+                $path = substr($path, 17);
+                if (file_exists($path)) {
+                    return stat($path);
+                }
+
+                return false;
+            }
+        }
+    }
+
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
+        include("phpvfscomposer://" . __DIR__ . '/..'.'/nikic/php-parser/bin/php-parse');
+        exit(0);
+    }
+}
+
+include __DIR__ . '/..'.'/nikic/php-parser/bin/php-parse';

www/vendor/bin/phpunit

@@ -1 +0,0 @@
-../phpunit/phpunit/phpunit

www/vendor/bin/phpunit

@@ -0,0 +1,123 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * Proxy PHP file generated by Composer
+ *
+ * This file includes the referenced bin path (../phpunit/phpunit/phpunit)
+ * using a stream wrapper to prevent the shebang from being output on PHP<8
+ *
+ * @generated
+ */
+
+namespace Composer;
+
+$GLOBALS['_composer_bin_dir'] = __DIR__;
+$GLOBALS['_composer_autoload_path'] = __DIR__ . '/..'.'/autoload.php';
+$GLOBALS['__PHPUNIT_ISOLATION_EXCLUDE_LIST'] = $GLOBALS['__PHPUNIT_ISOLATION_BLACKLIST'] = array(realpath(__DIR__ . '/..'.'/phpunit/phpunit/phpunit'));
+
+if (PHP_VERSION_ID < 80000) {
+    if (!class_exists('Composer\BinProxyWrapper')) {
+        /**
+         * @internal
+         */
+        final class BinProxyWrapper
+        {
+            private $handle;
+            private $position;
+            private $realpath;
+
+            public function stream_open($path, $mode, $options, &$opened_path)
+            {
+                // get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
+                $opened_path = substr($path, 17);
+                $this->realpath = realpath($opened_path) ?: $opened_path;
+                $opened_path = 'phpvfscomposer://'.$this->realpath;
+                $this->handle = fopen($this->realpath, $mode);
+                $this->position = 0;
+
+                return (bool) $this->handle;
+            }
+
+            public function stream_read($count)
+            {
+                $data = fread($this->handle, $count);
+
+                if ($this->position === 0) {
+                    $data = preg_replace('{^#!.*\r?\n}', '', $data);
+                }
+                $data = str_replace('__DIR__', var_export(dirname($this->realpath), true), $data);
+                $data = str_replace('__FILE__', var_export($this->realpath, true), $data);
+
+                $this->position += strlen($data);
+
+                return $data;
+            }
+
+            public function stream_cast($castAs)
+            {
+                return $this->handle;
+            }
+
+            public function stream_close()
+            {
+                fclose($this->handle);
+            }
+
+            public function stream_lock($operation)
+            {
+                return $operation ? flock($this->handle, $operation) : true;
+            }
+
+            public function stream_seek($offset, $whence)
+            {
+                if (0 === fseek($this->handle, $offset, $whence)) {
+                    $this->position = ftell($this->handle);
+                    return true;
+                }
+
+                return false;
+            }
+
+            public function stream_tell()
+            {
+                return $this->position;
+            }
+
+            public function stream_eof()
+            {
+                return feof($this->handle);
+            }
+
+            public function stream_stat()
+            {
+                return array();
+            }
+
+            public function stream_set_option($option, $arg1, $arg2)
+            {
+                return true;
+            }
+
+            public function url_stat($path, $flags)
+            {
+                $path = substr($path, 17);
+                if (file_exists($path)) {
+                    return stat($path);
+                }
+
+                return false;
+            }
+        }
+    }
+
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
+        include("phpvfscomposer://" . __DIR__ . '/..'.'/phpunit/phpunit/phpunit');
+        exit(0);
+    }
+}
+
+include __DIR__ . '/..'.'/phpunit/phpunit/phpunit';

www/vendor/composer/InstalledVersions.php

@@ -21,12 +21,14 @@ use Composer\Semver\VersionParser;
  * 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, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|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;
 
@@ -37,7 +39,7 @@ class InstalledVersions
 
     /**
      * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @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();
 
@@ -241,7 +243,7 @@ class InstalledVersions
 
     /**
      * @return array
-     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
+     * @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()
     {
@@ -255,7 +257,7 @@ class InstalledVersions
      *
      * @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, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
+     * @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()
     {
@@ -278,7 +280,7 @@ class InstalledVersions
      * 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, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @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()
     {
@@ -301,7 +303,7 @@ class InstalledVersions
      * @param  array[] $data A vendor/composer/installed.php data set
      * @return void
      *
-     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
+     * @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)
     {
@@ -311,7 +313,7 @@ class InstalledVersions
 
     /**
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @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()
     {

www/vendor/composer/autoload_classmap.php

@@ -24,15 +24,15 @@ return array(
     'CoreLibs\\Convert\\Byte' => $baseDir . '/lib/CoreLibs/Convert/Byte.php',
     'CoreLibs\\Convert\\Colors' => $baseDir . '/lib/CoreLibs/Convert/Colors.php',
     'CoreLibs\\Convert\\Encoding' => $baseDir . '/lib/CoreLibs/Convert/Encoding.php',
-    'CoreLibs\\Convert\\Extends\\VarSetTypeMain' => $baseDir . '/lib/CoreLibs/Convert/Extends/VarSetTypeMain.php',
+    'CoreLibs\\Convert\\Extends\\SetVarTypeMain' => $baseDir . '/lib/CoreLibs/Convert/Extends/SetVarTypeMain.php',
     'CoreLibs\\Convert\\Html' => $baseDir . '/lib/CoreLibs/Convert/Html.php',
     'CoreLibs\\Convert\\Json' => $baseDir . '/lib/CoreLibs/Convert/Json.php',
     'CoreLibs\\Convert\\Math' => $baseDir . '/lib/CoreLibs/Convert/Math.php',
     'CoreLibs\\Convert\\MimeAppName' => $baseDir . '/lib/CoreLibs/Convert/MimeAppName.php',
     'CoreLibs\\Convert\\MimeEncode' => $baseDir . '/lib/CoreLibs/Convert/MimeEncode.php',
+    'CoreLibs\\Convert\\SetVarType' => $baseDir . '/lib/CoreLibs/Convert/SetVarType.php',
+    'CoreLibs\\Convert\\SetVarTypeNull' => $baseDir . '/lib/CoreLibs/Convert/SetVarTypeNull.php',
     'CoreLibs\\Convert\\Strings' => $baseDir . '/lib/CoreLibs/Convert/Strings.php',
-    'CoreLibs\\Convert\\VarSetType' => $baseDir . '/lib/CoreLibs/Convert/VarSetType.php',
-    'CoreLibs\\Convert\\VarSetTypeNull' => $baseDir . '/lib/CoreLibs/Convert/VarSetTypeNull.php',
     'CoreLibs\\Create\\Email' => $baseDir . '/lib/CoreLibs/Create/Email.php',
     'CoreLibs\\Create\\Hash' => $baseDir . '/lib/CoreLibs/Create/Hash.php',
     'CoreLibs\\Create\\RandomKey' => $baseDir . '/lib/CoreLibs/Create/RandomKey.php',
@@ -40,8 +40,8 @@ return array(
     'CoreLibs\\Create\\Uids' => $baseDir . '/lib/CoreLibs/Create/Uids.php',
     'CoreLibs\\DB\\Extended\\ArrayIO' => $baseDir . '/lib/CoreLibs/DB/Extended/ArrayIO.php',
     'CoreLibs\\DB\\IO' => $baseDir . '/lib/CoreLibs/DB/IO.php',
+    'CoreLibs\\DB\\SQL\\Interface\\SqlFunctions' => $baseDir . '/lib/CoreLibs/DB/SQL/Interface/SqlFunctions.php',
     'CoreLibs\\DB\\SQL\\PgSQL' => $baseDir . '/lib/CoreLibs/DB/SQL/PgSQL.php',
-    'CoreLibs\\DB\\SQL\\SqlInterface\\SqlFunctions' => $baseDir . '/lib/CoreLibs/DB/SQL/SqlInterface/SqlFunctions.php',
     'CoreLibs\\Debug\\FileWriter' => $baseDir . '/lib/CoreLibs/Debug/FileWriter.php',
     'CoreLibs\\Debug\\Logging' => $baseDir . '/lib/CoreLibs/Debug/Logging.php',
     'CoreLibs\\Debug\\MemoryUsage' => $baseDir . '/lib/CoreLibs/Debug/MemoryUsage.php',
@@ -60,7 +60,6 @@ return array(
     'CoreLibs\\Language\\L10n' => $baseDir . '/lib/CoreLibs/Language/L10n.php',
     'CoreLibs\\Output\\Form\\Elements' => $baseDir . '/lib/CoreLibs/Output/Form/Elements.php',
     'CoreLibs\\Output\\Form\\Generate' => $baseDir . '/lib/CoreLibs/Output/Form/Generate.php',
-    'CoreLibs\\Output\\Form\\TableArraysInterface' => $baseDir . '/lib/CoreLibs/Output/TableArraysInterface.php',
     'CoreLibs\\Output\\Form\\TableArrays\\EditAccess' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditAccess.php',
     'CoreLibs\\Output\\Form\\TableArrays\\EditGroups' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditGroups.php',
     'CoreLibs\\Output\\Form\\TableArrays\\EditLanguages' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditLanguages.php',
@@ -69,6 +68,7 @@ return array(
     'CoreLibs\\Output\\Form\\TableArrays\\EditSchemas' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditSchemas.php',
     'CoreLibs\\Output\\Form\\TableArrays\\EditUsers' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditUsers.php',
     'CoreLibs\\Output\\Form\\TableArrays\\EditVisibleGroup' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditVisibleGroup.php',
+    'CoreLibs\\Output\\Form\\TableArrays\\Interface\\TableArraysInterface' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/Interface/TableArraysInterface.php',
     'CoreLibs\\Output\\Form\\Token' => $baseDir . '/lib/CoreLibs/Output/Form/Token.php',
     'CoreLibs\\Output\\Image' => $baseDir . '/lib/CoreLibs/Output/Image.php',
     'CoreLibs\\Output\\ProgressBar' => $baseDir . '/lib/CoreLibs/Output/ProgressBar.php',
@@ -696,175 +696,175 @@ return array(
     'SebastianBergmann\\Type\\UnknownType' => $vendorDir . '/sebastian/type/src/type/UnknownType.php',
     'SebastianBergmann\\Type\\VoidType' => $vendorDir . '/sebastian/type/src/type/VoidType.php',
     'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
-    'Smarty' => $baseDir . '/lib/Smarty/Smarty.class.php',
-    'SmartyCompilerException' => $baseDir . '/lib/Smarty/sysplugins/smartycompilerexception.php',
-    'SmartyException' => $baseDir . '/lib/Smarty/sysplugins/smartyexception.php',
-    'Smarty_Autoloader' => $baseDir . '/lib/Smarty/Autoloader.php',
-    'Smarty_CacheResource' => $baseDir . '/lib/Smarty/sysplugins/smarty_cacheresource.php',
-    'Smarty_CacheResource_Custom' => $baseDir . '/lib/Smarty/sysplugins/smarty_cacheresource_custom.php',
-    'Smarty_CacheResource_KeyValueStore' => $baseDir . '/lib/Smarty/sysplugins/smarty_cacheresource_keyvaluestore.php',
-    'Smarty_Data' => $baseDir . '/lib/Smarty/sysplugins/smarty_data.php',
-    'Smarty_Internal_Block' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_block.php',
-    'Smarty_Internal_CacheResource_File' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_cacheresource_file.php',
-    'Smarty_Internal_CompileBase' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compilebase.php',
-    'Smarty_Internal_Compile_Append' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_append.php',
-    'Smarty_Internal_Compile_Assign' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_assign.php',
-    'Smarty_Internal_Compile_Block' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_block.php',
-    'Smarty_Internal_Compile_Block_Child' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_block_child.php',
-    'Smarty_Internal_Compile_Block_Parent' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_block_parent.php',
-    'Smarty_Internal_Compile_Blockclose' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_block.php',
-    'Smarty_Internal_Compile_Break' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_break.php',
-    'Smarty_Internal_Compile_Call' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_call.php',
-    'Smarty_Internal_Compile_Capture' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_capture.php',
-    'Smarty_Internal_Compile_CaptureClose' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_capture.php',
-    'Smarty_Internal_Compile_Child' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_child.php',
-    'Smarty_Internal_Compile_Config_Load' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_config_load.php',
-    'Smarty_Internal_Compile_Continue' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_continue.php',
-    'Smarty_Internal_Compile_Debug' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_debug.php',
-    'Smarty_Internal_Compile_Else' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_if.php',
-    'Smarty_Internal_Compile_Elseif' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_if.php',
-    'Smarty_Internal_Compile_Eval' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_eval.php',
-    'Smarty_Internal_Compile_Extends' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_extends.php',
-    'Smarty_Internal_Compile_For' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_for.php',
-    'Smarty_Internal_Compile_Forclose' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_for.php',
-    'Smarty_Internal_Compile_Foreach' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_foreach.php',
-    'Smarty_Internal_Compile_Foreachclose' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_foreach.php',
-    'Smarty_Internal_Compile_Foreachelse' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_foreach.php',
-    'Smarty_Internal_Compile_Forelse' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_for.php',
-    'Smarty_Internal_Compile_Function' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_function.php',
-    'Smarty_Internal_Compile_Functionclose' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_function.php',
-    'Smarty_Internal_Compile_If' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_if.php',
-    'Smarty_Internal_Compile_Ifclose' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_if.php',
-    'Smarty_Internal_Compile_Include' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_include.php',
-    'Smarty_Internal_Compile_Insert' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_insert.php',
-    'Smarty_Internal_Compile_Ldelim' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_ldelim.php',
-    'Smarty_Internal_Compile_Make_Nocache' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_make_nocache.php',
-    'Smarty_Internal_Compile_Nocache' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_nocache.php',
-    'Smarty_Internal_Compile_Nocacheclose' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_nocache.php',
-    'Smarty_Internal_Compile_Parent' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_parent.php',
-    'Smarty_Internal_Compile_Private_Block_Plugin' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_private_block_plugin.php',
-    'Smarty_Internal_Compile_Private_ForeachSection' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_private_foreachsection.php',
-    'Smarty_Internal_Compile_Private_Function_Plugin' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_private_function_plugin.php',
-    'Smarty_Internal_Compile_Private_Modifier' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_private_modifier.php',
-    'Smarty_Internal_Compile_Private_Object_Block_Function' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_private_object_block_function.php',
-    'Smarty_Internal_Compile_Private_Object_Function' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_private_object_function.php',
-    'Smarty_Internal_Compile_Private_Print_Expression' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_private_print_expression.php',
-    'Smarty_Internal_Compile_Private_Registered_Block' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_private_registered_block.php',
-    'Smarty_Internal_Compile_Private_Registered_Function' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_private_registered_function.php',
-    'Smarty_Internal_Compile_Private_Special_Variable' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_private_special_variable.php',
-    'Smarty_Internal_Compile_Rdelim' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_rdelim.php',
-    'Smarty_Internal_Compile_Section' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_section.php',
-    'Smarty_Internal_Compile_Sectionclose' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_section.php',
-    'Smarty_Internal_Compile_Sectionelse' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_section.php',
-    'Smarty_Internal_Compile_Setfilter' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_setfilter.php',
-    'Smarty_Internal_Compile_Setfilterclose' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_setfilter.php',
-    'Smarty_Internal_Compile_Shared_Inheritance' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_shared_inheritance.php',
-    'Smarty_Internal_Compile_While' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_while.php',
-    'Smarty_Internal_Compile_Whileclose' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_compile_while.php',
-    'Smarty_Internal_Config_File_Compiler' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_config_file_compiler.php',
-    'Smarty_Internal_Configfilelexer' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_configfilelexer.php',
-    'Smarty_Internal_Configfileparser' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_configfileparser.php',
-    'Smarty_Internal_Data' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_data.php',
-    'Smarty_Internal_Debug' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_debug.php',
-    'Smarty_Internal_ErrorHandler' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_errorhandler.php',
-    'Smarty_Internal_Extension_Handler' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_extension_handler.php',
-    'Smarty_Internal_Method_AddAutoloadFilters' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_addautoloadfilters.php',
-    'Smarty_Internal_Method_AddDefaultModifiers' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_adddefaultmodifiers.php',
-    'Smarty_Internal_Method_Append' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_append.php',
-    'Smarty_Internal_Method_AppendByRef' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_appendbyref.php',
-    'Smarty_Internal_Method_AssignByRef' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_assignbyref.php',
-    'Smarty_Internal_Method_AssignGlobal' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_assignglobal.php',
-    'Smarty_Internal_Method_ClearAllAssign' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_clearallassign.php',
-    'Smarty_Internal_Method_ClearAllCache' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_clearallcache.php',
-    'Smarty_Internal_Method_ClearAssign' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_clearassign.php',
-    'Smarty_Internal_Method_ClearCache' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_clearcache.php',
-    'Smarty_Internal_Method_ClearCompiledTemplate' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_clearcompiledtemplate.php',
-    'Smarty_Internal_Method_ClearConfig' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_clearconfig.php',
-    'Smarty_Internal_Method_CompileAllConfig' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_compileallconfig.php',
-    'Smarty_Internal_Method_CompileAllTemplates' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_compilealltemplates.php',
-    'Smarty_Internal_Method_ConfigLoad' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_configload.php',
-    'Smarty_Internal_Method_CreateData' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_createdata.php',
-    'Smarty_Internal_Method_GetAutoloadFilters' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_getautoloadfilters.php',
-    'Smarty_Internal_Method_GetConfigVariable' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_getconfigvariable.php',
-    'Smarty_Internal_Method_GetConfigVars' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_getconfigvars.php',
-    'Smarty_Internal_Method_GetDebugTemplate' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_getdebugtemplate.php',
-    'Smarty_Internal_Method_GetDefaultModifiers' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_getdefaultmodifiers.php',
-    'Smarty_Internal_Method_GetGlobal' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_getglobal.php',
-    'Smarty_Internal_Method_GetRegisteredObject' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_getregisteredobject.php',
-    'Smarty_Internal_Method_GetStreamVariable' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_getstreamvariable.php',
-    'Smarty_Internal_Method_GetTags' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_gettags.php',
-    'Smarty_Internal_Method_GetTemplateVars' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_gettemplatevars.php',
-    'Smarty_Internal_Method_Literals' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_literals.php',
-    'Smarty_Internal_Method_LoadFilter' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_loadfilter.php',
-    'Smarty_Internal_Method_LoadPlugin' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_loadplugin.php',
-    'Smarty_Internal_Method_MustCompile' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_mustcompile.php',
-    'Smarty_Internal_Method_RegisterCacheResource' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_registercacheresource.php',
-    'Smarty_Internal_Method_RegisterClass' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_registerclass.php',
-    'Smarty_Internal_Method_RegisterDefaultConfigHandler' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_registerdefaultconfighandler.php',
-    'Smarty_Internal_Method_RegisterDefaultPluginHandler' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php',
-    'Smarty_Internal_Method_RegisterDefaultTemplateHandler' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php',
-    'Smarty_Internal_Method_RegisterFilter' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_registerfilter.php',
-    'Smarty_Internal_Method_RegisterObject' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_registerobject.php',
-    'Smarty_Internal_Method_RegisterPlugin' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_registerplugin.php',
-    'Smarty_Internal_Method_RegisterResource' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_registerresource.php',
-    'Smarty_Internal_Method_SetAutoloadFilters' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_setautoloadfilters.php',
-    'Smarty_Internal_Method_SetDebugTemplate' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_setdebugtemplate.php',
-    'Smarty_Internal_Method_SetDefaultModifiers' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_setdefaultmodifiers.php',
-    'Smarty_Internal_Method_UnloadFilter' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_unloadfilter.php',
-    'Smarty_Internal_Method_UnregisterCacheResource' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_unregistercacheresource.php',
-    'Smarty_Internal_Method_UnregisterFilter' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_unregisterfilter.php',
-    'Smarty_Internal_Method_UnregisterObject' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_unregisterobject.php',
-    'Smarty_Internal_Method_UnregisterPlugin' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_unregisterplugin.php',
-    'Smarty_Internal_Method_UnregisterResource' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_method_unregisterresource.php',
-    'Smarty_Internal_Nocache_Insert' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_nocache_insert.php',
-    'Smarty_Internal_ParseTree' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_parsetree.php',
-    'Smarty_Internal_ParseTree_Code' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_parsetree_code.php',
-    'Smarty_Internal_ParseTree_Dq' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_parsetree_dq.php',
-    'Smarty_Internal_ParseTree_DqContent' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_parsetree_dqcontent.php',
-    'Smarty_Internal_ParseTree_Tag' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_parsetree_tag.php',
-    'Smarty_Internal_ParseTree_Template' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_parsetree_template.php',
-    'Smarty_Internal_ParseTree_Text' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_parsetree_text.php',
-    'Smarty_Internal_Resource_Eval' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_resource_eval.php',
-    'Smarty_Internal_Resource_Extends' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_resource_extends.php',
-    'Smarty_Internal_Resource_File' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_resource_file.php',
-    'Smarty_Internal_Resource_Php' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_resource_php.php',
-    'Smarty_Internal_Resource_Stream' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_resource_stream.php',
-    'Smarty_Internal_Resource_String' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_resource_string.php',
-    'Smarty_Internal_Runtime_CacheModify' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_cachemodify.php',
-    'Smarty_Internal_Runtime_CacheResourceFile' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_cacheresourcefile.php',
-    'Smarty_Internal_Runtime_Capture' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_capture.php',
-    'Smarty_Internal_Runtime_CodeFrame' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_codeframe.php',
-    'Smarty_Internal_Runtime_FilterHandler' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_filterhandler.php',
-    'Smarty_Internal_Runtime_Foreach' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_foreach.php',
-    'Smarty_Internal_Runtime_GetIncludePath' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_getincludepath.php',
-    'Smarty_Internal_Runtime_Inheritance' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_inheritance.php',
-    'Smarty_Internal_Runtime_Make_Nocache' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_make_nocache.php',
-    'Smarty_Internal_Runtime_TplFunction' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_tplfunction.php',
-    'Smarty_Internal_Runtime_UpdateCache' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_updatecache.php',
-    'Smarty_Internal_Runtime_UpdateScope' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_updatescope.php',
-    'Smarty_Internal_Runtime_WriteFile' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_runtime_writefile.php',
-    'Smarty_Internal_SmartyTemplateCompiler' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_smartytemplatecompiler.php',
-    'Smarty_Internal_Template' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_template.php',
-    'Smarty_Internal_TemplateBase' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_templatebase.php',
-    'Smarty_Internal_TemplateCompilerBase' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_templatecompilerbase.php',
-    'Smarty_Internal_Templatelexer' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_templatelexer.php',
-    'Smarty_Internal_Templateparser' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_templateparser.php',
-    'Smarty_Internal_TestInstall' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_testinstall.php',
-    'Smarty_Internal_Undefined' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_undefined.php',
-    'Smarty_Resource' => $baseDir . '/lib/Smarty/sysplugins/smarty_resource.php',
-    'Smarty_Resource_Custom' => $baseDir . '/lib/Smarty/sysplugins/smarty_resource_custom.php',
-    'Smarty_Resource_Recompiled' => $baseDir . '/lib/Smarty/sysplugins/smarty_resource_recompiled.php',
-    'Smarty_Resource_Uncompiled' => $baseDir . '/lib/Smarty/sysplugins/smarty_resource_uncompiled.php',
-    'Smarty_Security' => $baseDir . '/lib/Smarty/sysplugins/smarty_security.php',
-    'Smarty_Template_Cached' => $baseDir . '/lib/Smarty/sysplugins/smarty_template_cached.php',
-    'Smarty_Template_Compiled' => $baseDir . '/lib/Smarty/sysplugins/smarty_template_compiled.php',
-    'Smarty_Template_Config' => $baseDir . '/lib/Smarty/sysplugins/smarty_template_config.php',
-    'Smarty_Template_Resource_Base' => $baseDir . '/lib/Smarty/sysplugins/smarty_template_resource_base.php',
-    'Smarty_Template_Source' => $baseDir . '/lib/Smarty/sysplugins/smarty_template_source.php',
-    'Smarty_Undefined_Variable' => $baseDir . '/lib/Smarty/sysplugins/smarty_undefined_variable.php',
-    'Smarty_Variable' => $baseDir . '/lib/Smarty/sysplugins/smarty_variable.php',
-    'TPC_yyStackEntry' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_configfileparser.php',
-    'TP_yyStackEntry' => $baseDir . '/lib/Smarty/sysplugins/smarty_internal_templateparser.php',
+    'Smarty' => $vendorDir . '/egrajp/smarty-extended/src/Smarty.class.php',
+    'SmartyCompilerException' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smartycompilerexception.php',
+    'SmartyException' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smartyexception.php',
+    'Smarty_Autoloader' => $vendorDir . '/egrajp/smarty-extended/src/Autoloader.php',
+    'Smarty_CacheResource' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_cacheresource.php',
+    'Smarty_CacheResource_Custom' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_cacheresource_custom.php',
+    'Smarty_CacheResource_KeyValueStore' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_cacheresource_keyvaluestore.php',
+    'Smarty_Data' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_data.php',
+    'Smarty_Internal_Block' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_block.php',
+    'Smarty_Internal_CacheResource_File' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_cacheresource_file.php',
+    'Smarty_Internal_CompileBase' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compilebase.php',
+    'Smarty_Internal_Compile_Append' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_append.php',
+    'Smarty_Internal_Compile_Assign' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_assign.php',
+    'Smarty_Internal_Compile_Block' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_block.php',
+    'Smarty_Internal_Compile_Block_Child' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_block_child.php',
+    'Smarty_Internal_Compile_Block_Parent' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_block_parent.php',
+    'Smarty_Internal_Compile_Blockclose' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_block.php',
+    'Smarty_Internal_Compile_Break' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_break.php',
+    'Smarty_Internal_Compile_Call' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_call.php',
+    'Smarty_Internal_Compile_Capture' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_capture.php',
+    'Smarty_Internal_Compile_CaptureClose' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_capture.php',
+    'Smarty_Internal_Compile_Child' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_child.php',
+    'Smarty_Internal_Compile_Config_Load' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_config_load.php',
+    'Smarty_Internal_Compile_Continue' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_continue.php',
+    'Smarty_Internal_Compile_Debug' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_debug.php',
+    'Smarty_Internal_Compile_Else' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_if.php',
+    'Smarty_Internal_Compile_Elseif' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_if.php',
+    'Smarty_Internal_Compile_Eval' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_eval.php',
+    'Smarty_Internal_Compile_Extends' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_extends.php',
+    'Smarty_Internal_Compile_For' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_for.php',
+    'Smarty_Internal_Compile_Forclose' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_for.php',
+    'Smarty_Internal_Compile_Foreach' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_foreach.php',
+    'Smarty_Internal_Compile_Foreachclose' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_foreach.php',
+    'Smarty_Internal_Compile_Foreachelse' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_foreach.php',
+    'Smarty_Internal_Compile_Forelse' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_for.php',
+    'Smarty_Internal_Compile_Function' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_function.php',
+    'Smarty_Internal_Compile_Functionclose' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_function.php',
+    'Smarty_Internal_Compile_If' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_if.php',
+    'Smarty_Internal_Compile_Ifclose' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_if.php',
+    'Smarty_Internal_Compile_Include' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_include.php',
+    'Smarty_Internal_Compile_Insert' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_insert.php',
+    'Smarty_Internal_Compile_Ldelim' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_ldelim.php',
+    'Smarty_Internal_Compile_Make_Nocache' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_make_nocache.php',
+    'Smarty_Internal_Compile_Nocache' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_nocache.php',
+    'Smarty_Internal_Compile_Nocacheclose' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_nocache.php',
+    'Smarty_Internal_Compile_Parent' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_parent.php',
+    'Smarty_Internal_Compile_Private_Block_Plugin' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_block_plugin.php',
+    'Smarty_Internal_Compile_Private_ForeachSection' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_foreachsection.php',
+    'Smarty_Internal_Compile_Private_Function_Plugin' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_function_plugin.php',
+    'Smarty_Internal_Compile_Private_Modifier' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_modifier.php',
+    'Smarty_Internal_Compile_Private_Object_Block_Function' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_object_block_function.php',
+    'Smarty_Internal_Compile_Private_Object_Function' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_object_function.php',
+    'Smarty_Internal_Compile_Private_Print_Expression' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_print_expression.php',
+    'Smarty_Internal_Compile_Private_Registered_Block' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_registered_block.php',
+    'Smarty_Internal_Compile_Private_Registered_Function' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_registered_function.php',
+    'Smarty_Internal_Compile_Private_Special_Variable' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_special_variable.php',
+    'Smarty_Internal_Compile_Rdelim' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_rdelim.php',
+    'Smarty_Internal_Compile_Section' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_section.php',
+    'Smarty_Internal_Compile_Sectionclose' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_section.php',
+    'Smarty_Internal_Compile_Sectionelse' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_section.php',
+    'Smarty_Internal_Compile_Setfilter' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_setfilter.php',
+    'Smarty_Internal_Compile_Setfilterclose' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_setfilter.php',
+    'Smarty_Internal_Compile_Shared_Inheritance' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_shared_inheritance.php',
+    'Smarty_Internal_Compile_While' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_while.php',
+    'Smarty_Internal_Compile_Whileclose' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_while.php',
+    'Smarty_Internal_Config_File_Compiler' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_config_file_compiler.php',
+    'Smarty_Internal_Configfilelexer' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_configfilelexer.php',
+    'Smarty_Internal_Configfileparser' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_configfileparser.php',
+    'Smarty_Internal_Data' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_data.php',
+    'Smarty_Internal_Debug' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_debug.php',
+    'Smarty_Internal_ErrorHandler' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_errorhandler.php',
+    'Smarty_Internal_Extension_Handler' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_extension_handler.php',
+    'Smarty_Internal_Method_AddAutoloadFilters' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_addautoloadfilters.php',
+    'Smarty_Internal_Method_AddDefaultModifiers' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_adddefaultmodifiers.php',
+    'Smarty_Internal_Method_Append' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_append.php',
+    'Smarty_Internal_Method_AppendByRef' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_appendbyref.php',
+    'Smarty_Internal_Method_AssignByRef' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_assignbyref.php',
+    'Smarty_Internal_Method_AssignGlobal' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_assignglobal.php',
+    'Smarty_Internal_Method_ClearAllAssign' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_clearallassign.php',
+    'Smarty_Internal_Method_ClearAllCache' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_clearallcache.php',
+    'Smarty_Internal_Method_ClearAssign' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_clearassign.php',
+    'Smarty_Internal_Method_ClearCache' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_clearcache.php',
+    'Smarty_Internal_Method_ClearCompiledTemplate' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_clearcompiledtemplate.php',
+    'Smarty_Internal_Method_ClearConfig' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_clearconfig.php',
+    'Smarty_Internal_Method_CompileAllConfig' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_compileallconfig.php',
+    'Smarty_Internal_Method_CompileAllTemplates' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_compilealltemplates.php',
+    'Smarty_Internal_Method_ConfigLoad' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_configload.php',
+    'Smarty_Internal_Method_CreateData' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_createdata.php',
+    'Smarty_Internal_Method_GetAutoloadFilters' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getautoloadfilters.php',
+    'Smarty_Internal_Method_GetConfigVariable' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getconfigvariable.php',
+    'Smarty_Internal_Method_GetConfigVars' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getconfigvars.php',
+    'Smarty_Internal_Method_GetDebugTemplate' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getdebugtemplate.php',
+    'Smarty_Internal_Method_GetDefaultModifiers' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getdefaultmodifiers.php',
+    'Smarty_Internal_Method_GetGlobal' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getglobal.php',
+    'Smarty_Internal_Method_GetRegisteredObject' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getregisteredobject.php',
+    'Smarty_Internal_Method_GetStreamVariable' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getstreamvariable.php',
+    'Smarty_Internal_Method_GetTags' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_gettags.php',
+    'Smarty_Internal_Method_GetTemplateVars' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_gettemplatevars.php',
+    'Smarty_Internal_Method_Literals' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_literals.php',
+    'Smarty_Internal_Method_LoadFilter' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_loadfilter.php',
+    'Smarty_Internal_Method_LoadPlugin' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_loadplugin.php',
+    'Smarty_Internal_Method_MustCompile' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_mustcompile.php',
+    'Smarty_Internal_Method_RegisterCacheResource' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registercacheresource.php',
+    'Smarty_Internal_Method_RegisterClass' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerclass.php',
+    'Smarty_Internal_Method_RegisterDefaultConfigHandler' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerdefaultconfighandler.php',
+    'Smarty_Internal_Method_RegisterDefaultPluginHandler' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php',
+    'Smarty_Internal_Method_RegisterDefaultTemplateHandler' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php',
+    'Smarty_Internal_Method_RegisterFilter' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerfilter.php',
+    'Smarty_Internal_Method_RegisterObject' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerobject.php',
+    'Smarty_Internal_Method_RegisterPlugin' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerplugin.php',
+    'Smarty_Internal_Method_RegisterResource' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerresource.php',
+    'Smarty_Internal_Method_SetAutoloadFilters' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_setautoloadfilters.php',
+    'Smarty_Internal_Method_SetDebugTemplate' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_setdebugtemplate.php',
+    'Smarty_Internal_Method_SetDefaultModifiers' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_setdefaultmodifiers.php',
+    'Smarty_Internal_Method_UnloadFilter' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_unloadfilter.php',
+    'Smarty_Internal_Method_UnregisterCacheResource' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_unregistercacheresource.php',
+    'Smarty_Internal_Method_UnregisterFilter' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_unregisterfilter.php',
+    'Smarty_Internal_Method_UnregisterObject' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_unregisterobject.php',
+    'Smarty_Internal_Method_UnregisterPlugin' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_unregisterplugin.php',
+    'Smarty_Internal_Method_UnregisterResource' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_unregisterresource.php',
+    'Smarty_Internal_Nocache_Insert' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_nocache_insert.php',
+    'Smarty_Internal_ParseTree' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree.php',
+    'Smarty_Internal_ParseTree_Code' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree_code.php',
+    'Smarty_Internal_ParseTree_Dq' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree_dq.php',
+    'Smarty_Internal_ParseTree_DqContent' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree_dqcontent.php',
+    'Smarty_Internal_ParseTree_Tag' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree_tag.php',
+    'Smarty_Internal_ParseTree_Template' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree_template.php',
+    'Smarty_Internal_ParseTree_Text' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree_text.php',
+    'Smarty_Internal_Resource_Eval' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_resource_eval.php',
+    'Smarty_Internal_Resource_Extends' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_resource_extends.php',
+    'Smarty_Internal_Resource_File' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_resource_file.php',
+    'Smarty_Internal_Resource_Php' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_resource_php.php',
+    'Smarty_Internal_Resource_Stream' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_resource_stream.php',
+    'Smarty_Internal_Resource_String' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_resource_string.php',
+    'Smarty_Internal_Runtime_CacheModify' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_cachemodify.php',
+    'Smarty_Internal_Runtime_CacheResourceFile' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_cacheresourcefile.php',
+    'Smarty_Internal_Runtime_Capture' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_capture.php',
+    'Smarty_Internal_Runtime_CodeFrame' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_codeframe.php',
+    'Smarty_Internal_Runtime_FilterHandler' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_filterhandler.php',
+    'Smarty_Internal_Runtime_Foreach' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_foreach.php',
+    'Smarty_Internal_Runtime_GetIncludePath' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_getincludepath.php',
+    'Smarty_Internal_Runtime_Inheritance' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_inheritance.php',
+    'Smarty_Internal_Runtime_Make_Nocache' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_make_nocache.php',
+    'Smarty_Internal_Runtime_TplFunction' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_tplfunction.php',
+    'Smarty_Internal_Runtime_UpdateCache' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_updatecache.php',
+    'Smarty_Internal_Runtime_UpdateScope' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_updatescope.php',
+    'Smarty_Internal_Runtime_WriteFile' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_writefile.php',
+    'Smarty_Internal_SmartyTemplateCompiler' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_smartytemplatecompiler.php',
+    'Smarty_Internal_Template' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_template.php',
+    'Smarty_Internal_TemplateBase' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatebase.php',
+    'Smarty_Internal_TemplateCompilerBase' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatecompilerbase.php',
+    'Smarty_Internal_Templatelexer' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatelexer.php',
+    'Smarty_Internal_Templateparser' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_templateparser.php',
+    'Smarty_Internal_TestInstall' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_testinstall.php',
+    'Smarty_Internal_Undefined' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_undefined.php',
+    'Smarty_Resource' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_resource.php',
+    'Smarty_Resource_Custom' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_resource_custom.php',
+    'Smarty_Resource_Recompiled' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_resource_recompiled.php',
+    'Smarty_Resource_Uncompiled' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_resource_uncompiled.php',
+    'Smarty_Security' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_security.php',
+    'Smarty_Template_Cached' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_template_cached.php',
+    'Smarty_Template_Compiled' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_template_compiled.php',
+    'Smarty_Template_Config' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_template_config.php',
+    'Smarty_Template_Resource_Base' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_template_resource_base.php',
+    'Smarty_Template_Source' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_template_source.php',
+    'Smarty_Undefined_Variable' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_undefined_variable.php',
+    'Smarty_Variable' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_variable.php',
+    'TPC_yyStackEntry' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_configfileparser.php',
+    'TP_yyStackEntry' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_templateparser.php',
     'Test\\DB\\TestDB' => $baseDir . '/lib/Test/DB/TestDB.php',
     'Test\\Test' => $baseDir . '/lib/Test/Test.php',
     'TheSeer\\Tokenizer\\Exception' => $vendorDir . '/theseer/tokenizer/src/Exception.php',

www/vendor/composer/autoload_static.php

@@ -57,15 +57,15 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
         'CoreLibs\\Convert\\Byte' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/Byte.php',
         'CoreLibs\\Convert\\Colors' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/Colors.php',
         'CoreLibs\\Convert\\Encoding' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/Encoding.php',
-        'CoreLibs\\Convert\\Extends\\VarSetTypeMain' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/Extends/VarSetTypeMain.php',
+        'CoreLibs\\Convert\\Extends\\SetVarTypeMain' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/Extends/SetVarTypeMain.php',
         'CoreLibs\\Convert\\Html' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/Html.php',
         'CoreLibs\\Convert\\Json' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/Json.php',
         'CoreLibs\\Convert\\Math' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/Math.php',
         'CoreLibs\\Convert\\MimeAppName' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/MimeAppName.php',
         'CoreLibs\\Convert\\MimeEncode' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/MimeEncode.php',
+        'CoreLibs\\Convert\\SetVarType' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/SetVarType.php',
+        'CoreLibs\\Convert\\SetVarTypeNull' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/SetVarTypeNull.php',
         'CoreLibs\\Convert\\Strings' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/Strings.php',
-        'CoreLibs\\Convert\\VarSetType' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/VarSetType.php',
-        'CoreLibs\\Convert\\VarSetTypeNull' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/VarSetTypeNull.php',
         'CoreLibs\\Create\\Email' => __DIR__ . '/../..' . '/lib/CoreLibs/Create/Email.php',
         'CoreLibs\\Create\\Hash' => __DIR__ . '/../..' . '/lib/CoreLibs/Create/Hash.php',
         'CoreLibs\\Create\\RandomKey' => __DIR__ . '/../..' . '/lib/CoreLibs/Create/RandomKey.php',
@@ -73,8 +73,8 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
         'CoreLibs\\Create\\Uids' => __DIR__ . '/../..' . '/lib/CoreLibs/Create/Uids.php',
         'CoreLibs\\DB\\Extended\\ArrayIO' => __DIR__ . '/../..' . '/lib/CoreLibs/DB/Extended/ArrayIO.php',
         'CoreLibs\\DB\\IO' => __DIR__ . '/../..' . '/lib/CoreLibs/DB/IO.php',
+        'CoreLibs\\DB\\SQL\\Interface\\SqlFunctions' => __DIR__ . '/../..' . '/lib/CoreLibs/DB/SQL/Interface/SqlFunctions.php',
         'CoreLibs\\DB\\SQL\\PgSQL' => __DIR__ . '/../..' . '/lib/CoreLibs/DB/SQL/PgSQL.php',
-        'CoreLibs\\DB\\SQL\\SqlInterface\\SqlFunctions' => __DIR__ . '/../..' . '/lib/CoreLibs/DB/SQL/SqlInterface/SqlFunctions.php',
         'CoreLibs\\Debug\\FileWriter' => __DIR__ . '/../..' . '/lib/CoreLibs/Debug/FileWriter.php',
         'CoreLibs\\Debug\\Logging' => __DIR__ . '/../..' . '/lib/CoreLibs/Debug/Logging.php',
         'CoreLibs\\Debug\\MemoryUsage' => __DIR__ . '/../..' . '/lib/CoreLibs/Debug/MemoryUsage.php',
@@ -93,7 +93,6 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
         'CoreLibs\\Language\\L10n' => __DIR__ . '/../..' . '/lib/CoreLibs/Language/L10n.php',
         'CoreLibs\\Output\\Form\\Elements' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/Elements.php',
         'CoreLibs\\Output\\Form\\Generate' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/Generate.php',
-        'CoreLibs\\Output\\Form\\TableArraysInterface' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/TableArraysInterface.php',
         'CoreLibs\\Output\\Form\\TableArrays\\EditAccess' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditAccess.php',
         'CoreLibs\\Output\\Form\\TableArrays\\EditGroups' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditGroups.php',
         'CoreLibs\\Output\\Form\\TableArrays\\EditLanguages' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditLanguages.php',
@@ -102,6 +101,7 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
         'CoreLibs\\Output\\Form\\TableArrays\\EditSchemas' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditSchemas.php',
         'CoreLibs\\Output\\Form\\TableArrays\\EditUsers' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditUsers.php',
         'CoreLibs\\Output\\Form\\TableArrays\\EditVisibleGroup' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditVisibleGroup.php',
+        'CoreLibs\\Output\\Form\\TableArrays\\Interface\\TableArraysInterface' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/Interface/TableArraysInterface.php',
         'CoreLibs\\Output\\Form\\Token' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/Token.php',
         'CoreLibs\\Output\\Image' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Image.php',
         'CoreLibs\\Output\\ProgressBar' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/ProgressBar.php',
@@ -729,175 +729,175 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
         'SebastianBergmann\\Type\\UnknownType' => __DIR__ . '/..' . '/sebastian/type/src/type/UnknownType.php',
         'SebastianBergmann\\Type\\VoidType' => __DIR__ . '/..' . '/sebastian/type/src/type/VoidType.php',
         'SebastianBergmann\\Version' => __DIR__ . '/..' . '/sebastian/version/src/Version.php',
-        'Smarty' => __DIR__ . '/../..' . '/lib/Smarty/Smarty.class.php',
-        'SmartyCompilerException' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smartycompilerexception.php',
-        'SmartyException' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smartyexception.php',
-        'Smarty_Autoloader' => __DIR__ . '/../..' . '/lib/Smarty/Autoloader.php',
-        'Smarty_CacheResource' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_cacheresource.php',
-        'Smarty_CacheResource_Custom' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_cacheresource_custom.php',
-        'Smarty_CacheResource_KeyValueStore' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_cacheresource_keyvaluestore.php',
-        'Smarty_Data' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_data.php',
-        'Smarty_Internal_Block' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_block.php',
-        'Smarty_Internal_CacheResource_File' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_cacheresource_file.php',
-        'Smarty_Internal_CompileBase' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compilebase.php',
-        'Smarty_Internal_Compile_Append' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_append.php',
-        'Smarty_Internal_Compile_Assign' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_assign.php',
-        'Smarty_Internal_Compile_Block' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_block.php',
-        'Smarty_Internal_Compile_Block_Child' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_block_child.php',
-        'Smarty_Internal_Compile_Block_Parent' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_block_parent.php',
-        'Smarty_Internal_Compile_Blockclose' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_block.php',
-        'Smarty_Internal_Compile_Break' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_break.php',
-        'Smarty_Internal_Compile_Call' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_call.php',
-        'Smarty_Internal_Compile_Capture' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_capture.php',
-        'Smarty_Internal_Compile_CaptureClose' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_capture.php',
-        'Smarty_Internal_Compile_Child' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_child.php',
-        'Smarty_Internal_Compile_Config_Load' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_config_load.php',
-        'Smarty_Internal_Compile_Continue' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_continue.php',
-        'Smarty_Internal_Compile_Debug' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_debug.php',
-        'Smarty_Internal_Compile_Else' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_if.php',
-        'Smarty_Internal_Compile_Elseif' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_if.php',
-        'Smarty_Internal_Compile_Eval' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_eval.php',
-        'Smarty_Internal_Compile_Extends' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_extends.php',
-        'Smarty_Internal_Compile_For' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_for.php',
-        'Smarty_Internal_Compile_Forclose' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_for.php',
-        'Smarty_Internal_Compile_Foreach' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_foreach.php',
-        'Smarty_Internal_Compile_Foreachclose' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_foreach.php',
-        'Smarty_Internal_Compile_Foreachelse' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_foreach.php',
-        'Smarty_Internal_Compile_Forelse' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_for.php',
-        'Smarty_Internal_Compile_Function' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_function.php',
-        'Smarty_Internal_Compile_Functionclose' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_function.php',
-        'Smarty_Internal_Compile_If' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_if.php',
-        'Smarty_Internal_Compile_Ifclose' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_if.php',
-        'Smarty_Internal_Compile_Include' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_include.php',
-        'Smarty_Internal_Compile_Insert' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_insert.php',
-        'Smarty_Internal_Compile_Ldelim' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_ldelim.php',
-        'Smarty_Internal_Compile_Make_Nocache' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_make_nocache.php',
-        'Smarty_Internal_Compile_Nocache' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_nocache.php',
-        'Smarty_Internal_Compile_Nocacheclose' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_nocache.php',
-        'Smarty_Internal_Compile_Parent' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_parent.php',
-        'Smarty_Internal_Compile_Private_Block_Plugin' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_private_block_plugin.php',
-        'Smarty_Internal_Compile_Private_ForeachSection' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_private_foreachsection.php',
-        'Smarty_Internal_Compile_Private_Function_Plugin' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_private_function_plugin.php',
-        'Smarty_Internal_Compile_Private_Modifier' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_private_modifier.php',
-        'Smarty_Internal_Compile_Private_Object_Block_Function' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_private_object_block_function.php',
-        'Smarty_Internal_Compile_Private_Object_Function' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_private_object_function.php',
-        'Smarty_Internal_Compile_Private_Print_Expression' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_private_print_expression.php',
-        'Smarty_Internal_Compile_Private_Registered_Block' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_private_registered_block.php',
-        'Smarty_Internal_Compile_Private_Registered_Function' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_private_registered_function.php',
-        'Smarty_Internal_Compile_Private_Special_Variable' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_private_special_variable.php',
-        'Smarty_Internal_Compile_Rdelim' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_rdelim.php',
-        'Smarty_Internal_Compile_Section' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_section.php',
-        'Smarty_Internal_Compile_Sectionclose' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_section.php',
-        'Smarty_Internal_Compile_Sectionelse' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_section.php',
-        'Smarty_Internal_Compile_Setfilter' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_setfilter.php',
-        'Smarty_Internal_Compile_Setfilterclose' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_setfilter.php',
-        'Smarty_Internal_Compile_Shared_Inheritance' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_shared_inheritance.php',
-        'Smarty_Internal_Compile_While' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_while.php',
-        'Smarty_Internal_Compile_Whileclose' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_compile_while.php',
-        'Smarty_Internal_Config_File_Compiler' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_config_file_compiler.php',
-        'Smarty_Internal_Configfilelexer' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_configfilelexer.php',
-        'Smarty_Internal_Configfileparser' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_configfileparser.php',
-        'Smarty_Internal_Data' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_data.php',
-        'Smarty_Internal_Debug' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_debug.php',
-        'Smarty_Internal_ErrorHandler' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_errorhandler.php',
-        'Smarty_Internal_Extension_Handler' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_extension_handler.php',
-        'Smarty_Internal_Method_AddAutoloadFilters' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_addautoloadfilters.php',
-        'Smarty_Internal_Method_AddDefaultModifiers' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_adddefaultmodifiers.php',
-        'Smarty_Internal_Method_Append' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_append.php',
-        'Smarty_Internal_Method_AppendByRef' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_appendbyref.php',
-        'Smarty_Internal_Method_AssignByRef' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_assignbyref.php',
-        'Smarty_Internal_Method_AssignGlobal' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_assignglobal.php',
-        'Smarty_Internal_Method_ClearAllAssign' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_clearallassign.php',
-        'Smarty_Internal_Method_ClearAllCache' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_clearallcache.php',
-        'Smarty_Internal_Method_ClearAssign' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_clearassign.php',
-        'Smarty_Internal_Method_ClearCache' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_clearcache.php',
-        'Smarty_Internal_Method_ClearCompiledTemplate' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_clearcompiledtemplate.php',
-        'Smarty_Internal_Method_ClearConfig' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_clearconfig.php',
-        'Smarty_Internal_Method_CompileAllConfig' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_compileallconfig.php',
-        'Smarty_Internal_Method_CompileAllTemplates' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_compilealltemplates.php',
-        'Smarty_Internal_Method_ConfigLoad' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_configload.php',
-        'Smarty_Internal_Method_CreateData' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_createdata.php',
-        'Smarty_Internal_Method_GetAutoloadFilters' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_getautoloadfilters.php',
-        'Smarty_Internal_Method_GetConfigVariable' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_getconfigvariable.php',
-        'Smarty_Internal_Method_GetConfigVars' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_getconfigvars.php',
-        'Smarty_Internal_Method_GetDebugTemplate' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_getdebugtemplate.php',
-        'Smarty_Internal_Method_GetDefaultModifiers' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_getdefaultmodifiers.php',
-        'Smarty_Internal_Method_GetGlobal' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_getglobal.php',
-        'Smarty_Internal_Method_GetRegisteredObject' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_getregisteredobject.php',
-        'Smarty_Internal_Method_GetStreamVariable' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_getstreamvariable.php',
-        'Smarty_Internal_Method_GetTags' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_gettags.php',
-        'Smarty_Internal_Method_GetTemplateVars' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_gettemplatevars.php',
-        'Smarty_Internal_Method_Literals' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_literals.php',
-        'Smarty_Internal_Method_LoadFilter' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_loadfilter.php',
-        'Smarty_Internal_Method_LoadPlugin' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_loadplugin.php',
-        'Smarty_Internal_Method_MustCompile' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_mustcompile.php',
-        'Smarty_Internal_Method_RegisterCacheResource' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_registercacheresource.php',
-        'Smarty_Internal_Method_RegisterClass' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_registerclass.php',
-        'Smarty_Internal_Method_RegisterDefaultConfigHandler' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_registerdefaultconfighandler.php',
-        'Smarty_Internal_Method_RegisterDefaultPluginHandler' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php',
-        'Smarty_Internal_Method_RegisterDefaultTemplateHandler' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php',
-        'Smarty_Internal_Method_RegisterFilter' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_registerfilter.php',
-        'Smarty_Internal_Method_RegisterObject' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_registerobject.php',
-        'Smarty_Internal_Method_RegisterPlugin' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_registerplugin.php',
-        'Smarty_Internal_Method_RegisterResource' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_registerresource.php',
-        'Smarty_Internal_Method_SetAutoloadFilters' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_setautoloadfilters.php',
-        'Smarty_Internal_Method_SetDebugTemplate' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_setdebugtemplate.php',
-        'Smarty_Internal_Method_SetDefaultModifiers' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_setdefaultmodifiers.php',
-        'Smarty_Internal_Method_UnloadFilter' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_unloadfilter.php',
-        'Smarty_Internal_Method_UnregisterCacheResource' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_unregistercacheresource.php',
-        'Smarty_Internal_Method_UnregisterFilter' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_unregisterfilter.php',
-        'Smarty_Internal_Method_UnregisterObject' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_unregisterobject.php',
-        'Smarty_Internal_Method_UnregisterPlugin' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_unregisterplugin.php',
-        'Smarty_Internal_Method_UnregisterResource' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_method_unregisterresource.php',
-        'Smarty_Internal_Nocache_Insert' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_nocache_insert.php',
-        'Smarty_Internal_ParseTree' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_parsetree.php',
-        'Smarty_Internal_ParseTree_Code' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_parsetree_code.php',
-        'Smarty_Internal_ParseTree_Dq' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_parsetree_dq.php',
-        'Smarty_Internal_ParseTree_DqContent' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_parsetree_dqcontent.php',
-        'Smarty_Internal_ParseTree_Tag' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_parsetree_tag.php',
-        'Smarty_Internal_ParseTree_Template' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_parsetree_template.php',
-        'Smarty_Internal_ParseTree_Text' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_parsetree_text.php',
-        'Smarty_Internal_Resource_Eval' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_resource_eval.php',
-        'Smarty_Internal_Resource_Extends' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_resource_extends.php',
-        'Smarty_Internal_Resource_File' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_resource_file.php',
-        'Smarty_Internal_Resource_Php' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_resource_php.php',
-        'Smarty_Internal_Resource_Stream' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_resource_stream.php',
-        'Smarty_Internal_Resource_String' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_resource_string.php',
-        'Smarty_Internal_Runtime_CacheModify' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_cachemodify.php',
-        'Smarty_Internal_Runtime_CacheResourceFile' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_cacheresourcefile.php',
-        'Smarty_Internal_Runtime_Capture' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_capture.php',
-        'Smarty_Internal_Runtime_CodeFrame' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_codeframe.php',
-        'Smarty_Internal_Runtime_FilterHandler' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_filterhandler.php',
-        'Smarty_Internal_Runtime_Foreach' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_foreach.php',
-        'Smarty_Internal_Runtime_GetIncludePath' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_getincludepath.php',
-        'Smarty_Internal_Runtime_Inheritance' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_inheritance.php',
-        'Smarty_Internal_Runtime_Make_Nocache' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_make_nocache.php',
-        'Smarty_Internal_Runtime_TplFunction' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_tplfunction.php',
-        'Smarty_Internal_Runtime_UpdateCache' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_updatecache.php',
-        'Smarty_Internal_Runtime_UpdateScope' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_updatescope.php',
-        'Smarty_Internal_Runtime_WriteFile' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_runtime_writefile.php',
-        'Smarty_Internal_SmartyTemplateCompiler' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_smartytemplatecompiler.php',
-        'Smarty_Internal_Template' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_template.php',
-        'Smarty_Internal_TemplateBase' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_templatebase.php',
-        'Smarty_Internal_TemplateCompilerBase' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_templatecompilerbase.php',
-        'Smarty_Internal_Templatelexer' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_templatelexer.php',
-        'Smarty_Internal_Templateparser' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_templateparser.php',
-        'Smarty_Internal_TestInstall' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_testinstall.php',
-        'Smarty_Internal_Undefined' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_undefined.php',
-        'Smarty_Resource' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_resource.php',
-        'Smarty_Resource_Custom' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_resource_custom.php',
-        'Smarty_Resource_Recompiled' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_resource_recompiled.php',
-        'Smarty_Resource_Uncompiled' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_resource_uncompiled.php',
-        'Smarty_Security' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_security.php',
-        'Smarty_Template_Cached' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_template_cached.php',
-        'Smarty_Template_Compiled' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_template_compiled.php',
-        'Smarty_Template_Config' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_template_config.php',
-        'Smarty_Template_Resource_Base' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_template_resource_base.php',
-        'Smarty_Template_Source' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_template_source.php',
-        'Smarty_Undefined_Variable' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_undefined_variable.php',
-        'Smarty_Variable' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_variable.php',
-        'TPC_yyStackEntry' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_configfileparser.php',
-        'TP_yyStackEntry' => __DIR__ . '/../..' . '/lib/Smarty/sysplugins/smarty_internal_templateparser.php',
+        'Smarty' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/Smarty.class.php',
+        'SmartyCompilerException' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smartycompilerexception.php',
+        'SmartyException' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smartyexception.php',
+        'Smarty_Autoloader' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/Autoloader.php',
+        'Smarty_CacheResource' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_cacheresource.php',
+        'Smarty_CacheResource_Custom' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_cacheresource_custom.php',
+        'Smarty_CacheResource_KeyValueStore' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_cacheresource_keyvaluestore.php',
+        'Smarty_Data' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_data.php',
+        'Smarty_Internal_Block' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_block.php',
+        'Smarty_Internal_CacheResource_File' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_cacheresource_file.php',
+        'Smarty_Internal_CompileBase' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compilebase.php',
+        'Smarty_Internal_Compile_Append' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_append.php',
+        'Smarty_Internal_Compile_Assign' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_assign.php',
+        'Smarty_Internal_Compile_Block' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_block.php',
+        'Smarty_Internal_Compile_Block_Child' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_block_child.php',
+        'Smarty_Internal_Compile_Block_Parent' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_block_parent.php',
+        'Smarty_Internal_Compile_Blockclose' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_block.php',
+        'Smarty_Internal_Compile_Break' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_break.php',
+        'Smarty_Internal_Compile_Call' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_call.php',
+        'Smarty_Internal_Compile_Capture' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_capture.php',
+        'Smarty_Internal_Compile_CaptureClose' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_capture.php',
+        'Smarty_Internal_Compile_Child' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_child.php',
+        'Smarty_Internal_Compile_Config_Load' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_config_load.php',
+        'Smarty_Internal_Compile_Continue' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_continue.php',
+        'Smarty_Internal_Compile_Debug' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_debug.php',
+        'Smarty_Internal_Compile_Else' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_if.php',
+        'Smarty_Internal_Compile_Elseif' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_if.php',
+        'Smarty_Internal_Compile_Eval' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_eval.php',
+        'Smarty_Internal_Compile_Extends' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_extends.php',
+        'Smarty_Internal_Compile_For' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_for.php',
+        'Smarty_Internal_Compile_Forclose' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_for.php',
+        'Smarty_Internal_Compile_Foreach' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_foreach.php',
+        'Smarty_Internal_Compile_Foreachclose' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_foreach.php',
+        'Smarty_Internal_Compile_Foreachelse' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_foreach.php',
+        'Smarty_Internal_Compile_Forelse' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_for.php',
+        'Smarty_Internal_Compile_Function' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_function.php',
+        'Smarty_Internal_Compile_Functionclose' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_function.php',
+        'Smarty_Internal_Compile_If' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_if.php',
+        'Smarty_Internal_Compile_Ifclose' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_if.php',
+        'Smarty_Internal_Compile_Include' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_include.php',
+        'Smarty_Internal_Compile_Insert' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_insert.php',
+        'Smarty_Internal_Compile_Ldelim' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_ldelim.php',
+        'Smarty_Internal_Compile_Make_Nocache' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_make_nocache.php',
+        'Smarty_Internal_Compile_Nocache' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_nocache.php',
+        'Smarty_Internal_Compile_Nocacheclose' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_nocache.php',
+        'Smarty_Internal_Compile_Parent' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_parent.php',
+        'Smarty_Internal_Compile_Private_Block_Plugin' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_block_plugin.php',
+        'Smarty_Internal_Compile_Private_ForeachSection' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_foreachsection.php',
+        'Smarty_Internal_Compile_Private_Function_Plugin' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_function_plugin.php',
+        'Smarty_Internal_Compile_Private_Modifier' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_modifier.php',
+        'Smarty_Internal_Compile_Private_Object_Block_Function' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_object_block_function.php',
+        'Smarty_Internal_Compile_Private_Object_Function' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_object_function.php',
+        'Smarty_Internal_Compile_Private_Print_Expression' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_print_expression.php',
+        'Smarty_Internal_Compile_Private_Registered_Block' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_registered_block.php',
+        'Smarty_Internal_Compile_Private_Registered_Function' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_registered_function.php',
+        'Smarty_Internal_Compile_Private_Special_Variable' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_special_variable.php',
+        'Smarty_Internal_Compile_Rdelim' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_rdelim.php',
+        'Smarty_Internal_Compile_Section' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_section.php',
+        'Smarty_Internal_Compile_Sectionclose' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_section.php',
+        'Smarty_Internal_Compile_Sectionelse' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_section.php',
+        'Smarty_Internal_Compile_Setfilter' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_setfilter.php',
+        'Smarty_Internal_Compile_Setfilterclose' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_setfilter.php',
+        'Smarty_Internal_Compile_Shared_Inheritance' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_shared_inheritance.php',
+        'Smarty_Internal_Compile_While' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_while.php',
+        'Smarty_Internal_Compile_Whileclose' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_while.php',
+        'Smarty_Internal_Config_File_Compiler' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_config_file_compiler.php',
+        'Smarty_Internal_Configfilelexer' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_configfilelexer.php',
+        'Smarty_Internal_Configfileparser' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_configfileparser.php',
+        'Smarty_Internal_Data' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_data.php',
+        'Smarty_Internal_Debug' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_debug.php',
+        'Smarty_Internal_ErrorHandler' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_errorhandler.php',
+        'Smarty_Internal_Extension_Handler' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_extension_handler.php',
+        'Smarty_Internal_Method_AddAutoloadFilters' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_addautoloadfilters.php',
+        'Smarty_Internal_Method_AddDefaultModifiers' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_adddefaultmodifiers.php',
+        'Smarty_Internal_Method_Append' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_append.php',
+        'Smarty_Internal_Method_AppendByRef' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_appendbyref.php',
+        'Smarty_Internal_Method_AssignByRef' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_assignbyref.php',
+        'Smarty_Internal_Method_AssignGlobal' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_assignglobal.php',
+        'Smarty_Internal_Method_ClearAllAssign' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_clearallassign.php',
+        'Smarty_Internal_Method_ClearAllCache' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_clearallcache.php',
+        'Smarty_Internal_Method_ClearAssign' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_clearassign.php',
+        'Smarty_Internal_Method_ClearCache' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_clearcache.php',
+        'Smarty_Internal_Method_ClearCompiledTemplate' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_clearcompiledtemplate.php',
+        'Smarty_Internal_Method_ClearConfig' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_clearconfig.php',
+        'Smarty_Internal_Method_CompileAllConfig' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_compileallconfig.php',
+        'Smarty_Internal_Method_CompileAllTemplates' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_compilealltemplates.php',
+        'Smarty_Internal_Method_ConfigLoad' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_configload.php',
+        'Smarty_Internal_Method_CreateData' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_createdata.php',
+        'Smarty_Internal_Method_GetAutoloadFilters' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getautoloadfilters.php',
+        'Smarty_Internal_Method_GetConfigVariable' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getconfigvariable.php',
+        'Smarty_Internal_Method_GetConfigVars' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getconfigvars.php',
+        'Smarty_Internal_Method_GetDebugTemplate' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getdebugtemplate.php',
+        'Smarty_Internal_Method_GetDefaultModifiers' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getdefaultmodifiers.php',
+        'Smarty_Internal_Method_GetGlobal' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getglobal.php',
+        'Smarty_Internal_Method_GetRegisteredObject' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getregisteredobject.php',
+        'Smarty_Internal_Method_GetStreamVariable' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_getstreamvariable.php',
+        'Smarty_Internal_Method_GetTags' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_gettags.php',
+        'Smarty_Internal_Method_GetTemplateVars' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_gettemplatevars.php',
+        'Smarty_Internal_Method_Literals' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_literals.php',
+        'Smarty_Internal_Method_LoadFilter' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_loadfilter.php',
+        'Smarty_Internal_Method_LoadPlugin' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_loadplugin.php',
+        'Smarty_Internal_Method_MustCompile' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_mustcompile.php',
+        'Smarty_Internal_Method_RegisterCacheResource' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registercacheresource.php',
+        'Smarty_Internal_Method_RegisterClass' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerclass.php',
+        'Smarty_Internal_Method_RegisterDefaultConfigHandler' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerdefaultconfighandler.php',
+        'Smarty_Internal_Method_RegisterDefaultPluginHandler' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php',
+        'Smarty_Internal_Method_RegisterDefaultTemplateHandler' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php',
+        'Smarty_Internal_Method_RegisterFilter' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerfilter.php',
+        'Smarty_Internal_Method_RegisterObject' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerobject.php',
+        'Smarty_Internal_Method_RegisterPlugin' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerplugin.php',
+        'Smarty_Internal_Method_RegisterResource' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_registerresource.php',
+        'Smarty_Internal_Method_SetAutoloadFilters' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_setautoloadfilters.php',
+        'Smarty_Internal_Method_SetDebugTemplate' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_setdebugtemplate.php',
+        'Smarty_Internal_Method_SetDefaultModifiers' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_setdefaultmodifiers.php',
+        'Smarty_Internal_Method_UnloadFilter' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_unloadfilter.php',
+        'Smarty_Internal_Method_UnregisterCacheResource' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_unregistercacheresource.php',
+        'Smarty_Internal_Method_UnregisterFilter' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_unregisterfilter.php',
+        'Smarty_Internal_Method_UnregisterObject' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_unregisterobject.php',
+        'Smarty_Internal_Method_UnregisterPlugin' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_unregisterplugin.php',
+        'Smarty_Internal_Method_UnregisterResource' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_method_unregisterresource.php',
+        'Smarty_Internal_Nocache_Insert' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_nocache_insert.php',
+        'Smarty_Internal_ParseTree' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree.php',
+        'Smarty_Internal_ParseTree_Code' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree_code.php',
+        'Smarty_Internal_ParseTree_Dq' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree_dq.php',
+        'Smarty_Internal_ParseTree_DqContent' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree_dqcontent.php',
+        'Smarty_Internal_ParseTree_Tag' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree_tag.php',
+        'Smarty_Internal_ParseTree_Template' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree_template.php',
+        'Smarty_Internal_ParseTree_Text' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_parsetree_text.php',
+        'Smarty_Internal_Resource_Eval' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_resource_eval.php',
+        'Smarty_Internal_Resource_Extends' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_resource_extends.php',
+        'Smarty_Internal_Resource_File' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_resource_file.php',
+        'Smarty_Internal_Resource_Php' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_resource_php.php',
+        'Smarty_Internal_Resource_Stream' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_resource_stream.php',
+        'Smarty_Internal_Resource_String' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_resource_string.php',
+        'Smarty_Internal_Runtime_CacheModify' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_cachemodify.php',
+        'Smarty_Internal_Runtime_CacheResourceFile' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_cacheresourcefile.php',
+        'Smarty_Internal_Runtime_Capture' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_capture.php',
+        'Smarty_Internal_Runtime_CodeFrame' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_codeframe.php',
+        'Smarty_Internal_Runtime_FilterHandler' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_filterhandler.php',
+        'Smarty_Internal_Runtime_Foreach' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_foreach.php',
+        'Smarty_Internal_Runtime_GetIncludePath' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_getincludepath.php',
+        'Smarty_Internal_Runtime_Inheritance' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_inheritance.php',
+        'Smarty_Internal_Runtime_Make_Nocache' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_make_nocache.php',
+        'Smarty_Internal_Runtime_TplFunction' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_tplfunction.php',
+        'Smarty_Internal_Runtime_UpdateCache' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_updatecache.php',
+        'Smarty_Internal_Runtime_UpdateScope' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_updatescope.php',
+        'Smarty_Internal_Runtime_WriteFile' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_runtime_writefile.php',
+        'Smarty_Internal_SmartyTemplateCompiler' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_smartytemplatecompiler.php',
+        'Smarty_Internal_Template' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_template.php',
+        'Smarty_Internal_TemplateBase' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatebase.php',
+        'Smarty_Internal_TemplateCompilerBase' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatecompilerbase.php',
+        'Smarty_Internal_Templatelexer' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatelexer.php',
+        'Smarty_Internal_Templateparser' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_templateparser.php',
+        'Smarty_Internal_TestInstall' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_testinstall.php',
+        'Smarty_Internal_Undefined' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_undefined.php',
+        'Smarty_Resource' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_resource.php',
+        'Smarty_Resource_Custom' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_resource_custom.php',
+        'Smarty_Resource_Recompiled' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_resource_recompiled.php',
+        'Smarty_Resource_Uncompiled' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_resource_uncompiled.php',
+        'Smarty_Security' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_security.php',
+        'Smarty_Template_Cached' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_template_cached.php',
+        'Smarty_Template_Compiled' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_template_compiled.php',
+        'Smarty_Template_Config' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_template_config.php',
+        'Smarty_Template_Resource_Base' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_template_resource_base.php',
+        'Smarty_Template_Source' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_template_source.php',
+        'Smarty_Undefined_Variable' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_undefined_variable.php',
+        'Smarty_Variable' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_variable.php',
+        'TPC_yyStackEntry' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_configfileparser.php',
+        'TP_yyStackEntry' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_templateparser.php',
         'Test\\DB\\TestDB' => __DIR__ . '/../..' . '/lib/Test/DB/TestDB.php',
         'Test\\Test' => __DIR__ . '/../..' . '/lib/Test/Test.php',
         'TheSeer\\Tokenizer\\Exception' => __DIR__ . '/..' . '/theseer/tokenizer/src/Exception.php',

www/vendor/composer/installed.json

@@ -2,33 +2,33 @@
     "packages": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.5.0",
-            "version_normalized": "1.5.0.0",
+            "version": "2.0.0",
+            "version_normalized": "2.0.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^11",
+                "doctrine/coding-standard": "^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.16 || ^1",
-                "phpstan/phpstan": "^1.4",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.30 || ^5.4"
+                "phpbench/phpbench": "^1.2",
+                "phpstan/phpstan": "^1.9.4",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5.27",
+                "vimeo/psalm": "^5.4"
             },
-            "time": "2022-12-30T00:15:36+00:00",
+            "time": "2022-12-30T00:23:10+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -55,7 +55,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
+                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
             },
             "funding": [
                 {
@@ -73,6 +73,39 @@
             ],
             "install-path": "../doctrine/instantiator"
         },
+        {
+            "name": "egrajp/smarty-extended",
+            "version": "4.3.0",
+            "version_normalized": "4.3.0.0",
+            "dist": {
+                "type": "zip",
+                "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.3.0/egrajp-smarty-extended.4.3.0.zip",
+                "shasum": "d41bda35c0d52da35cf911ab0b018655a09f072b"
+            },
+            "time": "2023-02-17T14:14:10+09:00",
+            "type": "library",
+            "installation-source": "dist",
+            "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"
+            ],
+            "install-path": "../egrajp/smarty-extended"
+        },
         {
             "name": "myclabs/deep-copy",
             "version": "1.11.0",
@@ -137,17 +170,17 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.2",
-            "version_normalized": "4.15.2.0",
+            "version": "v4.15.3",
+            "version_normalized": "4.15.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
                 "shasum": ""
             },
             "require": {
@@ -158,7 +191,7 @@
                 "ircmaxell/php-yacc": "^0.0.7",
                 "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
             },
-            "time": "2022-11-12T15:38:23+00:00",
+            "time": "2023-01-16T22:05:37+00:00",
             "bin": [
                 "bin/php-parse"
             ],
@@ -190,7 +223,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
             },
             "install-path": "../nikic/php-parser"
         },
@@ -313,17 +346,17 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.23",
-            "version_normalized": "9.2.23.0",
+            "version": "9.2.24",
+            "version_normalized": "9.2.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c"
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
-                "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2cf940ebc6355a9d430462811b5aaa308b174bed",
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed",
                 "shasum": ""
             },
             "require": {
@@ -348,7 +381,7 @@
                 "ext-pcov": "*",
                 "ext-xdebug": "*"
             },
-            "time": "2022-12-28T12:41:10+00:00",
+            "time": "2023-01-26T08:26:55+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -381,7 +414,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.24"
             },
             "funding": [
                 {
@@ -646,21 +679,21 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.27",
-            "version_normalized": "9.5.27.0",
+            "version": "9.6.3",
+            "version_normalized": "9.6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38"
+                "reference": "e7b1615e3e887d6c719121c6d4a44b0ab9645555"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38",
-                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e7b1615e3e887d6c719121c6d4a44b0ab9645555",
+                "reference": "e7b1615e3e887d6c719121c6d4a44b0ab9645555",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1",
+                "doctrine/instantiator": "^1.3.1 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
@@ -692,14 +725,14 @@
                 "ext-soap": "*",
                 "ext-xdebug": "*"
             },
-            "time": "2022-12-09T07:31:23+00:00",
+            "time": "2023-02-04T13:37:15+00:00",
             "bin": [
                 "phpunit"
             ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.5-dev"
+                    "dev-master": "9.6-dev"
                 }
             },
             "installation-source": "dist",
@@ -731,7 +764,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.3"
             },
             "funding": [
                 {
@@ -1133,17 +1166,17 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.4",
-            "version_normalized": "5.1.4.0",
+            "version": "5.1.5",
+            "version_normalized": "5.1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
                 "shasum": ""
             },
             "require": {
@@ -1155,7 +1188,7 @@
             "suggest": {
                 "ext-posix": "*"
             },
-            "time": "2022-04-03T09:37:03+00:00",
+            "time": "2023-02-03T06:03:51+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1187,7 +1220,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
             },
             "funding": [
                 {
@@ -1524,17 +1557,17 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.4",
-            "version_normalized": "4.0.4.0",
+            "version": "4.0.5",
+            "version_normalized": "4.0.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
                 "shasum": ""
             },
             "require": {
@@ -1543,7 +1576,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^9.3"
             },
-            "time": "2020-10-26T13:17:30+00:00",
+            "time": "2023-02-03T06:07:39+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1575,10 +1608,10 @@
                 }
             ],
             "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
             },
             "funding": [
                 {
@@ -1648,17 +1681,17 @@
         },
         {
             "name": "sebastian/type",
-            "version": "3.2.0",
-            "version_normalized": "3.2.0.0",
+            "version": "3.2.1",
+            "version_normalized": "3.2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
                 "shasum": ""
             },
             "require": {
@@ -1667,7 +1700,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^9.5"
             },
-            "time": "2022-09-12T14:47:03+00:00",
+            "time": "2023-02-03T06:13:03+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1695,7 +1728,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
             },
             "funding": [
                 {

www/vendor/composer/installed.php

@@ -1,274 +1,283 @@
 <?php return array(
     'root' => array(
+        'name' => 'egrajp/corelibs-dev',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
+        'reference' => NULL,
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => NULL,
-        'name' => 'gullevek/corelibs-dev',
         'dev' => true,
     ),
     'versions' => array(
         'doctrine/instantiator' => array(
-            'pretty_version' => '1.5.0',
-            'version' => '1.5.0.0',
+            'pretty_version' => '2.0.0',
+            'version' => '2.0.0.0',
+            'reference' => 'c6222283fa3f4ac679f8b9ced9a4e23f163e80d0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../doctrine/instantiator',
             'aliases' => array(),
-            'reference' => '0a0fa9780f5d4e507415a065172d26a98d02047b',
             'dev_requirement' => true,
         ),
-        'gullevek/corelibs-dev' => array(
+        'egrajp/corelibs-dev' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
+            'reference' => NULL,
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'egrajp/smarty-extended' => array(
+            'pretty_version' => '4.3.0',
+            'version' => '4.3.0.0',
             'reference' => NULL,
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../egrajp/smarty-extended',
+            'aliases' => array(),
             'dev_requirement' => false,
         ),
         'myclabs/deep-copy' => array(
             'pretty_version' => '1.11.0',
             'version' => '1.11.0.0',
+            'reference' => '14daed4296fae74d9e3201d2c4925d1acb7aa614',
             'type' => 'library',
             'install_path' => __DIR__ . '/../myclabs/deep-copy',
             'aliases' => array(),
-            'reference' => '14daed4296fae74d9e3201d2c4925d1acb7aa614',
             'dev_requirement' => true,
         ),
         'nikic/php-parser' => array(
-            'pretty_version' => 'v4.15.2',
-            'version' => '4.15.2.0',
+            'pretty_version' => 'v4.15.3',
+            'version' => '4.15.3.0',
+            'reference' => '570e980a201d8ed0236b0a62ddf2c9cbb2034039',
             'type' => 'library',
             'install_path' => __DIR__ . '/../nikic/php-parser',
             'aliases' => array(),
-            'reference' => 'f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc',
             'dev_requirement' => true,
         ),
         'phar-io/manifest' => array(
             'pretty_version' => '2.0.3',
             'version' => '2.0.3.0',
+            'reference' => '97803eca37d319dfa7826cc2437fc020857acb53',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phar-io/manifest',
             'aliases' => array(),
-            'reference' => '97803eca37d319dfa7826cc2437fc020857acb53',
             'dev_requirement' => true,
         ),
         'phar-io/version' => array(
             'pretty_version' => '3.2.1',
             'version' => '3.2.1.0',
+            'reference' => '4f7fd7836c6f332bb2933569e566a0d6c4cbed74',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phar-io/version',
             'aliases' => array(),
-            'reference' => '4f7fd7836c6f332bb2933569e566a0d6c4cbed74',
             'dev_requirement' => true,
         ),
         'phpunit/php-code-coverage' => array(
-            'pretty_version' => '9.2.23',
-            'version' => '9.2.23.0',
+            'pretty_version' => '9.2.24',
+            'version' => '9.2.24.0',
+            'reference' => '2cf940ebc6355a9d430462811b5aaa308b174bed',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpunit/php-code-coverage',
             'aliases' => array(),
-            'reference' => '9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c',
             'dev_requirement' => true,
         ),
         'phpunit/php-file-iterator' => array(
             'pretty_version' => '3.0.6',
             'version' => '3.0.6.0',
+            'reference' => 'cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpunit/php-file-iterator',
             'aliases' => array(),
-            'reference' => 'cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf',
             'dev_requirement' => true,
         ),
         'phpunit/php-invoker' => array(
             'pretty_version' => '3.1.1',
             'version' => '3.1.1.0',
+            'reference' => '5a10147d0aaf65b58940a0b72f71c9ac0423cc67',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpunit/php-invoker',
             'aliases' => array(),
-            'reference' => '5a10147d0aaf65b58940a0b72f71c9ac0423cc67',
             'dev_requirement' => true,
         ),
         'phpunit/php-text-template' => array(
             'pretty_version' => '2.0.4',
             'version' => '2.0.4.0',
+            'reference' => '5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpunit/php-text-template',
             'aliases' => array(),
-            'reference' => '5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28',
             'dev_requirement' => true,
         ),
         'phpunit/php-timer' => array(
             'pretty_version' => '5.0.3',
             'version' => '5.0.3.0',
+            'reference' => '5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpunit/php-timer',
             'aliases' => array(),
-            'reference' => '5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2',
             'dev_requirement' => true,
         ),
         'phpunit/phpunit' => array(
-            'pretty_version' => '9.5.27',
-            'version' => '9.5.27.0',
+            'pretty_version' => '9.6.3',
+            'version' => '9.6.3.0',
+            'reference' => 'e7b1615e3e887d6c719121c6d4a44b0ab9645555',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpunit/phpunit',
             'aliases' => array(),
-            'reference' => 'a2bc7ffdca99f92d959b3f2270529334030bba38',
             'dev_requirement' => true,
         ),
         'sebastian/cli-parser' => array(
             'pretty_version' => '1.0.1',
             'version' => '1.0.1.0',
+            'reference' => '442e7c7e687e42adc03470c7b668bc4b2402c0b2',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/cli-parser',
             'aliases' => array(),
-            'reference' => '442e7c7e687e42adc03470c7b668bc4b2402c0b2',
             'dev_requirement' => true,
         ),
         'sebastian/code-unit' => array(
             'pretty_version' => '1.0.8',
             'version' => '1.0.8.0',
+            'reference' => '1fc9f64c0927627ef78ba436c9b17d967e68e120',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/code-unit',
             'aliases' => array(),
-            'reference' => '1fc9f64c0927627ef78ba436c9b17d967e68e120',
             'dev_requirement' => true,
         ),
         'sebastian/code-unit-reverse-lookup' => array(
             'pretty_version' => '2.0.3',
             'version' => '2.0.3.0',
+            'reference' => 'ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/code-unit-reverse-lookup',
             'aliases' => array(),
-            'reference' => 'ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5',
             'dev_requirement' => true,
         ),
         'sebastian/comparator' => array(
             'pretty_version' => '4.0.8',
             'version' => '4.0.8.0',
+            'reference' => 'fa0f136dd2334583309d32b62544682ee972b51a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/comparator',
             'aliases' => array(),
-            'reference' => 'fa0f136dd2334583309d32b62544682ee972b51a',
             'dev_requirement' => true,
         ),
         'sebastian/complexity' => array(
             'pretty_version' => '2.0.2',
             'version' => '2.0.2.0',
+            'reference' => '739b35e53379900cc9ac327b2147867b8b6efd88',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/complexity',
             'aliases' => array(),
-            'reference' => '739b35e53379900cc9ac327b2147867b8b6efd88',
             'dev_requirement' => true,
         ),
         'sebastian/diff' => array(
             'pretty_version' => '4.0.4',
             'version' => '4.0.4.0',
+            'reference' => '3461e3fccc7cfdfc2720be910d3bd73c69be590d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/diff',
             'aliases' => array(),
-            'reference' => '3461e3fccc7cfdfc2720be910d3bd73c69be590d',
             'dev_requirement' => true,
         ),
         'sebastian/environment' => array(
-            'pretty_version' => '5.1.4',
-            'version' => '5.1.4.0',
+            'pretty_version' => '5.1.5',
+            'version' => '5.1.5.0',
+            'reference' => '830c43a844f1f8d5b7a1f6d6076b784454d8b7ed',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/environment',
             'aliases' => array(),
-            'reference' => '1b5dff7bb151a4db11d49d90e5408e4e938270f7',
             'dev_requirement' => true,
         ),
         'sebastian/exporter' => array(
             'pretty_version' => '4.0.5',
             'version' => '4.0.5.0',
+            'reference' => 'ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/exporter',
             'aliases' => array(),
-            'reference' => 'ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d',
             'dev_requirement' => true,
         ),
         'sebastian/global-state' => array(
             'pretty_version' => '5.0.5',
             'version' => '5.0.5.0',
+            'reference' => '0ca8db5a5fc9c8646244e629625ac486fa286bf2',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/global-state',
             'aliases' => array(),
-            'reference' => '0ca8db5a5fc9c8646244e629625ac486fa286bf2',
             'dev_requirement' => true,
         ),
         'sebastian/lines-of-code' => array(
             'pretty_version' => '1.0.3',
             'version' => '1.0.3.0',
+            'reference' => 'c1c2e997aa3146983ed888ad08b15470a2e22ecc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/lines-of-code',
             'aliases' => array(),
-            'reference' => 'c1c2e997aa3146983ed888ad08b15470a2e22ecc',
             'dev_requirement' => true,
         ),
         'sebastian/object-enumerator' => array(
             'pretty_version' => '4.0.4',
             'version' => '4.0.4.0',
+            'reference' => '5c9eeac41b290a3712d88851518825ad78f45c71',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/object-enumerator',
             'aliases' => array(),
-            'reference' => '5c9eeac41b290a3712d88851518825ad78f45c71',
             'dev_requirement' => true,
         ),
         'sebastian/object-reflector' => array(
             'pretty_version' => '2.0.4',
             'version' => '2.0.4.0',
+            'reference' => 'b4f479ebdbf63ac605d183ece17d8d7fe49c15c7',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/object-reflector',
             'aliases' => array(),
-            'reference' => 'b4f479ebdbf63ac605d183ece17d8d7fe49c15c7',
             'dev_requirement' => true,
         ),
         'sebastian/recursion-context' => array(
-            'pretty_version' => '4.0.4',
-            'version' => '4.0.4.0',
+            'pretty_version' => '4.0.5',
+            'version' => '4.0.5.0',
+            'reference' => 'e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/recursion-context',
             'aliases' => array(),
-            'reference' => 'cd9d8cf3c5804de4341c283ed787f099f5506172',
             'dev_requirement' => true,
         ),
         'sebastian/resource-operations' => array(
             'pretty_version' => '3.0.3',
             'version' => '3.0.3.0',
+            'reference' => '0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/resource-operations',
             'aliases' => array(),
-            'reference' => '0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8',
             'dev_requirement' => true,
         ),
         'sebastian/type' => array(
-            'pretty_version' => '3.2.0',
-            'version' => '3.2.0.0',
+            'pretty_version' => '3.2.1',
+            'version' => '3.2.1.0',
+            'reference' => '75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/type',
             'aliases' => array(),
-            'reference' => 'fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e',
             'dev_requirement' => true,
         ),
         'sebastian/version' => array(
             'pretty_version' => '3.0.2',
             'version' => '3.0.2.0',
+            'reference' => 'c6c1022351a901512170118436c764e473f6de8c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/version',
             'aliases' => array(),
-            'reference' => 'c6c1022351a901512170118436c764e473f6de8c',
             'dev_requirement' => true,
         ),
         'theseer/tokenizer' => array(
             'pretty_version' => '1.2.1',
             'version' => '1.2.1.0',
+            'reference' => '34a41e998c2183e22995f158c581e7b5e755ab9e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../theseer/tokenizer',
             'aliases' => array(),
-            'reference' => '34a41e998c2183e22995f158c581e7b5e755ab9e',
             'dev_requirement' => true,
         ),
     ),

www/vendor/doctrine/instantiator/composer.json

@@ -16,17 +16,17 @@
         }
     ],
     "require": {
-        "php": "^7.1 || ^8.0"
+        "php": "^8.1"
     },
     "require-dev": {
         "ext-phar":                  "*",
         "ext-pdo":                   "*",
-        "doctrine/coding-standard":  "^9 || ^11",
-        "phpbench/phpbench":         "^0.16 || ^1",
-        "phpstan/phpstan":           "^1.4",
-        "phpstan/phpstan-phpunit":   "^1",
-        "phpunit/phpunit":           "^7.5 || ^8.5 || ^9.5",
-        "vimeo/psalm": "^4.30 || ^5.4"
+        "doctrine/coding-standard":  "^11",
+        "phpbench/phpbench":         "^1.2",
+        "phpstan/phpstan":           "^1.9.4",
+        "phpstan/phpstan-phpunit":   "^1.3",
+        "phpunit/phpunit":           "^9.5.27",
+        "vimeo/psalm":               "^5.4"
     },
     "autoload": {
         "psr-4": {

www/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/ExceptionInterface.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Instantiator\Exception;
 
 use Throwable;

www/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/InvalidArgumentException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Instantiator\Exception;
 
 use InvalidArgumentException as BaseInvalidArgumentException;
@@ -36,7 +38,7 @@ class InvalidArgumentException extends BaseInvalidArgumentException implements E
     {
         return new self(sprintf(
             'The provided class "%s" is abstract, and cannot be instantiated',
-            $reflectionClass->getName()
+            $reflectionClass->getName(),
         ));
     }
 
@@ -44,7 +46,7 @@ class InvalidArgumentException extends BaseInvalidArgumentException implements E
     {
         return new self(sprintf(
             'The provided class "%s" is an enum, and cannot be instantiated',
-            $className
+            $className,
         ));
     }
 }

www/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/UnexpectedValueException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Instantiator\Exception;
 
 use Exception;
@@ -20,15 +22,15 @@ class UnexpectedValueException extends BaseUnexpectedValueException implements E
      */
     public static function fromSerializationTriggeredException(
         ReflectionClass $reflectionClass,
-        Exception $exception
+        Exception $exception,
     ): self {
         return new self(
             sprintf(
                 'An exception was raised while trying to instantiate an instance of "%s" via un-serialization',
-                $reflectionClass->getName()
+                $reflectionClass->getName(),
             ),
             0,
-            $exception
+            $exception,
         );
     }
 
@@ -42,7 +44,7 @@ class UnexpectedValueException extends BaseUnexpectedValueException implements E
         string $errorString,
         int $errorCode,
         string $errorFile,
-        int $errorLine
+        int $errorLine,
     ): self {
         return new self(
             sprintf(
@@ -50,10 +52,10 @@ class UnexpectedValueException extends BaseUnexpectedValueException implements E
                 . 'in file "%s" at line "%d"',
                 $reflectionClass->getName(),
                 $errorFile,
-                $errorLine
+                $errorLine,
             ),
             0,
-            new Exception($errorString, $errorCode)
+            new Exception($errorString, $errorCode),
         );
     }
 }

www/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Instantiator;
 
 use ArrayIterator;
@@ -20,8 +22,6 @@ use function sprintf;
 use function strlen;
 use function unserialize;
 
-use const PHP_VERSION_ID;
-
 final class Instantiator implements InstantiatorInterface
 {
     /**
@@ -31,37 +31,33 @@ final class Instantiator implements InstantiatorInterface
      *
      * @deprecated This constant will be private in 2.0
      */
-    public const SERIALIZATION_FORMAT_USE_UNSERIALIZER = 'C';
-
-    /** @deprecated This constant will be private in 2.0 */
-    public const SERIALIZATION_FORMAT_AVOID_UNSERIALIZER = 'O';
+    private const SERIALIZATION_FORMAT_USE_UNSERIALIZER   = 'C';
+    private const SERIALIZATION_FORMAT_AVOID_UNSERIALIZER = 'O';
 
     /**
      * Used to instantiate specific classes, indexed by class name.
      *
      * @var callable[]
      */
-    private static $cachedInstantiators = [];
+    private static array $cachedInstantiators = [];
 
     /**
      * Array of objects that can directly be cloned, indexed by class name.
      *
      * @var object[]
      */
-    private static $cachedCloneables = [];
+    private static array $cachedCloneables = [];
 
     /**
-     * @param string $className
      * @phpstan-param class-string<T> $className
      *
-     * @return object
      * @phpstan-return T
      *
      * @throws ExceptionInterface
      *
      * @template T of object
      */
-    public function instantiate($className)
+    public function instantiate(string $className): object
     {
         if (isset(self::$cachedCloneables[$className])) {
             /** @phpstan-var T */
@@ -84,12 +80,11 @@ final class Instantiator implements InstantiatorInterface
      *
      * @phpstan-param class-string<T> $className
      *
-     * @return object
      * @phpstan-return T
      *
      * @template T of object
      */
-    private function buildAndCacheFromFactory(string $className)
+    private function buildAndCacheFromFactory(string $className): object
     {
         $factory  = self::$cachedInstantiators[$className] = $this->buildFactory($className);
         $instance = $factory();
@@ -127,14 +122,12 @@ final class Instantiator implements InstantiatorInterface
             '%s:%d:"%s":0:{}',
             is_subclass_of($className, Serializable::class) ? self::SERIALIZATION_FORMAT_USE_UNSERIALIZER : self::SERIALIZATION_FORMAT_AVOID_UNSERIALIZER,
             strlen($className),
-            $className
+            $className,
         );
 
         $this->checkIfUnSerializationIsSupported($reflectionClass, $serializedString);
 
-        return static function () use ($serializedString) {
-            return unserialize($serializedString);
-        };
+        return static fn () => unserialize($serializedString);
     }
 
     /**
@@ -153,7 +146,7 @@ final class Instantiator implements InstantiatorInterface
             throw InvalidArgumentException::fromNonExistingClass($className);
         }
 
-        if (PHP_VERSION_ID >= 80100 && enum_exists($className, false)) {
+        if (enum_exists($className, false)) {
             throw InvalidArgumentException::fromEnum($className);
         }
 
@@ -181,7 +174,7 @@ final class Instantiator implements InstantiatorInterface
                 $message,
                 $code,
                 $file,
-                $line
+                $line,
             );
 
             return true;

www/vendor/doctrine/instantiator/src/Doctrine/Instantiator/InstantiatorInterface.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Instantiator;
 
 use Doctrine\Instantiator\Exception\ExceptionInterface;
@@ -10,15 +12,13 @@ use Doctrine\Instantiator\Exception\ExceptionInterface;
 interface InstantiatorInterface
 {
     /**
-     * @param string $className
      * @phpstan-param class-string<T> $className
      *
-     * @return object
      * @phpstan-return T
      *
      * @throws ExceptionInterface
      *
      * @template T of object
      */
-    public function instantiate($className);
+    public function instantiate(string $className): object;
 }