Mo create script update, phpstan fixes, document updates

create_mo: set auto base folder bases on current location so we do not need do adjust paths in script phpstan fixes: edit_base.php CoreLibs/Basci.php CoreLibs/DB/SQL/PgSQL.php Update documentation in method headers CoreLibs/Combined/DateTime.php
Add JS_TRANSLATE file to smart template flow
2022-10-12 09:48:22 +09:00 · 2022-10-04 17:35:46 +09:00 · 2022-09-06 11:17:03 +09:00 · 2022-09-06 11:16:33 +09:00 · 2022-09-02 17:00:22 +09:00 · 2022-08-05 12:43:57 +09:00
336 changed files with 3316 additions and 25774 deletions
--- a/4dev/bin/create_mo.sh
+++ b/4dev/bin/create_mo.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash

-base_folder='/var/www/html/developers/clemens/core_data/php_libraries/trunk/www/';
+BASE_FOLDER=$(dirname $(readlink -f $0))"/";
+# Assume script is in 4dev/bin
+base_folder="${BASE_FOLDER}../../www/";

 # locale gettext po to mo translator master
 for file in $(ls -1 ${base_folder}../4dev/locale/*.po); do
--- a/4dev/database/function/edit_access_set_uid.sql
+++ b/4dev/database/function/edit_access_set_uid.sql
@@ -25,4 +25,4 @@ BEGIN
 	RETURN NEW;
 END;
 $$
-	LANGUAGE 'plpgsql';
+LANGUAGE 'plpgsql';
--- a/4dev/database/function/edit_group_set_uid.sql
+++ b/4dev/database/function/edit_group_set_uid.sql
@@ -25,4 +25,4 @@ BEGIN
 	RETURN NEW;
 END;
 $$
-	LANGUAGE 'plpgsql';
+LANGUAGE 'plpgsql';
--- a/4dev/tests/CoreLibsACLLoginTest.php
+++ b/4dev/tests/CoreLibsACLLoginTest.php
@@ -1477,7 +1477,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				);
 				// - loginGetLoginHTML
 				$this->assertStringContainsString(
-					'<html>',
+					'<html lang="',
 					$login_mock->loginGetLoginHTML(),
 					'Assert login html string exits'
 				);
@@ -1529,7 +1529,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					// html login basic check only, content is the same as when
 					// read from loginGetLoginHTML()
 					$this->assertStringContainsString(
-						'<html>',
+						'<html lang="',
 						$_POST['login_html'],
 						'Assert ajax _POST html string exits'
 					);
--- a/4dev/tests/CoreLibsCheckEncodingTest.php
+++ b/4dev/tests/CoreLibsCheckEncodingTest.php
@@ -92,6 +92,7 @@ final class CoreLibsCheckEncodingTest extends TestCase
 		$error_char,
 		$expected
 	): void {
+		$current_subsitute_character = mb_substitute_character();
 		if ($error_char !== null) {
 			\CoreLibs\Check\Encoding::setErrorChar($error_char);
 			if (!in_array($error_char, ['none', 'long', 'entity'])) {
@@ -111,6 +112,8 @@ final class CoreLibsCheckEncodingTest extends TestCase
 			$expected,
 			$return
 		);
+		// reset after test
+		mb_substitute_character($current_subsitute_character);
 	}
 }

--- a/4dev/tests/CoreLibsCombinedDateTimeTest.php
+++ b/4dev/tests/CoreLibsCombinedDateTimeTest.php
@@ -13,7 +13,6 @@ use PHPUnit\Framework\TestCase;
 */
 final class CoreLibsCombinedDateTimeTest extends TestCase
 {
-
 	/**
 	 * timestamps
 	 *
@@ -618,13 +617,169 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 	 * @param array $expected
 	 * @return void
 	 */
-	public function testCalcDaysInterval(string $input_a, string $input_b, bool $flag, $expected): void
-	{
+	public function testCalcDaysInterval(
+		string $input_a,
+		string $input_b,
+		bool $flag,
+		$expected
+	): void {
 		$this->assertEquals(
 			$expected,
 			\CoreLibs\Combined\DateTime::calcDaysInterval($input_a, $input_b, $flag)
 		);
 	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function weekdayNumberProvider(): array
+	{
+		return [
+			'0 invalid' => [0, null, 'Inv',],
+			'0 invalid long' => [0, true, 'Invalid',],
+			'1 short' => [1, null, 'Mon',],
+			'1 long' => [1, true, 'Monday',],
+			'2 short' => [2, null, 'Tue',],
+			'2 long' => [2, true, 'Tuesday',],
+			'3 short' => [3, null, 'Wed',],
+			'3 long' => [3, true, 'Wednesday',],
+			'4 short' => [4, null, 'Thu',],
+			'4 long' => [4, true, 'Thursday',],
+			'5 short' => [5, null, 'Fri',],
+			'5 long' => [5, true, 'Friday',],
+			'6 short' => [6, null, 'Sat',],
+			'6 long' => [6, true, 'Saturday',],
+			'7 short' => [7, null, 'Sun',],
+			'7 long' => [7, true, 'Sunday',],
+			'8 invalid' => [8, null, 'Inv',],
+			'8 invalid long' => [8, true, 'Invalid',],
+		];
+	}
+
+	/**
+	 * int weekday number to string weekday
+	 *
+	 * @covers ::setWeekdayNameFromIsoDow
+	 * @dataProvider weekdayNumberProvider
+	 * @testdox weekdayListProvider $input (short $flag) will be $expected [$_dataName]
+	 *
+	 * @param  int       $input
+	 * @param  bool|null $flag
+	 * @param  string    $expected
+	 * @return void
+	 */
+	public function testSetWeekdayNameFromIsoDow(
+		int $input,
+		?bool $flag,
+		string $expected
+	): void {
+		if ($flag === null) {
+			$output = \CoreLibs\Combined\DateTime::setWeekdayNameFromIsoDow($input);
+		} else {
+			$output = \CoreLibs\Combined\DateTime::setWeekdayNameFromIsoDow($input, $flag);
+		}
+		$this->assertEquals(
+			$expected,
+			$output
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function weekdayDateProvider(): array
+	{
+		return [
+			'invalid date' => ['2022-02-31', -1],
+			'1: monday' => ['2022-07-25', 1],
+			'2: tuesday' => ['2022-07-26', 2],
+			'3: wednesday' => ['2022-07-27', 3],
+			'4: thursday' => ['2022-07-28', 4],
+			'5: friday' => ['2022-07-29', 5],
+			'6: saturday' => ['2022-07-30', 6],
+			'7: sunday' => ['2022-07-31', 7],
+		];
+	}
+
+	/**
+	 * date to weekday number
+	 *
+	 * @covers ::setWeekdayNumberFromDate
+	 * @dataProvider weekdayDateProvider
+	 * @testdox setWeekdayNumberFromDate $input will be $expected [$_dataName]
+	 *
+	 * @param  string $input
+	 * @param  int    $expected
+	 * @return void
+	 */
+	public function testSetWeekdayNumberFromDate(
+		string $input,
+		int $expected
+	): void {
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Combined\DateTime::setWeekdayNumberFromDate($input)
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function weekdayDateNameProvider(): array
+	{
+		return [
+			'invalid date short' => ['2022-02-31', null, 'Inv'],
+			'invalid date long' => ['2022-02-31', true, 'Invalid'],
+			'Mon short' => ['2022-07-25', null, 'Mon'],
+			'Monday long' => ['2022-07-25', true, 'Monday'],
+			'Tue short' => ['2022-07-26', null, 'Tue'],
+			'Tuesday long' => ['2022-07-26', true, 'Tuesday'],
+			'Wed short' => ['2022-07-27', null, 'Wed'],
+			'Wednesday long' => ['2022-07-27', true, 'Wednesday'],
+			'Thu short' => ['2022-07-28', null, 'Thu'],
+			'Thursday long' => ['2022-07-28', true, 'Thursday'],
+			'Fri short' => ['2022-07-29', null, 'Fri'],
+			'Friday long' => ['2022-07-29', true, 'Friday'],
+			'Sat short' => ['2022-07-30', null, 'Sat'],
+			'Saturday long' => ['2022-07-30', true, 'Saturday'],
+			'Sun short' => ['2022-07-31', null, 'Sun'],
+			'Sunday long' => ['2022-07-31', true, 'Sunday'],
+		];
+	}
+
+	/**
+	 * date to weekday name
+	 *
+	 * @covers ::setWeekdayNameFromDate
+	 * @dataProvider weekdayDateNameProvider
+	 * @testdox setWeekdayNameFromDate $input (short $flag) will be $expected [$_dataName]
+	 *
+	 * @param  string $input
+	 * @param  bool|null $flag
+	 * @param  string $expected
+	 * @return void
+	 */
+	public function testSetWeekdayNameFromDate(
+		string $input,
+		?bool $flag,
+		string $expected
+	): void {
+		if ($flag === null) {
+			$output = \CoreLibs\Combined\DateTime::setWeekdayNameFromDate($input);
+		} else {
+			$output = \CoreLibs\Combined\DateTime::setWeekdayNameFromDate($input, $flag);
+		}
+		$this->assertEquals(
+			$expected,
+			$output
+		);
+	}
 }

 // __END__
--- a/4dev/tests/CoreLibsConvertStringsTest.php
+++ b/4dev/tests/CoreLibsConvertStringsTest.php
@@ -0,0 +1,261 @@
+<?php // phpcs:disable Generic.Files.LineLength
+
+declare(strict_types=1);
+
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for Convert\Strings
+ * @coversDefaultClass \CoreLibs\Convert\Strings
+ * @testdox \CoreLibs\Convert\Strings method tests
+ */
+final class CoreLibsConvertStringsTest extends TestCase
+{
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function splitFormatStringProvider(): array
+	{
+		// 0: input
+		// 1: format
+		// 2: split characters as string, null for default
+		// 3: expected
+		return [
+			'all empty string' => [
+				'',
+				'',
+				null,
+				''
+			],
+			'empty input string' => [
+				'',
+				'2-2',
+				null,
+				''
+			],
+			'empty format string string' => [
+				'1234',
+				'',
+				null,
+				'1234'
+			],
+			'string format match' => [
+				'1234',
+				'2-2',
+				null,
+				'12-34'
+			],
+			'string format trailing match' => [
+				'1234',
+				'2-2-',
+				null,
+				'12-34'
+			],
+			'string format leading match' => [
+				'1234',
+				'-2-2',
+				null,
+				'12-34'
+			],
+			'string format double inside match' => [
+				'1234',
+				'2--2',
+				null,
+				'12--34',
+			],
+			'string format short first' => [
+				'1',
+				'2-2',
+				null,
+				'1'
+			],
+			'string format match first' => [
+				'12',
+				'2-2',
+				null,
+				'12'
+			],
+			'string format short second' => [
+				'123',
+				'2-2',
+				null,
+				'12-3'
+			],
+			'string format too long' => [
+				'1234567',
+				'2-2',
+				null,
+				'12-34-567'
+			],
+			'string format invalid format string' => [
+				'1234',
+				'2_2',
+				null,
+				'1234'
+			],
+			'different split character' => [
+				'1234',
+				'2_2',
+				'_',
+				'12_34'
+			],
+			'mixed split characters' => [
+				'123456',
+				'2-2_2',
+				'-_',
+				'12-34_56'
+			],
+			'length mixed' => [
+				'ABCD12345568ABC13',
+				'2-4_5-2#4',
+				'-_#',
+				'AB-CD12_34556-8A#BC13'
+			],
+			'split with split chars in string' => [
+				'12-34',
+				'2-2',
+				null,
+				'12--3-4'
+			],
+			'mutltibyte string' => [
+				'あいうえ',
+				'2-2',
+				null,
+				'あいうえ'
+			],
+			'mutltibyte split string' => [
+				'1234',
+				'２-２',
+				null,
+				'1234'
+			],
+		];
+	}
+
+	/**
+	 * split format string
+	 *
+	 * @covers ::splitFormatString
+	 * @dataProvider splitFormatStringProvider
+	 * @testdox splitFormatString $input with format $format and splitters $split_characters will be $expected [$_dataName]
+	 *
+	 * @param  string      $input
+	 * @param  string      $format
+	 * @param  string|null $split_characters
+	 * @param  string      $expected
+	 * @return void
+	 */
+	public function testSplitFormatString(
+		string $input,
+		string $format,
+		?string $split_characters,
+		string $expected
+	): void {
+		if ($split_characters === null) {
+			$output = \CoreLibs\Convert\Strings::splitFormatString(
+				$input,
+				$format
+			);
+		} else {
+			$output = \CoreLibs\Convert\Strings::splitFormatString(
+				$input,
+				$format,
+				$split_characters
+			);
+		}
+		$this->assertEquals(
+			$expected,
+			$output
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function countSplitPartsProvider(): array
+	{
+		return [
+			'0 elements' => [
+				'',
+				null,
+				0
+			],
+			'1 element' => [
+				'1',
+				null,
+				1,
+			],
+			'2 elements, trailing' => [
+				'1-2-',
+				null,
+				2
+			],
+			'2 elements, leading' => [
+				'-1-2',
+				null,
+				2
+			],
+			'2 elements, midde double' => [
+				'1--2',
+				null,
+				2
+			],
+			'4 elements' => [
+				'1-2-3-4',
+				null,
+				4
+			],
+			'3 elemenst, other splitter' => [
+				'2-3_3',
+				'-_',
+				3
+			],
+			'illegal splitter' => [
+				'あsdf',
+				null,
+				0
+			]
+		];
+	}
+
+	/**
+	 * count split parts
+	 *
+	 * @covers ::countSplitParts
+	 * @dataProvider countSplitPartsProvider
+	 * @testdox countSplitParts $input with splitters $split_characters will be $expected [$_dataName]
+	 *
+	 * @param  string      $input
+	 * @param  string|null $split_characters
+	 * @param  int         $expected
+	 * @return void
+	 */
+	public function testCountSplitParts(
+		string $input,
+		?string $split_characters,
+		int $expected
+	): void {
+		if ($split_characters === null) {
+			$output = \CoreLibs\Convert\Strings::countSplitParts(
+				$input
+			);
+		} else {
+			$output = \CoreLibs\Convert\Strings::countSplitParts(
+				$input,
+				$split_characters
+			);
+		}
+		$this->assertEquals(
+			$expected,
+			$output
+		);
+	}
+}
+
+// __END__
--- a/4dev/tests/CoreLibsCreateEmailTest.php
+++ b/4dev/tests/CoreLibsCreateEmailTest.php
@@ -122,7 +122,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @dataProvider encodeEmailNameProvider
-	 * @testdox encode email $email, name $name, encoding $encoding will be $expected [$_dataName]
+	 * @testdox encode email $email, name $name, encoding $encoding, folding $kv_folding will be $expected [$_dataName]
 	 *
 	 * @return void
 	 */
--- a/4dev/tests/CoreLibsCreateSessionTest.php
+++ b/4dev/tests/CoreLibsCreateSessionTest.php
@@ -181,7 +181,7 @@ final class CoreLibsCreateSessionTest extends TestCase
 		string $type,
 		array $mock_data,
 		string $expected,
-		string $expected_error,
+		string $expected_error
 	): void {
 		// override expected
 		if ($type == 'd') {
--- a/4dev/tests/CoreLibsDBIOTest.php
+++ b/4dev/tests/CoreLibsDBIOTest.php
@@ -2536,7 +2536,7 @@ final class CoreLibsDBIOTest extends TestCase
 	private function subAssertCursorExtTestDbReturnFunction(
 		\CoreLibs\DB\IO $db,
 		string $query,
-		array $cursor_ext_checks,
+		array $cursor_ext_checks
 	): void {
 		// cursor check
 		if (
--- a/4dev/update/20190910_page_content/20190910-edit_update_missing_cuid.sql
+++ b/4dev/update/20190910_page_content/20190910-edit_update_missing_cuid.sql
--- a/4dev/update/20191211_edit_add_missing_columns/20191211-edit_tables_missing_columns.sql
+++ b/4dev/update/20191211_edit_add_missing_columns/20191211-edit_tables_missing_columns.sql
--- a/4dev/update/20220617_edit_user_login_update/20220617-edit_user_login_user_id_add.sql
+++ b/4dev/update/20220617_edit_user_login_update/20220617-edit_user_login_user_id_add.sql
@@ -1,5 +1,7 @@
 -- 2022/6/17 update edit_user with login uid

+-- !!! COPY TABLE ARRAY FOLDER !!!
+
 -- the login uid, at least 32 chars
 ALTER TABLE edit_user ADD login_user_id VARCHAR UNIQUE;
 -- CREATE UNIQUE INDEX edit_user_login_user_id_key ON edit_user (login_user_id) WHERE login_user_id IS NOT NULL;
--- a/4dev/update/20220906_edit_acl_update/20220906_readme.md
+++ b/4dev/update/20220906_edit_acl_update/20220906_readme.md
@@ -0,0 +1,22 @@
+# Files to be changed
+
+Change: Update Generate\Form to use ACL for form creation (basic)
+Date: 2022/9/6
+
+## File List
+
+```sh
+includes/table_arrays/array_edit_pages.php
+includes/table_arrays/array_edit_users.php
+includes/templates/admin/edit_body.tpl
+includes/templates/admin/edit_elements.tpl
+includes/templates/admin/edit_load.tpl
+includes/templates/admin/edit_new.tpl
+includes/templates/admin/edit_save_delete.tpl
+includes/edit_base.php
+lib/CoreLibs/ACL/Login.php
+lib/CoreLibs/DB/Extended/ArrayIO.php
+lib/CoreLibs/Convert/MimeEncode.php
+lib/CoreLibs/Create/Email.php
+lib/CoreLibs/Output/Form/Generate.php
+```
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,72 +1,47 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Parameter \\#1 \\$connection of function pg_connection_busy expects PgSql\\\\Connection, object\\|resource given\\.$#"
-			count: 3
-			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
-
-		-
-			message: "#^Parameter \\#1 \\$connection of function pg_connection_status expects PgSql\\\\Connection, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_escape_bytea expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php

 		-
-			message: "#^Parameter \\#1 \\$connection of function pg_get_result expects PgSql\\\\Connection, object\\|resource given\\.$#"
-			count: 2
-			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
-
-		-
-			message: "#^Parameter \\#1 \\$connection of function pg_meta_data expects PgSql\\\\Connection, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_escape_identifier expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php

 		-
-			message: "#^Parameter \\#1 \\$connection of function pg_send_query expects PgSql\\\\Connection, object\\|resource given\\.$#"
-			count: 2
-			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
-
-		-
-			message: "#^Parameter \\#1 \\$connection of function pg_socket expects PgSql\\\\Connection, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_escape_literal expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php

 		-
-			message: "#^Parameter \\#1 \\$connection of function pg_version expects PgSql\\\\Connection\\|null, object\\|resource given\\.$#"
-			count: 2
-			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
-
-		-
-			message: "#^Parameter \\#1 \\$result of function pg_affected_rows expects PgSql\\\\Result, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_escape_string expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php

 		-
-			message: "#^Parameter \\#1 \\$result of function pg_fetch_all expects PgSql\\\\Result, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_execute expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php

 		-
-			message: "#^Parameter \\#1 \\$result of function pg_fetch_array expects PgSql\\\\Result, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_parameter_status expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php

 		-
-			message: "#^Parameter \\#1 \\$result of function pg_field_name expects PgSql\\\\Result, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_prepare expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php

 		-
-			message: "#^Parameter \\#1 \\$result of function pg_num_fields expects PgSql\\\\Result, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_query expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php

 		-
-			message: "#^Parameter \\#1 \\$result of function pg_num_rows expects PgSql\\\\Result, object\\|resource given\\.$#"
-			count: 1
-			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
-
-		-
-			message: "#^Parameter \\#1 \\$result of function pg_result_error expects PgSql\\\\Result, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_query_params expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php

--- a/phpstan.neon
+++ b/phpstan.neon
@@ -49,11 +49,11 @@ parameters:
 		- www/vendor
 	# ignore errores with
 	ignoreErrors:
-		- # 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 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(\\|null)?), object\\|resource given\\.$#"
+			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.#'
--- a/www/admin/class_test.datetime.php
+++ b/www/admin/class_test.datetime.php
@@ -139,6 +139,22 @@ foreach ($compare_dates as $compare_date) {
 		. DgS::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1], true)) . "<br>";
 }

+// test date conversion
+$dow = 2;
+print "DOW[$dow]: " . DateTime::setWeekdayNameFromIsoDow($dow) . "<br>";
+print "DOW[$dow],long: " . DateTime::setWeekdayNameFromIsoDow($dow, true) . "<br>";
+$date = '2022-7-22';
+print "DATE-dow[$date]: " . DateTime::setWeekdayNameFromDate($date) . "<br>";
+print "DATE-dow[$date],long: " . DateTime::setWeekdayNameFromDate($date, true) . "<br>";
+print "DOW-date[$date]: " . DateTime::setWeekdayNumberFromDate($date) . "<br>";
+$dow = 11;
+print "DOW[$dow];invalid: " . DateTime::setWeekdayNameFromIsoDow($dow) . "<br>";
+print "DOW[$dow],long;invalid: " . DateTime::setWeekdayNameFromIsoDow($dow, true) . "<br>";
+$date = '2022-70-242';
+print "DATE-dow[$date];invalid: " . DateTime::setWeekdayNameFromDate($date) . "<br>";
+print "DATE-dow[$date],long;invalid: " . DateTime::setWeekdayNameFromDate($date, true) . "<br>";
+print "DOW-date[$date];invalid: " . DateTime::setWeekdayNumberFromDate($date) . "<br>";
+
 // error message
 print $log->printErrorMsg();

--- a/www/admin/class_test.db.php
+++ b/www/admin/class_test.db.php
@@ -209,13 +209,12 @@ print "INSERT WITH NO PRIMARY KEY WITH RETURNING STATUS: " . Support::printToStr
 print "</pre>";

 // READ PREPARE
-if (
-	$db->dbPrepare(
-		'sel_test_foo',
-		"SELECT test_foo_id, test, some_bool, string_a, number_a, number_a_numeric, some_time "
-		. "FROM test_foo ORDER BY test_foo_id DESC LIMIT 5"
-	) === false
-) {
+$q_prep = "SELECT test_foo_id, test, some_bool, string_a, number_a, "
+	. "number_a_numeric, some_time "
+	. "FROM test_foo "
+	. "WHERE test = $1 "
+	. "ORDER BY test_foo_id DESC LIMIT 5";
+if ($db->dbPrepare('sel_test_foo', $q_prep) === false) {
 	print "Error in sel_test_foo prepare<br>";
 } else {
 	$max_rows = 6;
@@ -229,6 +228,29 @@ if (
 		$i++;
 	}
 }
+// prepre a second time on normal connection
+if ($db->dbPrepare('sel_test_foo', $q_prep) === false) {
+	print "Error prepareing<br>";
+	print "ERROR (dbPrepare on same query): "
+	. $db->dbGetLastError() . "/" . $db->dbGetLastWarning() . "/"
+	. "<pre>" . print_r($db->dbGetCombinedErrorHistory(), true) . "</pre><br>";
+}
+// NOTE: try to replacate connection still exists if script is run a second time
+// open pg bouncer connection
+$db_pgb = new CoreLibs\DB\IO($DB_CONFIG['test_pgbouncer'], $log);
+print "[PGB] DBINFO: " . $db_pgb->dbInfo() . "<br>";
+if ($db->dbPrepare('pgb_sel_test_foo', $q_prep) === false) {
+	print "[PGB] [1] Error in pgb_sel_test_foo prepare<br>";
+} else {
+	print "[PGB] [1] pgb_sel_test_foo prepare OK<br>";
+}
+// second prepare
+if ($db->dbPrepare('pgb_sel_test_foo', $q_prep) === false) {
+	print "[PGB] [2] Error in pgb_sel_test_foo prepare<br>";
+} else {
+	print "[PGB] [2] pgb_sel_test_foo prepare OK<br>";
+}
+$db_pgb->dbClose();

 # db write class test
 $table = 'test_foo';
--- a/www/admin/class_test.php
+++ b/www/admin/class_test.php
@@ -70,6 +70,7 @@ print '<div><a href="class_test.hash.php">Class Test: HASH</a></div>';
 print '<div><a href="class_test.encoding.php">Class Test: ENCODING (CHECK/CONVERT/MIME)</a></div>';
 print '<div><a href="class_test.image.php">Class Test: IMAGE</a></div>';
 print '<div><a href="class_test.byte.php">Class Test: BYTE CONVERT</a></div>';
+print '<div><a href="class_test.strings.php">Class Test: STRING CONVERT</a></div>';
 print '<div><a href="class_test.datetime.php">Class Test: DATE/TIME</a></div>';
 print '<div><a href="class_test.array.php">Class Test: ARRAY HANDLER</a></div>';
 print '<div><a href="class_test.file.php">Class Test: FILE</a></div>';
--- a/www/admin/class_test.strings.php
+++ b/www/admin/class_test.strings.php
@@ -0,0 +1,86 @@
+<?php // phpcs:ignore warning
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// define log file id
+$LOG_FILE_ID = 'classTest-string';
+ob_end_flush();
+
+$log = new CoreLibs\Debug\Logging([
+	'log_folder' => BASE . LOG,
+	'file_id' => $LOG_FILE_ID,
+	// add file date
+	'print_file_date' => true,
+	// set debug and print flags
+	'debug_all' => $DEBUG_ALL ?? false,
+	'echo_all' => $ECHO_ALL ?? false,
+	'print_all' => $PRINT_ALL ?? false,
+]);
+$byte_class = 'CoreLibs\Convert\Strings';
+
+$PAGE_NAME = 'TEST CLASS: STRINGS CONVERT';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
+
+$split = '4-4-4';
+$test_strings = [
+	'13',
+	'1234',
+	'12341',
+	'12341234',
+	'123412341',
+	'123412341234',
+	'1234123412341234512345',
+];
+
+foreach ($test_strings as $string) {
+	print "Convert: $string with $split to: "
+		. \CoreLibs\Convert\Strings::splitFormatString($string, $split)
+		. "<br>";
+}
+
+$split = '2_2';
+$string = '1234';
+print "Convert: $string with $split to: "
+	. \CoreLibs\Convert\Strings::splitFormatString($string, $split)
+	. "<br>";
+$split = '2-2';
+$string = 'あいうえ';
+print "Convert: $string with $split to: "
+	. \CoreLibs\Convert\Strings::splitFormatString($string, $split)
+	. "<br>";
+
+$test_splits = [
+	'',
+	'2',
+	'2-2',
+	'2-3-4',
+];
+foreach ($test_splits as $split) {
+	print "$split with count: " . \CoreLibs\Convert\Strings::countSplitParts($split) . "<br>";
+}
+
+// error message
+print $log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__
--- a/www/composer.lock
+++ b/www/composer.lock
@@ -138,16 +138,16 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v4.13.2",
+            "version": "v4.15.1",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
                "shasum": ""
            },
            "require": {
@@ -188,9 +188,9 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
            },
-            "time": "2021-11-30T19:35:32+00:00"
+            "time": "2022-09-04T07:30:47+00:00"
        },
        {
            "name": "phar-io/manifest",
@@ -303,252 +303,25 @@
            },
            "time": "2022-02-21T01:04:05+00:00"
        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
-            },
-            "time": "2020-06-27T09:03:43+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
-                "shasum": ""
-            },
-            "require": {
-                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
-            },
-            "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
-            },
-            "time": "2021-10-19T17:43:47+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "77a32518733312af16a44300404e945338981de3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
-                "reference": "77a32518733312af16a44300404e945338981de3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*",
-                "psalm/phar": "^4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
-            },
-            "time": "2022-03-15T21:29:03+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.15.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^6.0 || ^7.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
-            },
-            "time": "2021-12-08T12:19:24+00:00"
-        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "9.2.15",
+            "version": "9.2.17",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
                "shasum": ""
            },
            "require": {
                "ext-dom": "*",
                "ext-libxml": "*",
                "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.13.0",
+                "nikic/php-parser": "^4.14",
                "php": ">=7.3",
                "phpunit/php-file-iterator": "^3.0.3",
                "phpunit/php-text-template": "^2.0.2",
@@ -597,7 +370,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
            },
            "funding": [
                {
@@ -605,7 +378,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-03-07T09:28:20+00:00"
+            "time": "2022-08-30T12:24:04+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@@ -850,16 +623,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "9.5.20",
+            "version": "9.5.24",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
+                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
+                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
                "shasum": ""
            },
            "require": {
@@ -874,7 +647,6 @@
                "phar-io/manifest": "^2.0.3",
                "phar-io/version": "^3.0.2",
                "php": ">=7.3",
-                "phpspec/prophecy": "^1.12.1",
                "phpunit/php-code-coverage": "^9.2.13",
                "phpunit/php-file-iterator": "^3.0.5",
                "phpunit/php-invoker": "^3.1.1",
@@ -889,13 +661,9 @@
                "sebastian/global-state": "^5.0.1",
                "sebastian/object-enumerator": "^4.0.3",
                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.0",
+                "sebastian/type": "^3.1",
                "sebastian/version": "^3.0.2"
            },
-            "require-dev": {
-                "ext-pdo": "*",
-                "phpspec/prophecy-phpunit": "^2.0.1"
-            },
            "suggest": {
                "ext-soap": "*",
                "ext-xdebug": "*"
@@ -937,7 +705,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24"
            },
            "funding": [
                {
@@ -949,7 +717,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-04-01T12:37:26+00:00"
+            "time": "2022-08-30T07:42:16+00:00"
        },
        {
            "name": "sebastian/cli-parser",
@@ -1808,16 +1576,16 @@
        },
        {
            "name": "sebastian/type",
-            "version": "3.0.0",
+            "version": "3.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
+                "reference": "fb44e1cc6e557418387ad815780360057e40753e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb44e1cc6e557418387ad815780360057e40753e",
+                "reference": "fb44e1cc6e557418387ad815780360057e40753e",
                "shasum": ""
            },
            "require": {
@@ -1829,7 +1597,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                }
            },
            "autoload": {
@@ -1852,7 +1620,7 @@
            "homepage": "https://github.com/sebastianbergmann/type",
            "support": {
                "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.1.0"
            },
            "funding": [
                {
@@ -1860,7 +1628,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-03-15T09:54:48+00:00"
+            "time": "2022-08-29T06:55:37+00:00"
        },
        {
            "name": "sebastian/version",
@@ -1915,88 +1683,6 @@
            ],
            "time": "2020-09-28T06:39:44+00:00"
        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.25.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-10-20T20:35:02+00:00"
-        },
        {
            "name": "theseer/tokenizer",
            "version": "1.2.1",
@@ -2046,64 +1732,6 @@
                }
            ],
            "time": "2021-07-28T10:34:58+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
-            },
-            "time": "2021-03-09T10:59:23+00:00"
        }
    ],
    "aliases": [],
--- a/www/configs/config.db.php
+++ b/www/configs/config.db.php
@@ -17,7 +17,20 @@ $DB_CONFIG = [
 		'db_user' => $_ENV['DB_USER.TEST'] ?? '',
 		'db_pass' => $_ENV['DB_PASS.TEST'] ?? '',
 		'db_host' => $_ENV['DB_HOST.TEST'] ?? '',
-		'db_port' => 5432,
+		'db_port' => $_ENV['DB_PORT.PG'] ?? 5432,
+		'db_schema' => 'public',
+		'db_type' => 'pgsql',
+		'db_encoding' => '',
+		'db_ssl' => 'allow', // allow, disable, require, prefer
+		'db_debug' => true, // turn on logging or not
+	],
+	// same as above, but uses pg bouncer
+	'test_pgbouncer' => [
+		'db_name' => $_ENV['DB_NAME.TEST'] ?? '',
+		'db_user' => $_ENV['DB_USER.TEST'] ?? '',
+		'db_pass' => $_ENV['DB_PASS.TEST'] ?? '',
+		'db_host' => $_ENV['DB_HOST.TEST'] ?? '',
+		'db_port' => $_ENV['DB_PORT.PG_BOUNCER'] ?? 5432,
 		'db_schema' => 'public',
 		'db_type' => 'pgsql',
 		'db_encoding' => '',
--- a/www/configs/config.master.php
+++ b/www/configs/config.master.php
@@ -252,7 +252,7 @@ if ($is_secure) {
 define('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host']);
 define('DB_CONFIG', $DB_CONFIG[DB_CONFIG_NAME] ?? []);
 // because we can't change constant, but we want to for db debug flag
-$GLOBALS['DB_CONFIG'] = DB_CONFIG;
+$GLOBALS['DB_CONFIG_SET'] = DB_CONFIG;
 // define('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
 // define('DB_CONFIG_OTHER', SITE_CONFIG[$HOST_NAME]['db_host_other']);
 // override for login and global schemas
--- a/www/includes/admin_footer.php
+++ b/www/includes/admin_footer.php
@@ -2,9 +2,9 @@

 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
-* CREATED: 2008/08/14
+* CREATED:
 * SHORT DESCRIPTION:
-* URL redirect header
+*
 * HISTORY:
 *********************************************************************/

--- a/www/includes/admin_header.php
+++ b/www/includes/admin_header.php
@@ -2,8 +2,9 @@

 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
-* CREATED: 2008/08/01
+* CREATED:
 * SHORT DESCRIPTION:
+*
 * HISTORY:
 *********************************************************************/

--- a/www/includes/edit_base.php
+++ b/www/includes/edit_base.php
@@ -457,6 +457,8 @@ if ($form->my_page_name == 'edit_order') {
 						$pathinfo = pathinfo($output_file);
 						if (!empty($pathinfo['dirname'])) {
 							$pathinfo['dirname'] .= DIRECTORY_SEPARATOR;
+						} else {
+							$pathinfo['dirname'] = '';
 						}
 						if ($t_q) {
 							$t_q .= ', ';
@@ -552,6 +554,7 @@ if (is_dir(BASE . CACHE)) {
 }
 $smarty->display($EDIT_TEMPLATE, 'editAdmin_' . $smarty->lang, 'editAdmin_' . $smarty->lang);

+$form->log->debug('DEBUGEND', '==================================== [Form END]');
 // debug output
 echo $login->log->printErrorMsg();
 echo $form->log->printErrorMsg();
--- a/www/includes/table_arrays/array_edit_pages.php
+++ b/www/includes/table_arrays/array_edit_pages.php
@@ -66,8 +66,8 @@ $edit_pages = [
 			'int' => 1,
 			'type' => 'binary',
 			'element_list' => [
-				 '1' => 'Yes',
-				 '0' => 'No'
+				'1' => 'Yes',
+				'0' => 'No'
 			],
 		],
 		'popup' => [
@@ -76,8 +76,8 @@ $edit_pages = [
 			'int' => 1,
 			'type' => 'binary',
 			'element_list' => [
-				 '1' => 'Yes',
-				 '0' => 'No'
+				'1' => 'Yes',
+				'0' => 'No'
 			],
 		],
 		'popup_x' => [
@@ -128,12 +128,12 @@ $edit_pages = [
 			'name' => 'filename',
 			'before_value' => 'Filename: '
 		],
-		 [
-		   'name' => 'online',
-		   'binary' => ['Yes', 'No'],
-		   'before_value' => 'Online: '
-		 ],
-		 [
+		[
+			'name' => 'online',
+			'binary' => ['Yes', 'No'],
+			'before_value' => 'Online: '
+		],
+		[
 			'name' => 'menu',
 			'binary' => ['Yes', 'No'],
 			'before_value' => 'Menu: '
--- a/www/includes/table_arrays/array_edit_users.php
+++ b/www/includes/table_arrays/array_edit_users.php
@@ -15,7 +15,11 @@ $edit_users = [
 			'output_name' => 'Username',
 			'mandatory' => 1,
 			'error_check' => 'unique|alphanumericextended',
-			'type' => 'text'
+			'type' => 'text',
+			// if not min_edit_acl only read
+			// if not min_show_acl not visible
+			'min_edit_acl' => '100',
+			'min_show_acl' => '-1',
 		],
 		'password' => [
 			'value' => $GLOBALS['password'] ?? '',
@@ -30,6 +34,8 @@ $edit_users = [
 					'value' => 'NOW()' // value [todo: complex reference
 				],
 			],
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		// password date when first insert and password is set, needs special field with connection to password
 		// password reset force interval, if set, user needs to reset password after X time period
@@ -41,7 +47,9 @@ $edit_users = [
 			'type' => 'text',
 			'interval' => 1, // interval needs NULL write for empty
 			'size' => 5, // make it 5 chars long
-			'length' => 5
+			'length' => 5,
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'enabled' => [
 			'value' => $GLOBALS['enabled'] ?? '',
@@ -52,6 +60,8 @@ $edit_users = [
 				'1' => 'Yes',
 				'0' => 'No'
 			],
+			'min_edit_acl' => '100',
+			'min_show_acl' => '-1',
 		],
 		'deleted' => [
 			'value' => $GLOBALS['deleted'] ?? '',
@@ -62,6 +72,8 @@ $edit_users = [
 				'1' => 'Yes',
 				'0' => 'No'
 			],
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'strict' => [
 			'value' => $GLOBALS['strict'] ?? '',
@@ -72,6 +84,8 @@ $edit_users = [
 				'1' => 'Yes',
 				'0' => 'No'
 			],
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'locked' => [
 			'value' => $GLOBALS['locked'] ?? '',
@@ -82,6 +96,8 @@ $edit_users = [
 				'1' => 'Yes',
 				'0' => 'No'
 			],
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'admin' => [
 			'value' => $GLOBALS['admin'] ?? '',
@@ -92,6 +108,8 @@ $edit_users = [
 				'1' => 'Yes',
 				'0' => 'No'
 			],
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'debug' => [
 			'value' => $GLOBALS['debug'] ?? '',
@@ -102,6 +120,8 @@ $edit_users = [
 				'1' => 'Yes',
 				'0' => 'No'
 			],
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'db_debug' => [
 			'value' => $GLOBALS['db_debug'] ?? '',
@@ -112,22 +132,30 @@ $edit_users = [
 				'1' => 'Yes',
 				'0' => 'No'
 			],
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'email' => [
 			'value' => $GLOBALS['email'] ?? '',
 			'output_name' => 'E-Mail',
 			'type' => 'text',
-			'error_check' => 'email'
+			'error_check' => 'email',
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'last_name' => [
 			'value' => $GLOBALS['last_name'] ?? '',
 			'output_name' => 'Last Name',
-			'type' => 'text'
+			'type' => 'text',
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'first_name' => [
 			'value' => $GLOBALS['first_name'] ?? '',
 			'output_name' => 'First Name',
-			'type' => 'text'
+			'type' => 'text',
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'lock_until' => [
 			'value' => $GLOBALS['lock_until'] ?? '',
@@ -136,6 +164,8 @@ $edit_users = [
 			'error_check' => 'datetime',
 			'sql_read' => 'YYYY-MM-DD HH24:MI',
 			'datetime' => 1,
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'lock_after' => [
 			'value' => $GLOBALS['lock_after'] ?? '',
@@ -143,7 +173,8 @@ $edit_users = [
 			'type' => 'datetime',
 			'error_check' => 'datetime',
 			'sql_read' => 'YYYY-MM-DD HH24:MI',
-			'datetime' => 1,
+			'datetime' => 1,'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'login_user_id' => [
 			'value' => $GLOBALS['login_user_id'] ?? '',
@@ -151,19 +182,22 @@ $edit_users = [
 			'type' => 'text',
 			'error_check' => 'unique|custom',
 			'error_regex' => "/^[A-Za-z0-9]+$/",
-			'emptynull' => 1,
+			'emptynull' => 1,'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'login_user_id_set_date' => [
 			'output_name' => 'loginUserId set date',
 			'value' => $GLOBALS['login_user_id_set_date'] ?? '',
 			'type' => 'view',
-			'empty' => '-'
+			'empty' => '-',
+			'min_show_acl' => '100',
 		],
 		'login_user_id_last_revalidate' => [
 			'output_name' => 'loginUserId last revalidate date',
 			'value' => $GLOBALS['login_user_id_last_revalidate'] ?? '',
 			'type' => 'view',
-			'empty' => '-'
+			'empty' => '-',
+			'min_show_acl' => '100',
 		],
 		'login_user_id_locked' => [
 			'value' => $GLOBALS['login_user_id_locked'] ?? '',
@@ -174,6 +208,8 @@ $edit_users = [
 				'1' => 'Yes',
 				'0' => 'No'
 			],
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'login_user_id_revalidate_after' => [
 			'value' => $GLOBALS['login_user_id_revalidate_after'] ?? '',
@@ -182,7 +218,9 @@ $edit_users = [
 			'error_check' => 'intervalshort',
 			'interval' => 1, // interval needs NULL write for empty
 			'size' => 5, // make it 5 chars long
-			'length' => 5
+			'length' => 5,
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'login_user_id_valid_from' => [
 			'value' => $GLOBALS['login_user_id_valid_from'] ?? '',
@@ -191,6 +229,8 @@ $edit_users = [
 			'error_check' => 'datetime',
 			'sql_read' => 'YYYY-MM-DD HH24:MI',
 			'datetime' => 1,
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'login_user_id_valid_until' => [
 			'value' => $GLOBALS['login_user_id_valid_until'] ?? '',
@@ -199,6 +239,8 @@ $edit_users = [
 			'error_check' => 'datetime',
 			'sql_read' => 'YYYY-MM-DD HH24:MI',
 			'datetime' => 1,
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'edit_language_id' => [
 			'value' => $GLOBALS['edit_language_id'] ?? '',
@@ -206,14 +248,18 @@ $edit_users = [
 			'mandatory' => 1,
 			'int' => 1,
 			'type' => 'drop_down_db',
-			'query' => "SELECT edit_language_id, long_name FROM edit_language WHERE enabled = 1 ORDER BY order_number"
+			'query' => "SELECT edit_language_id, long_name FROM edit_language WHERE enabled = 1 ORDER BY order_number",
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'edit_scheme_id' => [
 			'value' => $GLOBALS['edit_scheme_id'] ?? '',
 			'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',
 		],
 		'edit_group_id' => [
 			'value' => $GLOBALS['edit_group_id'] ?? '',
@@ -221,7 +267,9 @@ $edit_users = [
 			'int' => 1,
 			'type' => 'drop_down_db',
 			'query' => "SELECT edit_group_id, name FROM edit_group WHERE enabled = 1 ORDER BY name",
-			'mandatory' => 1
+			'mandatory' => 1,
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'edit_access_right_id' => [
 			'value' => $GLOBALS['edit_access_right_id'] ?? '',
@@ -229,25 +277,30 @@ $edit_users = [
 			'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',
 		],
 		'login_error_count' => [
 			'output_name' => 'Login error count',
 			'value' => $GLOBALS['login_error_count'] ?? '',
 			'type' => 'view',
-			'empty' => '0'
+			'empty' => '0',
+			'min_show_acl' => '100',
 		],
 		'login_error_date_last' => [
 			'output_name' => 'Last login error',
 			'value' => $GLOBALS['login_error_date_liast'] ?? '',
 			'type' => 'view',
-			'empty' => '-'
+			'empty' => '-',
+			'min_show_acl' => '100',
 		],
 		'login_error_date_first' => [
 			'output_name' => 'First login error',
 			'value' => $GLOBALS['login_error_date_first'] ?? '',
 			'type' => 'view',
-			'empty' => '-'
+			'empty' => '-',
+			'min_show_acl' => '100',
 		],
 		'protected' => [
 			'value' => $GLOBALS['protected'] ?? '',
@@ -258,6 +311,8 @@ $edit_users = [
 				'1' => 'Yes',
 				'0' => 'No'
 			],
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 		'additional_acl' => [
 			'value' => $GLOBALS['additional_acl'] ?? '',
@@ -265,12 +320,27 @@ $edit_users = [
 			'type' => 'textarea',
 			'error_check' => 'json',
 			'rows' => 10,
-			'cols' => 60
+			'cols' => 60,
+			'min_edit_acl' => '100',
+			'min_show_acl' => '100',
 		],
 	],
 	'load_query' => "SELECT edit_user_id, username, enabled, deleted, "
 		. "strict, locked, login_error_count "
-		. "FROM edit_user ORDER BY username",
+		. "FROM edit_user "
+		// if base acl is not 90 only list enabled
+		// if not admin flag, do not list admin flagged
+		. (
+			!$GLOBALS['acl_admin'] ?
+				"WHERE admin = 0 "
+				. (
+					$GLOBALS['base_acl_level'] < 90 ?
+						"AND enabled = 1 " :
+						""
+				)
+			: ''
+		)
+		. "ORDER BY username",
 	'table_name' => 'edit_user',
 	'show_fields' => [
 		[
@@ -305,7 +375,12 @@ $edit_users = [
 		'edit_access_user' => [
 			'output_name' => 'Accounts',
 			'mandatory' => 1,
-			'delete' => 0, // set then reference entries are deleted, else the 'enable' flag is only set
+			// set then reference entries are deleted, else the 'enable' flag is only set
+			'delete' => 0,
+			// acl
+			'min_edit_acl' => '40',
+			'min_show_acl' => '20',
+			// table read prefix
 			'prefix' => 'ecu',
 			'read_data' => [
 				'table_name' => 'edit_access',
--- a/www/includes/templates/admin/edit_body.tpl
+++ b/www/includes/templates/admin/edit_body.tpl
@@ -83,13 +83,8 @@ function pop(theURL, winName, features) {
 	<td width="{$table_width}" class="edit_bgcolor">
 		<form method="post" name="edit_form" style="margin-block-end: 0em;">
 		<table width="100%" border="0" cellpadding="2" cellspacing="1">
-	 <!-- LOAD START //-->
 	{include file="edit_load.tpl"}
-	 <!-- LOAD END //-->
-	 <!-- NEW START //-->
 	{include file="edit_new.tpl"}
-	{* $form_create_new*}
-	 <!-- NEW END //-->
 	{if $form_yes}
 		{include file="edit_save_delete.tpl"}
 		{if $form_my_page_name == "edit_pages" && $filename_exist}
--- a/www/includes/templates/admin/edit_elements.tpl
+++ b/www/includes/templates/admin/edit_elements.tpl
@@ -8,6 +8,7 @@
 	********************************************************************
 *}
 {foreach from=$elements item=element key=key name=loop}
+{if $element.allow_edit}
 	<tr>
 		<td class="edit_fgcolor" class="normal" valign="top">
 			{$element.output_name}
@@ -129,4 +130,21 @@
 		{/if}
 		</td>
 	</tr>
+{elseif $element.allow_show}
+	<tr>
+		<td class="edit_fgcolor" class="normal" valign="top">
+			{$element.output_name}
+		</td>
+		<td class="{$element.color}" class="normal">
+			{if $element.type != 'view'}
+			{$element.show_value}
+			<input type="hidden" name="{$element.data.name}" value="{$element.show_value}">
+			{else}
+			{$element.data.value}
+			{/if}
+		</td>
+	</tr>
+{* {else}
+<!-- No {$key} --> *}
+{/if}
 {/foreach}
--- a/www/includes/templates/admin/edit_load.tpl
+++ b/www/includes/templates/admin/edit_load.tpl
@@ -7,7 +7,7 @@
 	* HISTORY:
 	********************************************************************
 *}
-
+<!-- LOAD START //-->
 <tr>
 	<td class="edit_fgcolor_alt" class="normal">
 		Load:
@@ -20,3 +20,4 @@
 		<input type="submit" name="archive" value="{t}Load{/t}">
 	</td>
 </tr>
+<!-- LOAD END //-->
--- a/www/includes/templates/admin/edit_new.tpl
+++ b/www/includes/templates/admin/edit_new.tpl
@@ -7,7 +7,8 @@
 	* HISTORY:
 	********************************************************************
 *}
-
+{if $new.seclevel_okay}
+	<!-- NEW START //-->
 	<tr>
 		<td class="edit_fgcolor_alt" class="normal">
 			{t}Create new media:{/t}
@@ -21,3 +22,5 @@
 			<input type="submit" name="new" value="{$new.new_name}">
 		</td>
 	</tr>
+	<!-- NEW END //-->
+{/if}
--- a/www/includes/templates/admin/edit_save_delete.tpl
+++ b/www/includes/templates/admin/edit_save_delete.tpl
@@ -7,16 +7,18 @@
 	* HISTORY:
 	********************************************************************
 *}
-	<tr>
 	{if $save_delete.seclevel_okay}
+	<tr>
+		<!-- SAVE START //-->
 		<td class="edit_fgcolor_alt" class="normal">
 			<input type="submit" name="save" value="{$save_delete.save}">
 		{if $save_delete.old_school_hidden}
 			<input type="hidden" name="{$save_delete.pk_name}" value="{$save_delete.pk_value}">
 		{/if}
 		</td>
-	{/if}
+		<!-- SAVE END //-->
 	{if $save_delete.show_delete}
+		<!-- DELETE START //-->
 		<td class="edit_fgcolor_delete">
 			{if !$save_delete.hide_delete_checkbox}
 			<input type="checkbox" name="really_delete" value="yes">&nbsp;{t}really{/t}&nbsp;
@@ -24,9 +26,11 @@
 			<input type="hidden" name="really_delete" value="yes">
 			{/if}
 			<input type="submit" name="delete" value="{t}Delete{/t}">
+			<!-- DELETE END //-->
 	{else}
 		<td class="edit_fgcolor_alt" class="normal">
            &nbsp;
 	{/if}
 		</td>
 	</tr>
+	{/if}
--- a/www/layout/admin/javascript/edit.jq.js
+++ b/www/layout/admin/javascript/edit.jq.js
@@ -14,9 +14,9 @@ if (!DEBUG) {
 	});
 }*/

-// open overlay boxes counter
-var GL_OB_S = 30;
-var GL_OB_BASE = 30;
+// open overlay boxes counter for z-index
+var GL_OB_S = 100;
+var GL_OB_BASE = 100;

 /**
 * opens a popup window with winName and given features (string)
@@ -1329,11 +1329,12 @@ function createLoginRow(login_string, header_id = 'mainHeader') // eslint-disabl
 		}
 		// clear out just in case for first entry
 		// fill with div name & login/logout button
-		$('#loginRow').html(phfo(cel('div', '', login_string)));
+		$('#loginRow').html(phfo(cel('div', 'loginRow-name', login_string)));
+		$('#loginRow').append(phfo(cel('div', 'loginRow-info', '')));
 		$('#loginRow').append(phfo(
 			aelx(
 				// outer div
-				cel('div'),
+				cel('div', 'loginRow-logout'),
 				// inner element
 				cel('input', 'logout', '', [], {
 					value: __('Logout'),
@@ -1386,6 +1387,8 @@ function createNavMenu(nav_menu, header_id = 'mainHeader') // eslint-disable-lin
 			}
 		});
 		$('#menuRow').html(content.join(''));
+	} else {
+		$('#menuRow').hide();
 	}
 }

--- a/www/lib/CoreLibs/ACL/Login.php
+++ b/www/lib/CoreLibs/ACL/Login.php
@@ -1131,6 +1131,9 @@ class Login

 		$html_string = (string)$this->login_template['template'];

+		$locales = $this->l->parseLocale($this->l->getLocale());
+		$this->login_template['strings']['LANGUAGE'] = $locales['lang'] ?? 'en';
+
 		// if password change is okay
 		if ($this->password_change) {
 			$html_string_password_change = $this->login_template['password_change'];
@@ -1287,6 +1290,7 @@ class Login
 					. $strings['PASSWORD_CHANGE_BUTTON_VALUE']
 					. '" OnClick="ShowHideDiv(\'pw_change_div\');">'
 			]);
+			// TODO: submit or JS to set target page as ajax call
 			// NOTE: for the HTML block I ignore line lengths
 			// phpcs:disable
 			$this->login_template['password_change'] = <<<EOM
@@ -1329,9 +1333,11 @@ EOM;
 		}

 		// now check templates
+		// TODO: submit or JS to set target page as ajax call
 		if (!$this->login_template['template']) {
 			$this->login_template['template'] = <<<EOM
-<html>
+<!DOCTYPE html>
+<html lang="{LANGUAGE}">
 <head>
 <title>{HTML_TITLE}</title>
 <style type="text/css">
@@ -1485,7 +1491,6 @@ EOM;
 		}
 		// initial the session if there is no session running already
 		// check if session exists and could be created
-		// TODO: move session creation and check to outside?
 		if ($this->session->checkActiveSession() === false) {
 			$this->login_error = 2;
 			echo '<b>No active session found</b>';
@@ -1615,7 +1620,7 @@ EOM;
 		// set the locale
 		if (
 			$this->session->checkActiveSession() === true &&
-			!empty($_SESSION['DEFAULT_LANG'])
+			!empty($_SESSION['DEFAULT_LOCALE'])
 		) {
 			$locale = $_SESSION['DEFAULT_LOCALE'] ?? '';
 		} else {
--- a/www/lib/CoreLibs/Basic.php
+++ b/www/lib/CoreLibs/Basic.php
@@ -66,7 +66,7 @@ class Basic
 	// logging interface, Debug\Logging class
 	/** @var \CoreLibs\Debug\Logging */
 	public $log;
-	/** @var\CoreLibs\Create\Session */
+	/** @var \CoreLibs\Create\Session */
 	public $session;

 	// email valid checks
--- a/www/lib/CoreLibs/Check/Jason.php
+++ b/www/lib/CoreLibs/Check/Jason.php
@@ -1,7 +1,7 @@
 <?php

 /*
- * DEPRECATED: Use correct Json:: instead
+ * DEPRECATED: Use correct Convert\Json:: instead
 */

 declare(strict_types=1);
--- a/www/lib/CoreLibs/Combined/ArrayHandler.php
+++ b/www/lib/CoreLibs/Combined/ArrayHandler.php
@@ -1,7 +1,7 @@
 <?php

 /*
- * html convert functions
+ * array search and transform functions
 */

 declare(strict_types=1);
--- a/www/lib/CoreLibs/Combined/DateTime.php
+++ b/www/lib/CoreLibs/Combined/DateTime.php
@@ -1,7 +1,7 @@
 <?php

 /*
- * image thumbnail, rotate, etc
+ * date convert and check functions
 */

 declare(strict_types=1);
@@ -193,6 +193,54 @@ class DateTime
 		}
 	}

+	/**
+	 * Returns long or short day of week name based on ISO day of week number
+	 * 1: Monday
+	 * ...
+	 * 7: Sunday
+	 *
+	 * @param  int    $isodow 1: Monday, 7: Sunday
+	 * @param  bool   $long   Default false 'Mon', if true 'Monday'
+	 * @return string         Day of week string either short 'Mon' or long 'Monday'
+	 */
+	public static function setWeekdayNameFromIsoDow(int $isodow, bool $long = false): string
+	{
+		// if not valid, set to invalid
+		if ($isodow < 1 || $isodow > 7) {
+			return $long ? 'Invalid' : 'Inv';
+		}
+		return date($long ? 'l' : 'D', strtotime("Sunday +{$isodow} days") ?: null);
+	}
+
+	/**
+	 * Get the day of week Name from date
+	 *
+	 * @param  string $date Any valid date
+	 * @param  bool   $long Default false 'Mon', if true 'Monday'
+	 * @return string       Day of week string either short 'Mon' or long 'Monday'
+	 */
+	public static function setWeekdayNameFromDate(string $date, bool $long = false): string
+	{
+		if (!self::checkDate($date)) {
+			return $long ? 'Invalid' : 'Inv';
+		}
+		return date($long ? 'l' : 'D', strtotime($date) ?: null);
+	}
+
+	/**
+	 * Get the day of week Name from date
+	 *
+	 * @param  string $date  Any valid date
+	 * @return int           ISO Weekday number 1: Monday, 7: Sunday, -1 for invalid date
+	 */
+	public static function setWeekdayNumberFromDate(string $date): int
+	{
+		if (!self::checkDate($date)) {
+			return -1;
+		}
+		return (int)date('N', strtotime($date) ?: null);
+	}
+
 	/**
 	 * splits & checks date, wrap around for check_date function
 	 *
@@ -264,16 +312,17 @@ class DateTime
 	}

 	/**
-	 * plits & checks date, wrap around for check_date function
-	 * returns int in:
-	 *     -1 if the first date is smaller the last
-	 *     0 if both are equal
-	 *     1 if the first date is bigger than the last
-	 *     false (bool): error
+	 * compares two dates, tries to convert them via strtotime to timestamps
+	 * returns int/bool in:
+	 * -1 if the first date is smaller the last
+	 * 0 if both are equal
+	 * 1 if the first date is bigger than the last
+	 * false if date validation/conversion failed
 	 *
 	 * @param  string $start_date start date string in YYYY-MM-DD
 	 * @param  string $end_date   end date string in YYYY-MM-DD
-	 * @return int|bool           false on error, or int -1/0/1 as difference
+	 * @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)
 	{
@@ -306,16 +355,17 @@ class DateTime

 	/**
 	 * compares the two dates + times. if seconds missing in one set,
-	 * add :00, converts / to -
+	 * adds :00, converts date + times via strtotime to timestamps
 	 * returns int/bool in:
-	 *     -1 if the first date is smaller the last
-	 *     0 if both are equal
-	 *     1 if the first date is bigger than the last
-	 *     false if no valid date/times chould be found
+	 * -1 if the first date is smaller the last
+	 * 0 if both are equal
+	 * 1 if the first date is bigger than the last
+	 * false if date/times validation/conversion failed
 	 *
 	 * @param  string $start_datetime start date/time in YYYY-MM-DD HH:mm:ss
 	 * @param  string $end_datetime   end date/time in YYYY-MM-DD HH:mm:ss
-	 * @return int|bool               false for error or -1/0/1 as difference
+	 * @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)
 	{
--- a/www/lib/CoreLibs/Convert/Byte.php
+++ b/www/lib/CoreLibs/Convert/Byte.php
@@ -1,7 +1,7 @@
 <?php

 /*
- * image thumbnail, rotate, etc
+ * byte conversion from and to human readable
 */

 declare(strict_types=1);
--- a/www/lib/CoreLibs/Convert/Encoding.php
+++ b/www/lib/CoreLibs/Convert/Encoding.php
@@ -1,7 +1,7 @@
 <?php

 /*
- * check if string is valid in target encoding
+ * convert string frmo one encdoing to another with auto detect flags
 */

 declare(strict_types=1);
--- a/www/lib/CoreLibs/Convert/MimeEncode.php
+++ b/www/lib/CoreLibs/Convert/MimeEncode.php
@@ -26,6 +26,7 @@ class MimeEncode
 		string $encoding,
 		string $line_break = "\r\n"
 	): string {
+		$current_internal_encoding = mb_internal_encoding();
 		// set internal encoding, so the mimeheader encode works correctly
 		mb_internal_encoding($encoding);
 		// if a subject, make a work around for the broken mb_mimencode
@@ -60,6 +61,9 @@ class MimeEncode
 		}
 		// strip out any spaces BEFORE a line break
 		$string = str_replace(" " . $line_break, $line_break, $_string);
+		// before we end, reset internal encoding
+		mb_internal_encoding($current_internal_encoding);
+		// return mime encoded string
 		return $string;
 	}
 }
--- a/www/lib/CoreLibs/Convert/Strings.php
+++ b/www/lib/CoreLibs/Convert/Strings.php
@@ -0,0 +1,123 @@
+<?php
+
+/*
+ * string convert and transform functions
+ */
+
+declare(strict_types=1);
+
+namespace CoreLibs\Convert;
+
+class Strings
+{
+	/**
+	 * return the number of elements in the split list
+	 * 0 if nothing / invalid split
+	 * 1 if no split character found
+	 * n for the numbers in the split list
+	 *
+	 * @param  string $split_format
+	 * @param  string $split_characters
+	 * @return int
+	 */
+	public static function countSplitParts(
+		string $split_format,
+		string $split_characters = '-'
+	): int {
+		if (
+			empty($split_format) ||
+			// non valid characters inside, abort
+			!preg_match("/^[0-9" . $split_characters . "]/", $split_format) ||
+			preg_match('/[^\x20-\x7e]/', $split_characters)
+		) {
+			return 0;
+		}
+		$split_list = preg_split(
+			// allowed split characters
+			"/([" . $split_characters . "]{1})/",
+			$split_format
+		);
+		if (!is_array($split_list)) {
+			return 0;
+		}
+		return count(array_filter($split_list));
+	}
+
+	/**
+	 * split format a string base on a split format string
+	 * split format string is eg
+	 * 4-4-4 that means 4 characters DASH 4 characters DASH 4 characters
+	 * So a string in the format of
+	 * ABCD1234EFGH will be ABCD-1234-EFGH
+	 * Note a string LONGER then the maxium will be attached with the LAST
+	 * split character. In above exmaple
+	 * ABCD1234EFGHTOOLONG will be ABCD-1234-EFGH-TOOLONG
+	 *
+	 * @param  string $value            string value to split
+	 * @param  string $split_format     split format
+	 * @param  string $split_characters list of charcters with which we split
+	 *                                  if not set uses dash ('-')
+	 * @return string                   split formatted string or original value if not chnaged
+	 */
+	public static function splitFormatString(
+		string $value,
+		string $split_format,
+		string $split_characters = '-'
+	): string {
+		if (
+			// abort if split format is empty
+			empty($split_format) ||
+			// if not in the valid ASCII character range for any of the strings
+			preg_match('/[^\x20-\x7e]/', $value) ||
+			// preg_match('/[^\x20-\x7e]/', $split_format) ||
+			preg_match('/[^\x20-\x7e]/', $split_characters) ||
+			// only numbers and split characters in split_format
+			!preg_match("/[0-9" . $split_characters . "]/", $split_format)
+		) {
+			return $value;
+		}
+		// split format list
+		$split_list = preg_split(
+			// allowed split characters
+			"/([" . $split_characters . "]{1})/",
+			$split_format,
+			-1,
+			PREG_SPLIT_DELIM_CAPTURE
+		);
+		// if this is false, or only one array, abort split
+		if (!is_array($split_list) || count($split_list) == 1) {
+			return $value;
+		}
+		$out = '';
+		$pos = 0;
+		$last_split = '';
+		foreach ($split_list as $offset) {
+			if (is_numeric($offset)) {
+				$_part = substr($value, $pos, (int)$offset);
+				if (empty($_part)) {
+					break;
+				}
+				$out .= $_part;
+				$pos += (int)$offset;
+			} elseif ($pos) { // if first, do not add
+				$out .= $offset;
+				$last_split = $offset;
+			}
+		}
+		if (!empty($out) && $pos < strlen($value)) {
+			$out .= $last_split . substr($value, $pos);
+		}
+		// if last is not alphanumeric remove, remove
+		if (!strcspn(substr($out, -1, 1), $split_characters)) {
+			$out = substr($out, 0, -1);
+		}
+		// overwrite only if out is set
+		if (!empty($out)) {
+			return $out;
+		} else {
+			return $value;
+		}
+	}
+}
+
+// __END__
--- a/www/lib/CoreLibs/Create/Email.php
+++ b/www/lib/CoreLibs/Create/Email.php
@@ -24,7 +24,7 @@ class Email
 		'JIS',
 		'JIS-ms',
 	];
-	/** @var string, normaly this does not need to be changed */
+	/** @var string normaly this does not need to be changed */
 	private static $mb_convert_kana_mode = 'KV';

 	/**
@@ -36,7 +36,7 @@ class Email
 	 * @param  string $email      E-Mail address
 	 * @param  string $email_name Name for the email address, in UTF-8, if not set, empty
 	 * @param  string $encoding   Encoding, if not set UTF-8
-	 * @param  bool   $kv_fodling If set to true and a valid encoding, do KV folding
+	 * @param  bool   $kv_folding If set to true and a valid encoding, do KV folding
 	 * @return string             Correctly encoded and build email string
 	 */
 	public static function encodeEmailName(
@@ -45,27 +45,26 @@ class Email
 		string $encoding = 'UTF-8',
 		bool $kv_folding = false
 	): string {
-		if (!empty($email_name)) {
-			// if encoding is not UTF-8 then we convert
-			if ($encoding != 'UTF-8') {
-				$email_name = mb_convert_encoding($email_name, $encoding, 'UTF-8');
-			}
-			$email_name =
-				mb_encode_mimeheader(
-					in_array($encoding, self::$encoding_kv_allowed) && $kv_folding ?
-						mb_convert_kana(
-							$email_name,
-							self::$mb_convert_kana_mode,
-							$encoding
-						) :
-						$email_name,
-					$encoding
-				);
-			return '"' . $email_name . '" '
-				. '<' . (string)$email . '>';
-		} else {
+		if (empty($email_name)) {
 			return $email;
 		}
+		// if encoding is not UTF-8 then we convert
+		if ($encoding != 'UTF-8') {
+			$email_name = mb_convert_encoding($email_name, $encoding, 'UTF-8');
+		}
+		$email_name =
+			mb_encode_mimeheader(
+				in_array($encoding, self::$encoding_kv_allowed) && $kv_folding ?
+					mb_convert_kana(
+						$email_name,
+						self::$mb_convert_kana_mode,
+						$encoding
+					) :
+					$email_name,
+				$encoding
+			);
+		return '"' . $email_name . '" '
+			. '<' . (string)$email . '>';
 	}

 	/**
@@ -75,7 +74,7 @@ class Email
 	 * @param  string               $body       Body string, in UTF-8
 	 * @param  array<string,string> $replace    Replace the array as key -> value, in UTF-8
 	 * @param  string               $encoding   Encoding for subject encode mime header
-	 * @param  bool                 $kv_fodling If set to true and a valid encoding,
+	 * @param  bool                 $kv_folding If set to true and a valid encoding,
 	 *                                          do KV folding
 	 * @return array<string>                    Pos 0: Subject, Pos 1: Body
 	 */
--- a/www/lib/CoreLibs/Create/RandomKey.php
+++ b/www/lib/CoreLibs/Create/RandomKey.php
@@ -1,7 +1,7 @@
 <?php

 /*
- * html convert functions
+ * random key functions
 */

 declare(strict_types=1);
--- a/www/lib/CoreLibs/DB/Extended/ArrayIO.php
+++ b/www/lib/CoreLibs/DB/Extended/ArrayIO.php
@@ -46,21 +46,28 @@ class ArrayIO extends \CoreLibs\DB\IO
 	public $pk_name = ''; // the primary key from this table
 	/** @var int|string|null */
 	public $pk_id; // the PK id
+	// security values
+	/** @var int base acl for current page */
+	private $base_acl_level = 0;

 	/**
 	 * constructor for the array io class, set the
 	 * primary key name automatically (from array)
 	 *
-	 * @param array<mixed> $db_config   db connection config
-	 * @param array<mixed> $table_array table array config
-	 * @param string       $table_name  table name string
+	 * @param array<mixed> $db_config      db connection config
+	 * @param array<mixed> $table_array    table array config
+	 * @param string       $table_name     table name string
 	 * @param \CoreLibs\Debug\Logging|null $log Logging class, default set if not set
+	 * @param int          $base_acl_level Set base acl level, if needed
+	 * @param int          $acl_admin      Flag if this is an admin ACL access level
 	 */
 	public function __construct(
 		array $db_config,
 		array $table_array,
 		string $table_name,
-		\CoreLibs\Debug\Logging $log = null
+		\CoreLibs\Debug\Logging $log = null,
+		int $base_acl_level = 0,
+		int $acl_admin = 0
 	) {
 		// instance db_io class
 		parent::__construct($db_config, $log ?? new \CoreLibs\Debug\Logging());
@@ -79,6 +86,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 				}
 			}
 		} // set pk_name IF table_array was given
+		$this->dbArrayIOSetAcl($base_acl_level, $acl_admin);
 	}

 	/**
@@ -89,6 +97,33 @@ class ArrayIO extends \CoreLibs\DB\IO
 		parent::__destruct();
 	}

+	/**
+	 * set the base acl level and admin acl flag
+	 * This is needed for table array ACL checks
+	 * if not set I assume 0 (non write/non read/non admin)
+	 *
+	 * @param  int  $base_acl_level ACL Level from 0 to 100, -1 is not allowed
+	 *                              Will sett 0 if invalid
+	 * @param  int  $acl_admin      0 for non admin, 1 for admin (base acl is 100)
+	 * @return void
+	 */
+	public function dbArrayIOSetAcl(int $base_acl_level, int $acl_admin): void
+	{
+		// default not allowed, must be 0 at least
+		if ($base_acl_level < 0) {
+			$base_acl_level = 0;
+		}
+		// only 0 or 1 allowed
+		if (!in_array($acl_admin, [0, 1])) {
+			$acl_admin = 0;
+		}
+		// if the user is admin flagged, auto set to 100, if not already set to 100
+		if ($acl_admin == 1) {
+			$base_acl_level = 100;
+		}
+		$this->base_acl_level = $base_acl_level;
+	}
+
 	/**
 	 * changes all previously alterd HTML code into visible one,
 	 * works for <b>,<i>, and <a> (thought <a> can be / or should
@@ -191,9 +226,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
 	 * @return array<mixed>              returns the table array that was deleted
 	 */
-	public function dbDelete($table_array = [])
+	public function dbDelete($table_array = [], $acl_limit = false)
 	{
 		// is array and has values, override set and set new
 		if (is_array($table_array) && count($table_array)) {
@@ -202,6 +238,11 @@ class ArrayIO extends \CoreLibs\DB\IO
 		if (!$this->dbCheckPkSet()) {
 			return $this->table_array;
 		}
+		if ($acl_limit === true && $this->base_acl_level < 100) {
+			$this->log->debug('DB DELETE ERROR', 'ACL Limit on, Delete, '
+				. 'but base ACL level of 100 not met: ' . $this->base_acl_level);
+			return $this->table_array;
+		}
 		// delete query
 		$q = 'DELETE FROM ' . $this->table_name . ' WHERE ';
 		$q .= $this->pk_name . ' = ' . $this->table_array[$this->pk_name]['value'] . ' ';
@@ -338,10 +379,14 @@ class ArrayIO extends \CoreLibs\DB\IO
 	 *
 	 * @param  boolean      $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
 	 * @return array<mixed>              table array or null
 	 */
-	public function dbWrite($addslashes = false, $table_array = [])
-	{
+	public function dbWrite(
+		bool $addslashes = false,
+		array $table_array = [],
+		bool $acl_limit = false
+	): array {
 		if (is_array($table_array) && count($table_array)) {
 			$this->table_array = $table_array;
 		}
@@ -355,6 +400,12 @@ class ArrayIO extends \CoreLibs\DB\IO
 		} else {
 			$insert = 0;
 		}
+		// early abort for new write with not enough ACL level
+		if ($insert && $acl_limit === true && $this->base_acl_level < 100) {
+			$this->log->debug('DB WRITE ERROR', 'ACL Limit on, Insert, '
+				. 'but base ACL level of 100 not met: ' . $this->base_acl_level);
+			return $this->table_array;
+		}

 		reset($this->table_array);
 		$q_data = '';
@@ -408,11 +459,25 @@ class ArrayIO extends \CoreLibs\DB\IO
 			/********************************* END FILE **************************************/

 			// do not write 'pk' (primary key) or 'view' values
+			// also do not write UPDATE for elements that are
+			// acl flagged, not if we have an ACL limiter, don't insert
+			// $this->log->debug('DB WRITE', 'C: ' . $column . ', '
+			// 	. 'ACL Level ' . $this->log->prBl($acl_limit) . ', '
+			// 	. 'TA ACL: ' . ($this->table_array[$column]['min_edit_acl'] ?? 100) . ', '
+			// 	. 'Base ACL: ' . $this->base_acl_level);
 			if (
 				!isset($this->table_array[$column]['pk']) &&
 				isset($this->table_array[$column]['type']) &&
 				$this->table_array[$column]['type'] != 'view' &&
-				strlen($column) > 0
+				strlen($column) > 0 &&
+				// no acl limiter
+				($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 (
@@ -510,6 +575,11 @@ class ArrayIO extends \CoreLibs\DB\IO
 			}
 		} // while ...

+		if (empty($q_data)) {
+			$this->log->debug('DB WRITE ERROR', 'No data to write, possible through ACL');
+			return $this->table_array;
+		}
+
 		// NOW get PK, and FK settings (FK only for update query)
 		// get it at the end, cause now we can be more sure of no double IDs, etc
 		reset($this->table_array);
--- a/www/lib/CoreLibs/DB/IO.php
+++ b/www/lib/CoreLibs/DB/IO.php
@@ -2580,9 +2580,9 @@ class IO
 		// loop through the write array and each field to build the query
 		foreach ($write_array as $field) {
 			if (
-				(empty($primary_key['value']) ||
-					(!empty($primary_key['value']) &&
-					!in_array($field, $not_write_update_array))
+				(
+					empty($primary_key['value']) ||
+					!in_array($field, $not_write_update_array)
 				) &&
 				!in_array($field, $not_write_array)
 			) {
@@ -2963,7 +2963,7 @@ class IO
 	 * Either as single array level for single insert
 	 * Or nested array for multiple insert values
 	 *
-	 * If key was set only returns tghose values directly or as array
+	 * If key was set only returns those values directly or as array
 	 *
 	 * On multiple insert return the position for which to return can be set too
 	 *
@@ -2978,7 +2978,7 @@ class IO
 		// return as is if key is null
 		if ($key === null) {
 			if (count($this->insert_id_arr) == 1) {
-				// return as nul if not found
+				// return as null if not found
 				return $this->insert_id_arr[0] ?? null;
 			} else {
 				return $this->insert_id_arr;
--- a/www/lib/CoreLibs/DB/SQL/PgSQL.php
+++ b/www/lib/CoreLibs/DB/SQL/PgSQL.php
@@ -779,7 +779,6 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 		}
 		// get result
 		$db_schema = $this->__dbFetchArray($cursor, PGSQL_ASSOC);
-		/** @phpstan-ignore-next-line Cannot access offset string on array|bool */
 		return $db_schema[$show_string] ?? '';
 	}

@@ -806,7 +805,6 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 		}
 		// check if schema does not exists
 		$row = $this->__dbFetchArray($cursor, PGSQL_ASSOC);
-		/** @phpstan-ignore-next-line */
 		if (empty($row['exists']) || $row['exists'] == 'f') {
 			return 2;
 		}
--- a/www/lib/CoreLibs/Debug/Logging.php
+++ b/www/lib/CoreLibs/Debug/Logging.php
@@ -173,7 +173,7 @@ class Logging

 		// can be overridden with basicSetLogFileId later
 		if (!empty($this->options['file_id'])) {
-			$this->setLogId($this->options['file_id'] ?? '');
+			$this->setLogId($this->options['file_id']);
 		} elseif (!empty($GLOBALS['LOG_FILE_ID'])) {
 			// legacy flow, should be removed and only set via options
 			$this->setLogId($GLOBALS['LOG_FILE_ID']);
--- a/www/lib/CoreLibs/Output/Form/Generate.php
+++ b/www/lib/CoreLibs/Output/Form/Generate.php
@@ -270,9 +270,11 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	public $save;
 	/** @var string */
 	public $remove_button;
-	// security publics
-	/** @var int */
-	public $base_acl_level;
+	// security values
+	/** @var int base acl for current page */
+	private $base_acl_level = 0;
+	/** @var int admin master flag (1/0) */
+	private $acl_admin = 0;
 	/** @var array<mixed> */
 	public $security_level;
 	// layout publics
@@ -336,6 +338,12 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		// load config array
 		// get table array definitions for current page name

+		// security settings
+		$this->base_acl_level = (int)$_SESSION['BASE_ACL_LEVEL'];
+		$this->acl_admin = (int)$_SESSION['ADMIN'];
+		$GLOBALS['base_acl_level'] = $this->base_acl_level;
+		$GLOBALS['acl_admin'] = $this->acl_admin;
+
 		// first check if we have a in page override as $table_arrays[page name]
 		if (
 			/* isset($GLOBALS['table_arrays']) &&
@@ -348,7 +356,8 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			// $config_array = $GLOBALS['table_arrays'][System::getPageName(1)];
 			$config_array = $table_arrays[System::getPageName(1)];
 		} else {
-			// WARNING: auto spl load does not work with this as it is an array and not a function/object
+			// WARNING: auto spl load does not work with this as it is an array
+			// and not a function/object
 			// check if this is the old path or the new path
 			// check local folder in current path
 			// then check general global folder
@@ -383,8 +392,12 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			$db_config,
 			$config_array['table_array'],
 			$config_array['table_name'],
-			$log ?? new \CoreLibs\Debug\Logging()
+			$log ?? new \CoreLibs\Debug\Logging(),
+			// set the ACL
+			$this->base_acl_level,
+			$this->acl_admin
 		);
+		// $this->log->debug('SESSION FORM', 'sessin: ' . $this->log->prAr($_SESSION));
 		// here should be a check if the config_array is correct ...
 		if (isset($config_array['show_fields']) && is_array($config_array['show_fields'])) {
 			$this->field_array = $config_array['show_fields'];
@@ -392,6 +405,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		if (isset($config_array['load_query']) && $config_array['load_query']) {
 			$this->load_query = $config_array['load_query'];
 		}
+		if (empty($this->load_query)) {
+			$this->log->debug('INIT ERROR', 'Missing Load Query for: ' . $this->my_page_name);
+		}
 		$this->archive_pk_name = 'a_' . $this->pk_name;
 		$this->col_name = str_replace('_id', '', $this->pk_name);
 		$this->int_pk_name = $this->pk_name;
@@ -416,8 +432,6 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		$this->save = $_POST['save'] ?? '';
 		$this->remove_button = $_POST['remove_button'] ?? '';

-		// security settings
-		$this->base_acl_level = $_SESSION['BASE_ACL_LEVEL'] ?? 0;
 		// security levels for buttons/actions
 		// if array does not exists create basic
 		if (
@@ -428,9 +442,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			)
 		) {
 			$this->security_level = [
-				'load' => 100,
+				'load' => 20,
 				'new' => 100,
-				'save' => 100,
+				'save' => 40,
 				'delete' => 100
 			];
 		} else {
@@ -438,9 +452,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			$this->security_level = isset($config_array['security_level']) ?
 				$config_array['security_level'] :
 				[
-					'load' => 100,
+					'load' => 20,
 					'new' => 100,
-					'save' => 100,
+					'save' => 40,
 					'delete' => 100
 				];
 		}
@@ -489,8 +503,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	 * @param  string|null   $key_value value to match to (optional)
 	 * @return string|null              returns key found or empty string
 	 */
-	public function formGetColNameFromKey(string $want_key, ?string $key_value = null): ?string
-	{
+	public function formGetColNameFromKey(
+		string $want_key,
+		?string $key_value = null
+	): ?string {
 		if (!is_array($this->table_array)) {
 			$this->table_array = [];
 		}
@@ -513,8 +529,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	 * @param  string|null $key_value if set searches for special right value
 	 * @return array<mixed>           found key fields
 	 */
-	public function formGetColNameArrayFromKey(string $want_key, ?string $key_value = null): array
-	{
+	public function formGetColNameArrayFromKey(
+		string $want_key,
+		?string $key_value = null
+	): array {
 		$key_array = [];
 		if (!is_array($this->table_array)) {
 			$this->table_array = [];
@@ -648,8 +666,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	 * @param  array<mixed> $remove_name  key names that should be removed
 	 * @return void                       has no return
 	 */
-	public function formProcedureDeleteFromElementList(array $element_list, array $remove_name): void
-	{
+	public function formProcedureDeleteFromElementList(
+		array $element_list,
+		array $remove_name
+	): void {
 		/** @phan-suppress-next-line PhanTypeArraySuspiciousNullable */
 		$this->log->debug('REMOVE ELEMENT', 'Remove REF ELEMENT: ' . $this->base_acl_level . ' >= '
 			. $this->security_level['delete']);
@@ -752,55 +772,72 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		$t_pk_name = '';
 		$pk_names = [];
 		$pk_ids = [];
+		$seclevel_okay = false;
+		// for error abort only
+		$return_array = [
+			't_pk_name' => $t_pk_name,
+			'pk_ids' => $pk_ids,
+			'pk_names' => $pk_names,
+			'pk_selected' => $pk_selected,
+			'seclevel_okay' => $seclevel_okay,
+		];
 		// when security level is okay ...
 		if (
-			isset($this->security_level['load']) &&
-			$this->base_acl_level >= $this->security_level['load']
+			empty($this->security_level['load']) ||
+			$this->base_acl_level < $this->security_level['load']
 		) {
-			$t_pk_name = $this->archive_pk_name;
+			return $return_array;
+		}
+		if (empty($this->load_query)) {
+			$this->log->debug('LOAD LIST ERROR', 'Missing load list query');
+			return $return_array;
+		}

-			// load list data
-			$this->dbExec($this->load_query);
-			while (is_array($res = $this->dbFetchArray())) {
-				$pk_ids[] = $res[$this->int_pk_name];
-				if (
-					isset($this->table_array[$this->int_pk_name]['value']) &&
-					$res[$this->int_pk_name] == $this->table_array[$this->int_pk_name]['value']
-				) {
-					$pk_selected = $res[$this->int_pk_name];
-				}
-				$t_string = '';
-				foreach ($this->field_array as $i => $field_array) {
-					if ($t_string) {
-						$t_string .= ', ';
-					}
-					if (isset($field_array['before_value'])) {
-						$t_string .= $field_array['before_value'];
-					}
-					// must have res element set
-					if (
-						isset($field_array['name']) &&
-						isset($res[$field_array['name']])
-					) {
-						if (isset($field_array['binary'])) {
-							if (isset($field_array['binary'][0])) {
-								$t_string .= $field_array['binary'][0];
-							} elseif (isset($field_array['binary'][1])) {
-								$t_string .= $field_array['binary'][1];
-							}
-						} else {
-							$t_string .= $res[$field_array['name']];
-						}
-					}
-				}
-				$pk_names[] = $t_string;
+		$t_pk_name = $this->archive_pk_name;
+
+		// load list data
+		$this->dbExec($this->load_query);
+		while (is_array($res = $this->dbFetchArray())) {
+			$pk_ids[] = $res[$this->int_pk_name];
+			if (
+				isset($this->table_array[$this->int_pk_name]['value']) &&
+				$res[$this->int_pk_name] == $this->table_array[$this->int_pk_name]['value']
+			) {
+				$pk_selected = $res[$this->int_pk_name];
 			}
-		} // show it at all
+			$t_string = '';
+			foreach ($this->field_array as $i => $field_array) {
+				if ($t_string) {
+					$t_string .= ', ';
+				}
+				if (isset($field_array['before_value'])) {
+					$t_string .= $field_array['before_value'];
+				}
+				// must have res element set
+				if (
+					isset($field_array['name']) &&
+					isset($res[$field_array['name']])
+				) {
+					if (isset($field_array['binary'])) {
+						if (isset($field_array['binary'][0])) {
+							$t_string .= $field_array['binary'][0];
+						} elseif (isset($field_array['binary'][1])) {
+							$t_string .= $field_array['binary'][1];
+						}
+					} else {
+						$t_string .= $res[$field_array['name']];
+					}
+				}
+			}
+			$pk_names[] = $t_string;
+		}
+		$seclevel_okay = true;
 		return [
 			't_pk_name' => $t_pk_name,
 			'pk_ids' => $pk_ids,
 			'pk_names' => $pk_names,
-			'pk_selected' => $pk_selected
+			'pk_selected' => $pk_selected,
+			'seclevel_okay' => $seclevel_okay,
 		];
 	}

@@ -808,30 +845,38 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	 * Create new entry element for HTML output
 	 *
 	 * @param  bool $hide_new_checkbox  show or hide the new checkbox, default is false
-	 * @return array<string,string|int> return the new create array with name & checkbox show flag
+	 * @return array<string,string|bool> return the new create array with name & checkbox show flag
 	 */
-	public function formCreateNew($hide_new_checkbox = false): array
+	public function formCreateNew(bool $hide_new_checkbox = false): array
 	{
-		$show_checkbox = 0;
+		$show_checkbox = false;
 		$new_name = '';
+		$seclevel_okay = false;
 		// when security level is okay
 		if (
-			isset($this->security_level['new']) &&
-			$this->base_acl_level >= $this->security_level['new']
+			empty($this->security_level['new']) ||
+			$this->base_acl_level < $this->security_level['new']
 		) {
-			if ($this->yes && !$hide_new_checkbox) {
-				$show_checkbox = 1;
-			}
-			// set type of new name
-			if ($this->yes) {
-				$new_name = $this->l->__('Clear all and create new');
-			} else {
-				$new_name = $this->l->__('New');
-			}
-		} // security level okay
+			return [
+				'new_name' => $new_name,
+				'show_checkbox' => $show_checkbox,
+				'seclevel_okay' => $seclevel_okay,
+			];
+		}
+		if ($this->yes && !$hide_new_checkbox) {
+			$show_checkbox = false;
+		}
+		// set type of new name
+		if ($this->yes) {
+			$new_name = $this->l->__('Clear all and create new');
+		} else {
+			$new_name = $this->l->__('New');
+		}
+		$seclevel_okay = true;
 		return [
 			'new_name' => $new_name,
-			'show_checkbox' => $show_checkbox
+			'show_checkbox' => $show_checkbox,
+			'seclevel_okay' => $seclevel_okay,
 		];
 	}

@@ -842,42 +887,57 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	 * @return array<string,mixed>         return the hide/show delete framework
 	 *                                     for html creation
 	 */
-	public function formCreateSaveDelete($hide_delete = false, $hide_delete_checkbox = false): array
-	{
-		$seclevel_okay = 0;
+	public function formCreateSaveDelete(
+		bool $hide_delete = false,
+		bool $hide_delete_checkbox = false,
+		bool $old_school_hidden = false
+	): array {
+		$seclevel_okay = false;
 		$save = '';
 		$pk_name = '';
 		$pk_value = '';
-		$show_delete = 0;
-		$old_school_hidden = 0;
+		$show_delete = false;
 		if (
-			(isset($this->security_level['save']) &&
-				$this->base_acl_level >= $this->security_level['save']) ||
-			(isset($this->security_level['delete']) &&
-				$this->base_acl_level >= $this->security_level['delete'])
+			(empty($this->security_level['save']) ||
+			$this->base_acl_level < $this->security_level['save']) &&
+			(empty($this->security_level['delete']) ||
+			$this->base_acl_level < $this->security_level['delete'])
 		) {
-			if ($this->base_acl_level >= $this->security_level['save']) {
-				$seclevel_okay = 1;
-				if (empty($this->table_array[$this->int_pk_name]['value'])) {
-					$save = $this->l->__('Save');
-				} else {
-					$save = $this->l->__('Update');
-				}
-				// print the old_school hidden if requestet
-				if ($old_school_hidden == 1) { /** @phpstan-ignore-line Unclear logic */
-					$pk_name = $this->int_pk_name;
-					$pk_value = $this->table_array[$this->int_pk_name]['value'];
-				}
-			} // show save part
-			// show delete part only if pk is set && we want to see the delete
-			if (
-				!empty($this->table_array[$this->int_pk_name]['value']) &&
-				!$hide_delete &&
-				$this->base_acl_level >= $this->security_level['delete']
-			) {
-				$show_delete = 1;
+			return [
+				'seclevel_okay' => $seclevel_okay,
+				'save' => $save,
+				'pk_name' => $pk_name,
+				'pk_value' => $pk_value,
+				'show_delete' => $show_delete,
+				'old_school_hidden' => $old_school_hidden,
+				'hide_delete_checkbox' => $hide_delete_checkbox
+			];
+		}
+		if (
+			!empty($this->security_level['save']) &&
+			$this->base_acl_level >= $this->security_level['save']
+		) {
+			$seclevel_okay = true;
+			if (empty($this->table_array[$this->int_pk_name]['value'])) {
+				$save = $this->l->__('Save');
+			} else {
+				$save = $this->l->__('Update');
 			}
-		} // print save/delete row at all$
+			// print the old_school hidden if requestet
+			if ($old_school_hidden === true) {
+				$pk_name = $this->int_pk_name;
+				$pk_value = $this->table_array[$this->int_pk_name]['value'];
+			}
+		} // show save part
+		// show delete part only if pk is set && we want to see the delete
+		if (
+			!empty($this->table_array[$this->int_pk_name]['value']) &&
+			!$hide_delete &&
+			!empty($this->security_level['delete']) &&
+			$this->base_acl_level >= $this->security_level['delete']
+		) {
+			$show_delete = true;
+		}
 		return [
 			'seclevel_okay' => $seclevel_okay,
 			'save' => $save,
@@ -921,11 +981,16 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		}
 		// create right side depending on 'definiton' in table_array
 		$type = $this->table_array[$element_name]['type'];
+		// set default min edit/read to 100 (admin)
+		$min_edit_acl = $this->table_array[$element_name]['min_edit_acl'] ?? 100;
+		$min_show_acl = $this->table_array[$element_name]['min_show_acl'] ?? 100;
+		$show_value = '-';
 		// view only output
 		if ($this->table_array[$element_name]['type'] == 'view') {
 			$data['value'] = empty($this->table_array[$element_name]['value']) ?
 				$this->table_array[$element_name]['empty'] :
 				$this->table_array[$element_name]['value'];
+			$show_value = $data['value'];
 		}
 		// binary true/false element
 		if ($this->table_array[$element_name]['type'] == 'binary') {
@@ -940,6 +1005,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 					(!$i && !$this->table_array[$element_name]['value']))
 				) {
 					$data['checked'] = $this->table_array[$element_name]['value'];
+					$show_value = $this->table_array[$element_name]['element_list'][$i] ?? $data['checked'];
 				}

 				if ($i) {
@@ -952,6 +1018,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			$data['name'] = $element_name;
 			$data['value'][] = $this->table_array[$element_name]['element_list'];
 			$data['checked'] = $this->table_array[$element_name]['value'];
+			// array map element list + value
+			// foreach ($data['checked'] as $checked)
+			$show_value = join(', ', $data['checked']);
 		}
 		// normal text element
 		if ($this->table_array[$element_name]['type'] == 'text') {
@@ -959,6 +1028,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			$data['value'] = $this->table_array[$element_name]['value'] ?? '';
 			$data['size'] = $this->table_array[$element_name]['size'] ?? '';
 			$data['length'] = $this->table_array[$element_name]['length'] ?? '';
+			$show_value = $data['value'];
 		}
 		// password element, does not write back the value
 		if ($this->table_array[$element_name]['type'] == 'password') {
@@ -971,11 +1041,13 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		if ($this->table_array[$element_name]['type'] == 'date') {
 			$data['name'] = $element_name;
 			$data['value'] = $this->table_array[$element_name]['value'] ?? '';
+			$show_value = $data['value'];
 		}
 		// date time (no sec) (YYYY-MM-DD HH:mm)
 		if ($this->table_array[$element_name]['type'] == 'datetime') {
 			$data['name'] = $element_name;
 			$data['value'] = $this->table_array[$element_name]['value'] ?? '';
+			$show_value = $data['value'];
 		}
 		// textarea
 		if ($this->table_array[$element_name]['type'] == 'textarea') {
@@ -983,6 +1055,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			$data['value'] = $this->table_array[$element_name]['value'] ?? '';
 			$data['rows'] = $this->table_array[$element_name]['rows'] ?? '';
 			$data['cols'] = $this->table_array[$element_name]['cols'] ?? '';
+			$show_value = $data['value'];
 		}
 		// for drop_down_*
 		if (preg_match("/^drop_down_/", $this->table_array[$element_name]['type'])) {
@@ -1047,6 +1120,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 					$this->table_array[$element_name]['value'] == $res[0]
 				) {
 					$data['selected'] = $this->table_array[$element_name]['value'];
+					$show_value = $res[1];
 				}
 			}
 			// for _input put additional field next to drop down
@@ -1079,6 +1153,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 				$data['output'][] = $value;
 				if ($this->table_array[$element_name]['value'] == $key) {
 					$data['selected'] = $this->table_array[$element_name]['value'];
+					$show_value = $value;
 				}
 			}
 		}
@@ -1093,6 +1168,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 				$data['output'][] = $value;
 				if ($this->table_array[$element_name]['value'] == $key) {
 					$data['checked'] = $this->table_array[$element_name]['value'];
+					$show_value = $value;
 				}
 				$data['separator'] = '';
 			}
@@ -1126,7 +1202,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			'output_name' => $output_name,
 			'color' => $EDIT_FGCOLOR_T,
 			'type' => $type,
-			'data' => $data
+			'data' => $data,
+			'show_value' => $show_value,
+			'allow_edit' => $this->base_acl_level >= $min_edit_acl ? 1 : 0,
+			'allow_show' => $this->base_acl_level >= $min_show_acl ? 1 : 0,
 		];
 	}

@@ -1146,6 +1225,12 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		}
 		reset($this->table_array);
 		foreach ($this->table_array as $key => $value) {
+			// skip if we are not allowe to write this anyway
+			// $this->log->debug('ERROR CHECK', 'ACL K: ' . $key . ', '
+			// 	. ($value['min_edit_acl'] ?? 100) . ' < ' . $this->base_acl_level);
+			if ($this->base_acl_level < ($value['min_edit_acl'] ?? 100)) {
+				continue;
+			}
 			//if ($value['mandatory'] && $value['error_check'])
 			// if error value set && somethign input, check if input okay
 			if (
@@ -1373,6 +1458,12 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		// do check for reference tables
 		reset($this->reference_array);
 		foreach ($this->reference_array as $key => $value) {
+			// skip if not allowed to write
+			if (
+				$this->base_acl_level < ($this->reference_array[$key]['min_edit_acl'] ?? 100)
+			) {
+				continue;
+			}
 			if (
 				isset($this->reference_array[$key]['mandatory']) &&
 				$this->reference_array[$key]['mandatory'] &&
@@ -1392,6 +1483,12 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 				if (!is_array($reference_array)) {
 					$reference_array = [];
 				}
+				// skip if not allowed to write
+				if (
+					$this->base_acl_level < ($this->reference_array['min_edit_acl'] ?? 100)
+				) {
+					continue;
+				}
 				// set pk/fk id for this
 				$_pk_name = '';
 				$_fk_name = '';
@@ -1567,32 +1664,33 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	{
 		// get order name
 		$order_name = $this->formGetColNameFromKey('order');
-		if ($order_name) {
-			// first check out of order ...
-			if (empty($this->table_array[$order_name]['value'])) {
-				// set order (read max)
-				$q = 'SELECT MAX(' . $order_name . ') + 1 AS max_page_order '
-					. 'FROM ' . $this->table_name;
-				if (
-					is_array($res = $this->dbReturnRow($q)) &&
-					!empty($res['max_page_order'])
-				) {
-					$this->table_array[$order_name]['value'] = $res['max_page_order'];
-				}
-				// frist element is 0 because NULL gets returned, set to 1
-				if (!$this->table_array[$order_name]['value']) {
-					$this->table_array[$order_name]['value'] = 1;
-				}
-			} elseif (!empty($this->table_array[$this->int_pk_name]['value'])) {
-				$q = 'SELECT ' . $order_name . ' AS order_name '
-					. 'FROM ' . $this->table_name . ' '
-					. 'WHERE ' . $this->int_pk_name . ' = ' . $this->table_array[$this->int_pk_name]['value'];
-				if (
-					is_array($res = $this->dbReturnRow($q)) &&
-					!empty($res['order_name'])
-				) {
-					$this->table_array[$order_name]['value'] = $res['order_name'];
-				}
+		if (empty($order_name)) {
+			return $this->table_array;
+		}
+		// first check out of order ...
+		if (empty($this->table_array[$order_name]['value'])) {
+			// set order (read max)
+			$q = 'SELECT MAX(' . $order_name . ') + 1 AS max_page_order '
+				. 'FROM ' . $this->table_name;
+			if (
+				is_array($res = $this->dbReturnRow($q)) &&
+				!empty($res['max_page_order'])
+			) {
+				$this->table_array[$order_name]['value'] = $res['max_page_order'];
+			}
+			// frist element is 0 because NULL gets returned, set to 1
+			if (!$this->table_array[$order_name]['value']) {
+				$this->table_array[$order_name]['value'] = 1;
+			}
+		} elseif (!empty($this->table_array[$this->int_pk_name]['value'])) {
+			$q = 'SELECT ' . $order_name . ' AS order_name '
+				. 'FROM ' . $this->table_name . ' '
+				. 'WHERE ' . $this->int_pk_name . ' = ' . $this->table_array[$this->int_pk_name]['value'];
+			if (
+				is_array($res = $this->dbReturnRow($q)) &&
+				!empty($res['order_name'])
+			) {
+				$this->table_array[$order_name]['value'] = $res['order_name'];
 			}
 		}
 		return $this->table_array;
@@ -1681,7 +1779,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	 * @param  bool $addslashes override internal addslasahes flag (default false)
 	 * @return void             has no return
 	 */
-	public function formSaveTableArray($addslashes = false)
+	public function formSaveTableArray(bool $addslashes = false)
 	{
 		// for drop_down_db_input check if text field is filled and if, if not yet in db ...
 		// and upload files
@@ -1827,7 +1925,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		//	. $this->table_array[$this->pk_name]['value'] . "/"
 		//	. $this->table_array[$this->int_pk_name]['value']);
 		// write the object
-		$this->dbWrite($addslashes);
+		$this->dbWrite($addslashes, [], true);
 		// write reference array (s) if necessary
 		if (is_array($this->reference_array)) {
 			if (!is_array($this->reference_array)) {
@@ -1852,6 +1950,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			$type = [];
 			reset($this->element_list);
 			foreach ($this->element_list as $table_name => $reference_array) {
+				// early skip if not enought ACL
+				if ($this->base_acl_level < ($reference_array['min_edit_acl'] ?? 100)) {
+					continue;
+				}
 				// init arrays
 				$q_begin = [];
 				$q_middle = [];
@@ -2157,7 +2259,14 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	public function formCreateElementReferenceTable(string $table_name): array
 	{
 		$data = [];
+		//
+		$show_value = '';
+		// set default min edit/read to 100 (admin)
+		$min_edit_acl = $this->reference_array[$table_name]['min_edit_acl'] ?? 100;
+		$min_show_acl = $this->reference_array[$table_name]['min_show_acl'] ?? 100;
+		// output name
 		$output_name = $this->reference_array[$table_name]['output_name'];
+		// mandatory flag
 		if (
 			isset($this->reference_array[$table_name]['mandatory']) &&
 			$this->reference_array[$table_name]['mandatory']
@@ -2169,17 +2278,27 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		while (is_array($res = $this->dbReturn($this->reference_array[$table_name]['query']))) {
 			$data['value'][] = $res[0];
 			$data['output'][] = $res[1];
-			$data['selected'][] = (\CoreLibs\Convert\Html::checked(
+			$selected = (\CoreLibs\Convert\Html::checked(
 				$this->reference_array[$table_name]['selected'] ?? '',
 				$res[0]
 			)) ? $res[0] : '';
+			$data['selected'][] = $selected;
+			if (!empty($selected)) {
+				if (!empty($show_value)) {
+					$show_value .= ", ";
+				}
+				$show_value .= $res[1];
+			}
 		}
 		$type = 'reference_table';
 		return [
 			'output_name' => $output_name,
 			'type' => $type,
 			'color' => 'edit_fgcolor',
-			'data' => $data
+			'data' => $data,
+			'show_value' => empty($show_value) ? '-' : $show_value,
+			'allow_edit' => $this->base_acl_level >= $min_edit_acl ? 1 : 0,
+			'allow_show' => $this->base_acl_level >= $min_show_acl ? 1 : 0,
 		];
 	}

@@ -2211,8 +2330,13 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			'pos' => [],
 			'table_name' => $table_name // sub table name
 		];
+		$show_value = '-';
+		// set default min edit/read to 100 (admin)
+		$min_edit_acl = $this->element_list[$table_name]['min_edit_acl'] ?? 100;
+		$min_show_acl = $this->element_list[$table_name]['min_show_acl'] ?? 100;
 		// output name for the viewable left table td box, prefixed with * if mandatory
 		$output_name = $this->element_list[$table_name]['output_name'];
+		// mandatory flag
 		if (
 			isset($this->element_list[$table_name]['mandatory']) &&
 			$this->element_list[$table_name]['mandatory']
@@ -2523,7 +2647,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			'output_name' => $output_name,
 			'type' => $type,
 			'color' => 'edit_fgcolor',
-			'data' => $data
+			'data' => $data,
+			'show_value' => $show_value,
+			'allow_edit' => $this->base_acl_level >= $min_edit_acl ? 1 : 0,
+			'allow_show' => $this->base_acl_level >= $min_show_acl ? 1 : 0,
 		];
 	}
 	// end of class
--- a/www/lib/CoreLibs/Template/SmartyExtend.php
+++ b/www/lib/CoreLibs/Template/SmartyExtend.php
@@ -105,6 +105,8 @@ class SmartyExtend extends \Smarty
 	public $CSS_TEMPLATE_NAME;
 	/** @var string|null */
 	public $TEMPLATE_TRANSLATE;
+	/** @var string|null */
+	public $JS_TRANSLATE;
 	// core group
 	/** @var string */
 	public $JS_CORE_TEMPLATE_NAME;
@@ -317,14 +319,14 @@ class SmartyExtend extends \Smarty
 		}
 		// javascript translate data as template for auto translate
 		if (empty($this->TEMPLATE_TRANSLATE)) {
-			$this->TEMPLATE_TRANSLATE = 'jsTranslate_'
+			$this->TEMPLATE_TRANSLATE = 'jsTranslate-'
 				. $this->locale_set . '.' . $this->encoding
 				. '.tpl';
 		} else {
 			// we assume we have some fixed set
-			// we must add _<$this->lang>
+			// we must add _<locale>.<encoding>
 			// if .tpl, put before .tpl
-			// if not .tpl, add _<$this->lang>.tpl
+			// if not .tpl, add _<locale>.<encoding>.tpl
 			if (strpos($this->TEMPLATE_TRANSLATE, '.tpl')) {
 				$this->TEMPLATE_TRANSLATE = str_replace(
 					'.tpl',
@@ -332,7 +334,7 @@ class SmartyExtend extends \Smarty
 					$this->TEMPLATE_TRANSLATE
 				);
 			} else {
-				$this->TEMPLATE_TRANSLATE .= '_'
+				$this->TEMPLATE_TRANSLATE .= '-'
 					. $this->locale_set . '.' . $this->encoding
 					. '.tpl';
 			}
@@ -341,6 +343,31 @@ class SmartyExtend extends \Smarty
 		if (!file_exists($this->getTemplateDir()[0] . DIRECTORY_SEPARATOR . $this->TEMPLATE_TRANSLATE)) {
 			$this->TEMPLATE_TRANSLATE = null;
 		}
+		if (empty($this->JS_TRANSLATE)) {
+			$this->JS_TRANSLATE = 'translate-'
+				. $this->locale_set . '.' . $this->encoding . '.js';
+		} else {
+			// we assume we have some fixed set
+			// we must add _<locale>.<encoding>
+			// if .js, put before .js
+			// if not .js, add _<locale>.<encoding>.js
+			if (strpos($this->JS_TRANSLATE, '.js')) {
+				$this->JS_TRANSLATE = str_replace(
+					'.js',
+					'-' . $this->locale_set . '.' . $this->encoding . '.js',
+					$this->JS_TRANSLATE
+				);
+			} else {
+				$this->JS_TRANSLATE .= '-'
+					. $this->locale_set . '.' . $this->encoding
+					. '.js';
+			}
+		}
+		if (!file_exists($this->JAVASCRIPT . $this->JS_TRANSLATE)) {
+			$this->JS_TRANSLATE = null;
+		} else {
+			$this->JS_TRANSLATE = $this->JAVASCRIPT . $this->JS_TRANSLATE;
+		}
 	}

 	/**
@@ -423,7 +450,7 @@ class SmartyExtend extends \Smarty
 				$this->DATA['ADMIN'] = $cms->acl['admin'] ?? 0;
 				// top menu
 				$this->DATA['nav_menu'] = $cms->adbTopMenu();
-				$this->DATA['nav_menu_count'] = is_array($this->DATA['nav_menu']) ? count($this->DATA['nav_menu']) : 0;
+				$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 */
@@ -469,6 +496,7 @@ class SmartyExtend extends \Smarty
 		$this->DATA['TEMPLATE_NAME'] = $this->TEMPLATE_NAME;
 		$this->DATA['CONTENT_INCLUDE'] = $this->CONTENT_INCLUDE;
 		$this->DATA['TEMPLATE_TRANSLATE'] = $this->TEMPLATE_TRANSLATE ?? null;
+		$this->DATA['JS_TRANSLATE'] = $this->JS_TRANSLATE ?? null;
 		$this->DATA['PAGE_FILE_NAME'] = str_replace('.php', '', $this->page_name) . '.tpl';
 		// render page
 		$this->renderSmarty();
--- a/www/vendor/composer/autoload_classmap.php
+++ b/www/vendor/composer/autoload_classmap.php
@@ -27,6 +27,7 @@ return array(
    '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\\Strings' => $baseDir . '/lib/CoreLibs/Convert/Strings.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',
@@ -382,6 +383,7 @@ return array(
    'PHPUnit\\Util\\PHP\\DefaultPhpProcess' => $vendorDir . '/phpunit/phpunit/src/Util/PHP/DefaultPhpProcess.php',
    'PHPUnit\\Util\\PHP\\WindowsPhpProcess' => $vendorDir . '/phpunit/phpunit/src/Util/PHP/WindowsPhpProcess.php',
    'PHPUnit\\Util\\Printer' => $vendorDir . '/phpunit/phpunit/src/Util/Printer.php',
+    'PHPUnit\\Util\\Reflection' => $vendorDir . '/phpunit/phpunit/src/Util/Reflection.php',
    'PHPUnit\\Util\\RegularExpression' => $vendorDir . '/phpunit/phpunit/src/Util/RegularExpression.php',
    'PHPUnit\\Util\\Test' => $vendorDir . '/phpunit/phpunit/src/Util/Test.php',
    'PHPUnit\\Util\\TestDox\\CliTestDoxPrinter' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/CliTestDoxPrinter.php',
@@ -670,6 +672,7 @@ return array(
    'SebastianBergmann\\Type\\RuntimeException' => $vendorDir . '/sebastian/type/src/exception/RuntimeException.php',
    'SebastianBergmann\\Type\\SimpleType' => $vendorDir . '/sebastian/type/src/type/SimpleType.php',
    'SebastianBergmann\\Type\\StaticType' => $vendorDir . '/sebastian/type/src/type/StaticType.php',
+    'SebastianBergmann\\Type\\TrueType' => $vendorDir . '/sebastian/type/src/type/TrueType.php',
    'SebastianBergmann\\Type\\Type' => $vendorDir . '/sebastian/type/src/type/Type.php',
    'SebastianBergmann\\Type\\TypeName' => $vendorDir . '/sebastian/type/src/TypeName.php',
    'SebastianBergmann\\Type\\UnionType' => $vendorDir . '/sebastian/type/src/type/UnionType.php',
--- a/www/vendor/composer/autoload_files.php
+++ b/www/vendor/composer/autoload_files.php
@@ -7,6 +7,5 @@ $baseDir = dirname($vendorDir);

 return array(
    'ec07570ca5a812141189b1fa81503674' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert/Functions.php',
-    '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
    '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
 );
--- a/www/vendor/composer/autoload_psr4.php
+++ b/www/vendor/composer/autoload_psr4.php
@@ -6,10 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);

 return array(
-    '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'),
-    'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
-    'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src/Prophecy'),
    'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
    'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'),
    'DeepCopy\\' => array($vendorDir . '/myclabs/deep-copy/src/DeepCopy'),
--- a/www/vendor/composer/autoload_static.php
+++ b/www/vendor/composer/autoload_static.php
@@ -8,26 +8,12 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
 {
    public static $files = array (
        'ec07570ca5a812141189b1fa81503674' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Assert/Functions.php',
-        '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
        '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
    );

    public static $prefixLengthsPsr4 = array (
-        'p' => 
-        array (
-            'phpDocumentor\\Reflection\\' => 25,
-        ),
-        'W' => 
-        array (
-            'Webmozart\\Assert\\' => 17,
-        ),
-        'S' => 
-        array (
-            'Symfony\\Polyfill\\Ctype\\' => 23,
-        ),
        'P' => 
        array (
-            'Prophecy\\' => 9,
            'PhpParser\\' => 10,
        ),
        'D' => 
@@ -38,24 +24,6 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
    );

    public static $prefixDirsPsr4 = array (
-        'phpDocumentor\\Reflection\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src',
-            1 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src',
-            2 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src',
-        ),
-        'Webmozart\\Assert\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/webmozart/assert/src',
-        ),
-        'Symfony\\Polyfill\\Ctype\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
-        ),
-        'Prophecy\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy',
-        ),
        'PhpParser\\' => 
        array (
            0 => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser',
@@ -92,6 +60,7 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
        '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\\Strings' => __DIR__ . '/../..' . '/lib/CoreLibs/Convert/Strings.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',
@@ -447,6 +416,7 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
        'PHPUnit\\Util\\PHP\\DefaultPhpProcess' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/PHP/DefaultPhpProcess.php',
        'PHPUnit\\Util\\PHP\\WindowsPhpProcess' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/PHP/WindowsPhpProcess.php',
        'PHPUnit\\Util\\Printer' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Printer.php',
+        'PHPUnit\\Util\\Reflection' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Reflection.php',
        'PHPUnit\\Util\\RegularExpression' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/RegularExpression.php',
        'PHPUnit\\Util\\Test' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Test.php',
        'PHPUnit\\Util\\TestDox\\CliTestDoxPrinter' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/TestDox/CliTestDoxPrinter.php',
@@ -735,6 +705,7 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
        'SebastianBergmann\\Type\\RuntimeException' => __DIR__ . '/..' . '/sebastian/type/src/exception/RuntimeException.php',
        'SebastianBergmann\\Type\\SimpleType' => __DIR__ . '/..' . '/sebastian/type/src/type/SimpleType.php',
        'SebastianBergmann\\Type\\StaticType' => __DIR__ . '/..' . '/sebastian/type/src/type/StaticType.php',
+        'SebastianBergmann\\Type\\TrueType' => __DIR__ . '/..' . '/sebastian/type/src/type/TrueType.php',
        'SebastianBergmann\\Type\\Type' => __DIR__ . '/..' . '/sebastian/type/src/type/Type.php',
        'SebastianBergmann\\Type\\TypeName' => __DIR__ . '/..' . '/sebastian/type/src/TypeName.php',
        'SebastianBergmann\\Type\\UnionType' => __DIR__ . '/..' . '/sebastian/type/src/type/UnionType.php',
--- a/www/vendor/composer/installed.json
+++ b/www/vendor/composer/installed.json
@@ -137,17 +137,17 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v4.13.2",
-            "version_normalized": "4.13.2.0",
+            "version": "v4.15.1",
+            "version_normalized": "4.15.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
                "shasum": ""
            },
            "require": {
@@ -158,7 +158,7 @@
                "ircmaxell/php-yacc": "^0.0.7",
                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
            },
-            "time": "2021-11-30T19:35:32+00:00",
+            "time": "2022-09-04T07:30:47+00:00",
            "bin": [
                "bin/php-parse"
            ],
@@ -190,7 +190,7 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
            },
            "install-path": "../nikic/php-parser"
        },
@@ -311,265 +311,26 @@
            },
            "install-path": "../phar-io/version"
        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
-            "version_normalized": "2.2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "time": "2020-06-27T09:03:43+00:00",
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                }
-            },
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
-            },
-            "install-path": "../phpdocumentor/reflection-common"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
-            "version_normalized": "5.3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
-                "shasum": ""
-            },
-            "require": {
-                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
-            },
-            "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
-            },
-            "time": "2021-10-19T17:43:47+00:00",
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                }
-            },
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
-            },
-            "install-path": "../phpdocumentor/reflection-docblock"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.6.1",
-            "version_normalized": "1.6.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "77a32518733312af16a44300404e945338981de3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
-                "reference": "77a32518733312af16a44300404e945338981de3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*",
-                "psalm/phar": "^4.8"
-            },
-            "time": "2022-03-15T21:29:03+00:00",
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
-            },
-            "install-path": "../phpdocumentor/type-resolver"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.15.0",
-            "version_normalized": "1.15.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^6.0 || ^7.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
-            },
-            "time": "2021-12-08T12:19:24+00:00",
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
-            },
-            "install-path": "../phpspec/prophecy"
-        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "9.2.15",
-            "version_normalized": "9.2.15.0",
+            "version": "9.2.17",
+            "version_normalized": "9.2.17.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
                "shasum": ""
            },
            "require": {
                "ext-dom": "*",
                "ext-libxml": "*",
                "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.13.0",
+                "nikic/php-parser": "^4.14",
                "php": ">=7.3",
                "phpunit/php-file-iterator": "^3.0.3",
                "phpunit/php-text-template": "^2.0.2",
@@ -587,7 +348,7 @@
                "ext-pcov": "*",
                "ext-xdebug": "*"
            },
-            "time": "2022-03-07T09:28:20+00:00",
+            "time": "2022-08-30T12:24:04+00:00",
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -620,7 +381,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
            },
            "funding": [
                {
@@ -885,17 +646,17 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "9.5.20",
-            "version_normalized": "9.5.20.0",
+            "version": "9.5.24",
+            "version_normalized": "9.5.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
+                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
+                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
                "shasum": ""
            },
            "require": {
@@ -910,7 +671,6 @@
                "phar-io/manifest": "^2.0.3",
                "phar-io/version": "^3.0.2",
                "php": ">=7.3",
-                "phpspec/prophecy": "^1.12.1",
                "phpunit/php-code-coverage": "^9.2.13",
                "phpunit/php-file-iterator": "^3.0.5",
                "phpunit/php-invoker": "^3.1.1",
@@ -925,18 +685,14 @@
                "sebastian/global-state": "^5.0.1",
                "sebastian/object-enumerator": "^4.0.3",
                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.0",
+                "sebastian/type": "^3.1",
                "sebastian/version": "^3.0.2"
            },
-            "require-dev": {
-                "ext-pdo": "*",
-                "phpspec/prophecy-phpunit": "^2.0.1"
-            },
            "suggest": {
                "ext-soap": "*",
                "ext-xdebug": "*"
            },
-            "time": "2022-04-01T12:37:26+00:00",
+            "time": "2022-08-30T07:42:16+00:00",
            "bin": [
                "phpunit"
            ],
@@ -975,7 +731,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24"
            },
            "funding": [
                {
@@ -1888,17 +1644,17 @@
        },
        {
            "name": "sebastian/type",
-            "version": "3.0.0",
-            "version_normalized": "3.0.0.0",
+            "version": "3.1.0",
+            "version_normalized": "3.1.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
+                "reference": "fb44e1cc6e557418387ad815780360057e40753e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb44e1cc6e557418387ad815780360057e40753e",
+                "reference": "fb44e1cc6e557418387ad815780360057e40753e",
                "shasum": ""
            },
            "require": {
@@ -1907,11 +1663,11 @@
            "require-dev": {
                "phpunit/phpunit": "^9.5"
            },
-            "time": "2022-03-15T09:54:48+00:00",
+            "time": "2022-08-29T06:55:37+00:00",
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                }
            },
            "installation-source": "dist",
@@ -1935,7 +1691,7 @@
            "homepage": "https://github.com/sebastianbergmann/type",
            "support": {
                "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.1.0"
            },
            "funding": [
                {
@@ -2001,91 +1757,6 @@
            ],
            "install-path": "../sebastian/version"
        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.25.0",
-            "version_normalized": "1.25.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "time": "2021-10-20T20:35:02+00:00",
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "installation-source": "dist",
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "install-path": "../symfony/polyfill-ctype"
-        },
        {
            "name": "theseer/tokenizer",
            "version": "1.2.1",
@@ -2138,67 +1809,6 @@
                }
            ],
            "install-path": "../theseer/tokenizer"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.10.0",
-            "version_normalized": "1.10.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "time": "2021-03-09T10:59:23+00:00",
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
-            },
-            "install-path": "../webmozart/assert"
        }
    ],
    "dev": true,
@@ -2208,10 +1818,6 @@
        "nikic/php-parser",
        "phar-io/manifest",
        "phar-io/version",
-        "phpdocumentor/reflection-common",
-        "phpdocumentor/reflection-docblock",
-        "phpdocumentor/type-resolver",
-        "phpspec/prophecy",
        "phpunit/php-code-coverage",
        "phpunit/php-file-iterator",
        "phpunit/php-invoker",
@@ -2234,8 +1840,6 @@
        "sebastian/resource-operations",
        "sebastian/type",
        "sebastian/version",
-        "symfony/polyfill-ctype",
-        "theseer/tokenizer",
-        "webmozart/assert"
+        "theseer/tokenizer"
    ]
 }
--- a/www/vendor/composer/installed.php
+++ b/www/vendor/composer/installed.php
@@ -38,12 +38,12 @@
            'dev_requirement' => true,
        ),
        'nikic/php-parser' => array(
-            'pretty_version' => 'v4.13.2',
-            'version' => '4.13.2.0',
+            'pretty_version' => 'v4.15.1',
+            'version' => '4.15.1.0',
            'type' => 'library',
            'install_path' => __DIR__ . '/../nikic/php-parser',
            'aliases' => array(),
-            'reference' => '210577fe3cf7badcc5814d99455df46564f3c077',
+            'reference' => '0ef6c55a3f47f89d7a374e6f835197a0b5fcf900',
            'dev_requirement' => true,
        ),
        'phar-io/manifest' => array(
@@ -64,49 +64,13 @@
            'reference' => '4f7fd7836c6f332bb2933569e566a0d6c4cbed74',
            'dev_requirement' => true,
        ),
-        'phpdocumentor/reflection-common' => array(
-            'pretty_version' => '2.2.0',
-            'version' => '2.2.0.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../phpdocumentor/reflection-common',
-            'aliases' => array(),
-            'reference' => '1d01c49d4ed62f25aa84a747ad35d5a16924662b',
-            'dev_requirement' => true,
-        ),
-        'phpdocumentor/reflection-docblock' => array(
-            'pretty_version' => '5.3.0',
-            'version' => '5.3.0.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../phpdocumentor/reflection-docblock',
-            'aliases' => array(),
-            'reference' => '622548b623e81ca6d78b721c5e029f4ce664f170',
-            'dev_requirement' => true,
-        ),
-        'phpdocumentor/type-resolver' => array(
-            'pretty_version' => '1.6.1',
-            'version' => '1.6.1.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../phpdocumentor/type-resolver',
-            'aliases' => array(),
-            'reference' => '77a32518733312af16a44300404e945338981de3',
-            'dev_requirement' => true,
-        ),
-        'phpspec/prophecy' => array(
-            'pretty_version' => 'v1.15.0',
-            'version' => '1.15.0.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../phpspec/prophecy',
-            'aliases' => array(),
-            'reference' => 'bbcd7380b0ebf3961ee21409db7b38bc31d69a13',
-            'dev_requirement' => true,
-        ),
        'phpunit/php-code-coverage' => array(
-            'pretty_version' => '9.2.15',
-            'version' => '9.2.15.0',
+            'pretty_version' => '9.2.17',
+            'version' => '9.2.17.0',
            'type' => 'library',
            'install_path' => __DIR__ . '/../phpunit/php-code-coverage',
            'aliases' => array(),
-            'reference' => '2e9da11878c4202f97915c1cb4bb1ca318a63f5f',
+            'reference' => 'aa94dc41e8661fe90c7316849907cba3007b10d8',
            'dev_requirement' => true,
        ),
        'phpunit/php-file-iterator' => array(
@@ -146,12 +110,12 @@
            'dev_requirement' => true,
        ),
        'phpunit/phpunit' => array(
-            'pretty_version' => '9.5.20',
-            'version' => '9.5.20.0',
+            'pretty_version' => '9.5.24',
+            'version' => '9.5.24.0',
            'type' => 'library',
            'install_path' => __DIR__ . '/../phpunit/phpunit',
            'aliases' => array(),
-            'reference' => '12bc8879fb65aef2138b26fc633cb1e3620cffba',
+            'reference' => 'd0aa6097bef9fd42458a9b3c49da32c6ce6129c5',
            'dev_requirement' => true,
        ),
        'sebastian/cli-parser' => array(
@@ -281,12 +245,12 @@
            'dev_requirement' => true,
        ),
        'sebastian/type' => array(
-            'pretty_version' => '3.0.0',
-            'version' => '3.0.0.0',
+            'pretty_version' => '3.1.0',
+            'version' => '3.1.0.0',
            'type' => 'library',
            'install_path' => __DIR__ . '/../sebastian/type',
            'aliases' => array(),
-            'reference' => 'b233b84bc4465aff7b57cf1c4bc75c86d00d6dad',
+            'reference' => 'fb44e1cc6e557418387ad815780360057e40753e',
            'dev_requirement' => true,
        ),
        'sebastian/version' => array(
@@ -298,15 +262,6 @@
            'reference' => 'c6c1022351a901512170118436c764e473f6de8c',
            'dev_requirement' => true,
        ),
-        'symfony/polyfill-ctype' => array(
-            'pretty_version' => 'v1.25.0',
-            'version' => '1.25.0.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
-            'aliases' => array(),
-            'reference' => '30885182c981ab175d4d034db0f6f469898070ab',
-            'dev_requirement' => true,
-        ),
        'theseer/tokenizer' => array(
            'pretty_version' => '1.2.1',
            'version' => '1.2.1.0',
@@ -316,14 +271,5 @@
            'reference' => '34a41e998c2183e22995f158c581e7b5e755ab9e',
            'dev_requirement' => true,
        ),
-        'webmozart/assert' => array(
-            'pretty_version' => '1.10.0',
-            'version' => '1.10.0.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../webmozart/assert',
-            'aliases' => array(),
-            'reference' => '6964c76c7804814a842473e0c8fd15bab0f18e25',
-            'dev_requirement' => true,
-        ),
    ),
 );
--- a/www/vendor/nikic/php-parser/README.md
+++ b/www/vendor/nikic/php-parser/README.md
@@ -3,10 +3,10 @@ PHP Parser

 [![Coverage Status](https://coveralls.io/repos/github/nikic/PHP-Parser/badge.svg?branch=master)](https://coveralls.io/github/nikic/PHP-Parser?branch=master)

-This is a PHP 5.2 to PHP 8.0 parser written in PHP. Its purpose is to simplify static code analysis and
+This is a PHP 5.2 to PHP 8.2 parser written in PHP. Its purpose is to simplify static code analysis and
 manipulation.

-[**Documentation for version 4.x**][doc_master] (stable; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 8.0).
+[**Documentation for version 4.x**][doc_4_x] (stable; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 8.2).

 [Documentation for version 3.x][doc_3_x] (unsupported; for running on PHP >= 5.5; for parsing PHP 5.2 to PHP 7.2).

@@ -222,4 +222,4 @@ Component documentation:
   * Parent and sibling references

 [doc_3_x]: https://github.com/nikic/PHP-Parser/tree/3.x/doc
- [doc_master]: https://github.com/nikic/PHP-Parser/tree/master/doc
+ [doc_4_x]: https://github.com/nikic/PHP-Parser/tree/4.x/doc
--- a/www/vendor/nikic/php-parser/grammar/php5.y
+++ b/www/vendor/nikic/php-parser/grammar/php5.y
@@ -689,9 +689,7 @@ array_expr:

 scalar_dereference:
      array_expr '[' dim_offset ']'                         { $$ = Expr\ArrayDimFetch[$1, $3]; }
-    | T_CONSTANT_ENCAPSED_STRING '[' dim_offset ']'
-          { $attrs = attributes(); $attrs['kind'] = strKind($1);
-            $$ = Expr\ArrayDimFetch[new Scalar\String_(Scalar\String_::parse($1), $attrs), $3]; }
+    | T_CONSTANT_ENCAPSED_STRING '[' dim_offset ']'         { $$ = Expr\ArrayDimFetch[Scalar\String_::fromString($1, attributes()), $3]; }
    | constant '[' dim_offset ']'                           { $$ = Expr\ArrayDimFetch[$1, $3]; }
    | scalar_dereference '[' dim_offset ']'                 { $$ = Expr\ArrayDimFetch[$1, $3]; }
    /* alternative array syntax missing intentionally */
@@ -793,10 +791,8 @@ ctor_arguments:

 common_scalar:
      T_LNUMBER                                             { $$ = $this->parseLNumber($1, attributes(), true); }
-    | T_DNUMBER                                             { $$ = Scalar\DNumber[Scalar\DNumber::parse($1)]; }
-    | T_CONSTANT_ENCAPSED_STRING
-          { $attrs = attributes(); $attrs['kind'] = strKind($1);
-            $$ = new Scalar\String_(Scalar\String_::parse($1, false), $attrs); }
+    | T_DNUMBER                                             { $$ = Scalar\DNumber::fromString($1, attributes()); }
+    | T_CONSTANT_ENCAPSED_STRING                            { $$ = Scalar\String_::fromString($1, attributes(), false); }
    | T_LINE                                                { $$ = Scalar\MagicConst\Line[]; }
    | T_FILE                                                { $$ = Scalar\MagicConst\File[]; }
    | T_DIR                                                 { $$ = Scalar\MagicConst\Dir[]; }
--- a/www/vendor/nikic/php-parser/grammar/php7.y
+++ b/www/vendor/nikic/php-parser/grammar/php7.y
@@ -382,8 +382,18 @@ enum_case_expr:

 class_entry_type:
      T_CLASS                                               { $$ = 0; }
-    | T_ABSTRACT T_CLASS                                    { $$ = Stmt\Class_::MODIFIER_ABSTRACT; }
-    | T_FINAL T_CLASS                                       { $$ = Stmt\Class_::MODIFIER_FINAL; }
+    | class_modifiers T_CLASS                               { $$ = $1; }
+;
+
+class_modifiers:
+      class_modifier                                        { $$ = $1; }
+    | class_modifiers class_modifier                        { $this->checkClassModifier($1, $2, #2); $$ = $1 | $2; }
+;
+
+class_modifier:
+      T_ABSTRACT                                            { $$ = Stmt\Class_::MODIFIER_ABSTRACT; }
+    | T_FINAL                                               { $$ = Stmt\Class_::MODIFIER_FINAL; }
+    | T_READONLY                                            { $$ = Stmt\Class_::MODIFIER_READONLY; }
 ;

 extends_from:
@@ -561,7 +571,7 @@ type_expr:
      type                                                  { $$ = $1; }
    | '?' type                                              { $$ = Node\NullableType[$2]; }
    | union_type                                            { $$ = Node\UnionType[$1]; }
-    | intersection_type                                     { $$ = Node\IntersectionType[$1]; }
+    | intersection_type                                     { $$ = $1; }
 ;

 type:
@@ -575,34 +585,52 @@ type_without_static:
    | T_CALLABLE                                            { $$ = Node\Identifier['callable']; }
 ;

+union_type_element:
+                type { $$ = $1; }
+        |        '(' intersection_type ')' { $$ = $2; }
+;
+
 union_type:
-      type '|' type                                         { init($1, $3); }
-    | union_type '|' type                                   { push($1, $3); }
+      union_type_element '|' union_type_element             { init($1, $3); }
+    | union_type '|' union_type_element                     { push($1, $3); }
+;
+
+union_type_without_static_element:
+                type_without_static { $$ = $1; }
+        |        '(' intersection_type_without_static ')' { $$ = $2; }
 ;

 union_type_without_static:
-      type_without_static '|' type_without_static           { init($1, $3); }
-    | union_type_without_static '|' type_without_static     { push($1, $3); }
+      union_type_without_static_element '|' union_type_without_static_element   { init($1, $3); }
+    | union_type_without_static '|' union_type_without_static_element           { push($1, $3); }
+;
+
+intersection_type_list:
+      type T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type   { init($1, $3); }
+    | intersection_type_list T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type
+          { push($1, $3); }
 ;

 intersection_type:
-      type T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type   { init($1, $3); }
-    | intersection_type T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type
+      intersection_type_list { $$ = Node\IntersectionType[$1]; }
+;
+
+intersection_type_without_static_list:
+      type_without_static T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type_without_static
+          { init($1, $3); }
+    | intersection_type_without_static_list T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type_without_static
          { push($1, $3); }
 ;

 intersection_type_without_static:
-      type_without_static T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type_without_static
-          { init($1, $3); }
-    | intersection_type_without_static T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type_without_static
-          { push($1, $3); }
+      intersection_type_without_static_list { $$ = Node\IntersectionType[$1]; }
 ;

 type_expr_without_static:
      type_without_static                                   { $$ = $1; }
    | '?' type_without_static                               { $$ = Node\NullableType[$2]; }
    | union_type_without_static                             { $$ = Node\UnionType[$1]; }
-    | intersection_type_without_static                      { $$ = Node\IntersectionType[$1]; }
+    | intersection_type_without_static                      { $$ = $1; }
 ;

 optional_type_without_static:
@@ -1014,9 +1042,7 @@ dereferencable_scalar:
          { $attrs = attributes(); $attrs['kind'] = Expr\Array_::KIND_LONG;
            $$ = new Expr\Array_($3, $attrs); }
    | array_short_syntax                                    { $$ = $1; }
-    | T_CONSTANT_ENCAPSED_STRING
-          { $attrs = attributes(); $attrs['kind'] = strKind($1);
-            $$ = new Scalar\String_(Scalar\String_::parse($1), $attrs); }
+    | T_CONSTANT_ENCAPSED_STRING                            { $$ = Scalar\String_::fromString($1, attributes()); }
    | '"' encaps_list '"'
          { $attrs = attributes(); $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
            parseEncapsed($2, '"', true); $$ = new Scalar\Encapsed($2, $attrs); }
@@ -1024,7 +1050,7 @@ dereferencable_scalar:

 scalar:
      T_LNUMBER                                             { $$ = $this->parseLNumber($1, attributes()); }
-    | T_DNUMBER                                             { $$ = Scalar\DNumber[Scalar\DNumber::parse($1)]; }
+    | T_DNUMBER                                             { $$ = Scalar\DNumber::fromString($1, attributes()); }
    | dereferencable_scalar                                 { $$ = $1; }
    | constant                                              { $$ = $1; }
    | class_constant                                        { $$ = $1; }
--- a/www/vendor/nikic/php-parser/grammar/phpyLang.php
+++ b/www/vendor/nikic/php-parser/grammar/phpyLang.php
@@ -128,14 +128,6 @@ function resolveMacros($code) {
                       . ' else { ' . $args[0] . ' = null; }';
            }

-            if ('strKind' === $name) {
-                assertArgs(1, $args, $name);
-
-                return '(' . $args[0] . '[0] === "\'" || (' . $args[0] . '[1] === "\'" && '
-                       . '(' . $args[0] . '[0] === \'b\' || ' . $args[0] . '[0] === \'B\')) '
-                       . '? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED)';
-            }
-
            if ('prependLeadingComments' === $name) {
                assertArgs(1, $args, $name);

--- a/www/vendor/nikic/php-parser/lib/PhpParser/Builder/Class_.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Builder/Class_.php
@@ -67,7 +67,7 @@ class Class_ extends Declaration
     * @return $this The builder instance (for fluid interface)
     */
    public function makeAbstract() {
-        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_ABSTRACT);
+        $this->flags = BuilderHelpers::addClassModifier($this->flags, Stmt\Class_::MODIFIER_ABSTRACT);

        return $this;
    }
@@ -78,7 +78,13 @@ class Class_ extends Declaration
     * @return $this The builder instance (for fluid interface)
     */
    public function makeFinal() {
-        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_FINAL);
+        $this->flags = BuilderHelpers::addClassModifier($this->flags, Stmt\Class_::MODIFIER_FINAL);
+
+        return $this;
+    }
+
+    public function makeReadonly() {
+        $this->flags = BuilderHelpers::addClassModifier($this->flags, Stmt\Class_::MODIFIER_READONLY);

        return $this;
    }
--- a/www/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php
@@ -178,7 +178,20 @@ final class BuilderHelpers
        }

        $builtinTypes = [
-            'array', 'callable', 'string', 'int', 'float', 'bool', 'iterable', 'void', 'object', 'mixed', 'never',
+            'array',
+            'callable',
+            'bool',
+            'int',
+            'float',
+            'string',
+            'iterable',
+            'void',
+            'object',
+            'null',
+            'false',
+            'mixed',
+            'never',
+            'true',
        ];

        $lowerType = strtolower($type);
@@ -310,4 +323,13 @@ final class BuilderHelpers
        Stmt\Class_::verifyModifier($modifiers, $modifier);
        return $modifiers | $modifier;
    }
+
+    /**
+     * Adds a modifier and returns new modifier bitmask.
+     * @return int New modifiers
+     */
+    public static function addClassModifier(int $existingModifiers, int $modifierToSet) : int {
+        Stmt\Class_::verifyClassModifier($existingModifiers, $modifierToSet);
+        return $existingModifiers | $modifierToSet;
+    }
 }
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php
@@ -33,7 +33,7 @@ abstract class KeywordEmulator extends TokenEmulator

    /**
     * @param mixed[] $tokens
-     * @return mixed[]|null
+     * @return array|string|null
     */
    private function getPreviousNonSpaceToken(array $tokens, int $start)
    {
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php
@@ -20,4 +20,17 @@ final class ReadonlyTokenEmulator extends KeywordEmulator
    {
        return \T_READONLY;
    }
-}
+
+    protected function isKeywordContext(array $tokens, int $pos): bool
+    {
+        if (!parent::isKeywordContext($tokens, $pos)) {
+            return false;
+        }
+        // Support "function readonly("
+        return !(isset($tokens[$pos + 1]) &&
+                 ($tokens[$pos + 1][0] === '(' ||
+                  ($tokens[$pos + 1][0] === \T_WHITESPACE &&
+                   isset($tokens[$pos + 2]) &&
+                   $tokens[$pos + 2][0] === '(')));
+    }
+}
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Const_.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Const_.php
@@ -11,7 +11,7 @@ class Const_ extends NodeAbstract
    /** @var Expr Value */
    public $value;

-    /** @var Name Namespaced name (if using NameResolver) */
+    /** @var Name|null Namespaced name (if using NameResolver) */
    public $namespacedName;

    /**
@@ -30,7 +30,7 @@ class Const_ extends NodeAbstract
    public function getSubNodeNames() : array {
        return ['name', 'value'];
    }
-    
+
    public function getType() : string {
        return 'Const';
    }
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Name.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Name.php
@@ -162,7 +162,7 @@ class Name extends NodeAbstract
            $realLength = $numParts - $realOffset;
        } else {
            $realLength = $length < 0 ? $length + $numParts - $realOffset : $length;
-            if ($realLength < 0 || $realLength > $numParts) {
+            if ($realLength < 0 || $realLength > $numParts - $realOffset) {
                throw new \OutOfBoundsException(sprintf('Length %d is out of bounds', $length));
            }
        }
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/DNumber.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/DNumber.php
@@ -24,6 +24,17 @@ class DNumber extends Scalar
        return ['value'];
    }

+    /**
+     * @param mixed[] $attributes
+     */
+    public static function fromString(string $str, array $attributes = []): DNumber
+    {
+        $attributes['rawValue'] = $str;
+        $float = self::parse($str);
+
+        return new DNumber($float, $attributes);
+    }
+
    /**
     * @internal
     *
@@ -63,7 +74,7 @@ class DNumber extends Scalar
        // dec
        return (float) $str;
    }
-    
+
    public function getType() : string {
        return 'Scalar_DNumber';
    }
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php
@@ -41,6 +41,8 @@ class LNumber extends Scalar
     * @return LNumber The constructed LNumber, including kind attribute
     */
    public static function fromString(string $str, array $attributes = [], bool $allowInvalidOctal = false) : LNumber {
+        $attributes['rawValue'] = $str;
+
        $str = str_replace('_', '', $str);

        if ('0' !== $str[0] || '0' === $str) {
@@ -71,7 +73,7 @@ class LNumber extends Scalar
        $attributes['kind'] = LNumber::KIND_OCT;
        return new LNumber(intval($str, 8), $attributes);
    }
-    
+
    public function getType() : string {
        return 'Scalar_LNumber';
    }
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php
@@ -42,6 +42,22 @@ class String_ extends Scalar
        return ['value'];
    }

+    /**
+     * @param bool $parseUnicodeEscape Whether to parse PHP 7 \u escapes
+     */
+    public static function fromString(string $str, array $attributes = [], bool $parseUnicodeEscape = true): self
+    {
+        $attributes['kind'] = ($str[0] === "'" || ($str[1] === "'" && ($str[0] === 'b' || $str[0] === 'B')))
+            ? Scalar\String_::KIND_SINGLE_QUOTED
+            : Scalar\String_::KIND_DOUBLE_QUOTED;
+
+        $attributes['rawValue'] = $str;
+
+        $string = self::parse($str, $parseUnicodeEscape);
+
+        return new self($string, $attributes);
+    }
+
    /**
     * @internal
     *
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php
@@ -13,7 +13,7 @@ abstract class ClassLike extends Node\Stmt
    /** @var Node\AttributeGroup[] PHP attribute groups */
    public $attrGroups;

-    /** @var Node\Name Namespaced name (if using NameResolver) */
+    /** @var Node\Name|null Namespaced name (if using NameResolver) */
    public $namespacedName;

    /**
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php
@@ -23,21 +23,23 @@ class ClassMethod extends Node\Stmt implements FunctionLike
    public $attrGroups;

    private static $magicNames = [
-        '__construct'  => true,
-        '__destruct'   => true,
-        '__call'       => true,
-        '__callstatic' => true,
-        '__get'        => true,
-        '__set'        => true,
-        '__isset'      => true,
-        '__unset'      => true,
-        '__sleep'      => true,
-        '__wakeup'     => true,
-        '__tostring'   => true,
-        '__set_state'  => true,
-        '__clone'      => true,
-        '__invoke'     => true,
-        '__debuginfo'  => true,
+        '__construct'   => true,
+        '__destruct'    => true,
+        '__call'        => true,
+        '__callstatic'  => true,
+        '__get'         => true,
+        '__set'         => true,
+        '__isset'       => true,
+        '__unset'       => true,
+        '__sleep'       => true,
+        '__wakeup'      => true,
+        '__tostring'    => true,
+        '__set_state'   => true,
+        '__clone'       => true,
+        '__invoke'      => true,
+        '__debuginfo'   => true,
+        '__serialize'   => true,
+        '__unserialize' => true,
    ];

    /**
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php
@@ -68,6 +68,10 @@ class Class_ extends ClassLike
        return (bool) ($this->flags & self::MODIFIER_FINAL);
    }

+    public function isReadonly() : bool {
+        return (bool) ($this->flags & self::MODIFIER_READONLY);
+    }
+
    /**
     * Whether the class is anonymous.
     *
@@ -77,6 +81,27 @@ class Class_ extends ClassLike
        return null === $this->name;
    }

+    /**
+     * @internal
+     */
+    public static function verifyClassModifier($a, $b) {
+        if ($a & self::MODIFIER_ABSTRACT && $b & self::MODIFIER_ABSTRACT) {
+            throw new Error('Multiple abstract modifiers are not allowed');
+        }
+
+        if ($a & self::MODIFIER_FINAL && $b & self::MODIFIER_FINAL) {
+            throw new Error('Multiple final modifiers are not allowed');
+        }
+
+        if ($a & self::MODIFIER_READONLY && $b & self::MODIFIER_READONLY) {
+            throw new Error('Multiple readonly modifiers are not allowed');
+        }
+
+        if ($a & 48 && $b & 48) {
+            throw new Error('Cannot use the final modifier on an abstract class');
+        }
+    }
+
    /**
     * @internal
     */
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php
@@ -20,7 +20,7 @@ class Function_ extends Node\Stmt implements FunctionLike
    /** @var Node\AttributeGroup[] PHP attribute groups */
    public $attrGroups;

-    /** @var Node\Name Namespaced name (if using NameResolver) */
+    /** @var Node\Name|null Namespaced name (if using NameResolver) */
    public $namespacedName;

    /**
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/UnionType.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/UnionType.php
@@ -10,7 +10,7 @@ class UnionType extends ComplexType
    /**
     * Constructs a union type.
     *
-     * @param (Identifier|Name)[] $types      Types
+     * @param (Identifier|Name|IntersectionType)[] $types      Types
     * @param array               $attributes Additional attributes
     */
    public function __construct(array $types, array $attributes = []) {
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php
@@ -2147,8 +2147,7 @@ class Php5 extends \PhpParser\ParserAbstract
                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
            },
            392 => function ($stackPos) {
-                 $attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(4-1)][0] === "'" || ($this->semStack[$stackPos-(4-1)][1] === "'" && ($this->semStack[$stackPos-(4-1)][0] === 'b' || $this->semStack[$stackPos-(4-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
-            $this->semValue = new Expr\ArrayDimFetch(new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(4-1)]), $attrs), $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayDimFetch(Scalar\String_::fromString($this->semStack[$stackPos-(4-1)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes), $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
            },
            393 => function ($stackPos) {
                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
@@ -2275,11 +2274,10 @@ class Php5 extends \PhpParser\ParserAbstract
                 $this->semValue = $this->parseLNumber($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes, true);
            },
            434 => function ($stackPos) {
-                 $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$stackPos-(1-1)]), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = Scalar\DNumber::fromString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
            },
            435 => function ($stackPos) {
-                 $attrs = $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(1-1)][0] === "'" || ($this->semStack[$stackPos-(1-1)][1] === "'" && ($this->semStack[$stackPos-(1-1)][0] === 'b' || $this->semStack[$stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
-            $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(1-1)], false), $attrs);
+                 $this->semValue = Scalar\String_::fromString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes, false);
            },
            436 => function ($stackPos) {
                 $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php
--- a/www/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php
@@ -664,6 +664,7 @@ abstract class ParserAbstract implements Parser
            'false'    => true,
            'mixed'    => true,
            'never'    => true,
+            'true'     => true,
        ];

        if (!$name->isUnqualified()) {
@@ -875,6 +876,15 @@ abstract class ParserAbstract implements Parser
        return $attributes;
    }

+    protected function checkClassModifier($a, $b, $modifierPos) {
+        try {
+            Class_::verifyClassModifier($a, $b);
+        } catch (Error $error) {
+            $error->setAttributes($this->getAttributesAt($modifierPos));
+            $this->emitError($error);
+        }
+    }
+
    protected function checkModifier($a, $b, $modifierPos) {
        // Jumping through some hoops here because verifyModifier() is also used elsewhere
        try {
--- a/www/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php
@@ -46,7 +46,15 @@ class Standard extends PrettyPrinterAbstract
    }

    protected function pUnionType(Node\UnionType $node) {
-        return $this->pImplode($node->types, '|');
+        $types = [];
+        foreach ($node->types as $typeNode) {
+            if ($typeNode instanceof Node\IntersectionType) {
+                $types[] = '('. $this->p($typeNode) . ')';
+                continue;
+            }
+            $types[] = $this->p($typeNode);
+        }
+        return implode('|', $types);
    }

    protected function pIntersectionType(Node\IntersectionType $node) {
--- a/www/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
@@ -923,11 +923,14 @@ abstract class PrettyPrinterAbstract
            foreach ($delayedAdd as $delayedAddNode) {
                if (!$first) {
                    $result .= $insertStr;
+                    if ($insertNewline) {
+                        $result .= $this->nl;
+                    }
                }
                $result .= $this->p($delayedAddNode, true);
                $first = false;
            }
-            $result .= $extraRight;
+            $result .= $extraRight === "\n" ? $this->nl : $extraRight;
        }

        return $result;
@@ -1454,6 +1457,16 @@ abstract class PrettyPrinterAbstract
            'Stmt_ClassMethod->params' => ['(', '', ''],
            'Stmt_Interface->extends' => [null, ' extends ', ''],
            'Stmt_Function->params' => ['(', '', ''],
+            'Stmt_Interface->attrGroups' => [null, '', "\n"],
+            'Stmt_Class->attrGroups' => [null, '', "\n"],
+            'Stmt_ClassConst->attrGroups' => [null, '', "\n"],
+            'Stmt_ClassMethod->attrGroups' => [null, '', "\n"],
+            'Stmt_Function->attrGroups' => [null, '', "\n"],
+            'Stmt_Property->attrGroups' => [null, '', "\n"],
+            'Stmt_Trait->attrGroups' => [null, '', "\n"],
+            'Expr_ArrowFunction->attrGroups' => [null, '', ' '],
+            'Expr_Closure->attrGroups' => [null, '', ' '],
+            'Expr_PrintableNewAnonClass->attrGroups' => [\T_NEW, ' ', ''],

            /* These cannot be empty to start with:
             * Expr_Isset->vars
--- a/www/vendor/phpdocumentor/reflection-common/.github/dependabot.yml
+++ b/www/vendor/phpdocumentor/reflection-common/.github/dependabot.yml
@@ -1,7 +0,0 @@
-version: 2
-updates:
- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
--- a/www/vendor/phpdocumentor/reflection-common/.github/workflows/push.yml
+++ b/www/vendor/phpdocumentor/reflection-common/.github/workflows/push.yml
@@ -1,223 +0,0 @@
-on:
-  push:
-    branches:
-      - 2.x
-  pull_request:
-name: Qa workflow
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Restore/cache vendor folder
-        uses: actions/cache@v1
-        with:
-          path: vendor
-          key: all-build-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            all-build-${{ hashFiles('**/composer.lock') }}
-            all-build-
-
-      - name: Restore/cache tools folder
-        uses: actions/cache@v1
-        with:
-          path: tools
-          key: all-tools-${{ github.sha }}
-          restore-keys: |
-            all-tools-${{ github.sha }}-
-            all-tools-
-
-      - name: composer
-        uses: docker://composer
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          args: install --no-interaction --prefer-dist --optimize-autoloader
-
-      - name: Install phive
-        run: make install-phive
-
-      - name: Install PHAR dependencies
-        run: tools/phive.phar --no-progress install --copy --trust-gpg-keys 4AA394086372C20A,8A03EA3B385DBAA1 --force-accept-unsigned
-
-  phpunit-with-coverage:
-    runs-on: ubuntu-latest
-    name: Unit tests
-    needs: setup
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.2
-          ini-values: memory_limit=2G, display_errors=On, error_reporting=-1
-          coverage: pcov
-
-      - name: Restore/cache tools folder
-        uses: actions/cache@v1
-        with:
-          path: tools
-          key: all-tools-${{ github.sha }}
-          restore-keys: |
-            all-tools-${{ github.sha }}-
-            all-tools-
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ubuntu-latest-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ubuntu-latest-composer-
-
-      - name: Install Composer dependencies
-        run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
-
-      - name: Run PHPUnit
-        run: php tools/phpunit
-
-  phpunit:
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      matrix:
-        operating-system:
-          - ubuntu-latest
-          - windows-latest
-          - macOS-latest
-        php-versions: ['7.2', '7.3', '7.4', '8.0']
-    name: Unit tests for PHP version ${{ matrix.php-versions }} on ${{ matrix.operating-system }}
-    needs:
-      - setup
-      - phpunit-with-coverage
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Restore/cache tools folder
-        uses: actions/cache@v1
-        with:
-          path: tools
-          key: all-tools-${{ github.sha }}
-          restore-keys: |
-            all-tools-${{ github.sha }}-
-            all-tools-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          ini-values: memory_limit=2G, display_errors=On, error_reporting=-1
-          coverage: none
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Install Composer dependencies
-        run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
-
-      - name: Run PHPUnit
-        continue-on-error: true
-        run: php tools/phpunit
-
-  codestyle:
-    runs-on: ubuntu-latest
-    needs: [setup, phpunit]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Restore/cache vendor folder
-        uses: actions/cache@v1
-        with:
-          path: vendor
-          key: all-build-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            all-build-${{ hashFiles('**/composer.lock') }}
-            all-build-
-      - name: Code style check
-        uses: phpDocumentor/coding-standard@latest
-        with:
-          args: -s
-
-  phpstan:
-    runs-on: ubuntu-latest
-    needs: [setup, phpunit]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Restore/cache vendor folder
-        uses: actions/cache@v1
-        with:
-          path: vendor
-          key: all-build-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            all-build-${{ hashFiles('**/composer.lock') }}
-            all-build-
-      - name: PHPStan
-        uses: phpDocumentor/phpstan-ga@latest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          args: analyse src --configuration phpstan.neon
-
-  psalm:
-    runs-on: ubuntu-latest
-    needs: [setup, phpunit]
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.2
-          ini-values: memory_limit=2G, display_errors=On, error_reporting=-1
-          tools: psalm
-          coverage: none
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Install Composer dependencies
-        run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
-
-      - name: Psalm
-        run: psalm --output-format=github
-
-  bc_check:
-    name: BC Check
-    runs-on: ubuntu-latest
-    needs: [setup, phpunit]
-    steps:
-      - uses: actions/checkout@v2
-      - name: fetch tags
-        run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: Restore/cache vendor folder
-        uses: actions/cache@v1
-        with:
-          path: vendor
-          key: all-build-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            all-build-${{ hashFiles('**/composer.lock') }}
-            all-build-
-      - name: Roave BC Check
-        uses: docker://nyholm/roave-bc-check-ga
--- a/www/vendor/phpdocumentor/reflection-common/LICENSE
+++ b/www/vendor/phpdocumentor/reflection-common/LICENSE
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 phpDocumentor
-
-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.
-
--- a/www/vendor/phpdocumentor/reflection-common/README.md
+++ b/www/vendor/phpdocumentor/reflection-common/README.md
@@ -1,11 +0,0 @@
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-![Qa workflow](https://github.com/phpDocumentor/ReflectionCommon/workflows/Qa%20workflow/badge.svg)
-[![Coveralls Coverage](https://img.shields.io/coveralls/github/phpDocumentor/ReflectionCommon.svg)](https://coveralls.io/github/phpDocumentor/ReflectionCommon?branch=master)
-[![Scrutinizer Code Coverage](https://img.shields.io/scrutinizer/coverage/g/phpDocumentor/ReflectionCommon.svg)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionCommon/?branch=master)
-[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/phpDocumentor/ReflectionCommon.svg)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionCommon/?branch=master)
-[![Stable Version](https://img.shields.io/packagist/v/phpDocumentor/Reflection-Common.svg)](https://packagist.org/packages/phpDocumentor/Reflection-Common)
-[![Unstable Version](https://img.shields.io/packagist/vpre/phpDocumentor/Reflection-Common.svg)](https://packagist.org/packages/phpDocumentor/Reflection-Common)
-
-
-ReflectionCommon
-================
--- a/www/vendor/phpdocumentor/reflection-common/composer.json
+++ b/www/vendor/phpdocumentor/reflection-common/composer.json
@@ -1,28 +0,0 @@
-{
-    "name": "phpdocumentor/reflection-common",
-    "keywords": ["phpdoc", "phpDocumentor", "reflection", "static analysis", "FQSEN"],
-    "homepage": "http://www.phpdoc.org",
-    "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Jaap van Otterdijk",
-            "email": "opensource@ijaap.nl"
-        }
-    ],
-    "require": {
-        "php": "^7.2 || ^8.0"
-    },
-    "autoload" : {
-      "psr-4" : {
-        "phpDocumentor\\Reflection\\": "src/"
-      }
-    },
-    "require-dev": {
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-2.x": "2.x-dev"
-        }
-    }
-}
--- a/www/vendor/phpdocumentor/reflection-common/src/Element.php
+++ b/www/vendor/phpdocumentor/reflection-common/src/Element.php
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * phpDocumentor
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection;
-
-/**
- * Interface for Api Elements
- */
-interface Element
-{
-    /**
-     * Returns the Fqsen of the element.
-     */
-    public function getFqsen() : Fqsen;
-
-    /**
-     * Returns the name of the element.
-     */
-    public function getName() : string;
-}
--- a/www/vendor/phpdocumentor/reflection-common/src/File.php
+++ b/www/vendor/phpdocumentor/reflection-common/src/File.php
@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of phpDocumentor.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection;
-
-/**
- * Interface for files processed by the ProjectFactory
- */
-interface File
-{
-    /**
-     * Returns the content of the file as a string.
-     */
-    public function getContents() : string;
-
-    /**
-     * Returns md5 hash of the file.
-     */
-    public function md5() : string;
-
-    /**
-     * Returns an relative path to the file.
-     */
-    public function path() : string;
-}
--- a/www/vendor/phpdocumentor/reflection-common/src/Fqsen.php
+++ b/www/vendor/phpdocumentor/reflection-common/src/Fqsen.php
@@ -1,89 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * phpDocumentor
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection;
-
-use InvalidArgumentException;
-use function assert;
-use function end;
-use function explode;
-use function is_string;
-use function preg_match;
-use function sprintf;
-use function trim;
-
-/**
- * Value Object for Fqsen.
- *
- * @link https://github.com/phpDocumentor/fig-standards/blob/master/proposed/phpdoc-meta.md
- *
- * @psalm-immutable
- */
-final class Fqsen
-{
-    /** @var string full quallified class name */
-    private $fqsen;
-
-    /** @var string name of the element without path. */
-    private $name;
-
-    /**
-     * Initializes the object.
-     *
-     * @throws InvalidArgumentException when $fqsen is not matching the format.
-     */
-    public function __construct(string $fqsen)
-    {
-        $matches = [];
-
-        $result = preg_match(
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            '/^\\\\([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff\\\\]*)?(?:[:]{2}\\$?([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*))?(?:\\(\\))?$/',
-            $fqsen,
-            $matches
-        );
-
-        if ($result === 0) {
-            throw new InvalidArgumentException(
-                sprintf('"%s" is not a valid Fqsen.', $fqsen)
-            );
-        }
-
-        $this->fqsen = $fqsen;
-
-        if (isset($matches[2])) {
-            $this->name = $matches[2];
-        } else {
-            $matches = explode('\\', $fqsen);
-            $name = end($matches);
-            assert(is_string($name));
-            $this->name = trim($name, '()');
-        }
-    }
-
-    /**
-     * converts this class to string.
-     */
-    public function __toString() : string
-    {
-        return $this->fqsen;
-    }
-
-    /**
-     * Returns the name of the element without path.
-     */
-    public function getName() : string
-    {
-        return $this->name;
-    }
-}
--- a/www/vendor/phpdocumentor/reflection-common/src/Location.php
+++ b/www/vendor/phpdocumentor/reflection-common/src/Location.php
@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of phpDocumentor.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection;
-
-/**
- * The location where an element occurs within a file.
- *
- * @psalm-immutable
- */
-final class Location
-{
-    /** @var int */
-    private $lineNumber = 0;
-
-    /** @var int */
-    private $columnNumber = 0;
-
-    /**
-     * Initializes the location for an element using its line number in the file and optionally the column number.
-     */
-    public function __construct(int $lineNumber, int $columnNumber = 0)
-    {
-        $this->lineNumber = $lineNumber;
-        $this->columnNumber = $columnNumber;
-    }
-
-    /**
-     * Returns the line number that is covered by this location.
-     */
-    public function getLineNumber() : int
-    {
-        return $this->lineNumber;
-    }
-
-    /**
-     * Returns the column number (character position on a line) for this location object.
-     */
-    public function getColumnNumber() : int
-    {
-        return $this->columnNumber;
-    }
-}
--- a/www/vendor/phpdocumentor/reflection-common/src/Project.php
+++ b/www/vendor/phpdocumentor/reflection-common/src/Project.php
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * phpDocumentor
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection;
-
-/**
- * Interface for project. Since the definition of a project can be different per factory this interface will be small.
- */
-interface Project
-{
-    /**
-     * Returns the name of the project.
-     */
-    public function getName() : string;
-}
--- a/www/vendor/phpdocumentor/reflection-common/src/ProjectFactory.php
+++ b/www/vendor/phpdocumentor/reflection-common/src/ProjectFactory.php
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * phpDocumentor
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection;
-
-/**
- * Interface for project factories. A project factory shall convert a set of files
- * into an object implementing the Project interface.
- */
-interface ProjectFactory
-{
-    /**
-     * Creates a project from the set of files.
-     *
-     * @param File[] $files
-     */
-    public function create(string $name, array $files) : Project;
-}
--- a/www/vendor/phpdocumentor/reflection-docblock/LICENSE
+++ b/www/vendor/phpdocumentor/reflection-docblock/LICENSE
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2010 Mike van Riel
-
-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.
--- a/www/vendor/phpdocumentor/reflection-docblock/README.md
+++ b/www/vendor/phpdocumentor/reflection-docblock/README.md
@@ -1,75 +0,0 @@
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-![Qa workflow](https://github.com/phpDocumentor/ReflectionDocBlock/workflows/Qa%20workflow/badge.svg)
-[![Coveralls Coverage](https://img.shields.io/coveralls/github/phpDocumentor/ReflectionDocBlock.svg)](https://coveralls.io/github/phpDocumentor/ReflectionDocBlock?branch=master)
-[![Scrutinizer Code Coverage](https://img.shields.io/scrutinizer/coverage/g/phpDocumentor/ReflectionDocBlock.svg)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/?branch=master)
-[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/phpDocumentor/ReflectionDocBlock.svg)](https://scrutinizer-ci.com/g/phpDocumentor/ReflectionDocBlock/?branch=master)
-[![Stable Version](https://img.shields.io/packagist/v/phpdocumentor/reflection-docblock.svg)](https://packagist.org/packages/phpdocumentor/reflection-docblock)
-[![Unstable Version](https://img.shields.io/packagist/vpre/phpdocumentor/reflection-docblock.svg)](https://packagist.org/packages/phpdocumentor/reflection-docblock)
-
-ReflectionDocBlock 
-==================
-
-Introduction
------------
-
-The ReflectionDocBlock component of phpDocumentor provides a DocBlock parser
-that is 100% compatible with the [PHPDoc standard](http://phpdoc.org/docs/latest).
-
-With this component, a library can provide support for annotations via DocBlocks
-or otherwise retrieve information that is embedded in a DocBlock.
-
-Installation
------------
-
-```bash
-composer require phpdocumentor/reflection-docblock
-```
-
-Usage
-----
-
-In order to parse the DocBlock one needs a DocBlockFactory that can be
-instantiated using its `createInstance` factory method like this:
-
-```php
-$factory  = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
-```
-
-Then we can use the `create` method of the factory to interpret the DocBlock.
-Please note that it is also possible to provide a class that has the
-`getDocComment()` method, such as an object of type `ReflectionClass`, the
-create method will read that if it exists.
-
-```php
-$docComment = <<<DOCCOMMENT
-/**
- * This is an example of a summary.
- *
- * This is a Description. A Summary and Description are separated by either
- * two subsequent newlines (thus a whiteline in between as can be seen in this
- * example), or when the Summary ends with a dot (`.`) and some form of
- * whitespace.
- */
-DOCCOMMENT;
-
-$docblock = $factory->create($docComment);
-```
-
-The `create` method will yield an object of type `\phpDocumentor\Reflection\DocBlock`
-whose methods can be queried:
-
-```php
-// Contains the summary for this DocBlock
-$summary = $docblock->getSummary();
-
-// Contains \phpDocumentor\Reflection\DocBlock\Description object
-$description = $docblock->getDescription();
-
-// You can either cast it to string
-$description = (string) $docblock->getDescription();
-
-// Or use the render method to get a string representation of the Description.
-$description = $docblock->getDescription()->render();
-```
-
-> For more examples it would be best to review the scripts in the [`/examples` folder](/examples).
--- a/www/vendor/phpdocumentor/reflection-docblock/composer.json
+++ b/www/vendor/phpdocumentor/reflection-docblock/composer.json
@@ -1,42 +0,0 @@
-{
-    "name": "phpdocumentor/reflection-docblock",
-    "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-    "type": "library",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Mike van Riel",
-            "email": "me@mikevanriel.com"
-        },
-        {
-            "name": "Jaap van Otterdijk",
-            "email": "account@ijaap.nl"
-        }
-    ],
-    "require": {
-        "php": "^7.2 || ^8.0",
-        "phpdocumentor/type-resolver": "^1.3",
-        "webmozart/assert": "^1.9.1",
-        "phpdocumentor/reflection-common": "^2.2",
-        "ext-filter": "*"
-    },
-    "require-dev": {
-        "mockery/mockery": "~1.3.2",
-        "psalm/phar": "^4.8"
-    },
-    "autoload": {
-        "psr-4": {
-            "phpDocumentor\\Reflection\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "phpDocumentor\\Reflection\\": ["tests/unit", "tests/integration"]
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "5.x-dev"
-        }
-    }
-}
--- a/www/vendor/phpdocumentor/reflection-docblock/src/DocBlock.php
+++ b/www/vendor/phpdocumentor/reflection-docblock/src/DocBlock.php
@@ -1,228 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of phpDocumentor.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection;
-
-use phpDocumentor\Reflection\DocBlock\Tag;
-use phpDocumentor\Reflection\DocBlock\Tags\TagWithType;
-use Webmozart\Assert\Assert;
-
-final class DocBlock
-{
-    /** @var string The opening line for this docblock. */
-    private $summary;
-
-    /** @var DocBlock\Description The actual description for this docblock. */
-    private $description;
-
-    /** @var Tag[] An array containing all the tags in this docblock; except inline. */
-    private $tags = [];
-
-    /** @var Types\Context|null Information about the context of this DocBlock. */
-    private $context;
-
-    /** @var Location|null Information about the location of this DocBlock. */
-    private $location;
-
-    /** @var bool Is this DocBlock (the start of) a template? */
-    private $isTemplateStart;
-
-    /** @var bool Does this DocBlock signify the end of a DocBlock template? */
-    private $isTemplateEnd;
-
-    /**
-     * @param DocBlock\Tag[] $tags
-     * @param Types\Context  $context  The context in which the DocBlock occurs.
-     * @param Location       $location The location within the file that this DocBlock occurs in.
-     */
-    public function __construct(
-        string $summary = '',
-        ?DocBlock\Description $description = null,
-        array $tags = [],
-        ?Types\Context $context = null,
-        ?Location $location = null,
-        bool $isTemplateStart = false,
-        bool $isTemplateEnd = false
-    ) {
-        Assert::allIsInstanceOf($tags, Tag::class);
-
-        $this->summary     = $summary;
-        $this->description = $description ?: new DocBlock\Description('');
-        foreach ($tags as $tag) {
-            $this->addTag($tag);
-        }
-
-        $this->context  = $context;
-        $this->location = $location;
-
-        $this->isTemplateEnd   = $isTemplateEnd;
-        $this->isTemplateStart = $isTemplateStart;
-    }
-
-    public function getSummary(): string
-    {
-        return $this->summary;
-    }
-
-    public function getDescription(): DocBlock\Description
-    {
-        return $this->description;
-    }
-
-    /**
-     * Returns the current context.
-     */
-    public function getContext(): ?Types\Context
-    {
-        return $this->context;
-    }
-
-    /**
-     * Returns the current location.
-     */
-    public function getLocation(): ?Location
-    {
-        return $this->location;
-    }
-
-    /**
-     * Returns whether this DocBlock is the start of a Template section.
-     *
-     * A Docblock may serve as template for a series of subsequent DocBlocks. This is indicated by a special marker
-     * (`#@+`) that is appended directly after the opening `/**` of a DocBlock.
-     *
-     * An example of such an opening is:
-     *
-     * ```
-     * /**#@+
-     *  * My DocBlock
-     *  * /
-     * ```
-     *
-     * The description and tags (not the summary!) are copied onto all subsequent DocBlocks and also applied to all
-     * elements that follow until another DocBlock is found that contains the closing marker (`#@-`).
-     *
-     * @see self::isTemplateEnd() for the check whether a closing marker was provided.
-     */
-    public function isTemplateStart(): bool
-    {
-        return $this->isTemplateStart;
-    }
-
-    /**
-     * Returns whether this DocBlock is the end of a Template section.
-     *
-     * @see self::isTemplateStart() for a more complete description of the Docblock Template functionality.
-     */
-    public function isTemplateEnd(): bool
-    {
-        return $this->isTemplateEnd;
-    }
-
-    /**
-     * Returns the tags for this DocBlock.
-     *
-     * @return Tag[]
-     */
-    public function getTags(): array
-    {
-        return $this->tags;
-    }
-
-    /**
-     * Returns an array of tags matching the given name. If no tags are found
-     * an empty array is returned.
-     *
-     * @param string $name String to search by.
-     *
-     * @return Tag[]
-     */
-    public function getTagsByName(string $name): array
-    {
-        $result = [];
-
-        foreach ($this->getTags() as $tag) {
-            if ($tag->getName() !== $name) {
-                continue;
-            }
-
-            $result[] = $tag;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns an array of tags with type matching the given name. If no tags are found
-     * an empty array is returned.
-     *
-     * @param string $name String to search by.
-     *
-     * @return TagWithType[]
-     */
-    public function getTagsWithTypeByName(string $name): array
-    {
-        $result = [];
-
-        foreach ($this->getTagsByName($name) as $tag) {
-            if (!$tag instanceof TagWithType) {
-                continue;
-            }
-
-            $result[] = $tag;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Checks if a tag of a certain type is present in this DocBlock.
-     *
-     * @param string $name Tag name to check for.
-     */
-    public function hasTag(string $name): bool
-    {
-        foreach ($this->getTags() as $tag) {
-            if ($tag->getName() === $name) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Remove a tag from this DocBlock.
-     *
-     * @param Tag $tagToRemove The tag to remove.
-     */
-    public function removeTag(Tag $tagToRemove): void
-    {
-        foreach ($this->tags as $key => $tag) {
-            if ($tag === $tagToRemove) {
-                unset($this->tags[$key]);
-                break;
-            }
-        }
-    }
-
-    /**
-     * Adds a tag to this DocBlock.
-     *
-     * @param Tag $tag The tag to add.
-     */
-    private function addTag(Tag $tag): void
-    {
-        $this->tags[] = $tag;
-    }
-}
--- a/www/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Description.php
+++ b/www/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Description.php
@@ -1,115 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of phpDocumentor.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock;
-
-use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
-use phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter;
-
-use function vsprintf;
-
-/**
- * Object representing to description for a DocBlock.
- *
- * A Description object can consist of plain text but can also include tags. A Description Formatter can then combine
- * a body template with sprintf-style placeholders together with formatted tags in order to reconstitute a complete
- * description text using the format that you would prefer.
- *
- * Because parsing a Description text can be a verbose process this is handled by the {@see DescriptionFactory}. It is
- * thus recommended to use that to create a Description object, like this:
- *
- *     $description = $descriptionFactory->create('This is a {@see Description}', $context);
- *
- * The description factory will interpret the given body and create a body template and list of tags from them, and pass
- * that onto the constructor if this class.
- *
- * > The $context variable is a class of type {@see \phpDocumentor\Reflection\Types\Context} and contains the namespace
- * > and the namespace aliases that apply to this DocBlock. These are used by the Factory to resolve and expand partial
- * > type names and FQSENs.
- *
- * If you do not want to use the DescriptionFactory you can pass a body template and tag listing like this:
- *
- *     $description = new Description(
- *         'This is a %1$s',
- *         [ new See(new Fqsen('\phpDocumentor\Reflection\DocBlock\Description')) ]
- *     );
- *
- * It is generally recommended to use the Factory as that will also apply escaping rules, while the Description object
- * is mainly responsible for rendering.
- *
- * @see DescriptionFactory to create a new Description.
- * @see Description\Formatter for the formatting of the body and tags.
- */
-class Description
-{
-    /** @var string */
-    private $bodyTemplate;
-
-    /** @var Tag[] */
-    private $tags;
-
-    /**
-     * Initializes a Description with its body (template) and a listing of the tags used in the body template.
-     *
-     * @param Tag[] $tags
-     */
-    public function __construct(string $bodyTemplate, array $tags = [])
-    {
-        $this->bodyTemplate = $bodyTemplate;
-        $this->tags         = $tags;
-    }
-
-    /**
-     * Returns the body template.
-     */
-    public function getBodyTemplate(): string
-    {
-        return $this->bodyTemplate;
-    }
-
-    /**
-     * Returns the tags for this DocBlock.
-     *
-     * @return Tag[]
-     */
-    public function getTags(): array
-    {
-        return $this->tags;
-    }
-
-    /**
-     * Renders this description as a string where the provided formatter will format the tags in the expected string
-     * format.
-     */
-    public function render(?Formatter $formatter = null): string
-    {
-        if ($formatter === null) {
-            $formatter = new PassthroughFormatter();
-        }
-
-        $tags = [];
-        foreach ($this->tags as $tag) {
-            $tags[] = '{' . $formatter->format($tag) . '}';
-        }
-
-        return vsprintf($this->bodyTemplate, $tags);
-    }
-
-    /**
-     * Returns a plain string representation of this description.
-     */
-    public function __toString(): string
-    {
-        return $this->render();
-    }
-}
--- a/www/vendor/phpdocumentor/reflection-docblock/src/DocBlock/DescriptionFactory.php
+++ b/www/vendor/phpdocumentor/reflection-docblock/src/DocBlock/DescriptionFactory.php
@@ -1,178 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of phpDocumentor.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock;
-
-use phpDocumentor\Reflection\Types\Context as TypeContext;
-use phpDocumentor\Reflection\Utils;
-
-use function count;
-use function implode;
-use function ltrim;
-use function min;
-use function str_replace;
-use function strlen;
-use function strpos;
-use function substr;
-use function trim;
-
-use const PREG_SPLIT_DELIM_CAPTURE;
-
-/**
- * Creates a new Description object given a body of text.
- *
- * Descriptions in phpDocumentor are somewhat complex entities as they can contain one or more tags inside their
- * body that can be replaced with a readable output. The replacing is done by passing a Formatter object to the
- * Description object's `render` method.
- *
- * In addition to the above does a Description support two types of escape sequences:
- *
- * 1. `{@}` to escape the `@` character to prevent it from being interpreted as part of a tag, i.e. `{{@}link}`
- * 2. `{}` to escape the `}` character, this can be used if you want to use the `}` character in the description
- *    of an inline tag.
- *
- * If a body consists of multiple lines then this factory will also remove any superfluous whitespace at the beginning
- * of each line while maintaining any indentation that is used. This will prevent formatting parsers from tripping
- * over unexpected spaces as can be observed with tag descriptions.
- */
-class DescriptionFactory
-{
-    /** @var TagFactory */
-    private $tagFactory;
-
-    /**
-     * Initializes this factory with the means to construct (inline) tags.
-     */
-    public function __construct(TagFactory $tagFactory)
-    {
-        $this->tagFactory = $tagFactory;
-    }
-
-    /**
-     * Returns the parsed text of this description.
-     */
-    public function create(string $contents, ?TypeContext $context = null): Description
-    {
-        $tokens   = $this->lex($contents);
-        $count    = count($tokens);
-        $tagCount = 0;
-        $tags     = [];
-
-        for ($i = 1; $i < $count; $i += 2) {
-            $tags[]     = $this->tagFactory->create($tokens[$i], $context);
-            $tokens[$i] = '%' . ++$tagCount . '$s';
-        }
-
-        //In order to allow "literal" inline tags, the otherwise invalid
-        //sequence "{@}" is changed to "@", and "{}" is changed to "}".
-        //"%" is escaped to "%%" because of vsprintf.
-        //See unit tests for examples.
-        for ($i = 0; $i < $count; $i += 2) {
-            $tokens[$i] = str_replace(['{@}', '{}', '%'], ['@', '}', '%%'], $tokens[$i]);
-        }
-
-        return new Description(implode('', $tokens), $tags);
-    }
-
-    /**
-     * Strips the contents from superfluous whitespace and splits the description into a series of tokens.
-     *
-     * @return string[] A series of tokens of which the description text is composed.
-     */
-    private function lex(string $contents): array
-    {
-        $contents = $this->removeSuperfluousStartingWhitespace($contents);
-
-        // performance optimalization; if there is no inline tag, don't bother splitting it up.
-        if (strpos($contents, '{@') === false) {
-            return [$contents];
-        }
-
-        return Utils::pregSplit(
-            '/\{
-                # "{@}" is not a valid inline tag. This ensures that we do not treat it as one, but treat it literally.
-                (?!@\})
-                # We want to capture the whole tag line, but without the inline tag delimiters.
-                (\@
-                    # Match everything up to the next delimiter.
-                    [^{}]*
-                    # Nested inline tag content should not be captured, or it will appear in the result separately.
-                    (?:
-                        # Match nested inline tags.
-                        (?:
-                            # Because we did not catch the tag delimiters earlier, we must be explicit with them here.
-                            # Notice that this also matches "{}", as a way to later introduce it as an escape sequence.
-                            \{(?1)?\}
-                            |
-                            # Make sure we match hanging "{".
-                            \{
-                        )
-                        # Match content after the nested inline tag.
-                        [^{}]*
-                    )* # If there are more inline tags, match them as well. We use "*" since there may not be any
-                       # nested inline tags.
-                )
-            \}/Sux',
-            $contents,
-            0,
-            PREG_SPLIT_DELIM_CAPTURE
-        );
-    }
-
-    /**
-     * Removes the superfluous from a multi-line description.
-     *
-     * When a description has more than one line then it can happen that the second and subsequent lines have an
-     * additional indentation. This is commonly in use with tags like this:
-     *
-     *     {@}since 1.1.0 This is an example
-     *         description where we have an
-     *         indentation in the second and
-     *         subsequent lines.
-     *
-     * If we do not normalize the indentation then we have superfluous whitespace on the second and subsequent
-     * lines and this may cause rendering issues when, for example, using a Markdown converter.
-     */
-    private function removeSuperfluousStartingWhitespace(string $contents): string
-    {
-        $lines = Utils::pregSplit("/\r\n?|\n/", $contents);
-
-        // if there is only one line then we don't have lines with superfluous whitespace and
-        // can use the contents as-is
-        if (count($lines) <= 1) {
-            return $contents;
-        }
-
-        // determine how many whitespace characters need to be stripped
-        $startingSpaceCount = 9999999;
-        for ($i = 1, $iMax = count($lines); $i < $iMax; ++$i) {
-            // lines with a no length do not count as they are not indented at all
-            if (trim($lines[$i]) === '') {
-                continue;
-            }
-
-            // determine the number of prefixing spaces by checking the difference in line length before and after
-            // an ltrim
-            $startingSpaceCount = min($startingSpaceCount, strlen($lines[$i]) - strlen(ltrim($lines[$i])));
-        }
-
-        // strip the number of spaces from each line
-        if ($startingSpaceCount > 0) {
-            for ($i = 1, $iMax = count($lines); $i < $iMax; ++$i) {
-                $lines[$i] = substr($lines[$i], $startingSpaceCount);
-            }
-        }
-
-        return implode("\n", $lines);
-    }
-}
--- a/www/vendor/phpdocumentor/reflection-docblock/src/DocBlock/ExampleFinder.php
+++ b/www/vendor/phpdocumentor/reflection-docblock/src/DocBlock/ExampleFinder.php
@@ -1,159 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of phpDocumentor.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock;
-
-use phpDocumentor\Reflection\DocBlock\Tags\Example;
-
-use function array_slice;
-use function file;
-use function getcwd;
-use function implode;
-use function is_readable;
-use function rtrim;
-use function sprintf;
-use function trim;
-
-use const DIRECTORY_SEPARATOR;
-
-/**
- * Class used to find an example file's location based on a given ExampleDescriptor.
- */
-class ExampleFinder
-{
-    /** @var string */
-    private $sourceDirectory = '';
-
-    /** @var string[] */
-    private $exampleDirectories = [];
-
-    /**
-     * Attempts to find the example contents for the given descriptor.
-     */
-    public function find(Example $example): string
-    {
-        $filename = $example->getFilePath();
-
-        $file = $this->getExampleFileContents($filename);
-        if (!$file) {
-            return sprintf('** File not found : %s **', $filename);
-        }
-
-        return implode('', array_slice($file, $example->getStartingLine() - 1, $example->getLineCount()));
-    }
-
-    /**
-     * Registers the project's root directory where an 'examples' folder can be expected.
-     */
-    public function setSourceDirectory(string $directory = ''): void
-    {
-        $this->sourceDirectory = $directory;
-    }
-
-    /**
-     * Returns the project's root directory where an 'examples' folder can be expected.
-     */
-    public function getSourceDirectory(): string
-    {
-        return $this->sourceDirectory;
-    }
-
-    /**
-     * Registers a series of directories that may contain examples.
-     *
-     * @param string[] $directories
-     */
-    public function setExampleDirectories(array $directories): void
-    {
-        $this->exampleDirectories = $directories;
-    }
-
-    /**
-     * Returns a series of directories that may contain examples.
-     *
-     * @return string[]
-     */
-    public function getExampleDirectories(): array
-    {
-        return $this->exampleDirectories;
-    }
-
-    /**
-     * Attempts to find the requested example file and returns its contents or null if no file was found.
-     *
-     * This method will try several methods in search of the given example file, the first one it encounters is
-     * returned:
-     *
-     * 1. Iterates through all examples folders for the given filename
-     * 2. Checks the source folder for the given filename
-     * 3. Checks the 'examples' folder in the current working directory for examples
-     * 4. Checks the path relative to the current working directory for the given filename
-     *
-     * @return string[] all lines of the example file
-     */
-    private function getExampleFileContents(string $filename): ?array
-    {
-        $normalizedPath = null;
-
-        foreach ($this->exampleDirectories as $directory) {
-            $exampleFileFromConfig = $this->constructExamplePath($directory, $filename);
-            if (is_readable($exampleFileFromConfig)) {
-                $normalizedPath = $exampleFileFromConfig;
-                break;
-            }
-        }
-
-        if (!$normalizedPath) {
-            if (is_readable($this->getExamplePathFromSource($filename))) {
-                $normalizedPath = $this->getExamplePathFromSource($filename);
-            } elseif (is_readable($this->getExamplePathFromExampleDirectory($filename))) {
-                $normalizedPath = $this->getExamplePathFromExampleDirectory($filename);
-            } elseif (is_readable($filename)) {
-                $normalizedPath = $filename;
-            }
-        }
-
-        $lines = $normalizedPath && is_readable($normalizedPath) ? file($normalizedPath) : false;
-
-        return $lines !== false ? $lines : null;
-    }
-
-    /**
-     * Get example filepath based on the example directory inside your project.
-     */
-    private function getExamplePathFromExampleDirectory(string $file): string
-    {
-        return getcwd() . DIRECTORY_SEPARATOR . 'examples' . DIRECTORY_SEPARATOR . $file;
-    }
-
-    /**
-     * Returns a path to the example file in the given directory..
-     */
-    private function constructExamplePath(string $directory, string $file): string
-    {
-        return rtrim($directory, '\\/') . DIRECTORY_SEPARATOR . $file;
-    }
-
-    /**
-     * Get example filepath based on sourcecode.
-     */
-    private function getExamplePathFromSource(string $file): string
-    {
-        return sprintf(
-            '%s%s%s',
-            trim($this->getSourceDirectory(), '\\/'),
-            DIRECTORY_SEPARATOR,
-            trim($file, '"')
-        );
-    }
-}
--- a/www/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Serializer.php
+++ b/www/vendor/phpdocumentor/reflection-docblock/src/DocBlock/Serializer.php
@@ -1,157 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of phpDocumentor.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock;
-
-use phpDocumentor\Reflection\DocBlock;
-use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
-use phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter;
-
-use function sprintf;
-use function str_repeat;
-use function str_replace;
-use function strlen;
-use function wordwrap;
-
-/**
- * Converts a DocBlock back from an object to a complete DocComment including Asterisks.
- */
-class Serializer
-{
-    /** @var string The string to indent the comment with. */
-    protected $indentString = ' ';
-
-    /** @var int The number of times the indent string is repeated. */
-    protected $indent = 0;
-
-    /** @var bool Whether to indent the first line with the given indent amount and string. */
-    protected $isFirstLineIndented = true;
-
-    /** @var int|null The max length of a line. */
-    protected $lineLength;
-
-    /** @var Formatter A custom tag formatter. */
-    protected $tagFormatter;
-    /** @var string */
-    private $lineEnding;
-
-    /**
-     * Create a Serializer instance.
-     *
-     * @param int       $indent          The number of times the indent string is repeated.
-     * @param string    $indentString    The string to indent the comment with.
-     * @param bool      $indentFirstLine Whether to indent the first line.
-     * @param int|null  $lineLength      The max length of a line or NULL to disable line wrapping.
-     * @param Formatter $tagFormatter    A custom tag formatter, defaults to PassthroughFormatter.
-     * @param string    $lineEnding      Line ending used in the output, by default \n is used.
-     */
-    public function __construct(
-        int $indent = 0,
-        string $indentString = ' ',
-        bool $indentFirstLine = true,
-        ?int $lineLength = null,
-        ?Formatter $tagFormatter = null,
-        string $lineEnding = "\n"
-    ) {
-        $this->indent              = $indent;
-        $this->indentString        = $indentString;
-        $this->isFirstLineIndented = $indentFirstLine;
-        $this->lineLength          = $lineLength;
-        $this->tagFormatter        = $tagFormatter ?: new PassthroughFormatter();
-        $this->lineEnding = $lineEnding;
-    }
-
-    /**
-     * Generate a DocBlock comment.
-     *
-     * @param DocBlock $docblock The DocBlock to serialize.
-     *
-     * @return string The serialized doc block.
-     */
-    public function getDocComment(DocBlock $docblock): string
-    {
-        $indent      = str_repeat($this->indentString, $this->indent);
-        $firstIndent = $this->isFirstLineIndented ? $indent : '';
-        // 3 === strlen(' * ')
-        $wrapLength = $this->lineLength ? $this->lineLength - strlen($indent) - 3 : null;
-
-        $text = $this->removeTrailingSpaces(
-            $indent,
-            $this->addAsterisksForEachLine(
-                $indent,
-                $this->getSummaryAndDescriptionTextBlock($docblock, $wrapLength)
-            )
-        );
-
-        $comment = $firstIndent . "/**\n";
-        if ($text) {
-            $comment .= $indent . ' * ' . $text . "\n";
-            $comment .= $indent . " *\n";
-        }
-
-        $comment = $this->addTagBlock($docblock, $wrapLength, $indent, $comment);
-
-        return str_replace("\n", $this->lineEnding, $comment . $indent . ' */');
-    }
-
-    private function removeTrailingSpaces(string $indent, string $text): string
-    {
-        return str_replace(
-            sprintf("\n%s * \n", $indent),
-            sprintf("\n%s *\n", $indent),
-            $text
-        );
-    }
-
-    private function addAsterisksForEachLine(string $indent, string $text): string
-    {
-        return str_replace(
-            "\n",
-            sprintf("\n%s * ", $indent),
-            $text
-        );
-    }
-
-    private function getSummaryAndDescriptionTextBlock(DocBlock $docblock, ?int $wrapLength): string
-    {
-        $text = $docblock->getSummary() . ((string) $docblock->getDescription() ? "\n\n" . $docblock->getDescription()
-                : '');
-        if ($wrapLength !== null) {
-            $text = wordwrap($text, $wrapLength);
-
-            return $text;
-        }
-
-        return $text;
-    }
-
-    private function addTagBlock(DocBlock $docblock, ?int $wrapLength, string $indent, string $comment): string
-    {
-        foreach ($docblock->getTags() as $tag) {
-            $tagText = $this->tagFormatter->format($tag);
-            if ($wrapLength !== null) {
-                $tagText = wordwrap($tagText, $wrapLength);
-            }
-
-            $tagText = str_replace(
-                "\n",
-                sprintf("\n%s * ", $indent),
-                $tagText
-            );
-
-            $comment .= sprintf("%s * %s\n", $indent, $tagText);
-        }
-
-        return $comment;
-    }
-}
--- a/www/vendor/phpdocumentor/reflection-docblock/src/DocBlock/StandardTagFactory.php
+++ b/www/vendor/phpdocumentor/reflection-docblock/src/DocBlock/StandardTagFactory.php
@@ -1,348 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of phpDocumentor.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock;
-
-use InvalidArgumentException;
-use phpDocumentor\Reflection\DocBlock\Tags\Author;
-use phpDocumentor\Reflection\DocBlock\Tags\Covers;
-use phpDocumentor\Reflection\DocBlock\Tags\Deprecated;
-use phpDocumentor\Reflection\DocBlock\Tags\Generic;
-use phpDocumentor\Reflection\DocBlock\Tags\InvalidTag;
-use phpDocumentor\Reflection\DocBlock\Tags\Link as LinkTag;
-use phpDocumentor\Reflection\DocBlock\Tags\Method;
-use phpDocumentor\Reflection\DocBlock\Tags\Param;
-use phpDocumentor\Reflection\DocBlock\Tags\Property;
-use phpDocumentor\Reflection\DocBlock\Tags\PropertyRead;
-use phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite;
-use phpDocumentor\Reflection\DocBlock\Tags\Return_;
-use phpDocumentor\Reflection\DocBlock\Tags\See as SeeTag;
-use phpDocumentor\Reflection\DocBlock\Tags\Since;
-use phpDocumentor\Reflection\DocBlock\Tags\Source;
-use phpDocumentor\Reflection\DocBlock\Tags\Throws;
-use phpDocumentor\Reflection\DocBlock\Tags\Uses;
-use phpDocumentor\Reflection\DocBlock\Tags\Var_;
-use phpDocumentor\Reflection\DocBlock\Tags\Version;
-use phpDocumentor\Reflection\FqsenResolver;
-use phpDocumentor\Reflection\Types\Context as TypeContext;
-use ReflectionMethod;
-use ReflectionNamedType;
-use ReflectionParameter;
-use Webmozart\Assert\Assert;
-
-use function array_merge;
-use function array_slice;
-use function call_user_func_array;
-use function count;
-use function get_class;
-use function preg_match;
-use function strpos;
-use function trim;
-
-/**
- * Creates a Tag object given the contents of a tag.
- *
- * This Factory is capable of determining the appropriate class for a tag and instantiate it using its `create`
- * factory method. The `create` factory method of a Tag can have a variable number of arguments; this way you can
- * pass the dependencies that you need to construct a tag object.
- *
- * > Important: each parameter in addition to the body variable for the `create` method must default to null, otherwise
- * > it violates the constraint with the interface; it is recommended to use the {@see Assert::notNull()} method to
- * > verify that a dependency is actually passed.
- *
- * This Factory also features a Service Locator component that is used to pass the right dependencies to the
- * `create` method of a tag; each dependency should be registered as a service or as a parameter.
- *
- * When you want to use a Tag of your own with custom handling you need to call the `registerTagHandler` method, pass
- * the name of the tag and a Fully Qualified Class Name pointing to a class that implements the Tag interface.
- */
-final class StandardTagFactory implements TagFactory
-{
-    /** PCRE regular expression matching a tag name. */
-    public const REGEX_TAGNAME = '[\w\-\_\\\\:]+';
-
-    /**
-     * @var array<class-string<Tag>> An array with a tag as a key, and an
-     *                               FQCN to a class that handles it as an array value.
-     */
-    private $tagHandlerMappings = [
-        'author' => Author::class,
-        'covers' => Covers::class,
-        'deprecated' => Deprecated::class,
-        // 'example'        => '\phpDocumentor\Reflection\DocBlock\Tags\Example',
-        'link' => LinkTag::class,
-        'method' => Method::class,
-        'param' => Param::class,
-        'property-read' => PropertyRead::class,
-        'property' => Property::class,
-        'property-write' => PropertyWrite::class,
-        'return' => Return_::class,
-        'see' => SeeTag::class,
-        'since' => Since::class,
-        'source' => Source::class,
-        'throw' => Throws::class,
-        'throws' => Throws::class,
-        'uses' => Uses::class,
-        'var' => Var_::class,
-        'version' => Version::class,
-    ];
-
-    /**
-     * @var array<class-string<Tag>> An array with a anotation s a key, and an
-     *      FQCN to a class that handles it as an array value.
-     */
-    private $annotationMappings = [];
-
-    /**
-     * @var ReflectionParameter[][] a lazy-loading cache containing parameters
-     *      for each tagHandler that has been used.
-     */
-    private $tagHandlerParameterCache = [];
-
-    /** @var FqsenResolver */
-    private $fqsenResolver;
-
-    /**
-     * @var mixed[] an array representing a simple Service Locator where we can store parameters and
-     *     services that can be inserted into the Factory Methods of Tag Handlers.
-     */
-    private $serviceLocator = [];
-
-    /**
-     * Initialize this tag factory with the means to resolve an FQSEN and optionally a list of tag handlers.
-     *
-     * If no tag handlers are provided than the default list in the {@see self::$tagHandlerMappings} property
-     * is used.
-     *
-     * @see self::registerTagHandler() to add a new tag handler to the existing default list.
-     *
-     * @param array<class-string<Tag>> $tagHandlers
-     */
-    public function __construct(FqsenResolver $fqsenResolver, ?array $tagHandlers = null)
-    {
-        $this->fqsenResolver = $fqsenResolver;
-        if ($tagHandlers !== null) {
-            $this->tagHandlerMappings = $tagHandlers;
-        }
-
-        $this->addService($fqsenResolver, FqsenResolver::class);
-    }
-
-    public function create(string $tagLine, ?TypeContext $context = null): Tag
-    {
-        if (!$context) {
-            $context = new TypeContext('');
-        }
-
-        [$tagName, $tagBody] = $this->extractTagParts($tagLine);
-
-        return $this->createTag(trim($tagBody), $tagName, $context);
-    }
-
-    /**
-     * @param mixed $value
-     */
-    public function addParameter(string $name, $value): void
-    {
-        $this->serviceLocator[$name] = $value;
-    }
-
-    public function addService(object $service, ?string $alias = null): void
-    {
-        $this->serviceLocator[$alias ?: get_class($service)] = $service;
-    }
-
-    public function registerTagHandler(string $tagName, string $handler): void
-    {
-        Assert::stringNotEmpty($tagName);
-        Assert::classExists($handler);
-        Assert::implementsInterface($handler, Tag::class);
-
-        if (strpos($tagName, '\\') && $tagName[0] !== '\\') {
-            throw new InvalidArgumentException(
-                'A namespaced tag must have a leading backslash as it must be fully qualified'
-            );
-        }
-
-        $this->tagHandlerMappings[$tagName] = $handler;
-    }
-
-    /**
-     * Extracts all components for a tag.
-     *
-     * @return string[]
-     */
-    private function extractTagParts(string $tagLine): array
-    {
-        $matches = [];
-        if (!preg_match('/^@(' . self::REGEX_TAGNAME . ')((?:[\s\(\{])\s*([^\s].*)|$)/us', $tagLine, $matches)) {
-            throw new InvalidArgumentException(
-                'The tag "' . $tagLine . '" does not seem to be wellformed, please check it for errors'
-            );
-        }
-
-        if (count($matches) < 3) {
-            $matches[] = '';
-        }
-
-        return array_slice($matches, 1);
-    }
-
-    /**
-     * Creates a new tag object with the given name and body or returns null if the tag name was recognized but the
-     * body was invalid.
-     */
-    private function createTag(string $body, string $name, TypeContext $context): Tag
-    {
-        $handlerClassName = $this->findHandlerClassName($name, $context);
-        $arguments        = $this->getArgumentsForParametersFromWiring(
-            $this->fetchParametersForHandlerFactoryMethod($handlerClassName),
-            $this->getServiceLocatorWithDynamicParameters($context, $name, $body)
-        );
-
-        try {
-            $callable = [$handlerClassName, 'create'];
-            Assert::isCallable($callable);
-            /** @phpstan-var callable(string): ?Tag $callable */
-            $tag = call_user_func_array($callable, $arguments);
-
-            return $tag ?? InvalidTag::create($body, $name);
-        } catch (InvalidArgumentException $e) {
-            return InvalidTag::create($body, $name)->withError($e);
-        }
-    }
-
-    /**
-     * Determines the Fully Qualified Class Name of the Factory or Tag (containing a Factory Method `create`).
-     *
-     * @return class-string<Tag>
-     */
-    private function findHandlerClassName(string $tagName, TypeContext $context): string
-    {
-        $handlerClassName = Generic::class;
-        if (isset($this->tagHandlerMappings[$tagName])) {
-            $handlerClassName = $this->tagHandlerMappings[$tagName];
-        } elseif ($this->isAnnotation($tagName)) {
-            // TODO: Annotation support is planned for a later stage and as such is disabled for now
-            $tagName = (string) $this->fqsenResolver->resolve($tagName, $context);
-            if (isset($this->annotationMappings[$tagName])) {
-                $handlerClassName = $this->annotationMappings[$tagName];
-            }
-        }
-
-        return $handlerClassName;
-    }
-
-    /**
-     * Retrieves the arguments that need to be passed to the Factory Method with the given Parameters.
-     *
-     * @param ReflectionParameter[] $parameters
-     * @param mixed[]               $locator
-     *
-     * @return mixed[] A series of values that can be passed to the Factory Method of the tag whose parameters
-     *     is provided with this method.
-     */
-    private function getArgumentsForParametersFromWiring(array $parameters, array $locator): array
-    {
-        $arguments = [];
-        foreach ($parameters as $parameter) {
-            $type     = $parameter->getType();
-            $typeHint = null;
-            if ($type instanceof ReflectionNamedType) {
-                $typeHint = $type->getName();
-                if ($typeHint === 'self') {
-                    $declaringClass = $parameter->getDeclaringClass();
-                    if ($declaringClass !== null) {
-                        $typeHint = $declaringClass->getName();
-                    }
-                }
-            }
-
-            if (isset($locator[$typeHint])) {
-                $arguments[] = $locator[$typeHint];
-                continue;
-            }
-
-            $parameterName = $parameter->getName();
-            if (isset($locator[$parameterName])) {
-                $arguments[] = $locator[$parameterName];
-                continue;
-            }
-
-            $arguments[] = null;
-        }
-
-        return $arguments;
-    }
-
-    /**
-     * Retrieves a series of ReflectionParameter objects for the static 'create' method of the given
-     * tag handler class name.
-     *
-     * @param class-string $handlerClassName
-     *
-     * @return ReflectionParameter[]
-     */
-    private function fetchParametersForHandlerFactoryMethod(string $handlerClassName): array
-    {
-        if (!isset($this->tagHandlerParameterCache[$handlerClassName])) {
-            $methodReflection                                  = new ReflectionMethod($handlerClassName, 'create');
-            $this->tagHandlerParameterCache[$handlerClassName] = $methodReflection->getParameters();
-        }
-
-        return $this->tagHandlerParameterCache[$handlerClassName];
-    }
-
-    /**
-     * Returns a copy of this class' Service Locator with added dynamic parameters,
-     * such as the tag's name, body and Context.
-     *
-     * @param TypeContext $context The Context (namespace and aliasses) that may be
-     *  passed and is used to resolve FQSENs.
-     * @param string      $tagName The name of the tag that may be
-     *  passed onto the factory method of the Tag class.
-     * @param string      $tagBody The body of the tag that may be
-     *  passed onto the factory method of the Tag class.
-     *
-     * @return mixed[]
-     */
-    private function getServiceLocatorWithDynamicParameters(
-        TypeContext $context,
-        string $tagName,
-        string $tagBody
-    ): array {
-        return array_merge(
-            $this->serviceLocator,
-            [
-                'name' => $tagName,
-                'body' => $tagBody,
-                TypeContext::class => $context,
-            ]
-        );
-    }
-
-    /**
-     * Returns whether the given tag belongs to an annotation.
-     *
-     * @todo this method should be populated once we implement Annotation notation support.
-     */
-    private function isAnnotation(string $tagContent): bool
-    {
-        // 1. Contains a namespace separator
-        // 2. Contains parenthesis
-        // 3. Is present in a list of known annotations (make the algorithm smart by first checking is the last part
-        //    of the annotation class name matches the found tag name
-
-        return false;
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Clemens Schwaighofer	ba89b188d9	Mo create script update, phpstan fixes, document updates create_mo: set auto base folder bases on current location so we do not need do adjust paths in script phpstan fixes: edit_base.php CoreLibs/Basci.php CoreLibs/DB/SQL/PgSQL.php Update documentation in method headers CoreLibs/Combined/DateTime.php	2022-10-12 09:48:22 +09:00
Clemens Schwaighofer	d15618cde4	Add JS_TRANSLATE file to smart template flow	2022-10-04 17:35:46 +09:00
Clemens Schwaighofer	0fd89727e9	Update Output\Form to allow ACL controlled edit/view entries Fixed phpunit test runs with encoding test run and not resetting the subsitute character back to default Note: There are mime encoding failures for php 7.4 and 8.0 and one ACL login failure test for php 7.4	2022-09-06 11:17:03 +09:00
Clemens Schwaighofer	a8e75d158b	Update composer installed packages	2022-09-06 11:16:33 +09:00
Clemens Schwaighofer	4b3fbaa309	Updates based on latest phpstan run	2022-09-02 17:00:22 +09:00
Clemens Schwaighofer	1a6c65df0e	Minor test updates, comment typo updates, DB_CONFIG_SET for default $DB_CONFIG_SET is now default current selcted db config instead of $DB_CONFIG so to not overwrite the array itself	2022-08-05 12:43:57 +09:00
Clemens Schwaighofer	24f553a17e	Update comments for split element counter	2022-07-29 13:20:54 +09:00
Clemens Schwaighofer	9a3ea2f7db	update strings class with split counter method	2022-07-29 13:19:45 +09:00
Clemens Schwaighofer	bcdb877d90	Phan/phpstan fixes	2022-07-29 11:06:53 +09:00
Clemens Schwaighofer	6d0e528c38	Combined\Datetime date/number to weekday conversion Convert functions for date or weekday number to weekday name or date to weekday number	2022-07-29 11:02:25 +09:00
Clemens Schwaighofer	7e6474195b	String split format fix for non ascii characters Currently just abort and return string as is	2022-07-29 10:38:32 +09:00
Clemens Schwaighofer	1795d3ba6c	String convert class added Currently with one method: splitFormatString Converts a string to a string with separater characters based on a format string	2022-07-29 07:00:02 +09:00
Clemens Schwaighofer	e1340acf55	Class header info string fix	2022-07-29 06:59:33 +09:00
Clemens Schwaighofer	b5ead3e266	Minor code block comment clean ups	2022-07-15 17:42:38 +09:00
Clemens Schwaighofer	f5daaca598	Fixes for Create\Email docstrings	2022-07-08 17:25:45 +09:00