Merge branch 'development'

Remove unused code and classes.
Clean up code to remove all named constant from them and throw
deprecation alerts if used.
Add basic psalm setup in root folder and remove from www folder

.phan/config.php

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

4dev/checking/phpunit.sh

@@ -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

@@ -0,0 +1,22 @@
+#!/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 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # create path
 path=$(pwd)"/"$0;
@@ -10,6 +10,11 @@ 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

@@ -0,0 +1,40 @@
+<?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

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

4dev/tests/AAASetupData/log

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

4dev/tests/ACL/CoreLibsACLLoginTest.php

@@ -120,8 +120,6 @@ final class CoreLibsACLLoginTest extends TestCase
 		// define('LOGIN_DB_SCHEMA', '');
 
 		// SHOULD SET
-		// PASSWORD_MIN_LENGTH (d9)
-		// PASSWORD_MAX_LENGTH (d255)
 		// DEFAULT_ACL_LEVEL (d80)
 
 		// OPT:
@@ -1106,7 +1104,21 @@ 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, false])
+			->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',
+					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
+						. 'includes' . DIRECTORY_SEPARATOR
+						. 'locale' . DIRECTORY_SEPARATOR,
+				]
+			])
 			->onlyMethods(['loginTerminate', 'loginReadPageName', 'loginPrintLogin'])
 			->getMock();
 		$login_mock->expects($this->any())
@@ -1729,7 +1741,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				],
 				20
 			],
-			'invalud search' => [
+			'invalid search' => [
 				12,
 				'foo',
 				[],
@@ -1774,7 +1786,21 @@ 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, false])
+			->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',
+					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
+						. 'includes' . DIRECTORY_SEPARATOR
+						. 'locale' . DIRECTORY_SEPARATOR,
+				]
+			])
 			->onlyMethods(['loginTerminate'])
 			->getMock();
 		$login_mock->expects($this->any())
@@ -1873,7 +1899,21 @@ 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, false])
+			->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',
+					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
+						. 'includes' . DIRECTORY_SEPARATOR
+						. 'locale' . DIRECTORY_SEPARATOR,
+				]
+			])
 			->onlyMethods(['loginTerminate'])
 			->getMock();
 		$login_mock->expects($this->any())
@@ -1946,7 +1986,21 @@ 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, false])
+			->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',
+					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
+						. 'includes' . DIRECTORY_SEPARATOR
+						. 'locale' . DIRECTORY_SEPARATOR,
+				]
+			])
 			->onlyMethods(['loginTerminate'])
 			->getMock();
 		$login_mock->expects($this->any())
@@ -2027,7 +2081,21 @@ 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, false])
+			->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',
+					'locale_path' => __DIR__ . DIRECTORY_SEPARATOR
+						. 'includes' . DIRECTORY_SEPARATOR
+						. 'locale' . DIRECTORY_SEPARATOR,
+				]
+			])
 			->onlyMethods(['loginTerminate'])
 			->getMock();
 		$login_mock->expects($this->any())

4dev/tests/ACL/includes

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

4dev/tests/Combined/CoreLibsCombinedArrayHandlerTest.php

@@ -107,6 +107,13 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 */
 	public function arraySearchRecursiveAllProvider(): array
 	{
+		/*
+		0: $needle,
+		1: array $input,
+		2: ?string $key_search_for,
+		3: bool $flag,
+		4: array $expected
+		*/
 		return [
 			'find value' => [
 				0 => 'bar',
@@ -172,6 +179,13 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 */
 	public function arraySearchSimpleProvider(): array
 	{
+		/*
+		0: array $input,
+		1: $key,
+		2: $value,
+		3: bool $flag,
+		4: bool $expected
+		*/
 		return [
 			'key/value exist' => [
 				0 => self::$array,
@@ -665,7 +679,7 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 *
 	 * @param array $input
 	 * @param string|int $key
-	 * @param string|int $value
+	 * @param string|int|bool $value
 	 * @param bool $expected
 	 * @return void
 	 */
@@ -724,7 +738,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/DB/CoreLibsDBIOTest.php

@@ -1253,10 +1253,14 @@ final class CoreLibsDBIOTest extends TestCase
 			'string value literal' => ['string literal', 'tl', '\'string literal\'',],
 			'empty string value literal' => ['', 'tl', '\'\'',],
 			'null string value literal' => [null, 'tl', 'NULL',],
-			// ?d (I have no idea what that does, is like string)
+			// escape string, but set all empty strings to null ('' is null)
 			'string value d' => ['string d', 'd', '\'string d\'',],
 			'empty string value d' => ['', 'd', 'NULL',],
 			'null string value d' => [null, 'd', 'NULL',],
+			// escape literal string, but set all empty strings to null ('' is null)
+			'string value literal d' => ['string d', 'dl', '\'string d\'',],
+			'empty string value literal d' => ['', 'dl', 'NULL',],
+			'null string value literal d' => [null, 'dl', 'NULL',],
 			// by bytea
 			'string value d' => ['string d', 'by', '\x737472696e672064',],
 			'empty string value d' => ['', 'by', 'NULL',],
@@ -1281,7 +1285,7 @@ final class CoreLibsDBIOTest extends TestCase
 	 * @dataProvider sqlEscapeProvider
 	 * @testdox Input value $input as $flag to $expected [$_dataName]
 	 *
-	 * @param int|float|string|null $input
+	 * @param int|float|string|bool|null $input
 	 * @param string $flag
 	 * @param int|float|string $expected
 	 * @return void

4dev/tests/Debug/CoreLibsDebugLoggingTest.php

@@ -15,6 +15,7 @@ use PHPUnit\Framework\TestCase;
  */
 final class CoreLibsDebugLoggingTest extends TestCase
 {
+	private const LOG_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'log' . DIRECTORY_SEPARATOR;
 	/**
 	 * test set for options BASIC
 	 *
@@ -33,17 +34,20 @@ final class CoreLibsDebugLoggingTest extends TestCase
 		return [
 			'log folder set' => [
 				[
-					'log_folder' => '/tmp'
+					'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
+					'file_id' => 'testClassInit'
 				],
 				[
-					'log_folder' => '/tmp/',
+					'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
 					'debug_all' => false,
 					'print_all' => false,
 				],
 				[]
 			],
 			'nothing set' => [
-				null,
+				[
+					'file_id' => 'testClassInit'
+				],
 				[
 					'log_folder' => getcwd() . DIRECTORY_SEPARATOR,
 					'debug_all' => false,
@@ -51,30 +55,33 @@ final class CoreLibsDebugLoggingTest extends TestCase
 				],
 				[]
 			],
-			'no options set, constant set' => [
-				null,
+			'no options set, constant set [DEPRECATED]' => [
 				[
-					'log_folder' => str_replace('/configs', '', __DIR__)
-					. DIRECTORY_SEPARATOR . 'log/',
+					'file_id' => 'testClassInit'
+				],
+				[
+					'log_folder' => str_replace(DIRECTORY_SEPARATOR . 'configs', '', __DIR__)
+							. DIRECTORY_SEPARATOR . 'log' . DIRECTORY_SEPARATOR,
 					'debug_all' => false,
 					'print_all' => false,
 				],
 				[
 					'constant' => [
-						'BASE' => str_replace('/configs', '', __DIR__)
+						'BASE' => str_replace(DIRECTORY_SEPARATOR . 'configs', '', __DIR__)
 							. DIRECTORY_SEPARATOR,
-						'LOG' => 'log/'
+						'LOG' => 'log' . DIRECTORY_SEPARATOR
 					]
 				]
 			],
 			'standard test set' => [
 				[
-					'log_folder' => '/tmp',
+					'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
+					'file_id' => 'testClassInit',
 					'debug_all' => true,
 					'print_all' => true,
 				],
 				[
-					'log_folder' => '/tmp/',
+					'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
 					'debug_all' => true,
 					'print_all' => true,
 				],
@@ -89,35 +96,66 @@ final class CoreLibsDebugLoggingTest extends TestCase
 	 * @dataProvider optionsProvider
 	 * @testdox init test [$_dataName]
 	 *
-	 * @param array|null $options
+	 * @param array $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) {
-				define($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 ($options === null) {
-			$log = new \CoreLibs\Debug\Logging();
-		} else {
-			$log = new \CoreLibs\Debug\Logging($options);
+		// 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);
 		}
+		$log = new \CoreLibs\Debug\Logging($options);
+		// reset error handler
+		restore_error_handler();
 		// check that settings match
 		$this->assertEquals(
 			$expected['log_folder'],
-			$log->getSetting('log_folder')
+			$log->getSetting('log_folder'),
+			'log folder not matching'
 		);
 		$this->assertEquals(
 			$expected['debug_all'],
-			$log->getSetting('debug_output_all')
+			$log->getSetting('debug_output_all'),
+			'debug all flag not matching'
 		);
 		$this->assertEquals(
 			$expected['print_all'],
-			$log->getSetting('print_output_all')
+			$log->getSetting('print_output_all'),
+			'print all flag not matching'
 		);
 		// print "LOG: " . $log->getSetting('log_folder') . "\n";
 		// print "DEBUG: " . $log->getSetting('debug_output_all') . "\n";
@@ -134,17 +172,23 @@ final class CoreLibsDebugLoggingTest extends TestCase
 		// 0: options
 		// 1: expected
 		// 2: override
+		// 3: exception message
 		return [
 			'no log id set' => [
-				null,
+				[
+					'log_folder' => self::LOG_FOLDER,
+				],
 				[
 					'log_file_id' => ''
 				],
-				[]
+				[],
+				null
 			],
 			// set log id manually afterwards
 			'set log id manually' => [
-				null,
+				[
+					'log_folder' => self::LOG_FOLDER,
+				],
 				[
 					'log_file_id' => '',
 					'set_log_file_id' => 'abc123',
@@ -154,21 +198,26 @@ final class CoreLibsDebugLoggingTest 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' => [
-				null,
+			'set log id via globals [DEPRECATED]' => [
+				[
+					'log_folder' => self::LOG_FOLDER,
+				],
 				[
 					'log_file_id' => 'def123'
 				],
@@ -176,11 +225,14 @@ final class CoreLibsDebugLoggingTest 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' => [
-				null,
+			'set log id via constant [DEPRECATED]' => [
+				[
+					'log_folder' => self::LOG_FOLDER,
+				],
 				[
 					'log_file_id' => 'ghi123'
 				],
@@ -192,12 +244,14 @@ final class CoreLibsDebugLoggingTest 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'
+					'file_id' => 'jkl456',
+					'log_folder' => self::LOG_FOLDER,
 				],
 				[
 					'log_file_id' => 'jkl456',
@@ -207,7 +261,8 @@ final class CoreLibsDebugLoggingTest extends TestCase
 					'values' => [
 						'log_file_id' => './#'
 					]
-				]
+				],
+				null
 			]
 		];
 	}
@@ -219,13 +274,18 @@ final class CoreLibsDebugLoggingTest extends TestCase
 	 * @dataProvider logIdOptionsProvider
 	 * @testdox log id set/get tests [$_dataName]
 	 *
-	 * @param array|null $options
+	 * @param array $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): void
-	{
+	public function testLogId(
+		array $options,
+		array $expected,
+		array $override,
+		?string $deprecation_message
+	): 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) {
@@ -237,11 +297,20 @@ final class CoreLibsDebugLoggingTest extends TestCase
 				$GLOBALS[$var] = $value;
 			}
 		}
-		if ($options === null) {
-			$log = new \CoreLibs\Debug\Logging();
-		} else {
-			$log = new \CoreLibs\Debug\Logging($options);
+		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);
 		}
+		$log = new \CoreLibs\Debug\Logging($options);
+		// reset error handler
+		restore_error_handler();
 		// check current
 		$this->assertEquals(
 			$log->getLogId(),
@@ -316,7 +385,10 @@ final class CoreLibsDebugLoggingTest extends TestCase
 		bool $expected_get
 	): void {
 		// neutral start with default
-		$log = new \CoreLibs\Debug\Logging();
+		$log = new \CoreLibs\Debug\Logging([
+			'file_id' => 'testSetGetLogLevelAll',
+			'log_folder' => self::LOG_FOLDER
+		]);
 		// set and check
 		$this->assertEquals(
 			$log->setLogLevelAll($type, $flag),
@@ -438,7 +510,10 @@ final class CoreLibsDebugLoggingTest extends TestCase
 		$expected_get
 	): void {
 		// neutral start with default
-		$log = new \CoreLibs\Debug\Logging();
+		$log = new \CoreLibs\Debug\Logging([
+			'file_id' => 'testSetGetLogLevel',
+			'log_folder' => self::LOG_FOLDER
+		]);
 		// set
 		$this->assertEquals(
 			$log->setLogLevel($type, $flag, $debug_on),
@@ -517,7 +592,10 @@ final class CoreLibsDebugLoggingTest extends TestCase
 		bool $expected_get
 	): void {
 		// neutral start with default
-		$log = new \CoreLibs\Debug\Logging();
+		$log = new \CoreLibs\Debug\Logging([
+			'file_id' => 'testSetGetLogPer',
+			'log_folder' => self::LOG_FOLDER
+		]);
 		// set and check
 		$this->assertEquals(
 			$log->setLogPer($type, $set),
@@ -546,7 +624,10 @@ final class CoreLibsDebugLoggingTest extends TestCase
 	public function testSetGetLogPrintFileDate(bool $input, bool $expected_set, bool $expected_get): void
 	{
 		// neutral start with default
-		$log = new \CoreLibs\Debug\Logging();
+		$log = new \CoreLibs\Debug\Logging([
+			'file_id' => 'testSetGetLogPrintFileDate',
+			'log_folder' => self::LOG_FOLDER
+		]);
 		// set and check
 		$this->assertEquals(
 			$log->setGetLogPrintFileDate($input),
@@ -612,7 +693,10 @@ final class CoreLibsDebugLoggingTest extends TestCase
 	 */
 	public function testPrAr(array $input, string $expected): void
 	{
-		$log = new \CoreLibs\Debug\Logging();
+		$log = new \CoreLibs\Debug\Logging([
+			'file_id' => 'testPrAr',
+			'log_folder' => self::LOG_FOLDER
+		]);
 		$this->assertEquals(
 			$log->prAr($input),
 			$expected
@@ -673,7 +757,10 @@ final class CoreLibsDebugLoggingTest extends TestCase
 	 */
 	public function testPrBl(bool $input, ?string $true, ?string $false, string $expected): void
 	{
-		$log = new \CoreLibs\Debug\Logging();
+		$log = new \CoreLibs\Debug\Logging([
+			'file_id' => 'testPrBl',
+			'log_folder' => self::LOG_FOLDER
+		]);
 		$return = '';
 		if ($true === null && $false === null) {
 			$return = $log->prBl($input);
@@ -959,9 +1046,16 @@ final class CoreLibsDebugLoggingTest extends TestCase
 	public function testLogUniqueId(bool $option, bool $override): void
 	{
 		if ($option === true) {
-			$log = new \CoreLibs\Debug\Logging(['per_run' => $option]);
+			$log = new \CoreLibs\Debug\Logging([
+				'file_id' => 'testLogUniqueId',
+				'log_folder' => self::LOG_FOLDER,
+				'per_run' => $option
+			]);
 		} else {
-			$log = new \CoreLibs\Debug\Logging();
+			$log = new \CoreLibs\Debug\Logging([
+				'file_id' => 'testLogUniqueId',
+				'log_folder' => self::LOG_FOLDER
+			]);
 			$log->setLogUniqueId();
 		}
 		$per_run_id = $log->getLogUniqueId();

4dev/tests/Debug/log/.gitignore

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

4dev/tests/Get/CoreLibsGetDotEnvTest.php

@@ -77,21 +77,24 @@ final class CoreLibsGetDotEnvTest extends TestCase
 				'file' => 'cannot_read.env',
 				'status' => 2,
 				'content' => [],
-				'chmod' => '000',
+				// 0000
+				'chmod' => '100000',
 			],
 			'empty file' => [
 				'folder' => __DIR__ . DIRECTORY_SEPARATOR . 'dotenv',
 				'file' => 'empty.env',
 				'status' => 1,
 				'content' => [],
-				'chmod' => null,
+				// 0664
+				'chmod' => '100664',
 			],
 			'override all' => [
 				'folder' => __DIR__ . DIRECTORY_SEPARATOR . 'dotenv',
 				'file' => 'test.env',
 				'status' => 0,
 				'content' => $dot_env_content,
-				'chmod' => null,
+				// 0664
+				'chmod' => '100664',
 			],
 			'override directory' => [
 				'folder' => __DIR__ . DIRECTORY_SEPARATOR . 'dotenv',
@@ -124,6 +127,16 @@ 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 (
@@ -134,6 +147,20 @@ 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) {
@@ -141,6 +168,7 @@ final class CoreLibsGetDotEnvTest extends TestCase
 		} else {
 			$status = DotEnv::readEnvFile();
 		}
+		restore_error_handler();
 		$this->assertEquals(
 			$status,
 			$expected_status,
@@ -153,8 +181,9 @@ final class CoreLibsGetDotEnvTest extends TestCase
 			'Assert _ENV correct'
 		);
 		// if we have file and chmod unset
-		if ($old_chmod !== null) {
-			chmod($folder . DIRECTORY_SEPARATOR . $file, $old_chmod);
+		print "Write mode: $old_chmod\n";
+		if ($old_chmod !== null && $chmod == '100000') {
+			chmod($folder . DIRECTORY_SEPARATOR . $file, 0664);
 		}
 	}
 }

4dev/tests/Language/CoreLibsLanguageGetLocaleTest.php

@@ -60,7 +60,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 	/**
 	 * all the test data
 	 *
-	 * @return array
+	 * @return array<mixed>
 	 */
 	public function setLocaleProvider(): array
 	{
@@ -72,6 +72,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 			// 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,
@@ -85,6 +86,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 					'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
@@ -99,6 +101,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 					'encoding' => 'UTF-8',
 					'path' => "/^\/(.*\/)?includes\/locale\/$/",
 				],
+				'setLocale: Unset $domain is deprecated'
 			],
 			'no params, session charset and lang short' => [
 				// lang, domain, encoding, path
@@ -113,6 +116,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 					'encoding' => 'UTF-8',
 					'path' => "/^\/(.*\/)?includes\/locale\/$/",
 				],
+				'setLocale: Unset $domain is deprecated',
 			],
 			// param lang (no sessions)
 			'locale param only, no sessions' => [
@@ -128,6 +132,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 					'encoding' => 'UTF-8',
 					'path' => "/^\/(.*\/)?includes\/locale\/$/",
 				],
+				'setLocale: Unset $domain is deprecated',
 			],
 			// different locale setting
 			'locale complex param only, no sessions' => [
@@ -143,6 +148,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 					'encoding' => 'SJIS',
 					'path' => "/^\/(.*\/)?includes\/locale\/$/",
 				],
+				'setLocale: Unset $domain is deprecated',
 			],
 			// param lang and domain (no override)
 			'locale, domain params, no sessions' => [
@@ -158,6 +164,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 					'encoding' => 'UTF-8',
 					'path' => "/^\/(.*\/)?includes\/locale\/$/",
 				],
+				'setLocale: Unset $path is deprecated',
 			],
 			// param lang and domain (no override)
 			'locale, domain, encoding params, no sessions' => [
@@ -173,6 +180,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 					'encoding' => 'UTF-8',
 					'path' => "/^\/(.*\/)?includes\/locale\/$/",
 				],
+				'setLocale: Unset $path is deprecated'
 			],
 			// lang, domain, path (no override)
 			'locale, domain and path, no sessions' => [
@@ -188,6 +196,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 					'encoding' => 'UTF-8',
 					'path' => "/^\/(.*\/)?locale_other\/$/",
 				],
+				null
 			],
 			// all params set (no override)
 			'all parameter, no sessions' => [
@@ -203,6 +212,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 					'encoding' => 'UTF-8',
 					'path' => "/^\/(.*\/)?locale_other\/$/",
 				],
+				null
 			],
 			// param lang and domain (no override)
 			'long locale, domain, encoding params, no sessions' => [
@@ -218,6 +228,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 					'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
@@ -225,14 +236,22 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 	}
 
 	/**
-	 * 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
-	 */
+	  * 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,
@@ -240,7 +259,8 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 		?string $path,
 		?string $SESSION_DEFAULT_LOCALE,
 		?string $SESSION_DEFAULT_CHARSET,
-		array $expected
+		array $expected,
+		?string $deprecation_message
 	): void {
 		$return_lang_settings = [];
 		global $_SESSION;
@@ -251,19 +271,41 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 		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) {
+		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) {
+		} 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) {
+		} 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) {
+		} elseif (
+			$language !== null && $domain !== null &&
+			$encoding !== null && $path === null
+		) {
 			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
 				$language,
 				$domain,
@@ -277,6 +319,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 				$path
 			);
 		}
+		restore_error_handler();
 		// print "RETURN: " . print_r($return_lang_settings, true) . "\n";
 
 		foreach (

4dev/tests/Language/CoreLibsLanguageL10nTest.php

@@ -22,37 +22,16 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	 */
 	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
+		// for deprecation test only, will be removed
 		if (!defined('BASE')) {
-			define('BASE', str_replace('/configs', '', __DIR__) . DIRECTORY_SEPARATOR);
+			define('BASE', str_replace(DIRECTORY_SEPARATOR . '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);
-		}
 	}
 
 	/**
@@ -110,59 +89,90 @@ final class CoreLibsLanguageL10nTest extends TestCase
 			// 3: path
 			// 4: locale expected
 			// 5: locale set expected
-			// 6: domain exepcted
-			// 7: context (null for none)
-			// 8: test string in
-			// 9: test translated
+			// 6: lang expected
+			// 7: encoding expected
+			// 8: domain exepcted
+			// 9: context (null for none)
+			// 10: test string in
+			// 11: test translated
+			// 12: deprecation message (until removed)
 			// new style load
 			'gettext load en' => [
 				'en_US.UTF-8',
 				'frontend',
-				__DIR__ . 'includes/locale/',
+				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
 				//
 				'en_US.UTF-8',
 				'en_US',
+				'en_US',
+				'UTF-8',
 				'frontend',
 				null,
 				'Original',
 				'Translated frontend en_US',
+				null,
 			],
 			'gettext load en' => [
 				'en_US.UTF-8',
 				'frontend',
-				__DIR__ . 'includes/locale/',
+				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
 				//
 				'en_US.UTF-8',
 				'en_US',
+				'en_US',
+				'UTF-8',
 				'frontend',
 				'context',
 				'Original',
 				'Original context frontend en_US',
+				null,
 			],
 			'gettext load ja' => [
 				'ja_JP.UTF-8',
 				'admin',
-				__DIR__ . 'includes/locale/',
+				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
 				//
 				'ja_JP.UTF-8',
 				'ja_JP',
+				'ja_JP',
+				'UTF-8',
 				'admin',
 				null,
 				'Original',
 				'Translated admin ja_JP',
+				null,
 			],
-			// mixed path and domain
-			'mixed path and domain' => [
+			// mixed path and domain [DEPRECATED]
+			'mixed path and domain [DEPRECATED]' => [
 				'en_US.UTF-8',
-				__DIR__ . 'includes/locale/',
+				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
 				'frontend',
 				//
 				'en_US.UTF-8',
 				'en_US',
+				'en_US',
+				'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',
+				'admin',
+				null,
+				//
+				'ja_JP.UTF-8',
+				'ja_JP',
+				'ja_JP',
+				'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 ' => [
@@ -173,9 +183,12 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				'',
 				'',
 				'',
+				'',
+				'',
 				null,
 				'Original',
 				'Original',
+				null,
 			]
 		];
 	}
@@ -192,10 +205,13 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	 * @param  string|null $path
 	 * @param  string      $locale_expected
 	 * @param  string      $locale_set_expected
+	 * @param  string      $lang_expected
+	 * @param  string      $encoding_expected
 	 * @param  string      $domain_expected
-	 * @param  ?string     $context
+	 * @param  string|null $context
 	 * @param  string      $original
 	 * @param  string      $translated
+	 * @param  string|null $deprecation_message
 	 * @return void
 	 */
 	public function testL10nObject(
@@ -204,20 +220,36 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		?string $path,
 		string $locale_expected,
 		string $locale_set_expected,
+		string $lang_expected,
+		string $encoding_expected,
 		string $domain_expected,
 		?string $context,
 		string $original,
-		string $translated
+		string $translated,
+		?string $deprecation_message
 	): 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) {
+			// same as if locale is null
 			$l10n = new \CoreLibs\Language\L10n($locale);
 		} elseif ($path === null) {
+			// deprecated, path must be set
 			$l10n = new \CoreLibs\Language\L10n($locale, $domain);
 		} else {
 			$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(
@@ -248,6 +280,19 @@ 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,
+				'domain' => $domain_expected,
+				'encoding' => $encoding_expected,
+				'path' => $path
+			],
+			$locale,
+			'getLocaleAsArray mismatch'
+		);
 	}
 
 	// l10nReloadMOfile and getTranslator
@@ -283,7 +328,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				// set 0-2
 				'en_US.UTF-8',
 				'frontend',
-				__DIR__ . 'includes/locale/',
+				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
 				// status 3
 				false,
 				// to translate 4
@@ -296,7 +341,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				// set new 8-10
 				'ja_JP.UTF-8',
 				'frontend',
-				__DIR__ . 'includes/locale/',
+				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
 				// status new 11
 				false,
 				// check new setter 12-14
@@ -322,7 +367,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				// set new 8-10
 				'en_US.UTF-8',
 				'frontend',
-				__DIR__ . 'includes/locale/',
+				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
 				// status new 11
 				false,
 				// check new setter 12-14
@@ -387,12 +432,8 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		string $domain_expected_b,
 		string $translated_b
 	): void {
-		if ($locale === null) {
+		if ($locale === null || $domain === null || $path === 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);
 		}
@@ -494,16 +535,16 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	{
 		return [
 			// 0: locale
-			// 1: path
-			// 2: domain
+			// 1: domain
+			// 2: path
 			// 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
@@ -518,8 +559,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
@@ -544,8 +585,8 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	 * @testdox plural string test for locale $locale and domain $domain with $context [$_dataName]
 	 *
 	 * @param  string  $locale
-	 * @param  string  $path
 	 * @param  string  $domain
+	 * @param  string  $path
 	 * @param  ?string $context
 	 * @param  string  $original_single
 	 * @param  string  $original_plural
@@ -555,8 +596,8 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	public function testNgettext(
 		// config 0-3
 		string $locale,
-		string $path,
 		string $domain,
+		string $path,
 		// context string
 		?string $context,
 		// input strings
@@ -565,7 +606,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		// expected
 		array $expected_strings
 	): void {
-		$l10n = new \CoreLibs\Language\L10n($locale, $path, $domain, false);
+		$l10n = new \CoreLibs\Language\L10n($locale, $domain, $path);
 
 		foreach ($expected_strings as $n => $expected) {
 			if (empty($context)) {
@@ -981,7 +1022,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 			'standard en' => [
 				'en_US.UTF-8',
 				'frontend',
-				__DIR__ . 'includes/locale/',
+				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
 				'UTF-8',
 				'Original',
 				'Translated frontend en_US',
@@ -989,7 +1030,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 			'standard ja' => [
 				'ja_JP.UTF-8',
 				'admin',
-				__DIR__ . 'includes/locale/',
+				__DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR,
 				'UTF-8',
 				'Original',
 				'Translated admin ja_JP',
@@ -1030,6 +1071,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		_textdomain($domain);
 		_bindtextdomain($domain, $path);
 		_bind_textdomain_codeset($domain, $encoding);
+
 		$this->assertEquals(
 			$translated,
 			__($original),

4dev/tests/dotenv/.env

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

README.md

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

ReadMe.composer-release.md

@@ -0,0 +1,16 @@
+# CoreLibs Composer release flow
+
+- run local phan/phptan/phunit tests
+- commit and sync to master branch
+- create a version tag in master branch
+- checkout development on CoreLibs-composer-all branch
+- sync `php_libraries/trunk/www/lib/CoreLibs/*` to c`omposer-packages/CoreLibs-Composer-All/src/`
+- if phpunit files have been changed/updated sync them to `composer-packages/CoreLibs-Composer-All/test/phpunit/`
+- run phan/phpstan/phpunit tests in composer branch
+- commit and sync to master
+- create the same version tag as before in the trunk/master
+- GITEA and GITLAB:
+  - Run `publish/publish.sh` script to create composer packages
+- 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`

composer.json

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

phpstan-bootstrap.php

@@ -8,5 +8,7 @@ $_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

@@ -19,17 +19,21 @@ parameters:
 		- www/configs/config.master.php
 		# if composer.json autoloader defined, this is not needed
 		# - www/lib/autoloader.php
-		- www/vendor/autoload.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
+		# - 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
 		# ignore admin header stuff
 		# - www/includes/admin_header.php # ignore the admin include stuff
 		- www/includes/admin_footer.php # ignore the admin include stuff
@@ -50,9 +54,9 @@ parameters:
 		#- # this error is ignore because of the PHP 8.0 to 8.1 change for pg_*, only for 8.0 or lower
 			# message: "#^Parameter \\#1 \\$(result|connection) of function pg_\\w+ expects resource(\\|null)?, object\\|resource(\\|bool)? given\\.$#"
 			# path: %currentWorkingDirectory%/www/lib/CoreLibs/DB/SQL/PgSQL.php
-		- # this is for 8.1 or newer
-			message: "#^Parameter \\#1 \\$(result|connection) of function pg_\\w+ expects PgSql\\\\(Result|Connection(\\|string)?(\\|null)?), object\\|resource given\\.$#"
-			path: %currentWorkingDirectory%/www/lib/CoreLibs/DB/SQL/PgSQL.php
+		# - # this is for 8.1 or newer
+		# 	message: "#^Parameter \\#1 \\$(result|connection) of function pg_\\w+ expects PgSql\\\\(Result|Connection(\\|string)?(\\|null)?), object\\|resource given\\.$#"
+		# 	path: %currentWorkingDirectory%/www/lib/CoreLibs/DB/SQL/PgSQL.php
 		# this is ignored for now
 		# - '#Expression in empty\(\) is always falsy.#'
 		# -

phpunit.xml

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

psalm-config.php

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

psalm.xml

@@ -0,0 +1,26 @@
+<?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

@@ -0,0 +1,23 @@
+
+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

@@ -0,0 +1,74 @@
+{
+    "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

@@ -0,0 +1,80 @@
+<?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

@@ -0,0 +1,49 @@
+<?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

@@ -0,0 +1,163 @@
+<?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

@@ -0,0 +1,17 @@
+<?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

@@ -0,0 +1,87 @@
+<?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

@@ -0,0 +1,160 @@
+<?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

@@ -0,0 +1,76 @@
+<?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

@@ -0,0 +1,58 @@
+<?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

@@ -0,0 +1,84 @@
+<?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

@@ -0,0 +1,52 @@
+<?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

@@ -0,0 +1,187 @@
+<?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

@@ -0,0 +1,45 @@
+<?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

@@ -0,0 +1,25 @@
+<?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);
+    }
+}

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

@@ -0,0 +1,212 @@
+<?php
+
+namespace Amp\Internal;
+
+use Amp\Deferred;
+use Amp\Failure;
+use Amp\Promise;
+use Amp\Success;
+use React\Promise\PromiseInterface as ReactPromise;
+
+/**
+ * Trait used by Iterator implementations. Do not use this trait in your code, instead compose your class from one of
+ * the available classes implementing \Amp\Iterator.
+ * Note that it is the responsibility of the user of this trait to ensure that listeners have a chance to listen first
+ * before emitting values.
+ *
+ * @internal
+ * @template-covariant TValue
+ */
+trait Producer
+{
+    /** @var Promise|null */
+    private $complete;
+
+    /** @var mixed[] */
+    private $values = [];
+
+    /** @var Deferred[] */
+    private $backPressure = [];
+
+    /** @var int */
+    private $consumePosition = -1;
+
+    /** @var int */
+    private $emitPosition = -1;
+
+    /** @var Deferred|null */
+    private $waiting;
+
+    /** @var null|array */
+    private $resolutionTrace;
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return Promise<bool>
+     */
+    public function advance(): Promise
+    {
+        if ($this->waiting !== null) {
+            throw new \Error("The prior promise returned must resolve before invoking this method again");
+        }
+
+        unset($this->values[$this->consumePosition]);
+
+        $position = ++$this->consumePosition;
+
+        if (\array_key_exists($position, $this->values)) {
+            \assert(isset($this->backPressure[$position]));
+            $deferred = $this->backPressure[$position];
+            unset($this->backPressure[$position]);
+            $deferred->resolve();
+
+            return new Success(true);
+        }
+
+        if ($this->complete) {
+            return $this->complete;
+        }
+
+        $this->waiting = new Deferred;
+
+        return $this->waiting->promise();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return TValue
+     */
+    public function getCurrent()
+    {
+        if (empty($this->values) && $this->complete) {
+            throw new \Error("The iterator has completed");
+        }
+
+        if (!\array_key_exists($this->consumePosition, $this->values)) {
+            throw new \Error("Promise returned from advance() must resolve before calling this method");
+        }
+
+        return $this->values[$this->consumePosition];
+    }
+
+    /**
+     * Emits a value from the iterator. The returned promise is resolved once the emitted value has been consumed.
+     *
+     * @param mixed $value
+     *
+     * @return Promise
+     * @psalm-return Promise<null>
+     *
+     * @throws \Error If the iterator has completed.
+     */
+    private function emit($value): Promise
+    {
+        if ($this->complete) {
+            throw new \Error("Iterators cannot emit values after calling complete");
+        }
+
+        if ($value instanceof ReactPromise) {
+            $value = Promise\adapt($value);
+        }
+
+        if ($value instanceof Promise) {
+            $deferred = new Deferred;
+            $value->onResolve(function ($e, $v) use ($deferred) {
+                if ($this->complete) {
+                    $deferred->fail(
+                        new \Error("The iterator was completed before the promise result could be emitted")
+                    );
+                    return;
+                }
+
+                if ($e) {
+                    $this->fail($e);
+                    $deferred->fail($e);
+                    return;
+                }
+
+                $deferred->resolve($this->emit($v));
+            });
+
+            return $deferred->promise();
+        }
+
+        $position = ++$this->emitPosition;
+
+        $this->values[$position] = $value;
+
+        if ($this->waiting !== null) {
+            $waiting = $this->waiting;
+            $this->waiting = null;
+            $waiting->resolve(true);
+            return new Success; // Consumer was already waiting for a new value, so back-pressure is unnecessary.
+        }
+
+        $this->backPressure[$position] = $pressure = new Deferred;
+
+        return $pressure->promise();
+    }
+
+    /**
+     * Completes the iterator.
+     *
+     * @return void
+     *
+     * @throws \Error If the iterator has already been completed.
+     */
+    private function complete()
+    {
+        if ($this->complete) {
+            $message = "Iterator has already been completed";
+
+            if (isset($this->resolutionTrace)) {
+                $trace = formatStacktrace($this->resolutionTrace);
+                $message .= ". Previous completion 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;
+        })());
+
+        $this->complete = new Success(false);
+
+        if ($this->waiting !== null) {
+            $waiting = $this->waiting;
+            $this->waiting = null;
+            $waiting->resolve($this->complete);
+        }
+    }
+
+    /**
+     * @param \Throwable $exception
+     *
+     * @return void
+     */
+    private function fail(\Throwable $exception)
+    {
+        $this->complete = new Failure($exception);
+
+        if ($this->waiting !== null) {
+            $waiting = $this->waiting;
+            $this->waiting = null;
+            $waiting->resolve($this->complete);
+        }
+    }
+}

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

@@ -0,0 +1,90 @@
+<?php
+
+namespace Amp\Internal;
+
+use Amp\Coroutine;
+use Amp\Loop;
+use Amp\Promise;
+use React\Promise\PromiseInterface as ReactPromise;
+
+/**
+ * Stores a set of functions to be invoked when a promise is resolved.
+ *
+ * @internal
+ * @psalm-internal Amp\Internal
+ */
+class ResolutionQueue
+{
+    /** @var array<array-key, 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 $queue = [];
+
+    /**
+     * @param callable|null $callback Initial callback to add to queue.
+     *
+     * @psalm-param 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 $callback
+     */
+    public function __construct(callable $callback = null)
+    {
+        if ($callback !== null) {
+            $this->push($callback);
+        }
+    }
+
+    /**
+     * Unrolls instances of self to avoid blowing up the call stack on resolution.
+     *
+     * @param callable $callback
+     *
+     * @psalm-param 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 $callback
+     *
+     * @return void
+     */
+    public function push(callable $callback)
+    {
+        if ($callback instanceof self) {
+            $this->queue = \array_merge($this->queue, $callback->queue);
+            return;
+        }
+
+        $this->queue[] = $callback;
+    }
+
+    /**
+     * Calls each callback in the queue, passing the provided values to the function.
+     *
+     * @param \Throwable|null $exception
+     * @param mixed           $value
+     *
+     * @return void
+     */
+    public function __invoke($exception, $value)
+    {
+        foreach ($this->queue as $callback) {
+            try {
+                $result = $callback($exception, $value);
+
+                if ($result === null) {
+                    continue;
+                }
+
+                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/functions.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace Amp\Internal;
+
+/**
+ * Formats a stacktrace obtained via `debug_backtrace()`.
+ *
+ * @param array<array{file?: string, line: int, type?: string, class: string, function: string}> $trace Output of
+ *     `debug_backtrace()`.
+ *
+ * @return string Formatted stacktrace.
+ *
+ * @codeCoverageIgnore
+ * @internal
+ */
+function formatStacktrace(array $trace): string
+{
+    return \implode("\n", \array_map(static function ($e, $i) {
+        $line = "#{$i} ";
+
+        if (isset($e["file"])) {
+            $line .= "{$e['file']}:{$e['line']} ";
+        }
+
+        if (isset($e["type"])) {
+            $line .= $e["class"] . $e["type"];
+        }
+
+        return $line . $e["function"] . "()";
+    }, $trace, \array_keys($trace)));
+}
+
+/**
+ * Creates a `TypeError` with a standardized error message.
+ *
+ * @param string[] $expected Expected types.
+ * @param mixed    $given Given value.
+ *
+ * @return \TypeError
+ *
+ * @internal
+ */
+function createTypeError(array $expected, $given): \TypeError
+{
+    $givenType = \is_object($given) ? \sprintf("instance of %s", \get_class($given)) : \gettype($given);
+
+    if (\count($expected) === 1) {
+        $expectedType = "Expected the following type: " . \array_pop($expected);
+    } else {
+        $expectedType = "Expected one of the following types: " . \implode(", ", $expected);
+    }
+
+    return new \TypeError("{$expectedType}; {$givenType} given");
+}
+
+/**
+ * Returns the current time relative to an arbitrary point in time.
+ *
+ * @return int Time in milliseconds.
+ */
+function getCurrentTime(): int
+{
+    /** @var int|null $startTime */
+    static $startTime;
+    /** @var int|null $nextWarning */
+    static $nextWarning;
+
+    if (\PHP_INT_SIZE === 4) {
+        // @codeCoverageIgnoreStart
+        if ($startTime === null) {
+            $startTime = \PHP_VERSION_ID >= 70300 ? \hrtime(false)[0] : \time();
+            $nextWarning = \PHP_INT_MAX - 86400 * 7;
+        }
+
+        if (\PHP_VERSION_ID >= 70300) {
+            list($seconds, $nanoseconds) = \hrtime(false);
+            $seconds -= $startTime;
+
+            if ($seconds >= $nextWarning) {
+                $timeToOverflow = (\PHP_INT_MAX - $seconds * 1000) / 1000;
+                \trigger_error(
+                    "getCurrentTime() will overflow in $timeToOverflow seconds, please restart the process before that. " .
+                    "You're using a 32 bit version of PHP, so time will overflow about every 24 days. Regular restarts are required.",
+                    \E_USER_WARNING
+                );
+
+                /** @psalm-suppress PossiblyNullOperand */
+                $nextWarning += 600; // every 10 minutes
+            }
+
+            return (int) ($seconds * 1000 + $nanoseconds / 1000000);
+        }
+
+        $seconds = \microtime(true) - $startTime;
+        if ($seconds >= $nextWarning) {
+            $timeToOverflow = (\PHP_INT_MAX - $seconds * 1000) / 1000;
+            \trigger_error(
+                "getCurrentTime() will overflow in $timeToOverflow seconds, please restart the process before that. " .
+                "You're using a 32 bit version of PHP, so time will overflow about every 24 days. Regular restarts are required.",
+                \E_USER_WARNING
+            );
+
+            /** @psalm-suppress PossiblyNullOperand */
+            $nextWarning += 600; // every 10 minutes
+        }
+
+        return (int) ($seconds * 1000);
+        // @codeCoverageIgnoreEnd
+    }
+
+    if (\PHP_VERSION_ID >= 70300) {
+        list($seconds, $nanoseconds) = \hrtime(false);
+        return (int) ($seconds * 1000 + $nanoseconds / 1000000);
+    }
+
+    return (int) (\microtime(true) * 1000);
+}

vendor/amphp/amp/lib/InvalidYieldError.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Amp;
+
+class InvalidYieldError extends \Error
+{
+    /**
+     * @param \Generator      $generator
+     * @param string          $prefix
+     * @param \Throwable|null $previous
+     */
+    public function __construct(\Generator $generator, string $prefix, \Throwable $previous = null)
+    {
+        $yielded = $generator->current();
+        $prefix .= \sprintf(
+            "; %s yielded at key %s",
+            \is_object($yielded) ? \get_class($yielded) : \gettype($yielded),
+            \var_export($generator->key(), true)
+        );
+
+        if (!$generator->valid()) {
+            parent::__construct($prefix, 0, $previous);
+            return;
+        }
+
+        $reflGen = new \ReflectionGenerator($generator);
+        $exeGen = $reflGen->getExecutingGenerator();
+        if ($isSubgenerator = ($exeGen !== $generator)) {
+            $reflGen = new \ReflectionGenerator($exeGen);
+        }
+
+        parent::__construct(\sprintf(
+            "%s on line %s in %s",
+            $prefix,
+            $reflGen->getExecutingLine(),
+            $reflGen->getExecutingFile()
+        ), 0, $previous);
+    }
+}

vendor/amphp/amp/lib/Iterator.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Amp;
+
+/**
+ * Defines an asynchronous iterator over a set of values that is designed to be used within a coroutine.
+ *
+ * @template-covariant TValue
+ */
+interface Iterator
+{
+    /**
+     * Succeeds with true if an emitted value is available by calling getCurrent() or false if the iterator has
+     * resolved. If the iterator fails, the returned promise will fail with the same exception.
+     *
+     * @return Promise
+     * @psalm-return Promise<bool>
+     *
+     * @throws \Error If the prior promise returned from this method has not resolved.
+     * @throws \Throwable The exception used to fail the iterator.
+     */
+    public function advance(): Promise;
+
+    /**
+     * Gets the last emitted value or throws an exception if the iterator has completed.
+     *
+     * @return mixed  Value emitted from the iterator.
+     * @psalm-return TValue
+     *
+     * @throws \Error If the iterator has resolved or advance() was not called before calling this method.
+     * @throws \Throwable The exception used to fail the iterator.
+     */
+    public function getCurrent();
+}

vendor/amphp/amp/lib/LazyPromise.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Amp;
+
+/**
+ * Creates a promise that calls $promisor only when the result of the promise is requested (i.e. onResolve() is called
+ * on the promise). $promisor can return a promise or any value. If $promisor throws an exception, the promise fails
+ * with that exception. If $promisor returns a Generator, it will be run as a coroutine.
+ */
+final class LazyPromise implements Promise
+{
+    /** @var callable|null */
+    private $promisor;
+
+    /** @var Promise|null */
+    private $promise;
+
+    /**
+     * @param callable $promisor Function which starts an async operation, returning a Promise (or any value).
+     *     Generators will be run as a coroutine.
+     */
+    public function __construct(callable $promisor)
+    {
+        $this->promisor = $promisor;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function onResolve(callable $onResolved)
+    {
+        if ($this->promise === null) {
+            \assert($this->promisor !== null);
+
+            $provider = $this->promisor;
+            $this->promisor = null;
+            $this->promise = call($provider);
+        }
+
+        \assert($this->promise !== null);
+
+        $this->promise->onResolve($onResolved);
+    }
+}

vendor/amphp/amp/lib/Loop.php

@@ -0,0 +1,456 @@
+<?php
+
+namespace Amp;
+
+use Amp\Loop\Driver;
+use Amp\Loop\DriverFactory;
+use Amp\Loop\InvalidWatcherError;
+use Amp\Loop\UnsupportedFeatureException;
+use Amp\Loop\Watcher;
+
+/**
+ * Accessor to allow global access to the event loop.
+ *
+ * @see \Amp\Loop\Driver
+ */
+final class Loop
+{
+    /**
+     * @var Driver
+     */
+    private static $driver;
+
+    /**
+     * Disable construction as this is a static class.
+     */
+    private function __construct()
+    {
+        // intentionally left blank
+    }
+
+    /**
+     * Sets the driver to be used for `Loop::run()`.
+     *
+     * @param Driver $driver
+     *
+     * @return void
+     */
+    public static function set(Driver $driver)
+    {
+        try {
+            self::$driver = new class extends Driver {
+                /**
+                 * @return void
+                 */
+                protected function activate(array $watchers)
+                {
+                    throw new \Error("Can't activate watcher during garbage collection.");
+                }
+
+                /**
+                 * @return void
+                 */
+                protected function dispatch(bool $blocking)
+                {
+                    throw new \Error("Can't dispatch during garbage collection.");
+                }
+
+                /**
+                 * @return void
+                 */
+                protected function deactivate(Watcher $watcher)
+                {
+                    // do nothing
+                }
+
+                public function getHandle()
+                {
+                    return null;
+                }
+            };
+
+            \gc_collect_cycles();
+        } finally {
+            self::$driver = $driver;
+        }
+    }
+
+    /**
+     * Run the event loop and optionally execute a callback within the scope of it.
+     *
+     * The loop MUST continue to run until it is either stopped explicitly, no referenced watchers exist anymore, or an
+     * exception is thrown that cannot be handled. Exceptions that cannot be handled are exceptions thrown from an
+     * error handler or exceptions that would be passed to an error handler but none exists to handle them.
+     *
+     * @param callable|null $callback The callback to execute.
+     *
+     * @return void
+     */
+    public static function run(callable $callback = null)
+    {
+        if ($callback) {
+            self::$driver->defer($callback);
+        }
+
+        self::$driver->run();
+    }
+
+    /**
+     * Stop the event loop.
+     *
+     * When an event loop is stopped, it continues with its current tick and exits the loop afterwards. Multiple calls
+     * to stop MUST be ignored and MUST NOT raise an exception.
+     *
+     * @return void
+     */
+    public static function stop()
+    {
+        self::$driver->stop();
+    }
+
+    /**
+     * Defer the execution of a callback.
+     *
+     * The deferred callable MUST be executed before any other type of watcher in a tick. Order of enabling MUST be
+     * preserved when executing the callbacks.
+     *
+     * The created watcher MUST immediately be marked as enabled, but only be activated (i.e. callback can be called)
+     * right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param callable(string $watcherId, mixed $data) $callback The callback to defer. The `$watcherId` will be
+     *     invalidated before the callback call.
+     * @param mixed $data Arbitrary data given to the callback function as the `$data` parameter.
+     *
+     * @return string An unique identifier that can be used to cancel, enable or disable the watcher.
+     */
+    public static function defer(callable $callback, $data = null): string
+    {
+        return self::$driver->defer($callback, $data);
+    }
+
+    /**
+     * Delay the execution of a callback.
+     *
+     * The delay is a minimum and approximate, accuracy is not guaranteed. Order of calls MUST be determined by which
+     * timers expire first, but timers with the same expiration time MAY be executed in any order.
+     *
+     * The created watcher MUST immediately be marked as enabled, but only be activated (i.e. callback can be called)
+     * right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param int   $delay The amount of time, in milliseconds, to delay the execution for.
+     * @param callable(string $watcherId, mixed $data) $callback The callback to delay. The `$watcherId` will be
+     *     invalidated before the callback call.
+     * @param mixed $data Arbitrary data given to the callback function as the `$data` parameter.
+     *
+     * @return string An unique identifier that can be used to cancel, enable or disable the watcher.
+     */
+    public static function delay(int $delay, callable $callback, $data = null): string
+    {
+        return self::$driver->delay($delay, $callback, $data);
+    }
+
+    /**
+     * Repeatedly execute a callback.
+     *
+     * The interval between executions is a minimum and approximate, accuracy is not guaranteed. Order of calls MUST be
+     * determined by which timers expire first, but timers with the same expiration time MAY be executed in any order.
+     * The first execution is scheduled after the first interval period.
+     *
+     * The created watcher MUST immediately be marked as enabled, but only be activated (i.e. callback can be called)
+     * right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param int   $interval The time interval, in milliseconds, to wait between executions.
+     * @param callable(string $watcherId, mixed $data) $callback The callback to repeat.
+     * @param mixed $data Arbitrary data given to the callback function as the `$data` parameter.
+     *
+     * @return string An unique identifier that can be used to cancel, enable or disable the watcher.
+     */
+    public static function repeat(int $interval, callable $callback, $data = null): string
+    {
+        return self::$driver->repeat($interval, $callback, $data);
+    }
+
+    /**
+     * Execute a callback when a stream resource becomes readable or is closed for reading.
+     *
+     * Warning: Closing resources locally, e.g. with `fclose`, might not invoke the callback. Be sure to `cancel` the
+     * watcher when closing the resource locally. Drivers MAY choose to notify the user if there are watchers on invalid
+     * resources, but are not required to, due to the high performance impact. Watchers on closed resources are
+     * therefore undefined behavior.
+     *
+     * Multiple watchers on the same stream MAY be executed in any order.
+     *
+     * The created watcher MUST immediately be marked as enabled, but only be activated (i.e. callback can be called)
+     * right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param resource $stream The stream to monitor.
+     * @param callable(string $watcherId, resource $stream, mixed $data) $callback The callback to execute.
+     * @param mixed    $data Arbitrary data given to the callback function as the `$data` parameter.
+     *
+     * @return string An unique identifier that can be used to cancel, enable or disable the watcher.
+     */
+    public static function onReadable($stream, callable $callback, $data = null): string
+    {
+        return self::$driver->onReadable($stream, $callback, $data);
+    }
+
+    /**
+     * Execute a callback when a stream resource becomes writable or is closed for writing.
+     *
+     * Warning: Closing resources locally, e.g. with `fclose`, might not invoke the callback. Be sure to `cancel` the
+     * watcher when closing the resource locally. Drivers MAY choose to notify the user if there are watchers on invalid
+     * resources, but are not required to, due to the high performance impact. Watchers on closed resources are
+     * therefore undefined behavior.
+     *
+     * Multiple watchers on the same stream MAY be executed in any order.
+     *
+     * The created watcher MUST immediately be marked as enabled, but only be activated (i.e. callback can be called)
+     * right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param resource $stream The stream to monitor.
+     * @param callable(string $watcherId, resource $stream, mixed $data) $callback The callback to execute.
+     * @param mixed    $data Arbitrary data given to the callback function as the `$data` parameter.
+     *
+     * @return string An unique identifier that can be used to cancel, enable or disable the watcher.
+     */
+    public static function onWritable($stream, callable $callback, $data = null): string
+    {
+        return self::$driver->onWritable($stream, $callback, $data);
+    }
+
+    /**
+     * Execute a callback when a signal is received.
+     *
+     * Warning: Installing the same signal on different instances of this interface is deemed undefined behavior.
+     * Implementations MAY try to detect this, if possible, but are not required to. This is due to technical
+     * limitations of the signals being registered globally per process.
+     *
+     * Multiple watchers on the same signal MAY be executed in any order.
+     *
+     * The created watcher MUST immediately be marked as enabled, but only be activated (i.e. callback can be called)
+     * right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param int   $signo The signal number to monitor.
+     * @param callable(string $watcherId, int $signo, mixed $data) $callback The callback to execute.
+     * @param mixed $data Arbitrary data given to the callback function as the $data parameter.
+     *
+     * @return string An unique identifier that can be used to cancel, enable or disable the watcher.
+     *
+     * @throws UnsupportedFeatureException If signal handling is not supported.
+     */
+    public static function onSignal(int $signo, callable $callback, $data = null): string
+    {
+        return self::$driver->onSignal($signo, $callback, $data);
+    }
+
+    /**
+     * Enable a watcher to be active starting in the next tick.
+     *
+     * Watchers MUST immediately be marked as enabled, but only be activated (i.e. callbacks can be called) right before
+     * the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param string $watcherId The watcher identifier.
+     *
+     * @return void
+     *
+     * @throws InvalidWatcherError If the watcher identifier is invalid.
+     */
+    public static function enable(string $watcherId)
+    {
+        self::$driver->enable($watcherId);
+    }
+
+    /**
+     * Disable a watcher immediately.
+     *
+     * A watcher MUST be disabled immediately, e.g. if a defer watcher disables a later defer watcher, the second defer
+     * watcher isn't executed in this tick.
+     *
+     * Disabling a watcher MUST NOT invalidate the watcher. Calling this function MUST NOT fail, even if passed an
+     * invalid watcher.
+     *
+     * @param string $watcherId The watcher identifier.
+     *
+     * @return void
+     */
+    public static function disable(string $watcherId)
+    {
+        if (\PHP_VERSION_ID < 70200 && !isset(self::$driver)) {
+            // Prior to PHP 7.2, self::$driver may be unset during destruct.
+            // See https://github.com/amphp/amp/issues/212.
+            return;
+        }
+
+        self::$driver->disable($watcherId);
+    }
+
+    /**
+     * Cancel a watcher.
+     *
+     * This will detatch the event loop from all resources that are associated to the watcher. After this operation the
+     * watcher is permanently invalid. Calling this function MUST NOT fail, even if passed an invalid watcher.
+     *
+     * @param string $watcherId The watcher identifier.
+     *
+     * @return void
+     */
+    public static function cancel(string $watcherId)
+    {
+        if (\PHP_VERSION_ID < 70200 && !isset(self::$driver)) {
+            // Prior to PHP 7.2, self::$driver may be unset during destruct.
+            // See https://github.com/amphp/amp/issues/212.
+            return;
+        }
+
+        self::$driver->cancel($watcherId);
+    }
+
+    /**
+     * Reference a watcher.
+     *
+     * This will keep the event loop alive whilst the watcher is still being monitored. Watchers have this state by
+     * default.
+     *
+     * @param string $watcherId The watcher identifier.
+     *
+     * @return void
+     *
+     * @throws InvalidWatcherError If the watcher identifier is invalid.
+     */
+    public static function reference(string $watcherId)
+    {
+        self::$driver->reference($watcherId);
+    }
+
+    /**
+     * Unreference a watcher.
+     *
+     * The event loop should exit the run method when only unreferenced watchers are still being monitored. Watchers
+     * are all referenced by default.
+     *
+     * @param string $watcherId The watcher identifier.
+     *
+     * @return void
+     */
+    public static function unreference(string $watcherId)
+    {
+        if (\PHP_VERSION_ID < 70200 && !isset(self::$driver)) {
+            // Prior to PHP 7.2, self::$driver may be unset during destruct.
+            // See https://github.com/amphp/amp/issues/212.
+            return;
+        }
+
+        self::$driver->unreference($watcherId);
+    }
+
+    /**
+     * Returns the current loop time in millisecond increments. Note this value does not necessarily correlate to
+     * wall-clock time, rather the value returned is meant to be used in relative comparisons to prior values returned
+     * by this method (intervals, expiration calculations, etc.) and is only updated once per loop tick.
+     *
+     * @return int
+     */
+    public static function now(): int
+    {
+        return self::$driver->now();
+    }
+
+    /**
+     * Stores information in the loop bound registry.
+     *
+     * Stored information is package private. Packages MUST NOT retrieve the stored state of other packages. Packages
+     * MUST use their namespace as prefix for keys. They may do so by using `SomeClass::class` as key.
+     *
+     * If packages want to expose loop bound state to consumers other than the package, they SHOULD provide a dedicated
+     * interface for that purpose instead of sharing the storage key.
+     *
+     * @param string $key The namespaced storage key.
+     * @param mixed  $value The value to be stored.
+     *
+     * @return void
+     */
+    public static function setState(string $key, $value)
+    {
+        self::$driver->setState($key, $value);
+    }
+
+    /**
+     * Gets information stored bound to the loop.
+     *
+     * Stored information is package private. Packages MUST NOT retrieve the stored state of other packages. Packages
+     * MUST use their namespace as prefix for keys. They may do so by using `SomeClass::class` as key.
+     *
+     * If packages want to expose loop bound state to consumers other than the package, they SHOULD provide a dedicated
+     * interface for that purpose instead of sharing the storage key.
+     *
+     * @param string $key The namespaced storage key.
+     *
+     * @return mixed The previously stored value or `null` if it doesn't exist.
+     */
+    public static function getState(string $key)
+    {
+        return self::$driver->getState($key);
+    }
+
+    /**
+     * Set a callback to be executed when an error occurs.
+     *
+     * The callback receives the error as the first and only parameter. The return value of the callback gets ignored.
+     * If it can't handle the error, it MUST throw the error. Errors thrown by the callback or during its invocation
+     * MUST be thrown into the `run` loop and stop the driver.
+     *
+     * Subsequent calls to this method will overwrite the previous handler.
+     *
+     * @param callable(\Throwable $error)|null $callback The callback to execute. `null` will clear the
+     *     current handler.
+     *
+     * @return callable(\Throwable $error)|null The previous handler, `null` if there was none.
+     */
+    public static function setErrorHandler(callable $callback = null)
+    {
+        return self::$driver->setErrorHandler($callback);
+    }
+
+    /**
+     * Retrieve an associative array of information about the event loop driver.
+     *
+     * The returned array MUST contain the following data describing the driver's currently registered watchers:
+     *
+     *     [
+     *         "defer"            => ["enabled" => int, "disabled" => int],
+     *         "delay"            => ["enabled" => int, "disabled" => int],
+     *         "repeat"           => ["enabled" => int, "disabled" => int],
+     *         "on_readable"      => ["enabled" => int, "disabled" => int],
+     *         "on_writable"      => ["enabled" => int, "disabled" => int],
+     *         "on_signal"        => ["enabled" => int, "disabled" => int],
+     *         "enabled_watchers" => ["referenced" => int, "unreferenced" => int],
+     *         "running"          => bool
+     *     ];
+     *
+     * Implementations MAY optionally add more information in the array but at minimum the above `key => value` format
+     * MUST always be provided.
+     *
+     * @return array Statistics about the loop in the described format.
+     */
+    public static function getInfo(): array
+    {
+        return self::$driver->getInfo();
+    }
+
+    /**
+     * Retrieve the event loop driver that is in scope.
+     *
+     * @return Driver
+     */
+    public static function get(): Driver
+    {
+        return self::$driver;
+    }
+}
+
+// Default factory, don't move this to a file loaded by the composer "files" autoload mechanism, otherwise custom
+// implementations might have issues setting a default loop, because it's overridden by us then.
+
+// @codeCoverageIgnoreStart
+Loop::set((new DriverFactory)->create());
+// @codeCoverageIgnoreEnd

vendor/amphp/amp/lib/Loop/Driver.php

@@ -0,0 +1,742 @@
+<?php
+
+namespace Amp\Loop;
+
+use Amp\Coroutine;
+use Amp\Promise;
+use React\Promise\PromiseInterface as ReactPromise;
+use function Amp\Promise\rethrow;
+
+/**
+ * Event loop driver which implements all basic operations to allow interoperability.
+ *
+ * Watchers (enabled or new watchers) MUST immediately be marked as enabled, but only be activated (i.e. callbacks can
+ * be called) right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+ *
+ * All registered callbacks MUST NOT be called from a file with strict types enabled (`declare(strict_types=1)`).
+ */
+abstract class Driver
+{
+    // Don't use 1e3 / 1e6, they result in a float instead of int
+    const MILLISEC_PER_SEC = 1000;
+    const MICROSEC_PER_SEC = 1000000;
+
+    /** @var string */
+    private $nextId = "a";
+
+    /** @var Watcher[] */
+    private $watchers = [];
+
+    /** @var Watcher[] */
+    private $enableQueue = [];
+
+    /** @var Watcher[] */
+    private $deferQueue = [];
+
+    /** @var Watcher[] */
+    private $nextTickQueue = [];
+
+    /** @var callable(\Throwable):void|null */
+    private $errorHandler;
+
+    /** @var bool */
+    private $running = false;
+
+    /** @var array */
+    private $registry = [];
+
+    /**
+     * Run the event loop.
+     *
+     * One iteration of the loop is called one "tick". A tick covers the following steps:
+     *
+     *  1. Activate watchers created / enabled in the last tick / before `run()`.
+     *  2. Execute all enabled defer watchers.
+     *  3. Execute all due timer, pending signal and actionable stream callbacks, each only once per tick.
+     *
+     * The loop MUST continue to run until it is either stopped explicitly, no referenced watchers exist anymore, or an
+     * exception is thrown that cannot be handled. Exceptions that cannot be handled are exceptions thrown from an
+     * error handler or exceptions that would be passed to an error handler but none exists to handle them.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->running = true;
+
+        try {
+            while ($this->running) {
+                if ($this->isEmpty()) {
+                    return;
+                }
+                $this->tick();
+            }
+        } finally {
+            $this->stop();
+        }
+    }
+
+    /**
+     * @return bool True if no enabled and referenced watchers remain in the loop.
+     */
+    private function isEmpty(): bool
+    {
+        foreach ($this->watchers as $watcher) {
+            if ($watcher->enabled && $watcher->referenced) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Executes a single tick of the event loop.
+     *
+     * @return void
+     */
+    private function tick()
+    {
+        if (empty($this->deferQueue)) {
+            $this->deferQueue = $this->nextTickQueue;
+        } else {
+            $this->deferQueue = \array_merge($this->deferQueue, $this->nextTickQueue);
+        }
+        $this->nextTickQueue = [];
+
+        $this->activate($this->enableQueue);
+        $this->enableQueue = [];
+
+        foreach ($this->deferQueue as $watcher) {
+            if (!isset($this->deferQueue[$watcher->id])) {
+                continue; // Watcher disabled by another defer watcher.
+            }
+
+            unset($this->watchers[$watcher->id], $this->deferQueue[$watcher->id]);
+
+            try {
+                /** @var mixed $result */
+                $result = ($watcher->callback)($watcher->id, $watcher->data);
+
+                if ($result === null) {
+                    continue;
+                }
+
+                if ($result instanceof \Generator) {
+                    $result = new Coroutine($result);
+                }
+
+                if ($result instanceof Promise || $result instanceof ReactPromise) {
+                    rethrow($result);
+                }
+            } catch (\Throwable $exception) {
+                $this->error($exception);
+            }
+        }
+
+        /** @psalm-suppress RedundantCondition */
+        $this->dispatch(empty($this->nextTickQueue) && empty($this->enableQueue) && $this->running && !$this->isEmpty());
+    }
+
+    /**
+     * Activates (enables) all the given watchers.
+     *
+     * @param Watcher[] $watchers
+     *
+     * @return void
+     */
+    abstract protected function activate(array $watchers);
+
+    /**
+     * Dispatches any pending read/write, timer, and signal events.
+     *
+     * @param bool $blocking
+     *
+     * @return void
+     */
+    abstract protected function dispatch(bool $blocking);
+
+    /**
+     * Stop the event loop.
+     *
+     * When an event loop is stopped, it continues with its current tick and exits the loop afterwards. Multiple calls
+     * to stop MUST be ignored and MUST NOT raise an exception.
+     *
+     * @return void
+     */
+    public function stop()
+    {
+        $this->running = false;
+    }
+
+    /**
+     * Defer the execution of a callback.
+     *
+     * The deferred callable MUST be executed before any other type of watcher in a tick. Order of enabling MUST be
+     * preserved when executing the callbacks.
+     *
+     * The created watcher MUST immediately be marked as enabled, but only be activated (i.e. callback can be called)
+     * right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param callable (string $watcherId, mixed $data) $callback The callback to defer. The `$watcherId` will be
+     *     invalidated before the callback call.
+     * @param mixed $data Arbitrary data given to the callback function as the `$data` parameter.
+     *
+     * @return string An unique identifier that can be used to cancel, enable or disable the watcher.
+     */
+    public function defer(callable $callback, $data = null): string
+    {
+        /** @psalm-var Watcher<null> $watcher */
+        $watcher = new Watcher;
+        $watcher->type = Watcher::DEFER;
+        $watcher->id = $this->nextId++;
+        $watcher->callback = $callback;
+        $watcher->data = $data;
+
+        $this->watchers[$watcher->id] = $watcher;
+        $this->nextTickQueue[$watcher->id] = $watcher;
+
+        return $watcher->id;
+    }
+
+    /**
+     * Delay the execution of a callback.
+     *
+     * The delay is a minimum and approximate, accuracy is not guaranteed. Order of calls MUST be determined by which
+     * timers expire first, but timers with the same expiration time MAY be executed in any order.
+     *
+     * The created watcher MUST immediately be marked as enabled, but only be activated (i.e. callback can be called)
+     * right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param int   $delay The amount of time, in milliseconds, to delay the execution for.
+     * @param callable (string $watcherId, mixed $data) $callback The callback to delay. The `$watcherId` will be
+     *     invalidated before the callback call.
+     * @param mixed $data Arbitrary data given to the callback function as the `$data` parameter.
+     *
+     * @return string An unique identifier that can be used to cancel, enable or disable the watcher.
+     */
+    public function delay(int $delay, callable $callback, $data = null): string
+    {
+        if ($delay < 0) {
+            throw new \Error("Delay must be greater than or equal to zero");
+        }
+
+        /** @psalm-var Watcher<int> $watcher */
+        $watcher = new Watcher;
+        $watcher->type = Watcher::DELAY;
+        $watcher->id = $this->nextId++;
+        $watcher->callback = $callback;
+        $watcher->value = $delay;
+        $watcher->expiration = $this->now() + $delay;
+        $watcher->data = $data;
+
+        $this->watchers[$watcher->id] = $watcher;
+        $this->enableQueue[$watcher->id] = $watcher;
+
+        return $watcher->id;
+    }
+
+    /**
+     * Repeatedly execute a callback.
+     *
+     * The interval between executions is a minimum and approximate, accuracy is not guaranteed. Order of calls MUST be
+     * determined by which timers expire first, but timers with the same expiration time MAY be executed in any order.
+     * The first execution is scheduled after the first interval period.
+     *
+     * The created watcher MUST immediately be marked as enabled, but only be activated (i.e. callback can be called)
+     * right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param int   $interval The time interval, in milliseconds, to wait between executions.
+     * @param callable (string $watcherId, mixed $data) $callback The callback to repeat.
+     * @param mixed $data Arbitrary data given to the callback function as the `$data` parameter.
+     *
+     * @return string An unique identifier that can be used to cancel, enable or disable the watcher.
+     */
+    public function repeat(int $interval, callable $callback, $data = null): string
+    {
+        if ($interval < 0) {
+            throw new \Error("Interval must be greater than or equal to zero");
+        }
+
+        /** @psalm-var Watcher<int> $watcher */
+        $watcher = new Watcher;
+        $watcher->type = Watcher::REPEAT;
+        $watcher->id = $this->nextId++;
+        $watcher->callback = $callback;
+        $watcher->value = $interval;
+        $watcher->expiration = $this->now() + $interval;
+        $watcher->data = $data;
+
+        $this->watchers[$watcher->id] = $watcher;
+        $this->enableQueue[$watcher->id] = $watcher;
+
+        return $watcher->id;
+    }
+
+    /**
+     * Execute a callback when a stream resource becomes readable or is closed for reading.
+     *
+     * Warning: Closing resources locally, e.g. with `fclose`, might not invoke the callback. Be sure to `cancel` the
+     * watcher when closing the resource locally. Drivers MAY choose to notify the user if there are watchers on invalid
+     * resources, but are not required to, due to the high performance impact. Watchers on closed resources are
+     * therefore undefined behavior.
+     *
+     * Multiple watchers on the same stream MAY be executed in any order.
+     *
+     * The created watcher MUST immediately be marked as enabled, but only be activated (i.e. callback can be called)
+     * right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param resource $stream The stream to monitor.
+     * @param callable (string $watcherId, resource $stream, mixed $data) $callback The callback to execute.
+     * @param mixed    $data Arbitrary data given to the callback function as the `$data` parameter.
+     *
+     * @return string An unique identifier that can be used to cancel, enable or disable the watcher.
+     */
+    public function onReadable($stream, callable $callback, $data = null): string
+    {
+        /** @psalm-var Watcher<resource> $watcher */
+        $watcher = new Watcher;
+        $watcher->type = Watcher::READABLE;
+        $watcher->id = $this->nextId++;
+        $watcher->callback = $callback;
+        $watcher->value = $stream;
+        $watcher->data = $data;
+
+        $this->watchers[$watcher->id] = $watcher;
+        $this->enableQueue[$watcher->id] = $watcher;
+
+        return $watcher->id;
+    }
+
+    /**
+     * Execute a callback when a stream resource becomes writable or is closed for writing.
+     *
+     * Warning: Closing resources locally, e.g. with `fclose`, might not invoke the callback. Be sure to `cancel` the
+     * watcher when closing the resource locally. Drivers MAY choose to notify the user if there are watchers on invalid
+     * resources, but are not required to, due to the high performance impact. Watchers on closed resources are
+     * therefore undefined behavior.
+     *
+     * Multiple watchers on the same stream MAY be executed in any order.
+     *
+     * The created watcher MUST immediately be marked as enabled, but only be activated (i.e. callback can be called)
+     * right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param resource $stream The stream to monitor.
+     * @param callable (string $watcherId, resource $stream, mixed $data) $callback The callback to execute.
+     * @param mixed    $data Arbitrary data given to the callback function as the `$data` parameter.
+     *
+     * @return string An unique identifier that can be used to cancel, enable or disable the watcher.
+     */
+    public function onWritable($stream, callable $callback, $data = null): string
+    {
+        /** @psalm-var Watcher<resource> $watcher */
+        $watcher = new Watcher;
+        $watcher->type = Watcher::WRITABLE;
+        $watcher->id = $this->nextId++;
+        $watcher->callback = $callback;
+        $watcher->value = $stream;
+        $watcher->data = $data;
+
+        $this->watchers[$watcher->id] = $watcher;
+        $this->enableQueue[$watcher->id] = $watcher;
+
+        return $watcher->id;
+    }
+
+    /**
+     * Execute a callback when a signal is received.
+     *
+     * Warning: Installing the same signal on different instances of this interface is deemed undefined behavior.
+     * Implementations MAY try to detect this, if possible, but are not required to. This is due to technical
+     * limitations of the signals being registered globally per process.
+     *
+     * Multiple watchers on the same signal MAY be executed in any order.
+     *
+     * The created watcher MUST immediately be marked as enabled, but only be activated (i.e. callback can be called)
+     * right before the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param int   $signo The signal number to monitor.
+     * @param callable (string $watcherId, int $signo, mixed $data) $callback The callback to execute.
+     * @param mixed $data Arbitrary data given to the callback function as the $data parameter.
+     *
+     * @return string An unique identifier that can be used to cancel, enable or disable the watcher.
+     *
+     * @throws UnsupportedFeatureException If signal handling is not supported.
+     */
+    public function onSignal(int $signo, callable $callback, $data = null): string
+    {
+        /** @psalm-var Watcher<int> $watcher */
+        $watcher = new Watcher;
+        $watcher->type = Watcher::SIGNAL;
+        $watcher->id = $this->nextId++;
+        $watcher->callback = $callback;
+        $watcher->value = $signo;
+        $watcher->data = $data;
+
+        $this->watchers[$watcher->id] = $watcher;
+        $this->enableQueue[$watcher->id] = $watcher;
+
+        return $watcher->id;
+    }
+
+    /**
+     * Enable a watcher to be active starting in the next tick.
+     *
+     * Watchers MUST immediately be marked as enabled, but only be activated (i.e. callbacks can be called) right before
+     * the next tick. Callbacks of watchers MUST NOT be called in the tick they were enabled.
+     *
+     * @param string $watcherId The watcher identifier.
+     *
+     * @return void
+     *
+     * @throws InvalidWatcherError If the watcher identifier is invalid.
+     */
+    public function enable(string $watcherId)
+    {
+        if (!isset($this->watchers[$watcherId])) {
+            throw new InvalidWatcherError($watcherId, "Cannot enable an invalid watcher identifier: '{$watcherId}'");
+        }
+
+        $watcher = $this->watchers[$watcherId];
+
+        if ($watcher->enabled) {
+            return; // Watcher already enabled.
+        }
+
+        $watcher->enabled = true;
+
+        switch ($watcher->type) {
+            case Watcher::DEFER:
+                $this->nextTickQueue[$watcher->id] = $watcher;
+                break;
+
+            case Watcher::REPEAT:
+            case Watcher::DELAY:
+                \assert(\is_int($watcher->value));
+
+                $watcher->expiration = $this->now() + $watcher->value;
+                $this->enableQueue[$watcher->id] = $watcher;
+                break;
+
+            default:
+                $this->enableQueue[$watcher->id] = $watcher;
+                break;
+        }
+    }
+
+    /**
+     * Cancel a watcher.
+     *
+     * This will detach the event loop from all resources that are associated to the watcher. After this operation the
+     * watcher is permanently invalid. Calling this function MUST NOT fail, even if passed an invalid watcher.
+     *
+     * @param string $watcherId The watcher identifier.
+     *
+     * @return void
+     */
+    public function cancel(string $watcherId)
+    {
+        $this->disable($watcherId);
+        unset($this->watchers[$watcherId]);
+    }
+
+    /**
+     * Disable a watcher immediately.
+     *
+     * A watcher MUST be disabled immediately, e.g. if a defer watcher disables a later defer watcher, the second defer
+     * watcher isn't executed in this tick.
+     *
+     * Disabling a watcher MUST NOT invalidate the watcher. Calling this function MUST NOT fail, even if passed an
+     * invalid watcher.
+     *
+     * @param string $watcherId The watcher identifier.
+     *
+     * @return void
+     */
+    public function disable(string $watcherId)
+    {
+        if (!isset($this->watchers[$watcherId])) {
+            return;
+        }
+
+        $watcher = $this->watchers[$watcherId];
+
+        if (!$watcher->enabled) {
+            return; // Watcher already disabled.
+        }
+
+        $watcher->enabled = false;
+        $id = $watcher->id;
+
+        switch ($watcher->type) {
+            case Watcher::DEFER:
+                if (isset($this->nextTickQueue[$id])) {
+                    // Watcher was only queued to be enabled.
+                    unset($this->nextTickQueue[$id]);
+                } else {
+                    unset($this->deferQueue[$id]);
+                }
+                break;
+
+            default:
+                if (isset($this->enableQueue[$id])) {
+                    // Watcher was only queued to be enabled.
+                    unset($this->enableQueue[$id]);
+                } else {
+                    $this->deactivate($watcher);
+                }
+                break;
+        }
+    }
+
+    /**
+     * Deactivates (disables) the given watcher.
+     *
+     * @param Watcher $watcher
+     *
+     * @return void
+     */
+    abstract protected function deactivate(Watcher $watcher);
+
+    /**
+     * Reference a watcher.
+     *
+     * This will keep the event loop alive whilst the watcher is still being monitored. Watchers have this state by
+     * default.
+     *
+     * @param string $watcherId The watcher identifier.
+     *
+     * @return void
+     *
+     * @throws InvalidWatcherError If the watcher identifier is invalid.
+     */
+    public function reference(string $watcherId)
+    {
+        if (!isset($this->watchers[$watcherId])) {
+            throw new InvalidWatcherError($watcherId, "Cannot reference an invalid watcher identifier: '{$watcherId}'");
+        }
+
+        $this->watchers[$watcherId]->referenced = true;
+    }
+
+    /**
+     * Unreference a watcher.
+     *
+     * The event loop should exit the run method when only unreferenced watchers are still being monitored. Watchers
+     * are all referenced by default.
+     *
+     * @param string $watcherId The watcher identifier.
+     *
+     * @return void
+     */
+    public function unreference(string $watcherId)
+    {
+        if (!isset($this->watchers[$watcherId])) {
+            return;
+        }
+
+        $this->watchers[$watcherId]->referenced = false;
+    }
+
+    /**
+     * Stores information in the loop bound registry.
+     *
+     * Stored information is package private. Packages MUST NOT retrieve the stored state of other packages. Packages
+     * MUST use their namespace as prefix for keys. They may do so by using `SomeClass::class` as key.
+     *
+     * If packages want to expose loop bound state to consumers other than the package, they SHOULD provide a dedicated
+     * interface for that purpose instead of sharing the storage key.
+     *
+     * @param string $key The namespaced storage key.
+     * @param mixed  $value The value to be stored.
+     *
+     * @return void
+     */
+    final public function setState(string $key, $value)
+    {
+        if ($value === null) {
+            unset($this->registry[$key]);
+        } else {
+            $this->registry[$key] = $value;
+        }
+    }
+
+    /**
+     * Gets information stored bound to the loop.
+     *
+     * Stored information is package private. Packages MUST NOT retrieve the stored state of other packages. Packages
+     * MUST use their namespace as prefix for keys. They may do so by using `SomeClass::class` as key.
+     *
+     * If packages want to expose loop bound state to consumers other than the package, they SHOULD provide a dedicated
+     * interface for that purpose instead of sharing the storage key.
+     *
+     * @param string $key The namespaced storage key.
+     *
+     * @return mixed The previously stored value or `null` if it doesn't exist.
+     */
+    final public function getState(string $key)
+    {
+        return isset($this->registry[$key]) ? $this->registry[$key] : null;
+    }
+
+    /**
+     * Set a callback to be executed when an error occurs.
+     *
+     * The callback receives the error as the first and only parameter. The return value of the callback gets ignored.
+     * If it can't handle the error, it MUST throw the error. Errors thrown by the callback or during its invocation
+     * MUST be thrown into the `run` loop and stop the driver.
+     *
+     * Subsequent calls to this method will overwrite the previous handler.
+     *
+     * @param callable(\Throwable $error):void|null $callback The callback to execute. `null` will clear the
+     *     current handler.
+     *
+     * @return callable(\Throwable $error):void|null The previous handler, `null` if there was none.
+     */
+    public function setErrorHandler(callable $callback = null)
+    {
+        $previous = $this->errorHandler;
+        $this->errorHandler = $callback;
+        return $previous;
+    }
+
+    /**
+     * Invokes the error handler with the given exception.
+     *
+     * @param \Throwable $exception The exception thrown from a watcher callback.
+     *
+     * @return void
+     * @throws \Throwable If no error handler has been set.
+     */
+    protected function error(\Throwable $exception)
+    {
+        if ($this->errorHandler === null) {
+            throw $exception;
+        }
+
+        ($this->errorHandler)($exception);
+    }
+
+    /**
+     * Returns the current loop time in millisecond increments. Note this value does not necessarily correlate to
+     * wall-clock time, rather the value returned is meant to be used in relative comparisons to prior values returned
+     * by this method (intervals, expiration calculations, etc.) and is only updated once per loop tick.
+     *
+     * Extending classes should override this function to return a value cached once per loop tick.
+     *
+     * @return int
+     */
+    public function now(): int
+    {
+        return (int) (\microtime(true) * self::MILLISEC_PER_SEC);
+    }
+
+    /**
+     * Get the underlying loop handle.
+     *
+     * Example: the `uv_loop` resource for `libuv` or the `EvLoop` object for `libev` or `null` for a native driver.
+     *
+     * Note: This function is *not* exposed in the `Loop` class. Users shall access it directly on the respective loop
+     * instance.
+     *
+     * @return null|object|resource The loop handle the event loop operates on. `null` if there is none.
+     */
+    abstract public function getHandle();
+
+    /**
+     * Returns the same array of data as getInfo().
+     *
+     * @return array
+     */
+    public function __debugInfo()
+    {
+        // @codeCoverageIgnoreStart
+        return $this->getInfo();
+        // @codeCoverageIgnoreEnd
+    }
+
+    /**
+     * Retrieve an associative array of information about the event loop driver.
+     *
+     * The returned array MUST contain the following data describing the driver's currently registered watchers:
+     *
+     *     [
+     *         "defer"            => ["enabled" => int, "disabled" => int],
+     *         "delay"            => ["enabled" => int, "disabled" => int],
+     *         "repeat"           => ["enabled" => int, "disabled" => int],
+     *         "on_readable"      => ["enabled" => int, "disabled" => int],
+     *         "on_writable"      => ["enabled" => int, "disabled" => int],
+     *         "on_signal"        => ["enabled" => int, "disabled" => int],
+     *         "enabled_watchers" => ["referenced" => int, "unreferenced" => int],
+     *         "running"          => bool
+     *     ];
+     *
+     * Implementations MAY optionally add more information in the array but at minimum the above `key => value` format
+     * MUST always be provided.
+     *
+     * @return array Statistics about the loop in the described format.
+     */
+    public function getInfo(): array
+    {
+        $watchers = [
+            "referenced" => 0,
+            "unreferenced" => 0,
+        ];
+
+        $defer = $delay = $repeat = $onReadable = $onWritable = $onSignal = [
+            "enabled" => 0,
+            "disabled" => 0,
+        ];
+
+        foreach ($this->watchers as $watcher) {
+            switch ($watcher->type) {
+                case Watcher::READABLE:
+                    $array = &$onReadable;
+                    break;
+                case Watcher::WRITABLE:
+                    $array = &$onWritable;
+                    break;
+                case Watcher::SIGNAL:
+                    $array = &$onSignal;
+                    break;
+                case Watcher::DEFER:
+                    $array = &$defer;
+                    break;
+                case Watcher::DELAY:
+                    $array = &$delay;
+                    break;
+                case Watcher::REPEAT:
+                    $array = &$repeat;
+                    break;
+
+                default:
+                    // @codeCoverageIgnoreStart
+                    throw new \Error("Unknown watcher type");
+                // @codeCoverageIgnoreEnd
+            }
+
+            if ($watcher->enabled) {
+                ++$array["enabled"];
+
+                if ($watcher->referenced) {
+                    ++$watchers["referenced"];
+                } else {
+                    ++$watchers["unreferenced"];
+                }
+            } else {
+                ++$array["disabled"];
+            }
+        }
+
+        return [
+            "enabled_watchers" => $watchers,
+            "defer" => $defer,
+            "delay" => $delay,
+            "repeat" => $repeat,
+            "on_readable" => $onReadable,
+            "on_writable" => $onWritable,
+            "on_signal" => $onSignal,
+            "running" => (bool) $this->running,
+        ];
+    }
+}