First phpstan strict check

.phan/config.php

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

4dev/checking/phpunit.sh

@@ -15,8 +15,8 @@ php_bin="";
 if [ ! -z "${1}" ]; then
 	case "${1}" in
 		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
-		# "7.4") php_bin="/usr/bin/php7.4 "; ;;
-		# "8.0") php_bin="/usr/bin/php8.0 "; ;;
+		"7.4") php_bin="/usr/bin/php7.4 "; ;;
+		"8.0") php_bin="/usr/bin/php8.0 "; ;;
 		"8.1") php_bin="/usr/bin/php8.1 "; ;;
 		"8.2") php_bin="/usr/bin/php8.2 "; ;;
 		*) echo "Not support PHP: ${1}"; exit; ;;
@@ -25,8 +25,8 @@ fi;
 if [ ! -z "${2}" ] && [ -z "${php_bin}" ]; then
 	case "${2}" in
 		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
-		# "7.4") php_bin="/usr/bin/php7.4 "; ;;
-		# "8.0") php_bin="/usr/bin/php8.0 "; ;;
+		"7.4") php_bin="/usr/bin/php7.4 "; ;;
+		"8.0") php_bin="/usr/bin/php8.0 "; ;;
 		"8.1") php_bin="/usr/bin/php8.1 "; ;;
 		"8.2") php_bin="/usr/bin/php8.2 "; ;;
 		*) echo "Not support PHP: ${1}"; exit; ;;

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

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

4dev/sync/sync_template.sh

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

4dev/tests/AAASetupData/CoreLibsAAASetupDataTest.php

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

4dev/tests/AAASetupData/includes

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

4dev/tests/AAASetupData/log

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

4dev/tests/ACL/includes

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

4dev/tests/CoreLibsACLLoginTest.php

@@ -7,14 +7,6 @@ namespace tests;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 
-/*
-Not yet covered tests:
-- loginGetLocale
-- loginGetHeaderColor
-- loginGetPages
-- loginGetEuid
-*/
-
 /**
  * Test class for ACL\Login
  * @coversDefaultClass \CoreLibs\ACL\Login
@@ -68,10 +60,13 @@ final class CoreLibsACLLoginTest extends TestCase
 
 		// logger is always needed
 		// define basic connection set valid and one invalid
-		self::$log = new \CoreLibs\Logging\Logging([
+		self::$log = new \CoreLibs\Debug\Logging([
 			// 'log_folder' => __DIR__ . DIRECTORY_SEPARATOR . 'log',
 			'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
-			'log_file_id' => 'CoreLibs-ACL-Login-Test',
+			'file_id' => 'CoreLibs-ACL-Login-Test',
+			'debug_all' => true,
+			'echo_all' => false,
+			'print_all' => true,
 		]);
 		// test database we need to connect do, if not possible this test is skipped
 		self::$db = new \CoreLibs\DB\IO(
@@ -125,6 +120,8 @@ final class CoreLibsACLLoginTest extends TestCase
 		// define('LOGIN_DB_SCHEMA', '');
 
 		// SHOULD SET
+		// PASSWORD_MIN_LENGTH (d9)
+		// PASSWORD_MAX_LENGTH (d255)
 		// DEFAULT_ACL_LEVEL (d80)
 
 		// OPT:
@@ -264,8 +261,6 @@ final class CoreLibsACLLoginTest extends TestCase
 					'GROUP_ACL_LEVEL' => -1,
 					'PAGES_ACL_LEVEL' => [],
 					'USER_ACL_LEVEL' => -1,
-					'USER_ADDITIONAL_ACL' => [],
-					'GROUP_ADDITIONAL_ACL' => [],
 					'UNIT_UID' => [
 						'AdminAccess' => 1,
 					],
@@ -279,7 +274,6 @@ final class CoreLibsACLLoginTest extends TestCase
 							'data' => [
 								'test' => 'value',
 							],
-							'additional_acl' => []
 						],
 					],
 					// 'UNIT_DEFAULT' => '',
@@ -1112,22 +1106,7 @@ final class CoreLibsACLLoginTest extends TestCase
 
 		/** @var \CoreLibs\ACL\Login&MockObject */
 		$login_mock = $this->getMockBuilder(\CoreLibs\ACL\Login::class)
-			->setConstructorArgs([
-				self::$db,
-				self::$log,
-				$session_mock,
-				[
-					'auto_login' => false,
-					'default_acl_level' => 80,
-					'logout_target' => '',
-					'site_locale' => 'en_US.UTF-8',
-					'site_domain' => 'admin',
-					'site_encoding' => 'UTF-8',
-					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
-						. 'includes' . DIRECTORY_SEPARATOR
-						. 'locale' . DIRECTORY_SEPARATOR,
-				]
-			])
+			->setConstructorArgs([self::$db, self::$log, $session_mock, false])
 			->onlyMethods(['loginTerminate', 'loginReadPageName', 'loginPrintLogin'])
 			->getMock();
 		$login_mock->expects($this->any())
@@ -1750,7 +1729,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				],
 				20
 			],
-			'invalid search' => [
+			'invalud search' => [
 				12,
 				'foo',
 				[],
@@ -1795,22 +1774,7 @@ final class CoreLibsACLLoginTest extends TestCase
 		);
 		/** @var \CoreLibs\ACL\Login&MockObject */
 		$login_mock = $this->getMockBuilder(\CoreLibs\ACL\Login::class)
-			->setConstructorArgs([
-				self::$db,
-				self::$log,
-				$session_mock,
-				[
-					'auto_login' => false,
-					'default_acl_level' => 80,
-					'logout_target' => '',
-					'site_locale' => 'en_US.UTF-8',
-					'site_domain' => 'admin',
-					'site_encoding' => 'UTF-8',
-					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
-						. 'includes' . DIRECTORY_SEPARATOR
-						. 'locale' . DIRECTORY_SEPARATOR,
-				]
-			])
+			->setConstructorArgs([self::$db, self::$log, $session_mock, false])
 			->onlyMethods(['loginTerminate'])
 			->getMock();
 		$login_mock->expects($this->any())
@@ -1909,22 +1873,7 @@ final class CoreLibsACLLoginTest extends TestCase
 		);
 		/** @var \CoreLibs\ACL\Login&MockObject */
 		$login_mock = $this->getMockBuilder(\CoreLibs\ACL\Login::class)
-			->setConstructorArgs([
-				self::$db,
-				self::$log,
-				$session_mock,
-				[
-					'auto_login' => false,
-					'default_acl_level' => 80,
-					'logout_target' => '',
-					'site_locale' => 'en_US.UTF-8',
-					'site_domain' => 'admin',
-					'site_encoding' => 'UTF-8',
-					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
-						. 'includes' . DIRECTORY_SEPARATOR
-						. 'locale' . DIRECTORY_SEPARATOR,
-				]
-			])
+			->setConstructorArgs([self::$db, self::$log, $session_mock, false])
 			->onlyMethods(['loginTerminate'])
 			->getMock();
 		$login_mock->expects($this->any())
@@ -1997,22 +1946,7 @@ final class CoreLibsACLLoginTest extends TestCase
 		);
 		/** @var \CoreLibs\ACL\Login&MockObject */
 		$login_mock = $this->getMockBuilder(\CoreLibs\ACL\Login::class)
-			->setConstructorArgs([
-				self::$db,
-				self::$log,
-				$session_mock,
-				[
-					'auto_login' => false,
-					'default_acl_level' => 80,
-					'logout_target' => '',
-					'site_locale' => 'en_US.UTF-8',
-					'site_domain' => 'admin',
-					'site_encoding' => 'UTF-8',
-					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
-						. 'includes' . DIRECTORY_SEPARATOR
-						. 'locale' . DIRECTORY_SEPARATOR,
-				]
-			])
+			->setConstructorArgs([self::$db, self::$log, $session_mock, false])
 			->onlyMethods(['loginTerminate'])
 			->getMock();
 		$login_mock->expects($this->any())
@@ -2093,22 +2027,7 @@ final class CoreLibsACLLoginTest extends TestCase
 		);
 		/** @var \CoreLibs\ACL\Login&MockObject */
 		$login_mock = $this->getMockBuilder(\CoreLibs\ACL\Login::class)
-			->setConstructorArgs([
-				self::$db,
-				self::$log,
-				$session_mock,
-				[
-					'auto_login' => false,
-					'default_acl_level' => 80,
-					'logout_target' => '',
-					'site_locale' => 'en_US.UTF-8',
-					'site_domain' => 'admin',
-					'site_encoding' => 'UTF-8',
-					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
-						. 'includes' . DIRECTORY_SEPARATOR
-						. 'locale' . DIRECTORY_SEPARATOR,
-				]
-			])
+			->setConstructorArgs([self::$db, self::$log, $session_mock, false])
 			->onlyMethods(['loginTerminate'])
 			->getMock();
 		$login_mock->expects($this->any())

4dev/tests/CoreLibsCheckPasswordTest.php

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

4dev/tests/CoreLibsCombinedArrayHandlerTest.php

@@ -31,7 +31,6 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 		4,
 		'b',
 		'c' => 'test',
-		'single' => 'single',
 		'same' => 'same',
 		'deep' => [
 			'sub' => [
@@ -108,13 +107,6 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 */
 	public function arraySearchRecursiveAllProvider(): array
 	{
-		/*
-		0: $needle,
-		1: array $input,
-		2: ?string $key_search_for,
-		3: bool $flag,
-		4: array $expected
-		*/
 		return [
 			'find value' => [
 				0 => 'bar',
@@ -180,13 +172,6 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 */
 	public function arraySearchSimpleProvider(): array
 	{
-		/*
-		0: array $input,
-		1: $key,
-		2: $value,
-		3: bool $flag,
-		4: bool $expected
-		*/
 		return [
 			'key/value exist' => [
 				0 => self::$array,
@@ -289,188 +274,6 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function arraySearchKeyProvider(): array
-	{
-		/*
-		0: search in array
-		1: search keys
-		2: flat flag
-		3: prefix flag
-		4: expected array
-		*/
-		return [
-			// single
-			'find single, standard' => [
-				0 => self::$array,
-				1 => ['single'],
-				2 => null,
-				3 => null,
-				4 => [
-					0 => [
-						'value' => 'single',
-						'path' => ['single'],
-					],
-				],
-			],
-			'find single, prefix' => [
-				0 => self::$array,
-				1 => ['single'],
-				2 => null,
-				3 => true,
-				4 => [
-					'single' => [
-						0 => [
-							'value' => 'single',
-							'path' => ['single'],
-						],
-					],
-				],
-			],
-			'find single, flat' => [
-				0 => self::$array,
-				1 => ['single'],
-				2 => true,
-				3 => null,
-				4 => [
-					'single',
-				],
-			],
-			'find single, flat, prefix' => [
-				0 => self::$array,
-				1 => ['single'],
-				2 => true,
-				3 => true,
-				4 => [
-					'single' => [
-						'single',
-					],
-				],
-			],
-			// not found
-			'not found, standard' => [
-				0 => self::$array,
-				1 => ['NOT FOUND'],
-				2 => null,
-				3 => null,
-				4 => [],
-			],
-			'not found, standard, prefix' => [
-				0 => self::$array,
-				1 => ['NOT FOUND'],
-				2 => null,
-				3 => true,
-				4 => [
-					'NOT FOUND' => [],
-				],
-			],
-			'not found, flat' => [
-				0 => self::$array,
-				1 => ['NOT FOUND'],
-				2 => true,
-				3 => null,
-				4 => [],
-			],
-			'not found, flat, prefix' => [
-				0 => self::$array,
-				1 => ['NOT FOUND'],
-				2 => true,
-				3 => true,
-				4 => [
-					'NOT FOUND' => [],
-				],
-			],
-			// multi
-			'multiple found, standard' => [
-				0 => self::$array,
-				1 => ['same'],
-				2 => null,
-				3 => null,
-				4 => [
-					[
-						'value' => 'same',
-						'path' => ['a', 'same', ],
-					],
-					[
-						'value' => 'same',
-						'path' => ['same', ],
-					],
-					[
-						'value' => 'same',
-						'path' => ['deep', 'sub', 'same', ],
-					],
-				]
-			],
-			'multiple found, flat' => [
-				0 => self::$array,
-				1 => ['same'],
-				2 => true,
-				3 => null,
-				4 => ['same', 'same', 'same', ],
-			],
-			// search with multiple
-			'search multiple, standard' => [
-				0 => self::$array,
-				1 => ['single', 'nested'],
-				2 => null,
-				3 => null,
-				4 => [
-					[
-						'value' => 'single',
-						'path' => ['single'],
-					],
-					[
-						'value' => 'bar',
-						'path' => ['deep', 'sub', 'nested', ],
-					],
-				],
-			],
-			'search multiple, prefix' => [
-				0 => self::$array,
-				1 => ['single', 'nested'],
-				2 => null,
-				3 => true,
-				4 => [
-					'single' => [
-						[
-							'value' => 'single',
-							'path' => ['single'],
-						],
-					],
-					'nested' => [
-						[
-							'value' => 'bar',
-							'path' => ['deep', 'sub', 'nested', ],
-						],
-					],
-				],
-			],
-			'search multiple, flat' => [
-				0 => self::$array,
-				1 => ['single', 'nested'],
-				2 => true,
-				3 => null,
-				4 => [
-					'single', 'bar',
-				],
-			],
-			'search multiple, flat, prefix' => [
-				0 => self::$array,
-				1 => ['single', 'nested'],
-				2 => true,
-				3 => true,
-				4 => [
-					'single' => ['single', ],
-					'nested' => ['bar', ],
-				],
-			],
-		];
-	}
-
 	/**
 	 * provides array listing for the merge test
 	 *
@@ -862,7 +665,7 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 *
 	 * @param array $input
 	 * @param string|int $key
-	 * @param string|int|bool $value
+	 * @param string|int $value
 	 * @param bool $expected
 	 * @return void
 	 */
@@ -874,44 +677,6 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 		);
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @covers::arraySearchKey
-	 * @dataProvider arraySearchKeyProvider
-	 * @testdox arraySearchKey Search array with keys and flat: $flat, prefix: $prefix [$_dataName]
-	 *
-	 * @param  array $input
-	 * @param  array $needles
-	 * @param  bool|null $flat
-	 * @param  bool|null $prefix
-	 * @param  array $expected
-	 * @return void
-	 */
-	public function testArraySearchKey(
-		array $input,
-		array $needles,
-		?bool $flat,
-		?bool $prefix,
-		array $expected
-	): void {
-		if ($flat === null && $prefix === null) {
-			$result = \CoreLibs\Combined\ArrayHandler::arraySearchKey($input, $needles);
-		} elseif ($flat === null) {
-			$result = \CoreLibs\Combined\ArrayHandler::arraySearchKey($input, $needles, prefix: $prefix);
-		} elseif ($prefix === null) {
-			$result = \CoreLibs\Combined\ArrayHandler::arraySearchKey($input, $needles, flat: $flat);
-		} else {
-			$result = \CoreLibs\Combined\ArrayHandler::arraySearchKey($input, $needles, $flat, $prefix);
-		}
-		// print "E: " . print_r($expected, true) . "\n";
-		// print "R: " . print_r($result, true) . "\n";
-		$this->assertEquals(
-			$expected,
-			$result
-		);
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -959,7 +724,7 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 		$warning = array_shift($arrays);
 
 		// phpunit 10.0 compatible
-		$this->expectExceptionMessage($warning);
+		$this->expectExceptionMessage(($warning));
 
 		\CoreLibs\Combined\ArrayHandler::arrayMergeRecursive(...$arrays);
 

4dev/tests/CoreLibsCombinedDateTimeTest.php

@@ -458,47 +458,6 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function dateRangeHasWeekendProvider(): array
-	{
-		return [
-			'no weekend' => [
-				'2023-07-03',
-				'2023-07-04',
-				false
-			],
-			'start weekend sat' => [
-				'2023-07-01',
-				'2023-07-04',
-				true
-			],
-			'start weekend sun' => [
-				'2023-07-02',
-				'2023-07-04',
-				true
-			],
-			'end weekend sat' => [
-				'2023-07-03',
-				'2023-07-08',
-				true
-			],
-			'end weekend sun' => [
-				'2023-07-03',
-				'2023-07-09',
-				true
-			],
-			'long period > 6 days' => [
-				'2023-07-03',
-				'2023-07-27',
-				true
-			]
-		];
-	}
-
 	/**
 	 * date string convert test
 	 *
@@ -821,29 +780,6 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 			$output
 		);
 	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::dateRangeHasWeekend
-	 * @dataProvider dateRangeHasWeekendProvider
-	 * @testdox dateRangeHasWeekend $start_date and $end_date are expected weekend $expected [$_dataName]
-	 *
-	 * @param  string $start_date
-	 * @param  string $end_date
-	 * @param  bool   $expected
-	 * @return void
-	 */
-	public function testDateRangeHasWeekend(
-		string $start_date,
-		string $end_date,
-		bool $expected
-	): void {
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Combined\DateTime::dateRangeHasWeekend($start_date, $end_date)
-		);
-	}
 }
 
 // __END__

4dev/tests/CoreLibsCreateEmailTest.php

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

4dev/tests/CoreLibsCreateUidsTest.php

@@ -21,83 +21,45 @@ final class CoreLibsCreateUidsTest extends TestCase
 	public function uniqIdProvider(): array
 	{
 		return [
-			// number length
-			'too short' => [
-				0 => 1,
-				1 => 4,
-				2 => null
-			],
-			'valid length: 10' => [
-				0 => 10,
-				1 => 10,
-				2 => null
-			],
-			'valid length: 9, auto length' => [
-				0 => 9,
-				1 => 8,
-				2 => null
-			],
-			'valid length: 9, force length' => [
-				0 => 9,
-				1 => 9,
-				2 => true,
-			],
-			'very long: 512' => [
-				0 => 512,
-				1 => 512,
-				2 => null
-			],
-			// below is all legacy
 			'md5 hash' => [
 				0 => 'md5',
 				1 => 32,
-				2 => null
 			],
 			'sha256 hash' => [
 				0 => 'sha256',
-				1 => 64,
-				2 => null
+				1 => 64
 			],
 			'ripemd160 hash' => [
 				0 => 'ripemd160',
-				1 => 40,
-				2 => null
+				1 => 40
 			],
 			'adler32 hash' => [
 				0 => 'adler32',
-				1 => 8,
-				2 => null
+				1 => 8
 			],
-			'not in list, set default length' => [
+			'not in list hash but valid' => [
 				0 => 'sha3-512',
-				1 => 64,
-				2 => null
+				1 => strlen(hash('sha3-512', 'A'))
 			],
 			'default hash not set' => [
 				0 => null,
 				1 => 64,
-				2 => null
 			],
 			'invalid name' => [
 				0 => 'iamnotavalidhash',
 				1 => 64,
-				2 => null
 			],
-			// auto calls
-			'auto: ' . \CoreLibs\Create\Uids::DEFAULT_UNNIQ_ID_LENGTH => [
-				0 => \CoreLibs\Create\Uids::DEFAULT_UNNIQ_ID_LENGTH,
-				1 => 64,
-				2 => null
+			'auto: ' . \CoreLibs\Create\Uids::DEFAULT_HASH => [
+				0 => \CoreLibs\Create\Uids::DEFAULT_HASH,
+				1 => strlen(hash(\CoreLibs\Create\Uids::DEFAULT_HASH, 'A'))
 			],
 			'auto: ' . \CoreLibs\Create\Uids::STANDARD_HASH_LONG => [
 				0 => \CoreLibs\Create\Uids::STANDARD_HASH_LONG,
-				1 => strlen(hash(\CoreLibs\Create\Uids::STANDARD_HASH_LONG, 'A')),
-				2 => null
+				1 => strlen(hash(\CoreLibs\Create\Uids::STANDARD_HASH_LONG, 'A'))
 			],
 			'auto: ' . \CoreLibs\Create\Uids::STANDARD_HASH_SHORT => [
 				0 => \CoreLibs\Create\Uids::STANDARD_HASH_SHORT,
-				1 => strlen(hash(\CoreLibs\Create\Uids::STANDARD_HASH_SHORT, 'A')),
-				2 => null
+				1 => strlen(hash(\CoreLibs\Create\Uids::STANDARD_HASH_SHORT, 'A'))
 			],
 		];
 	}
@@ -143,26 +105,25 @@ final class CoreLibsCreateUidsTest extends TestCase
 	 *
 	 * @covers ::uniqId
 	 * @dataProvider uniqIdProvider
-	 * @testdox uniqId $input will be length $expected (Force $flag) [$_dataName]
+	 * @testdox uniqId $input will be length $expected [$_dataName]
 	 *
-	 * @param int|string|null $input
+	 * @param string|null $input
 	 * @param string $expected
-	 * @param bool|null $flag
 	 * @return void
 	 */
-	public function testUniqId(int|string|null $input, int $expected, ?bool $flag): void
+	public function testUniqId(?string $input, int $expected): void
 	{
 		if ($input === null) {
-			$uniq_id_length = strlen(\CoreLibs\Create\Uids::uniqId());
-		} elseif ($flag === null) {
-			$uniq_id_length = strlen(\CoreLibs\Create\Uids::uniqId($input));
+			$this->assertEquals(
+				$expected,
+				strlen(\CoreLibs\Create\Uids::uniqId())
+			);
 		} else {
-			$uniq_id_length = strlen(\CoreLibs\Create\Uids::uniqId($input, $flag));
+			$this->assertEquals(
+				$expected,
+				strlen(\CoreLibs\Create\Uids::uniqId($input))
+			);
 		}
-		$this->assertEquals(
-			$expected,
-			$uniq_id_length
-		);
 	}
 
 	/**

4dev/tests/CoreLibsDebugLoggingTest.php

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

4dev/tests/CoreLibsDebugSupportTest.php

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

4dev/tests/CoreLibsGetDotEnvTest.php

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

4dev/tests/CoreLibsGetSystemTest.php

@@ -67,17 +67,17 @@ final class CoreLibsGetSystemTest extends TestCase
 			'original set' => [
 				0 => null,
 				1 => 'NOHOST',
-				2 => 0,
+				2 => 'NOPORT',
 			],
 			'override set no port' => [
 				0 => 'foo.org',
 				1 => 'foo.org',
-				2 => 80
+				2 => '80'
 			],
 			'override set with port' => [
 				0 => 'foo.org:443',
 				1 => 'foo.org',
-				2 => 443
+				2 => '443'
 			]
 		];
 	}
@@ -138,10 +138,10 @@ final class CoreLibsGetSystemTest extends TestCase
 	 *
 	 * @param string|null $input
 	 * @param string $expected_host
-	 * @param int $expected_port
+	 * @param string $expected_port
 	 * @return void
 	 */
-	public function testGetHostNanme(?string $input, string $expected_host, int $expected_port): void
+	public function testGetHostNanme(?string $input, string $expected_host, string $expected_port): void
 	{
 		// print "HOSTNAME: " . $_SERVER['HTTP_HOST'] . "<br>";
 		// print "SERVER: " . print_r($_SERVER, true) . "\n";

4dev/tests/CoreLibsLanguageGetLocaleTest.php

@@ -0,0 +1,310 @@
+<?php // phpcs:disable Generic.Files.LineLength
+
+declare(strict_types=1);
+
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for Language\GetLocale
+ *
+ * @coversDefaultClass \CoreLibs\Language\GetLocale
+ * @testdox \CoreLibs\Language\GetLocale method tests
+ */
+final class CoreLibsLanguageGetLocaleTest extends TestCase
+{
+	/**
+	 * set all constant variables that must be set before call
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass(): void
+	{
+		// default web page encoding setting
+		if (!defined('DEFAULT_ENCODING')) {
+			define('DEFAULT_ENCODING', 'UTF-8');
+		}
+		if (!defined('DEFAULT_LOCALE')) {
+			// default lang + encoding
+			define('DEFAULT_LOCALE', 'en_US.UTF-8');
+		}
+		// site
+		if (!defined('SITE_ENCODING')) {
+			define('SITE_ENCODING', DEFAULT_ENCODING);
+		}
+		if (!defined('SITE_LOCALE')) {
+			define('SITE_LOCALE', DEFAULT_LOCALE);
+		}
+		// just set
+		if (!defined('BASE')) {
+			define('BASE', str_replace('/configs', '', __DIR__) . DIRECTORY_SEPARATOR);
+		}
+		if (!defined('INCLUDES')) {
+			define('INCLUDES', 'includes' . DIRECTORY_SEPARATOR);
+		}
+		if (!defined('LANG')) {
+			define('LANG', 'lang' . DIRECTORY_SEPARATOR);
+		}
+		if (!defined('LOCALE')) {
+			define('LOCALE', 'locale' . DIRECTORY_SEPARATOR);
+		}
+		if (!defined('CONTENT_PATH')) {
+			define('CONTENT_PATH', 'frontend' . DIRECTORY_SEPARATOR);
+		}
+		// array session
+		$_SESSION = [];
+		global $_SESSION;
+	}
+
+	/**
+	 * all the test data
+	 *
+	 * @return array
+	 */
+	public function setLocaleProvider(): array
+	{
+		return [
+			// 0: locale
+			// 1: domain
+			// 2: encoding
+			// 3: path
+			// 4: SESSION: DEFAULT_LOCALE
+			// 5: SESSION: DEFAULT_CHARSET
+			// 6: expected array
+			'no params, all default constants' => [
+				// lang, domain, encoding, path
+				null, null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'en_US.UTF-8',
+					'lang' => 'en_US',
+					'domain' => 'frontend',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			'no params, session charset and lang' => [
+				// lang, domain, encoding, path
+				null, null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				'ja_JP', 'UTF-8',
+				// return array
+				[
+					'locale' => 'ja_JP',
+					'lang' => 'ja_JP',
+					'domain' => 'frontend',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			'no params, session charset and lang short' => [
+				// lang, domain, encoding, path
+				null, null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				'ja', 'UTF-8',
+				// return array
+				[
+					'locale' => 'ja',
+					'lang' => 'ja',
+					'domain' => 'frontend',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			// param lang (no sessions)
+			'locale param only, no sessions' => [
+				// lang, domain, encoding, path
+				'ja.UTF-8', null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja.UTF-8',
+					'lang' => 'ja',
+					'domain' => 'frontend',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			// different locale setting
+			'locale complex param only, no sessions' => [
+				// lang, domain, encoding, path
+				'ja_JP.SJIS', null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja_JP.SJIS',
+					'lang' => 'ja_JP',
+					'domain' => 'frontend',
+					'encoding' => 'SJIS',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			// param lang and domain (no override)
+			'locale, domain params, no sessions' => [
+				// lang, domain, encoding, path
+				'ja.UTF-8', 'admin', null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja.UTF-8',
+					'lang' => 'ja',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			// param lang and domain (no override)
+			'locale, domain, encoding params, no sessions' => [
+				// lang, domain, encoding, path
+				'ja.UTF-8', 'admin', 'UTF-8', null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja.UTF-8',
+					'lang' => 'ja',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			// lang, domain, path (no override)
+			'locale, domain and path, no sessions' => [
+				// lang, domain, encoding, path
+				'ja.UTF-8', 'admin', '', __DIR__ . '/locale_other/',
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja.UTF-8',
+					'lang' => 'ja',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?locale_other\/$/",
+				],
+			],
+			// all params set (no override)
+			'all parameter, no sessions' => [
+				// lang, domain, encoding, path
+				'ja', 'admin', 'UTF-8', __DIR__ . '/locale_other/',
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja',
+					'lang' => 'ja',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?locale_other\/$/",
+				],
+			],
+			// param lang and domain (no override)
+			'long locale, domain, encoding params, no sessions' => [
+				// lang, domain, encoding, path
+				'de_CH.UTF-8@euro', 'admin', 'UTF-8', null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'de_CH.UTF-8@euro',
+					'lang' => 'de_CH',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			// TODO invalid params (bad path) (no override)
+			// TODO param calls, but with override set
+		];
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::setLocale
+	 * @dataProvider setLocaleProvider
+	 * @testdox lang settings lang $language, domain $domain, encoding $encoding, path $path; session lang: $SESSION_DEFAULT_LOCALE, session char: $SESSION_DEFAULT_CHARSET [$_dataName]
+	 *
+	 * @return void
+	 */
+	public function testsetLocale(
+		?string $language,
+		?string $domain,
+		?string $encoding,
+		?string $path,
+		?string $SESSION_DEFAULT_LOCALE,
+		?string $SESSION_DEFAULT_CHARSET,
+		array $expected
+	): void {
+		$return_lang_settings = [];
+		global $_SESSION;
+		// set override
+		if ($SESSION_DEFAULT_LOCALE !== null) {
+			$_SESSION['DEFAULT_LOCALE'] = $SESSION_DEFAULT_LOCALE;
+		}
+		if ($SESSION_DEFAULT_CHARSET !== null) {
+			$_SESSION['DEFAULT_CHARSET'] = $SESSION_DEFAULT_CHARSET;
+		}
+		// function call
+		if ($language === null && $domain === null && $encoding === null && $path === null) {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale();
+		} elseif ($language !== null && $domain === null && $encoding === null && $path === null) {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
+				$language
+			);
+		} elseif ($language !== null && $domain !== null && $encoding === null && $path === null) {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
+				$language,
+				$domain
+			);
+		} elseif ($language !== null && $domain !== null && $encoding !== null && $path === null) {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
+				$language,
+				$domain,
+				$encoding
+			);
+		} else {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
+				$language,
+				$domain,
+				$encoding,
+				$path
+			);
+		}
+		// print "RETURN: " . print_r($return_lang_settings, true) . "\n";
+
+		foreach (
+			[
+				'locale', 'lang', 'domain', 'encoding', 'path'
+			] as $key
+		) {
+			$value = $expected[$key];
+			if (strpos($value, "/") === 0) {
+				// this is regex
+				$this->assertMatchesRegularExpression(
+					$value,
+					$return_lang_settings[$key],
+					'assert regex failed for ' . $key
+				);
+			} else {
+				// assert equal
+				$this->assertEquals(
+					$value,
+					$return_lang_settings[$key],
+					'assert equal failed for ' . $key
+				);
+			}
+		}
+		// unset all vars
+		$_SESSION = [];
+		unset($GLOBALS['OVERRIDE_LANG']);
+	}
+}
+
+// __END__

4dev/tests/CoreLibsLanguageL10nTest.php

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

4dev/tests/Debug/log/.gitignore

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

4dev/tests/Language/CoreLibsLanguageGetLocaleTest.php

@@ -1,568 +0,0 @@
-<?php // phpcs:disable Generic.Files.LineLength
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for Language\GetLocale
- *
- * @coversDefaultClass \CoreLibs\Language\GetLocale
- * @testdox \CoreLibs\Language\GetLocale method tests
- */
-final class CoreLibsLanguageGetLocaleTest extends TestCase
-{
-	public const SITE_ENCODING = 'UTF-8';
-	public const SITE_LOCALE = 'en_US.UTF-8';
-	public const SITE_DOMAIN = 'admin';
-	public const LOCALE_PATH = __DIR__ . DIRECTORY_SEPARATOR
-		. 'includes' . DIRECTORY_SEPARATOR
-		. 'locale' . DIRECTORY_SEPARATOR;
-
-	/**
-	 * set all constant variables that must be set before call
-	 *
-	 * @return void
-	 */
-	public static function setUpBeforeClass(): void
-	{
-		// default web page encoding setting
-		/* if (!defined('DEFAULT_ENCODING')) {
-			define('DEFAULT_ENCODING', 'UTF-8');
-		}
-		if (!defined('DEFAULT_LOCALE')) {
-			// default lang + encoding
-			define('DEFAULT_LOCALE', 'en_US.UTF-8');
-		}
-		// site
-		if (!defined('SITE_ENCODING')) {
-			define('SITE_ENCODING', DEFAULT_ENCODING);
-		}
-		if (!defined('SITE_LOCALE')) {
-			define('SITE_LOCALE', DEFAULT_LOCALE);
-		} */
-		// just set
-		/* if (!defined('BASE')) {
-			define('BASE', str_replace('/configs', '', __DIR__) . DIRECTORY_SEPARATOR);
-		}
-		if (!defined('INCLUDES')) {
-			define('INCLUDES', 'includes' . DIRECTORY_SEPARATOR);
-		}
-		if (!defined('LANG')) {
-			define('LANG', 'lang' . DIRECTORY_SEPARATOR);
-		}
-		if (!defined('LOCALE')) {
-			define('LOCALE', 'locale' . DIRECTORY_SEPARATOR);
-		}
-		if (!defined('CONTENT_PATH')) {
-			define('CONTENT_PATH', 'frontend' . DIRECTORY_SEPARATOR);
-		} */
-		// array session
-		$_SESSION = [];
-		global $_SESSION;
-	}
-
-	/**
-	 * all the test data
-	 *
-	 * @return array<mixed>
-	 */
-	/* public function setLocaleProvider(): array
-	{
-		return [
-			// 0: locale
-			// 1: domain
-			// 2: encoding
-			// 3: path
-			// 4: SESSION: DEFAULT_LOCALE
-			// 5: SESSION: DEFAULT_CHARSET
-			// 6: expected array
-			// 7: deprecation message
-			'no params, all default constants' => [
-				// lang, domain, encoding, path
-				null, null, null, null,
-				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
-				null, null,
-				// return array
-				[
-					'locale' => 'en_US.UTF-8',
-					'lang' => 'en_US',
-					'domain' => 'frontend',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-				'setLocale: Unset $locale or unset SESSION locale is deprecated',
-			],
-			'no params, session charset and lang' => [
-				// lang, domain, encoding, path
-				null, null, null, null,
-				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
-				'ja_JP', 'UTF-8',
-				// return array
-				[
-					'locale' => 'ja_JP',
-					'lang' => 'ja_JP',
-					'domain' => 'frontend',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-				'setLocale: Unset $domain is deprecated'
-			],
-			'no params, session charset and lang short' => [
-				// lang, domain, encoding, path
-				null, null, null, null,
-				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
-				'ja', 'UTF-8',
-				// return array
-				[
-					'locale' => 'ja',
-					'lang' => 'ja',
-					'domain' => 'frontend',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-				'setLocale: Unset $domain is deprecated',
-			],
-			// param lang (no sessions)
-			'locale param only, no sessions' => [
-				// lang, domain, encoding, path
-				'ja.UTF-8', null, null, null,
-				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
-				null, null,
-				// return array
-				[
-					'locale' => 'ja.UTF-8',
-					'lang' => 'ja',
-					'domain' => 'frontend',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-				'setLocale: Unset $domain is deprecated',
-			],
-			// different locale setting
-			'locale complex param only, no sessions' => [
-				// lang, domain, encoding, path
-				'ja_JP.SJIS', null, null, null,
-				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
-				null, null,
-				// return array
-				[
-					'locale' => 'ja_JP.SJIS',
-					'lang' => 'ja_JP',
-					'domain' => 'frontend',
-					'encoding' => 'SJIS',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-				'setLocale: Unset $domain is deprecated',
-			],
-			// param lang and domain (no override)
-			'locale, domain params, no sessions' => [
-				// lang, domain, encoding, path
-				'ja.UTF-8', 'admin', null, null,
-				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
-				null, null,
-				// return array
-				[
-					'locale' => 'ja.UTF-8',
-					'lang' => 'ja',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-				'setLocale: Unset $path is deprecated',
-			],
-			// param lang and domain (no override)
-			'locale, domain, encoding params, no sessions' => [
-				// lang, domain, encoding, path
-				'ja.UTF-8', 'admin', 'UTF-8', null,
-				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
-				null, null,
-				// return array
-				[
-					'locale' => 'ja.UTF-8',
-					'lang' => 'ja',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-				'setLocale: Unset $path is deprecated'
-			],
-			// lang, domain, path (no override)
-			'locale, domain and path, no sessions' => [
-				// lang, domain, encoding, path
-				'ja.UTF-8', 'admin', '', __DIR__ . '/locale_other/',
-				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
-				null, null,
-				// return array
-				[
-					'locale' => 'ja.UTF-8',
-					'lang' => 'ja',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?locale_other\/$/",
-				],
-				null
-			],
-			// all params set (no override)
-			'all parameter, no sessions' => [
-				// lang, domain, encoding, path
-				'ja', 'admin', 'UTF-8', __DIR__ . '/locale_other/',
-				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
-				null, null,
-				// return array
-				[
-					'locale' => 'ja',
-					'lang' => 'ja',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?locale_other\/$/",
-				],
-				null
-			],
-			// param lang and domain (no override)
-			'long locale, domain, encoding params, no sessions' => [
-				// lang, domain, encoding, path
-				'de_CH.UTF-8@euro', 'admin', 'UTF-8', null,
-				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
-				null, null,
-				// return array
-				[
-					'locale' => 'de_CH.UTF-8@euro',
-					'lang' => 'de_CH',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-				'setLocale: Unset $path is deprecated',
-			],
-			// TODO invalid params (bad path) (no override)
-			// TODO param calls, but with override set
-		];
-	} */
-
-	/**
-	  * Undocumented function
-	  *
-	  * @covers ::setLocale
-	  * @dataProvider setLocaleProvider
-	  * @testdox lang settings lang $language, domain $domain, encoding $encoding, path $path; session lang: $SESSION_DEFAULT_LOCALE, session char: $SESSION_DEFAULT_CHARSET [$_dataName]
-	  *
-	  * @param  string|null  $language
-	  * @param  string|null  $domain
-	  * @param  string|null  $encoding
-	  * @param  string|null  $path
-	  * @param  string|null  $SESSION_DEFAULT_LOCALE
-	  * @param  string|null  $SESSION_DEFAULT_CHARSET
-	  * @param  array<mixed> $expected
-	  * @param  string|null  $deprecation_message
-	  * @return void
-	  */
-	/* public function testsetLocale(
-		?string $language,
-		?string $domain,
-		?string $encoding,
-		?string $path,
-		?string $SESSION_DEFAULT_LOCALE,
-		?string $SESSION_DEFAULT_CHARSET,
-		array $expected,
-		?string $deprecation_message
-	): void {
-		$return_lang_settings = [];
-		global $_SESSION;
-		// set override
-		if ($SESSION_DEFAULT_LOCALE !== null) {
-			$_SESSION['DEFAULT_LOCALE'] = $SESSION_DEFAULT_LOCALE;
-		}
-		if ($SESSION_DEFAULT_CHARSET !== null) {
-			$_SESSION['DEFAULT_CHARSET'] = $SESSION_DEFAULT_CHARSET;
-		}
-		if ($deprecation_message !== null) {
-			set_error_handler(
-				static function (int $errno, string $errstr): never {
-					throw new \Exception($errstr, $errno);
-				},
-				E_USER_DEPRECATED
-			);
-			// catch this with the message
-			$this->expectExceptionMessage($deprecation_message);
-		}
-		// function call
-		if (
-			$language === null && $domain === null &&
-			$encoding === null && $path === null
-		) {
-			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale();
-		} elseif (
-			$language !== null && $domain === null &&
-			$encoding === null && $path === null
-		) {
-			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
-				$language
-			);
-		} elseif (
-			$language !== null && $domain !== null &&
-			$encoding === null && $path === null
-		) {
-			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
-				$language,
-				$domain
-			);
-		} elseif (
-			$language !== null && $domain !== null &&
-			$encoding !== null && $path === null
-		) {
-			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
-				$language,
-				$domain,
-				$encoding
-			);
-		} else {
-			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
-				$language,
-				$domain,
-				$encoding,
-				$path
-			);
-		}
-		restore_error_handler();
-		// print "RETURN: " . print_r($return_lang_settings, true) . "\n";
-
-		foreach (
-			[
-				'locale', 'lang', 'domain', 'encoding', 'path'
-			] as $key
-		) {
-			$value = $expected[$key];
-			if (strpos($value, "/") === 0) {
-				// this is regex
-				$this->assertMatchesRegularExpression(
-					$value,
-					$return_lang_settings[$key],
-					'assert regex failed for ' . $key
-				);
-			} else {
-				// assert equal
-				$this->assertEquals(
-					$value,
-					$return_lang_settings[$key],
-					'assert equal failed for ' . $key
-				);
-			}
-		}
-		// unset all vars
-		$_SESSION = [];
-		unset($GLOBALS['OVERRIDE_LANG']);
-	} */
-
-	/**
-	 * all the test data
-	 *
-	 * @return array<mixed>
-	 */
-	public function setLocaleFromSessionProvider(): array
-	{
-		return [
-			// 0: locale
-			// 1: domain
-			// 2: encoding
-			// 3: path
-			// 4: SESSION: DEFAULT_LOCALE
-			// 5: SESSION: DEFAULT_CHARSET
-			// 5: SESSION: DEFAULT_DOMAIN
-			// 6: SESSION: LOCALE_PATH
-			// 6: expected array
-			// 7: deprecation message
-			'all session vars set' => [
-				// lang, domain, encoding, path
-				self::SITE_LOCALE, self::SITE_DOMAIN, self::SITE_ENCODING, self::LOCALE_PATH,
-				// SESSION SETTINGS: locale, charset, domain, path
-				'ja_JP.UTF-8', 'UTF-8', 'admin', __DIR__ . '/locale_other/',
-				// return array
-				[
-					'locale' => 'ja_JP.UTF-8',
-					'lang' => 'ja_JP',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?locale_other\/$/",
-				],
-			],
-			// param lang and domain (no override)
-			'no session set, only parameters' => [
-				// lang, domain, encoding, path
-				self::SITE_LOCALE, self::SITE_DOMAIN, self::SITE_ENCODING, self::LOCALE_PATH,
-				// SESSION SETTINGS: locale, charset, domain, path
-				null, null, null, null,
-				// return array
-				[
-					'locale' => 'en_US.UTF-8',
-					'lang' => 'en_US',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-			],
-			// special parse session check for locales
-			'all session vars set, short lang' => [
-				// lang, domain, encoding, path
-				self::SITE_LOCALE, self::SITE_DOMAIN, self::SITE_ENCODING, self::LOCALE_PATH,
-				// SESSION SETTINGS: locale, charset, domain, path
-				'ja', 'UTF-8', 'admin', __DIR__ . '/locale_other/',
-				// return array
-				[
-					'locale' => 'ja',
-					'lang' => 'ja',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?locale_other\/$/",
-				],
-			],
-			// lang with modifier
-			// param lang and domain (no override)
-			'long locale, domain, encoding params, no sessions' => [
-				// lang, domain, encoding, path
-				self::SITE_LOCALE, self::SITE_DOMAIN, self::SITE_ENCODING, self::LOCALE_PATH,
-				// SESSION SETTINGS: locale, charset, domain, path
-				'de_CH.UTF-8@euro', 'admin', 'UTF-8',  __DIR__ . '/includes/locale/',
-				// return array
-				[
-					'locale' => 'de_CH.UTF-8@euro',
-					'lang' => 'de_CH',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-			],
-			// missing session values check
-			// special parse session check for locales
-			'session missing encoding, set from parameters' => [
-				// lang, domain, encoding, path
-				self::SITE_LOCALE, self::SITE_DOMAIN, self::SITE_ENCODING, self::LOCALE_PATH,
-				// SESSION SETTINGS: locale, charset, domain, path
-				'ja', null, 'admin', __DIR__ . '/locale_other/',
-				// return array
-				[
-					'locale' => 'ja',
-					'lang' => 'ja',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?locale_other\/$/",
-				],
-			],
-			// null return check for invalid entries
-			'no session set, only parameters, all invalid' => [
-				// lang, domain, encoding, path
-				'###', '&&&&', '$$$$', 'foo_bar_path',
-				// SESSION SETTINGS: locale, charset, domain, path
-				null, null, null, null,
-				// return array
-				[
-					'locale' => null,
-					'lang' => null,
-					'domain' => null,
-					'encoding' => null,
-					'path' => null,
-				],
-			],
-			// invalid session names, fall backup
-			'all session vars are invalid, fallback' => [
-				// lang, domain, encoding, path
-				self::SITE_LOCALE, self::SITE_DOMAIN, self::SITE_ENCODING, self::LOCALE_PATH,
-				// SESSION SETTINGS: locale, charset, domain, path
-				'###', '&&&&', '$$$$', 'foo_bar_path',
-				// return array
-				[
-					'locale' => 'en_US.UTF-8',
-					'lang' => 'en_US',
-					'domain' => 'admin',
-					'encoding' => 'UTF-8',
-					'path' => "/^\/(.*\/)?includes\/locale\/$/",
-				],
-			],
-		];
-	}
-
-	/**
-	  * Undocumented function
-	  *
-	  * @covers ::setLocale
-	  * @dataProvider setLocaleFromSessionProvider
-	  * @testdox lang settings lang $language, domain $domain, encoding $encoding, path $path; session lang: $SESSION_DEFAULT_LOCALE, session char: $SESSION_DEFAULT_CHARSET [$_dataName]
-	  *
-	  * @param  string|      $language
-	  * @param  string|      $domain
-	  * @param  string|      $encoding
-	  * @param  string|      $path
-	  * @param  string|null  $SESSION_DEFAULT_LOCALE
-	  * @param  string|null  $SESSION_DEFAULT_CHARSET
-	  * @param  string|null  $SESSION_DEFAULT_DOMAIN
-	  * @param  string|null  $SESSION_LOCALE_PATH
-	  * @param  array<mixed> $expected
-	  * @return void
-	  */
-	public function testsetLocaleFromSession(
-		string $language,
-		string $domain,
-		string $encoding,
-		string $path,
-		?string $SESSION_DEFAULT_LOCALE,
-		?string $SESSION_DEFAULT_CHARSET,
-		?string $SESSION_DEFAULT_DOMAIN,
-		?string $SESSION_LOCALE_PATH,
-		array $expected,
-	): void {
-		$return_lang_settings = [];
-		global $_SESSION;
-		// set override
-		if ($SESSION_DEFAULT_LOCALE !== null) {
-			$_SESSION['DEFAULT_LOCALE'] = $SESSION_DEFAULT_LOCALE;
-		}
-		if ($SESSION_DEFAULT_CHARSET !== null) {
-			$_SESSION['DEFAULT_CHARSET'] = $SESSION_DEFAULT_CHARSET;
-		}
-		if ($SESSION_DEFAULT_DOMAIN !== null) {
-			$_SESSION['DEFAULT_DOMAIN'] = $SESSION_DEFAULT_DOMAIN;
-		}
-		if ($SESSION_LOCALE_PATH !== null) {
-			$_SESSION['LOCALE_PATH'] = $SESSION_LOCALE_PATH;
-		}
-		$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocaleFromSession(
-			$language,
-			$domain,
-			$encoding,
-			$path
-		);
-		// print "RETURN: " . print_r($return_lang_settings, true) . "\n";
-		foreach (
-			[
-				'locale', 'lang', 'domain', 'encoding', 'path'
-			] as $key
-		) {
-			$value = $expected[$key];
-			if (
-				!empty($value) &&
-				strpos($value, "/") === 0
-			) {
-				// this is regex
-				$this->assertMatchesRegularExpression(
-					$value,
-					$return_lang_settings[$key] ?? '',
-					'assert regex failed for ' . $key
-				);
-			} else {
-				// assert equal
-				$this->assertEquals(
-					$value,
-					$return_lang_settings[$key],
-					'assert equal failed for ' . $key
-				);
-			}
-		}
-		// unset all vars
-		$_SESSION = [];
-		unset($GLOBALS['OVERRIDE_LANG']);
-	}
-}
-
-// __END__

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

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

4dev/tests/Logging/CoreLibsLoggingLoggingTest.php

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

4dev/tests/Logging/log/.gitignore

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

4dev/tests/Security/CoreLibsSecuritySymmetricEncryptionTest.php

@@ -1,172 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-use CoreLibs\Security\CreateKey;
-use CoreLibs\Security\SymmetricEncryption;
-
-/**
- * Test class for Security\SymmetricEncryption and Security\CreateKey
- * @coversDefaultClass \CoreLibs\Security\SymmetricEncryption
- * @testdox \CoreLibs\Security\SymmetricEncryption method tests
- */
-final class CoreLibsSecuritySymmetricEncryptionTest extends TestCase
-{
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerEncryptDecryptSuccess(): array
-	{
-		return [
-			'valid string' => [
-				'input' => 'I am a secret',
-				'expected' => 'I am a secret',
-			],
-		];
-	}
-
-	/**
-	 * test encrypt/decrypt produce correct output
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptDecryptSuccess
-	 * @testdox encrypt/decrypt $input must be $expected [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testEncryptDecryptSuccess(string $input, string $expected): void
-	{
-		$key = CreateKey::generateRandomKey();
-		$encrypted = SymmetricEncryption::encrypt($input, $key);
-		$decrypted = SymmetricEncryption::decrypt($encrypted, $key);
-
-		$this->assertEquals(
-			$expected,
-			$decrypted
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerEncryptFailed(): array
-	{
-		return [
-			'wrong decryption key' => [
-				'input' => 'I am a secret',
-				'excpetion_message' => 'Invalid Key'
-			],
-		];
-	}
-
-	/**
-	 * Test decryption with wrong key
-	 *
-	 * @covers ::generateRandomKey
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerEncryptFailed
-	 * @testdox decrypt with wrong key $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testEncryptFailed(string $input, string $exception_message): void
-	{
-		$key = CreateKey::generateRandomKey();
-		$encrypted = SymmetricEncryption::encrypt($input, $key);
-		$wrong_key = CreateKey::generateRandomKey();
-		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::decrypt($encrypted, $wrong_key);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerWrongKey(): array
-	{
-		return [
-			'not hex key' => [
-				'key' => 'not_a_hex_key',
-				'exception_message' => 'Invalid hex key'
-			],
-			'too short hex key' => [
-				'key' => '1cabd5cba9e042f12522f4ff2de5c31d233b',
-				'excpetion_message' => 'Key is not the correct size (must be '
-					. 'SODIUM_CRYPTO_SECRETBOX_KEYBYTES bytes long).'
-			],
-		];
-	}
-
-	/**
-	 * test invalid key provided to decrypt or encrypt
-	 *
-	 * @covers ::encrypt
-	 * @covers ::decrypt
-	 * @dataProvider providerWrongKey
-	 * @testdox wrong key $key throws $exception_message [$_dataName]
-	 *
-	 * @param  string $key
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongKey(string $key, string $exception_message): void
-	{
-		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::encrypt('test', $key);
-		// we must encrypt valid thing first so we can fail with the wrong kjey
-		$enc_key = CreateKey::generateRandomKey();
-		$encrypted = SymmetricEncryption::encrypt('test', $enc_key);
-		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::decrypt($encrypted, $key);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function providerWrongCiphertext(): array
-	{
-		return [
-			'too short ciphertext' => [
-				'input' => 'short',
-				'exception_message' => 'Invalid ciphertext (too short)'
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::decrypt
-	 * @dataProvider providerWrongCiphertext
-	 * @testdox too short ciphertext $input throws $exception_message [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $exception_message
-	 * @return void
-	 */
-	public function testWrongCiphertext(string $input, string $exception_message): void
-	{
-		$key = CreateKey::generateRandomKey();
-		$this->expectExceptionMessage($exception_message);
-		SymmetricEncryption::decrypt($input, $key);
-	}
-}
-
-// __END__

4dev/tests/Template/CoreLibsTemplateHtmlBuilderBlockTest.php

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

4dev/tests/Template/CoreLibsTemplateHtmlBuilderElementTest.php

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

4dev/tests/Template/CoreLibsTemplateHtmlBuilderStringReplaceTest.php

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

4dev/tests/dotenv/.env

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

README.md

@@ -4,6 +4,7 @@
 
 * Uses PSR-12
 * tab indent instead of 4 spaces indent
+* Warning at 120 character length, error at 240 character length
 
 ## General information
 
@@ -23,9 +24,9 @@ There are three branches:
 ### master
 
 The active branch, which is the namespace branch.
-Compatible with PHP 8.1 or higher
+Currently compatible with PHP 7.4 and 8.0
 
-### legacy (deprecated)
+### legacy
 
 The old non namepsace format layout.
 This is fully deprecated and will no longer be maintaned.
@@ -38,17 +39,17 @@ Any current development is done here
 ## Static checks
 
 With phpstan (`4dev/checking/phpstan.sh`)
-`vendor/bin/phpstan`
+`phpstan`
 
 With phan (`4dev/checking/phan.sh`)
-`vendor/bin/phan --progress-bar -C --analyze-twice`
+`phan --progress-bar -C --analyze-twice`
 
 pslam is setup but not configured
 
 ## Unit tests
 
 With phpunit (`4dev/checking/phpunit.sh`)
-`www/vendor/bin/phpunit -c $phpunit.xml 4dev/tests/`
+`phpunit -c $phpunit.xml 4dev/tests/`
 
 ## Other Notes
 

ReadMe.composer-release.md

@@ -9,8 +9,13 @@
 - run phan/phpstan/phpunit tests in composer branch
 - commit and sync to master
 - create the same version tag as before in the trunk/master
-- GITEA and GITLAB:
-  - Run `publish/publish.sh` script to create composer packages
+- GITEA
+  - download ZIP file from TAG
+  - `curl --user clemens.schwaighofer:KEY \
+     --upload-file ~/Documents/Composer/CoreLibs-Composer-All-vX.Y.Z.zip \
+     https://git.egplusww.jp/api/packages/Composer/composer?version=X.Y.Z`
+- GitLab
+  - `curl --data tag=vX-Y-Z --header "Deploy-Token: TOKENr" "https://gitlab-na.factory.tools/api/v4/projects/950/packages/composer"`
 - Composer Packagest local
   - update pacakges.json file with new version and commit
-  - run `git pull egra-gitea master` on udon-core in `/var/www/html/composer/www`
+  - `git pull egra-gitea master`

composer.json

@@ -1,22 +1,13 @@
 {
-    "name": "egrajp/development-corelibs-dev",
-    "version": "dev-master",
-    "description": "CoreLibs: Development package",
-    "type": "library",
     "require-dev": {
         "phpstan/phpstan": "^1.10",
         "phan/phan": "^5.4",
         "phpstan/extension-installer": "^1.2",
-        "vimeo/psalm": "^5.7",
-        "phpstan/phpstan-deprecation-rules": "^1.1"
+        "phpstan/phpstan-strict-rules": "^1.5"
     },
     "config": {
         "allow-plugins": {
             "phpstan/extension-installer": true
         }
-    },
-    "require": {
-        "php": ">=8.1",
-        "psr/log": "^2.0 || ^3.0"
     }
 }

phpstan-bootstrap.php

@@ -8,7 +8,5 @@ $_SERVER['HTTP_HOST'] = 'soba.tokyo.tequila.jp';
 // for whatever reason it does not load that from the confing.master.php
 // for includes/admin_header.php
 define('BASE_NAME', '');
-define('SITE_DOMAIN', '');
-define('HOST_NAME', 'soba.tokyo.tequila.jp');
 
 // __END__

phpstan.neon

@@ -6,42 +6,73 @@ parameters:
 	level: 8 # max is now 9
 	checkMissingCallableSignature: true
 	treatPhpDocTypesAsCertain: false
+	strictRules:
+		allRules: false
+		disallowedLooseComparison: false
+		booleansInConditions: false
+		uselessCast: true
+		requireParentConstructorCall: false
+		disallowedConstructs: false
+		overwriteVariablesWithLoop: false
+		closureUsesThis: false
+		matchingInheritedMethodNames: false
+		numericOperandsInArithmeticOperators: false
+		strictCalls: false
+		switchConditionsMatchingType: false
+		noVariableVariables: false
 	paths:
 		- %currentWorkingDirectory%/www
 	bootstrapFiles:
 		- %currentWorkingDirectory%/phpstan-bootstrap.php
+		# - %currentWorkingDirectory%/www/lib/autoloader.php
 		- %currentWorkingDirectory%/www/vendor/autoload.php
 	scanDirectories:
 		- www/vendor
 	scanFiles:
 		- www/configs/config.php
 		- www/configs/config.master.php
+		# if composer.json autoloader defined, this is not needed
+		# - www/lib/autoloader.php
+		- www/vendor/autoload.php
 	excludePaths:
 		# do not check old qq file uploader tests
 		- www/admin/qq_file_upload_*.php
+		# ignore all test files
+		- www/admin/class_test*.php
+		# extra in sub folder
+		- www/admin/subfolder/class_test*.php
 		- www/admin/error_test.php
 		# admin synlink files
 		- www/admin/edit_*.php
-		# config symlinks
 		- www/admin/config.php
-		- www/frontend/config.php
-		- www/frontend/*/config.php
+		# frotend symlink
+		- www/frontend/*config.php
 		# ignore admin header stuff
 		# - www/includes/admin_header.php # ignore the admin include stuff
 		- www/includes/admin_footer.php # ignore the admin include stuff
+		# deprecated files
+		- www/includes/admin_set_paths.php # ignore the admin include stuff
+		- www/includes/admin_smarty.php # ignore the admin include stuff
+		- www/includes/edit_base.LEGACY.php # old style
 		# folders with data no check needed
 		- www/templates_c
 		- www/cache
 		- www/log
 		- www/media
 		- www/tmp
+		# File uploader
+		- www/lib/FileUpload
 		# ignore composer
 		- www/vendor
 	# ignore errores with
 	ignoreErrors:
-		# - # in the class_test tree we allow deprecated calls
-		# 	message: "#^Call to deprecated method #"
-		# 	path: %currentWorkingDirectory%/www/admin/class_test.*.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(\\|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.#'
 		# -
 		# 	message: '#Reflection error: [a-zA-Z0-9\\_]+ not found.#'

phpunit.xml

@@ -2,6 +2,5 @@
 	cacheResultFile="/tmp/phpunit-corelibs.result.cache"
 	colors="true"
 	verbose="true"
-	convertDeprecationsToExceptions="true"
 >
 </phpunit>

psalm-config.php

@@ -1,5 +0,0 @@
-<?php
-
-define('BASE', '');
-
-// __END__

psalm.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="8"
-    resolveFromConfigFile="true"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    autoloader="psalm-config.php"
-    findUnusedBaselineEntry="true"
-    findUnusedCode="true"
->
-    <projectFiles>
-        <file name="phpstan-conditional.php" />
-        <file name="phpstan-bootstrap.php" />
-        <directory name="www" />
-        <ignoreFiles>
-            <directory name="www/templates_c" />
-            <directory name="www/cache" />
-            <directory name="www/log" />
-            <directory name="www/media" />
-            <directory name="www/tmp" />
-            <directory name="www/vendor" />
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-</psalm>

vendor/amphp/amp/LICENSE

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

vendor/amphp/amp/composer.json

@@ -1,74 +0,0 @@
-{
-    "name": "amphp/amp",
-    "homepage": "https://amphp.org/amp",
-    "description": "A non-blocking concurrency framework for PHP applications.",
-    "keywords": [
-        "async",
-        "asynchronous",
-        "concurrency",
-        "promise",
-        "awaitable",
-        "future",
-        "non-blocking",
-        "event",
-        "event-loop"
-    ],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Daniel Lowrey",
-            "email": "rdlowrey@php.net"
-        },
-        {
-            "name": "Aaron Piotrowski",
-            "email": "aaron@trowski.com"
-        },
-        {
-            "name": "Bob Weinand",
-            "email": "bobwei9@hotmail.com"
-        },
-        {
-            "name": "Niklas Keller",
-            "email": "me@kelunik.com"
-        }
-    ],
-    "require": {
-        "php": ">=7.1"
-    },
-    "require-dev": {
-        "ext-json": "*",
-        "amphp/phpunit-util": "^1",
-        "amphp/php-cs-fixer-config": "dev-master",
-        "react/promise": "^2",
-        "phpunit/phpunit": "^7 | ^8 | ^9",
-        "psalm/phar": "^3.11@dev",
-        "jetbrains/phpstorm-stubs": "^2019.3"
-    },
-    "autoload": {
-        "psr-4": {
-            "Amp\\": "lib"
-        },
-        "files": [
-            "lib/functions.php",
-            "lib/Internal/functions.php"
-        ]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Amp\\Test\\": "test"
-        }
-    },
-    "support": {
-        "issues": "https://github.com/amphp/amp/issues",
-        "irc": "irc://irc.freenode.org/amphp"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.x-dev"
-        }
-    },
-    "scripts": {
-        "test": "@php -dzend.assertions=1 -dassert.exception=1 ./vendor/bin/phpunit",
-        "code-style": "@php ./vendor/bin/php-cs-fixer fix"
-    }
-}

vendor/amphp/amp/lib/CallableMaker.php

@@ -1,80 +0,0 @@
-<?php
-
-namespace Amp;
-
-// @codeCoverageIgnoreStart
-if (\PHP_VERSION_ID < 70100) {
-    /** @psalm-suppress DuplicateClass */
-    trait CallableMaker
-    {
-        /** @var \ReflectionClass */
-        private static $__reflectionClass;
-
-        /** @var \ReflectionMethod[] */
-        private static $__reflectionMethods = [];
-
-        /**
-         * Creates a callable from a protected or private instance method that may be invoked by callers requiring a
-         * publicly invokable callback.
-         *
-         * @param string $method Instance method name.
-         *
-         * @return callable
-         *
-         * @psalm-suppress MixedInferredReturnType
-         */
-        private function callableFromInstanceMethod(string $method): callable
-        {
-            if (!isset(self::$__reflectionMethods[$method])) {
-                if (self::$__reflectionClass === null) {
-                    self::$__reflectionClass = new \ReflectionClass(self::class);
-                }
-                self::$__reflectionMethods[$method] = self::$__reflectionClass->getMethod($method);
-            }
-
-            return self::$__reflectionMethods[$method]->getClosure($this);
-        }
-
-        /**
-         * Creates a callable from a protected or private static method that may be invoked by methods requiring a
-         * publicly invokable callback.
-         *
-         * @param string $method Static method name.
-         *
-         * @return callable
-         *
-         * @psalm-suppress MixedInferredReturnType
-         */
-        private static function callableFromStaticMethod(string $method): callable
-        {
-            if (!isset(self::$__reflectionMethods[$method])) {
-                if (self::$__reflectionClass === null) {
-                    self::$__reflectionClass = new \ReflectionClass(self::class);
-                }
-                self::$__reflectionMethods[$method] = self::$__reflectionClass->getMethod($method);
-            }
-
-            return self::$__reflectionMethods[$method]->getClosure();
-        }
-    }
-} else {
-    /** @psalm-suppress DuplicateClass */
-    trait CallableMaker
-    {
-        /**
-         * @deprecated Use \Closure::fromCallable() instead of this method in PHP 7.1.
-         */
-        private function callableFromInstanceMethod(string $method): callable
-        {
-            return \Closure::fromCallable([$this, $method]);
-        }
-
-        /**
-         * @deprecated Use \Closure::fromCallable() instead of this method in PHP 7.1.
-         */
-        private static function callableFromStaticMethod(string $method): callable
-        {
-            return \Closure::fromCallable([self::class, $method]);
-        }
-    }
-} // @codeCoverageIgnoreEnd

vendor/amphp/amp/lib/CancellationToken.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace Amp;
-
-/**
- * Cancellation tokens are simple objects that allow registering handlers to subscribe to cancellation requests.
- */
-interface CancellationToken
-{
-    /**
-     * Subscribes a new handler to be invoked on a cancellation request.
-     *
-     * This handler might be invoked immediately in case the token has already been cancelled. Returned generators will
-     * automatically be run as coroutines. Any unhandled exceptions will be throw into the event loop.
-     *
-     * @param callable(CancelledException) $callback Callback to be invoked on a cancellation request. Will receive a
-     * `CancelledException` as first argument that may be used to fail the operation's promise.
-     *
-     * @return string Identifier that can be used to cancel the subscription.
-     */
-    public function subscribe(callable $callback): string;
-
-    /**
-     * Unsubscribes a previously registered handler.
-     *
-     * The handler will no longer be called as long as this method isn't invoked from a subscribed callback.
-     *
-     * @param string $id
-     *
-     * @return void
-     */
-    public function unsubscribe(string $id);
-
-    /**
-     * Returns whether cancellation has been requested yet.
-     *
-     * @return bool
-     */
-    public function isRequested(): bool;
-
-    /**
-     * Throws the `CancelledException` if cancellation has been requested, otherwise does nothing.
-     *
-     * @return void
-     *
-     * @throws CancelledException
-     */
-    public function throwIfRequested();
-}

vendor/amphp/amp/lib/CancellationTokenSource.php

@@ -1,163 +0,0 @@
-<?php
-
-namespace Amp;
-
-use React\Promise\PromiseInterface as ReactPromise;
-use function Amp\Promise\rethrow;
-
-/**
- * A cancellation token source provides a mechanism to cancel operations.
- *
- * Cancellation of operation works by creating a cancellation token source and passing the corresponding token when
- * starting the operation. To cancel the operation, invoke `CancellationTokenSource::cancel()`.
- *
- * Any operation can decide what to do on a cancellation request, it has "don't care" semantics. An operation SHOULD be
- * aborted, but MAY continue. Example: A DNS client might continue to receive and cache the response, as the query has
- * been sent anyway. An HTTP client would usually close a connection, but might not do so in case a response is close to
- * be fully received to reuse the connection.
- *
- * **Example**
- *
- * ```php
- * $tokenSource = new CancellationTokenSource;
- * $token = $tokenSource->getToken();
- *
- * $response = yield $httpClient->request("https://example.com/stream", $token);
- * $responseBody = $response->getBody();
- *
- * while (($chunk = yield $response->read()) !== null) {
- *     // consume $chunk
- *
- *     if ($noLongerInterested) {
- *         $cancellationTokenSource->cancel();
- *         break;
- *     }
- * }
- * ```
- *
- * @see CancellationToken
- * @see CancelledException
- */
-final class CancellationTokenSource
-{
-    /** @var CancellationToken */
-    private $token;
-
-    /** @var callable|null */
-    private $onCancel;
-
-    public function __construct()
-    {
-        $onCancel = null;
-
-        $this->token = new class($onCancel) implements CancellationToken {
-            /** @var string */
-            private $nextId = "a";
-
-            /** @var callable[] */
-            private $callbacks = [];
-
-            /** @var \Throwable|null */
-            private $exception;
-
-            /**
-             * @param mixed $onCancel
-             * @param-out callable $onCancel
-             */
-            public function __construct(&$onCancel)
-            {
-                /** @psalm-suppress MissingClosureReturnType We still support PHP 7.0 */
-                $onCancel = function (\Throwable $exception) {
-                    $this->exception = $exception;
-
-                    $callbacks = $this->callbacks;
-                    $this->callbacks = [];
-
-                    foreach ($callbacks as $callback) {
-                        $this->invokeCallback($callback);
-                    }
-                };
-            }
-
-            /**
-             * @param callable $callback
-             *
-             * @return void
-             */
-            private function invokeCallback(callable $callback)
-            {
-                // No type declaration to prevent exception outside the try!
-                try {
-                    /** @var mixed $result */
-                    $result = $callback($this->exception);
-
-                    if ($result instanceof \Generator) {
-                        /** @psalm-var \Generator<mixed, Promise|ReactPromise|(Promise|ReactPromise)[], mixed, mixed> $result */
-                        $result = new Coroutine($result);
-                    }
-
-                    if ($result instanceof Promise || $result instanceof ReactPromise) {
-                        rethrow($result);
-                    }
-                } catch (\Throwable $exception) {
-                    Loop::defer(static function () use ($exception) {
-                        throw $exception;
-                    });
-                }
-            }
-
-            public function subscribe(callable $callback): string
-            {
-                $id = $this->nextId++;
-
-                if ($this->exception) {
-                    $this->invokeCallback($callback);
-                } else {
-                    $this->callbacks[$id] = $callback;
-                }
-
-                return $id;
-            }
-
-            public function unsubscribe(string $id)
-            {
-                unset($this->callbacks[$id]);
-            }
-
-            public function isRequested(): bool
-            {
-                return isset($this->exception);
-            }
-
-            public function throwIfRequested()
-            {
-                if (isset($this->exception)) {
-                    throw $this->exception;
-                }
-            }
-        };
-
-        $this->onCancel = $onCancel;
-    }
-
-    public function getToken(): CancellationToken
-    {
-        return $this->token;
-    }
-
-    /**
-     * @param \Throwable|null $previous Exception to be used as the previous exception to CancelledException.
-     *
-     * @return void
-     */
-    public function cancel(\Throwable $previous = null)
-    {
-        if ($this->onCancel === null) {
-            return;
-        }
-
-        $onCancel = $this->onCancel;
-        $this->onCancel = null;
-        $onCancel(new CancelledException($previous));
-    }
-}

vendor/amphp/amp/lib/CancelledException.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace Amp;
-
-/**
- * Will be thrown in case an operation is cancelled.
- *
- * @see CancellationToken
- * @see CancellationTokenSource
- */
-class CancelledException extends \Exception
-{
-    public function __construct(\Throwable $previous = null)
-    {
-        parent::__construct("The operation was cancelled", 0, $previous);
-    }
-}

vendor/amphp/amp/lib/CombinedCancellationToken.php

@@ -1,87 +0,0 @@
-<?php
-
-namespace Amp;
-
-final class CombinedCancellationToken implements CancellationToken
-{
-    /** @var array{0: CancellationToken, 1: string}[] */
-    private $tokens = [];
-
-    /** @var string */
-    private $nextId = "a";
-
-    /** @var callable[] */
-    private $callbacks = [];
-
-    /** @var CancelledException|null */
-    private $exception;
-
-    public function __construct(CancellationToken ...$tokens)
-    {
-        $thatException = &$this->exception;
-        $thatCallbacks = &$this->callbacks;
-
-        foreach ($tokens as $token) {
-            $id = $token->subscribe(static function (CancelledException $exception) use (&$thatException, &$thatCallbacks) {
-                $thatException = $exception;
-
-                $callbacks = $thatCallbacks;
-                $thatCallbacks = [];
-
-                foreach ($callbacks as $callback) {
-                    asyncCall($callback, $thatException);
-                }
-            });
-
-            $this->tokens[] = [$token, $id];
-        }
-    }
-
-    public function __destruct()
-    {
-        foreach ($this->tokens as list($token, $id)) {
-            /** @var CancellationToken $token */
-            $token->unsubscribe($id);
-        }
-    }
-
-    /** @inheritdoc */
-    public function subscribe(callable $callback): string
-    {
-        $id = $this->nextId++;
-
-        if ($this->exception) {
-            asyncCall($callback, $this->exception);
-        } else {
-            $this->callbacks[$id] = $callback;
-        }
-
-        return $id;
-    }
-
-    /** @inheritdoc */
-    public function unsubscribe(string $id)
-    {
-        unset($this->callbacks[$id]);
-    }
-
-    /** @inheritdoc */
-    public function isRequested(): bool
-    {
-        foreach ($this->tokens as list($token)) {
-            if ($token->isRequested()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /** @inheritdoc */
-    public function throwIfRequested()
-    {
-        foreach ($this->tokens as list($token)) {
-            $token->throwIfRequested();
-        }
-    }
-}

vendor/amphp/amp/lib/Coroutine.php

@@ -1,160 +0,0 @@
-<?php
-
-namespace Amp;
-
-use React\Promise\PromiseInterface as ReactPromise;
-
-/**
- * Creates a promise from a generator function yielding promises.
- *
- * When a promise is yielded, execution of the generator is interrupted until the promise is resolved. A success
- * value is sent into the generator, while a failure reason is thrown into the generator. Using a coroutine,
- * asynchronous code can be written without callbacks and be structured like synchronous code.
- *
- * @template-covariant TReturn
- * @template-implements Promise<TReturn>
- */
-final class Coroutine implements Promise
-{
-    use Internal\Placeholder;
-
-    /**
-     * Attempts to transform the non-promise yielded from the generator into a promise, otherwise returns an instance
-     * `Amp\Failure` failed with an instance of `Amp\InvalidYieldError`.
-     *
-     * @param mixed      $yielded Non-promise yielded from generator.
-     * @param \Generator $generator No type for performance, we already know the type.
-     *
-     * @return Promise
-     */
-    private static function transform($yielded, $generator): Promise
-    {
-        $exception = null; // initialize here, see https://github.com/vimeo/psalm/issues/2951
-
-        try {
-            if (\is_array($yielded)) {
-                return Promise\all($yielded);
-            }
-
-            if ($yielded instanceof ReactPromise) {
-                return Promise\adapt($yielded);
-            }
-
-            // No match, continue to returning Failure below.
-        } catch (\Throwable $exception) {
-            // Conversion to promise failed, fall-through to returning Failure below.
-        }
-
-        return new Failure(new InvalidYieldError(
-            $generator,
-            \sprintf(
-                "Unexpected yield; Expected an instance of %s or %s or an array of such instances",
-                Promise::class,
-                ReactPromise::class
-            ),
-            $exception
-        ));
-    }
-
-    /**
-     * @param \Generator $generator
-     * @psalm-param \Generator<mixed,Promise|ReactPromise|array<array-key,
-     *     Promise|ReactPromise>,mixed,Promise<TReturn>|ReactPromise|TReturn> $generator
-     */
-    public function __construct(\Generator $generator)
-    {
-        try {
-            $yielded = $generator->current();
-
-            if (!$yielded instanceof Promise) {
-                if (!$generator->valid()) {
-                    $this->resolve($generator->getReturn());
-                    return;
-                }
-
-                $yielded = self::transform($yielded, $generator);
-            }
-        } catch (\Throwable $exception) {
-            $this->fail($exception);
-            return;
-        }
-
-        /**
-         * @param \Throwable|null $e Exception to be thrown into the generator.
-         * @param mixed           $v Value to be sent into the generator.
-         *
-         * @return void
-         *
-         * @psalm-suppress MissingClosureParamType
-         * @psalm-suppress MissingClosureReturnType
-         */
-        $onResolve = function (\Throwable $e = null, $v) use ($generator, &$onResolve) {
-            /** @var bool $immediate Used to control iterative coroutine continuation. */
-            static $immediate = true;
-
-            /** @var \Throwable|null $exception Promise failure reason when executing next coroutine step, null at all other times. */
-            static $exception;
-
-            /** @var mixed $value Promise success value when executing next coroutine step, null at all other times. */
-            static $value;
-
-            $exception = $e;
-            /** @psalm-suppress MixedAssignment */
-            $value = $v;
-
-            if (!$immediate) {
-                $immediate = true;
-                return;
-            }
-
-            try {
-                try {
-                    do {
-                        if ($exception) {
-                            // Throw exception at current execution point.
-                            $yielded = $generator->throw($exception);
-                        } else {
-                            // Send the new value and execute to next yield statement.
-                            $yielded = $generator->send($value);
-                        }
-
-                        if (!$yielded instanceof Promise) {
-                            if (!$generator->valid()) {
-                                $this->resolve($generator->getReturn());
-                                $onResolve = null;
-                                return;
-                            }
-
-                            $yielded = self::transform($yielded, $generator);
-                        }
-
-                        $immediate = false;
-                        $yielded->onResolve($onResolve);
-                    } while ($immediate);
-
-                    $immediate = true;
-                } catch (\Throwable $exception) {
-                    $this->fail($exception);
-                    $onResolve = null;
-                } finally {
-                    $exception = null;
-                    $value = null;
-                }
-            } catch (\Throwable $e) {
-                Loop::defer(static function () use ($e) {
-                    throw $e;
-                });
-            }
-        };
-
-        try {
-            $yielded->onResolve($onResolve);
-
-            unset($generator, $yielded, $onResolve);
-        } catch (\Throwable $e) {
-            Loop::defer(static function () use ($e) {
-                throw $e;
-            });
-        }
-    }
-}

vendor/amphp/amp/lib/Deferred.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace Amp;
-
-/**
- * Deferred is a container for a promise that is resolved using the resolve() and fail() methods of this object.
- * The contained promise may be accessed using the promise() method. This object should not be part of a public
- * API, but used internally to create and resolve a promise.
- *
- * @template TValue
- */
-final class Deferred
-{
-    /** @var Promise<TValue> Has public resolve and fail methods. */
-    private $resolver;
-
-    /** @var Promise<TValue> Hides placeholder methods */
-    private $promise;
-
-    public function __construct()
-    {
-        $this->resolver = new class implements Promise {
-            use Internal\Placeholder {
-                resolve as public;
-                fail as public;
-                isResolved as public;
-            }
-        };
-
-        $this->promise = new Internal\PrivatePromise($this->resolver);
-    }
-
-    /**
-     * @return Promise<TValue>
-     */
-    public function promise(): Promise
-    {
-        return $this->promise;
-    }
-
-    /**
-     * Fulfill the promise with the given value.
-     *
-     * @param mixed $value
-     *
-     * @psalm-param TValue|Promise<TValue> $value
-     *
-     * @return void
-     */
-    public function resolve($value = null)
-    {
-        /** @psalm-suppress UndefinedInterfaceMethod */
-        $this->resolver->resolve($value);
-    }
-
-    /**
-     * Fails the promise the the given reason.
-     *
-     * @param \Throwable $reason
-     *
-     * @return void
-     */
-    public function fail(\Throwable $reason)
-    {
-        /** @psalm-suppress UndefinedInterfaceMethod */
-        $this->resolver->fail($reason);
-    }
-
-    /**
-     * @return bool True if the promise has been resolved.
-     */
-    public function isResolved(): bool
-    {
-        return $this->resolver->isResolved();
-    }
-}

vendor/amphp/amp/lib/Delayed.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace Amp;
-
-/**
- * Creates a promise that resolves itself with a given value after a number of milliseconds.
- *
- * @template-covariant TReturn
- * @template-implements Promise<TReturn>
- */
-final class Delayed implements Promise
-{
-    use Internal\Placeholder;
-
-    /** @var string|null Event loop watcher identifier. */
-    private $watcher;
-
-    /**
-     * @param int     $time Milliseconds before succeeding the promise.
-     * @param TReturn $value Succeed the promise with this value.
-     */
-    public function __construct(int $time, $value = null)
-    {
-        $this->watcher = Loop::delay($time, function () use ($value) {
-            $this->watcher = null;
-            $this->resolve($value);
-        });
-    }
-
-    /**
-     * References the internal watcher in the event loop, keeping the loop running while this promise is pending.
-     *
-     * @return self
-     */
-    public function reference(): self
-    {
-        if ($this->watcher !== null) {
-            Loop::reference($this->watcher);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Unreferences the internal watcher in the event loop, allowing the loop to stop while this promise is pending if
-     * no other events are pending in the loop.
-     *
-     * @return self
-     */
-    public function unreference(): self
-    {
-        if ($this->watcher !== null) {
-            Loop::unreference($this->watcher);
-        }
-
-        return $this;
-    }
-}

vendor/amphp/amp/lib/Emitter.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace Amp;
-
-/**
- * Emitter is a container for an iterator that can emit values using the emit() method and completed using the
- * complete() and fail() methods of this object. The contained iterator may be accessed using the iterate()
- * method. This object should not be part of a public API, but used internally to create and emit values to an
- * iterator.
- *
- * @template TValue
- */
-final class Emitter
-{
-    /** @var Iterator<TValue> Has public emit, complete, and fail methods. */
-    private $emitter;
-
-    /** @var Iterator<TValue> Hides producer methods. */
-    private $iterator;
-
-    public function __construct()
-    {
-        $this->emitter = new class implements Iterator {
-            use Internal\Producer {
-                emit as public;
-                complete as public;
-                fail as public;
-            }
-        };
-
-        $this->iterator = new Internal\PrivateIterator($this->emitter);
-    }
-
-    /**
-     * @return Iterator
-     * @psalm-return Iterator<TValue>
-     */
-    public function iterate(): Iterator
-    {
-        return $this->iterator;
-    }
-
-    /**
-     * Emits a value to the iterator.
-     *
-     * @param mixed $value
-     *
-     * @psalm-param TValue $value
-     *
-     * @return Promise
-     * @psalm-return Promise<null>
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
-     */
-    public function emit($value): Promise
-    {
-        /** @psalm-suppress UndefinedInterfaceMethod */
-        return $this->emitter->emit($value);
-    }
-
-    /**
-     * Completes the iterator.
-     *
-     * @return void
-     */
-    public function complete()
-    {
-        /** @psalm-suppress UndefinedInterfaceMethod */
-        $this->emitter->complete();
-    }
-
-    /**
-     * Fails the iterator with the given reason.
-     *
-     * @param \Throwable $reason
-     *
-     * @return void
-     */
-    public function fail(\Throwable $reason)
-    {
-        /** @psalm-suppress UndefinedInterfaceMethod */
-        $this->emitter->fail($reason);
-    }
-}

vendor/amphp/amp/lib/Failure.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace Amp;
-
-use React\Promise\PromiseInterface as ReactPromise;
-
-/**
- * Creates a failed promise using the given exception.
- *
- * @template-covariant TValue
- * @template-implements Promise<TValue>
- */
-final class Failure implements Promise
-{
-    /** @var \Throwable $exception */
-    private $exception;
-
-    /**
-     * @param \Throwable $exception Rejection reason.
-     */
-    public function __construct(\Throwable $exception)
-    {
-        $this->exception = $exception;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function onResolve(callable $onResolved)
-    {
-        try {
-            /** @var mixed $result */
-            $result = $onResolved($this->exception, null);
-
-            if ($result === null) {
-                return;
-            }
-
-            if ($result instanceof \Generator) {
-                $result = new Coroutine($result);
-            }
-
-            if ($result instanceof Promise || $result instanceof ReactPromise) {
-                Promise\rethrow($result);
-            }
-        } catch (\Throwable $exception) {
-            Loop::defer(static function () use ($exception) {
-                throw $exception;
-            });
-        }
-    }
-}

vendor/amphp/amp/lib/Internal/Placeholder.php

@@ -1,187 +0,0 @@
-<?php
-
-namespace Amp\Internal;
-
-use Amp\Coroutine;
-use Amp\Failure;
-use Amp\Loop;
-use Amp\Promise;
-use React\Promise\PromiseInterface as ReactPromise;
-
-/**
- * Trait used by Promise implementations. Do not use this trait in your code, instead compose your class from one of
- * the available classes implementing \Amp\Promise.
- *
- * @internal
- */
-trait Placeholder
-{
-    /** @var bool */
-    private $resolved = false;
-
-    /** @var mixed */
-    private $result;
-
-    /** @var ResolutionQueue|null|callable(\Throwable|null, mixed): (Promise|\React\Promise\PromiseInterface|\Generator<mixed,
-     *     Promise|\React\Promise\PromiseInterface|array<array-key, Promise|\React\Promise\PromiseInterface>, mixed,
-     *     mixed>|null)|callable(\Throwable|null, mixed): void */
-    private $onResolved;
-
-    /** @var null|array */
-    private $resolutionTrace;
-
-    /**
-     * @inheritdoc
-     */
-    public function onResolve(callable $onResolved)
-    {
-        if ($this->resolved) {
-            if ($this->result instanceof Promise) {
-                $this->result->onResolve($onResolved);
-                return;
-            }
-
-            try {
-                /** @var mixed $result */
-                $result = $onResolved(null, $this->result);
-
-                if ($result === null) {
-                    return;
-                }
-
-                if ($result instanceof \Generator) {
-                    $result = new Coroutine($result);
-                }
-
-                if ($result instanceof Promise || $result instanceof ReactPromise) {
-                    Promise\rethrow($result);
-                }
-            } catch (\Throwable $exception) {
-                Loop::defer(static function () use ($exception) {
-                    throw $exception;
-                });
-            }
-            return;
-        }
-
-        if (null === $this->onResolved) {
-            $this->onResolved = $onResolved;
-            return;
-        }
-
-        if (!$this->onResolved instanceof ResolutionQueue) {
-            /** @psalm-suppress InternalClass */
-            $this->onResolved = new ResolutionQueue($this->onResolved);
-        }
-
-        /** @psalm-suppress InternalMethod */
-        $this->onResolved->push($onResolved);
-    }
-
-    public function __destruct()
-    {
-        try {
-            $this->result = null;
-        } catch (\Throwable $e) {
-            Loop::defer(static function () use ($e) {
-                throw $e;
-            });
-        }
-    }
-
-    /**
-     * @param mixed $value
-     *
-     * @return void
-     *
-     * @throws \Error Thrown if the promise has already been resolved.
-     */
-    private function resolve($value = null)
-    {
-        if ($this->resolved) {
-            $message = "Promise has already been resolved";
-
-            if (isset($this->resolutionTrace)) {
-                $trace = formatStacktrace($this->resolutionTrace);
-                $message .= ". Previous resolution trace:\n\n{$trace}\n\n";
-            } else {
-                // @codeCoverageIgnoreStart
-                $message .= ", define environment variable AMP_DEBUG or const AMP_DEBUG = true and enable assertions "
-                    . "for a stacktrace of the previous resolution.";
-                // @codeCoverageIgnoreEnd
-            }
-
-            throw new \Error($message);
-        }
-
-        \assert((function () {
-            $env = \getenv("AMP_DEBUG") ?: "0";
-            if (($env !== "0" && $env !== "false") || (\defined("AMP_DEBUG") && \AMP_DEBUG)) {
-                $trace = \debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS);
-                \array_shift($trace); // remove current closure
-                $this->resolutionTrace = $trace;
-            }
-
-            return true;
-        })());
-
-        if ($value instanceof ReactPromise) {
-            $value = Promise\adapt($value);
-        }
-
-        $this->resolved = true;
-        $this->result = $value;
-
-        if ($this->onResolved === null) {
-            return;
-        }
-
-        $onResolved = $this->onResolved;
-        $this->onResolved = null;
-
-        if ($this->result instanceof Promise) {
-            $this->result->onResolve($onResolved);
-            return;
-        }
-
-        try {
-            /** @var mixed $result */
-            $result = $onResolved(null, $this->result);
-            $onResolved = null; // allow garbage collection of $onResolved, to catch any exceptions from destructors
-
-            if ($result === null) {
-                return;
-            }
-
-            if ($result instanceof \Generator) {
-                $result = new Coroutine($result);
-            }
-
-            if ($result instanceof Promise || $result instanceof ReactPromise) {
-                Promise\rethrow($result);
-            }
-        } catch (\Throwable $exception) {
-            Loop::defer(static function () use ($exception) {
-                throw $exception;
-            });
-        }
-    }
-
-    /**
-     * @param \Throwable $reason Failure reason.
-     *
-     * @return void
-     */
-    private function fail(\Throwable $reason)
-    {
-        $this->resolve(new Failure($reason));
-    }
-
-    /**
-     * @return bool True if the placeholder has been resolved.
-     */
-    private function isResolved(): bool
-    {
-        return $this->resolved;
-    }
-}

vendor/amphp/amp/lib/Internal/PrivateIterator.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace Amp\Internal;
-
-use Amp\Iterator;
-use Amp\Promise;
-
-/**
- * Wraps an Iterator instance that has public methods to emit, complete, and fail into an object that only allows
- * access to the public API methods.
- *
- * @template-covariant TValue
- * @template-implements Iterator<TValue>
- */
-final class PrivateIterator implements Iterator
-{
-    /** @var Iterator<TValue> */
-    private $iterator;
-
-    /**
-     * @param Iterator $iterator
-     *
-     * @psalm-param Iterator<TValue> $iterator
-     */
-    public function __construct(Iterator $iterator)
-    {
-        $this->iterator = $iterator;
-    }
-
-    /**
-     * @return Promise<bool>
-     */
-    public function advance(): Promise
-    {
-        return $this->iterator->advance();
-    }
-
-    /**
-     * @psalm-return TValue
-     */
-    public function getCurrent()
-    {
-        return $this->iterator->getCurrent();
-    }
-}

vendor/amphp/amp/lib/Internal/PrivatePromise.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Amp\Internal;
-
-use Amp\Promise;
-
-/**
- * Wraps a Promise instance that has public methods to resolve and fail the promise into an object that only allows
- * access to the public API methods.
- */
-final class PrivatePromise implements Promise
-{
-    /** @var Promise */
-    private $promise;
-
-    public function __construct(Promise $promise)
-    {
-        $this->promise = $promise;
-    }
-
-    public function onResolve(callable $onResolved)
-    {
-        $this->promise->onResolve($onResolved);
-    }
-}