Add print bool in logging class

DB\IO Tester now has correct testing for pgVersion string compare. Uses
mocked pgVersion return for this

Session class update with full magic set/get or method set/get for
_SESSION var. Also added full testing for this

4dev/bin/create_mo.sh

@@ -8,6 +8,9 @@ for file in $(ls -1 ${base_folder}../4dev/locale/*.po); do
 	echo "Translate language ${file}";
 	locale=$(echo "${file}" | cut -d "-" -f 1);
 	domain=$(echo "${file}" | cut -d "-" -f 2);
+	if [ ! -d "${base_folder}/includes/locale/${locale}/LC_MESSAGES/" ]; then
+		mkdir -p "${base_folder}/includes/locale/${locale}/LC_MESSAGES/";
+	fi;
 	msgfmt -o ${base_folder}/includes/locale/${locale}/LC_MESSAGES/${domain}.mo ${base_folder}../4dev/locale/${locale}-${domain}.po;
 done;
 

4dev/database/table/edit_access_data.sql

@@ -14,3 +14,7 @@ CREATE TABLE edit_access_data (
 	name	VARCHAR,
 	value	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+-- create a unique index for each attached data block for each edit access can
+-- only have ONE value;
+CREATE UNIQUE INDEX edit_access_data_edit_access_id_name_ukey ON edit_access_data (edit_access_id, name);

4dev/tests/CoreLibsACLLoginTest.php

@@ -15,6 +15,7 @@ final class CoreLibsACLLoginTest extends TestCase
 {
 	private static $db;
 	private static $log;
+	private static $session;
 
 	/**
 	 * start DB conneciton, setup DB, etc
@@ -28,6 +29,8 @@ final class CoreLibsACLLoginTest extends TestCase
 				'The PgSQL extension is not available.'
 			);
 		}
+		// init session
+		self::$session = new \CoreLibs\Create\Session('ACLLoginTest');
 		// logger is always needed
 		// define basic connection set valid and one invalid
 		self::$log = new \CoreLibs\Debug\Logging([
@@ -96,7 +99,7 @@ final class CoreLibsACLLoginTest extends TestCase
 			'ACL\Login Tests have not yet been implemented'
 		);
 
-		$login = new \CoreLibs\ACL\Login(self::$db, self::$log);
+		$login = new \CoreLibs\ACL\Login(self::$db, self::$log, self::$session);
 	}
 }
 

4dev/tests/CoreLibsConvertJsonTest.php

@@ -13,7 +13,6 @@ use PHPUnit\Framework\TestCase;
  */
 final class CoreLibsConvertJsonTest extends TestCase
 {
-
 	/**
 	 * test list for json convert tests
 	 *

4dev/tests/CoreLibsCreateSessionTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace tests;
 
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Test class for Create\Session
@@ -20,86 +21,451 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 */
 	public function sessionProvider(): array
 	{
+		// 0: session name as parameter or for GLOBAL value
+		// 1: type p: parameter, g: global, d: php.ini default
+		// 2: mock data as array
+		//    checkCliStatus: true/false,
+		//    getSessionStatus: PHP_SESSION_DISABLED for abort,
+		//                      PHP_SESSION_NONE/ACTIVE for ok
+		//    setSessionName: true/false,
+		//    checkActiveSession: true/false, [1st call, 2nd call]
+		//    getSessionId: string or false
+		// 3: exepcted name (session)
+		// 4: expected error string
 		return [
 			'session parameter' => [
 				'sessionNameParameter',
 				'p',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => true,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => '1234abcd4567'
+				],
 				'sessionNameParameter',
-				'/^\w+$/'
+				''
 			],
 			'session globals' => [
 				'sessionNameGlobals',
 				'g',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => true,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => '1234abcd4567'
+				],
 				'sessionNameGlobals',
-				'/^\w+$/'
+				''
 			],
-			'session constant' => [
-				'sessionNameConstant',
-				'c',
-				'sessionNameConstant',
-				'/^\w+$/'
+			'session name default' => [
+				'',
+				'd',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => true,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => '1234abcd4567'
+				],
+				'',
+				''
+			],
+			// error checks
+			// 1: we are in cli
+			'on cli error' => [
+				'',
+				'd',
+				[
+					'checkCliStatus' => true,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => true,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => '1234abcd4567'
+				],
+				'',
+				'[SESSION] No sessions in php cli'
+			],
+			// 2: session disabled
+			'session disabled error' => [
+				'',
+				'd',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_DISABLED,
+					'setSessionName' => true,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => '1234abcd4567'
+				],
+				'',
+				'[SESSION] Sessions are disabled'
+			],
+			// 3: invalid session name: string
+			'invalid name chars error' => [
+				'1invalid$session#;',
+				'p',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => false,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => '1234abcd4567'
+				],
+				'',
+				'[SESSION] Invalid session name: 1invalid$session#;'
+			],
+			// 3: invalid session name: only numbers
+			'invalid name numbers only error' => [
+				'123',
+				'p',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => false,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => '1234abcd4567'
+				],
+				'',
+				'[SESSION] Invalid session name: 123'
+			],
+			// 3: invalid session name: invalid name short
+			// 3: invalid session name: too long (128)
+			// 4: failed to start session (2nd false on check active session)
+			'invalid name numbers only error' => [
+				'',
+				'd',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => true,
+					'checkActiveSession' => [false, false],
+					'getSessionId' => '1234abcd4567'
+				],
+				'',
+				'[SESSION] Failed to activate session'
+			],
+			// 5: get session id return false
+			'invalid name numbers only error' => [
+				'',
+				'd',
+				[
+					'checkCliStatus' => false,
+					'getSessionStatus' => PHP_SESSION_NONE,
+					'setSessionName' => true,
+					'checkActiveSession' => [false, true],
+					'getSessionId' => false
+				],
+				'',
+				'[SESSION] getSessionId did not return a session id'
 			],
 		];
 	}
 
 	/**
-	 * Undocumented function
+	 * Test session start
 	 *
+	 * @covers ::startSession
+	 * @dataProvider sessionProvider
+	 * @testdox startSession $input name for $type will be $expected (error: $expected_error) [$_dataName]
+	 *
+	 * @param string $input
+	 * @param string $type
+	 * @param array<mixed> $mock_data
+	 * @param string $expected
+	 * @param string $expected_error
 	 * @return void
 	 */
-	protected function setUp(): void
-	{
-		if (session_id()) {
-			session_destroy();
+	public function testStartSession(
+		string $input,
+		string $type,
+		array $mock_data,
+		string $expected,
+		string $expected_error,
+	): void {
+		// override expected
+		if ($type == 'd') {
+			$expected = ini_get('session.name');
+		}
+		/** @var \CoreLibs\Create\Session&MockObject $session_mock */
+		$session_mock = $this->createPartialMock(
+			\CoreLibs\Create\Session::class,
+			[
+				'checkCliStatus', 'getSessionStatus', 'checkActiveSession',
+				'setSessionName', 'startSessionCall', 'getSessionId',
+				'getSessionName'
+			]
+		);
+		// set return values based requested input values
+		// OK: true
+		// error: false
+		$session_mock->method('checkCliStatus')->willReturn($mock_data['checkCliStatus']);
+		// OK: PHP_SESSION_ACTIVE, PHP_SESSION_NONE
+		// error: PHP_SESSION_DISABLED
+		$session_mock->method('getSessionStatus')->willReturn($mock_data['getSessionStatus']);
+		// false: try start
+		// true: skip start
+		// note that on second call if false -> error
+		$session_mock->method('checkActiveSession')
+			->willReturnOnConsecutiveCalls(
+				$mock_data['checkActiveSession'][0],
+				$mock_data['checkActiveSession'][1],
+			);
+		// dummy set for session name
+		$session_mock->method('setSessionName')->with($input)->willReturn($mock_data['setSessionName']);
+		// set session name & return bsed on request data
+		$session_mock->method('getSessionName')->willReturn($expected);
+		// will not return anything
+		$session_mock->method('startSessionCall');
+		// in test case only return string
+		// false: will return false
+		$session_mock->method('getSessionId')->willReturn($mock_data['getSessionId']);
+
+		// regex for session id
+		$ression_id_regex = "/^\w+$/";
+
+		unset($GLOBALS['SET_SESSION_NAME']);
+		$session_id = '';
+		switch ($type) {
+			case 'p':
+				$session_id = $session_mock->startSession($input);
+				break;
+			case 'g':
+				$GLOBALS['SET_SESSION_NAME'] = $input;
+				$session_id = $session_mock->startSession();
+				break;
+			case 'd':
+				$session_id = $session_mock->startSession();
+				break;
+		}
+		// asert checks
+		if (!empty($session_id)) {
+			$this->assertMatchesRegularExpression(
+				$ression_id_regex,
+				(string)$session_id,
+				'session id regex from retrun'
+			);
+			$this->assertMatchesRegularExpression(
+				$ression_id_regex,
+				(string)$session_mock->getSessionId()
+			);
+			$this->assertEquals(
+				$expected,
+				$session_mock->getSessionName()
+			);
+		} else {
+			// false checks
+			$this->assertEquals(
+				$expected_error,
+				$session_mock->getErrorStr(),
+				'error assert'
+			);
 		}
 	}
 
 	/**
-	 * Undocumented function
+	 * provider for session name check
 	 *
-	 * @dataProvider sessionProvider
-	 * @testdox  startSession $input name for $type will be $expected_n with $expected_i [$_dataName]
+	 * @return array
+	 */
+	public function sessionNameProvider(): array
+	{
+		// 0: string for session
+		// 1: expected return as bool
+		return [
+			'valid name' => [
+				'abc',
+				true
+			],
+			'valid name longer' => [
+				'something-abc-123',
+				true
+			],
+			'invalid name' => [
+				'abc#abc',
+				false
+			],
+			'only numbers' => [
+				'123',
+				false
+			],
+			'longer than 128 chars' => [
+				'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'
+					. 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'
+					. 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz',
+				false
+			],
+			'too short' => [
+				'',
+				false
+			],
+		];
+	}
+
+	/**
+	 * test valid session name
 	 *
-	 * @param string $input
-	 * @param string $type
-	 * @param string|bool $expected_n
-	 * @param string|bool $expected_i
+	 * @covers ::checkValidSessionName
+	 * @dataProvider sessionNameProvider
+	 * @testdox checkValidSessionName $input seessionn name is $expected [$_dataName]
+	 *
+	 * @param  string $input
+	 * @param  bool   $expected
 	 * @return void
 	 */
-	public function testStartSession(string $input, string $type, $expected_n, $expected_i): void
+	public function testCheckValidSessionName(string $input, bool $expected): void
 	{
-		// NEEDS MOCKING
-		/* $session_id = '';
-		switch ($type) {
-			case 'p':
-				$session_id = \CoreLibs\Create\Session::startSession($input);
-				break;
-			case 'g':
-				$GLOBALS['SET_SESSION_NAME'] = $input;
-				$session_id = \CoreLibs\Create\Session::startSession();
-				break;
-			case 'c':
-				define('SET_SESSION_NAME', $input);
-				$session_id = \CoreLibs\Create\Session::startSession();
-				break;
-		}
-		$this->assertMatchesRegularExpression(
-			$expected_i,
-			(string)$session_id
-		);
-		$this->assertMatchesRegularExpression(
-			$expected_i,
-			(string)\CoreLibs\Create\Session::getSessionId()
-		);
 		$this->assertEquals(
-			$expected_n,
-			\CoreLibs\Create\Session::getSessionName()
+			$expected,
+			\CoreLibs\Create\Session::checkValidSessionName($input)
 		);
-		if ($type == 'g') {
-			unset($GLOBALS['SET_SESSION_NAME']);
-		} */
-		$this->markTestSkipped('[CoreLibsCreateSessionTest] No implementation '
-			. 'for Create\Session. Cannot run session_start in CLI');
+	}
+
+	/**
+	 * provider for set/get tests
+	 *
+	 * @return array
+	 */
+	public function sessionDataProvider(): array
+	{
+		return [
+			'test' => [
+				'foo',
+				'bar',
+				'bar',
+			],
+			'int key test' => [
+				123,
+				'bar',
+				'bar',
+			],
+			// more complex value tests
+			'array values' => [
+				'array',
+				[1, 2, 3],
+				[1, 2, 3],
+			]
+		];
+	}
+
+	/**
+	 * method call test
+	 *
+	 * @covers ::setS
+	 * @covers ::getS
+	 * @covers ::issetS
+	 * @covers ::unsetS
+	 * @dataProvider sessionDataProvider
+	 * @testdox setS/getS/issetS/unsetS $name with $input is $expected [$_dataName]
+	 *
+	 * @param  string|int $name
+	 * @param  mixed $input
+	 * @param  mixed $expected
+	 * @return void
+	 */
+	public function testMethodSetGet($name, $input, $expected): void
+	{
+		$session = new \CoreLibs\Create\Session();
+		$session->setS($name, $input);
+		$this->assertEquals(
+			$expected,
+			$session->getS($name),
+			'method set assert'
+		);
+		// isset true
+		$this->assertTrue(
+			$session->issetS($name),
+			'method isset assert ok'
+		);
+		$session->unsetS($name);
+		$this->assertEquals(
+			'',
+			$session->getS($name),
+			'method unset assert'
+		);
+		// iset false
+		$this->assertFalse(
+			$session->issetS($name),
+			'method isset assert false'
+		);
+	}
+
+	/**
+	 * magic call test
+	 *
+	 * @covers ::__set
+	 * @covers ::__get
+	 * @covers ::__isset
+	 * @covers ::__unset
+	 * @dataProvider sessionDataProvider
+	 * @testdox __set/__get/__iseet/__unset $name with $input is $expected [$_dataName]
+	 *
+	 * @param  string|int $name
+	 * @param  mixed $input
+	 * @param  mixed $expected
+	 * @return void
+	 */
+	public function testMagicSetGet($name, $input, $expected): void
+	{
+		$session = new \CoreLibs\Create\Session();
+		$session->$name = $input;
+		$this->assertEquals(
+			$expected,
+			$session->$name,
+			'magic set assert'
+		);
+		// isset true
+		$this->assertTrue(
+			isset($session->$name),
+			'magic isset assert ok'
+		);
+		unset($session->$name);
+		$this->assertEquals(
+			'',
+			$session->$name,
+			'magic unset assert'
+		);
+		// isset true
+		$this->assertFalse(
+			isset($session->$name),
+			'magic isset assert false'
+		);
+	}
+
+	/**
+	 * unset all test
+	 *
+	 * @covers ::unsetAllS
+	 * @testdox unsetAllS test
+	 *
+	 * @return void
+	 */
+	public function testUnsetAll(): void
+	{
+		$test_values = [
+			'foo' => 'abc',
+			'bar' => '123'
+		];
+		$session = new \CoreLibs\Create\Session();
+		foreach ($test_values as $name => $value) {
+			$session->setS($name, $value);
+			// confirm set
+			$this->assertEquals(
+				$value,
+				$session->getS($name),
+				'set assert: ' . $name
+			);
+		}
+		// unset all
+		$session->unsetAllS();
+		// check unset
+		foreach (array_keys($test_values) as $name) {
+			$this->assertEquals(
+				'',
+				$session->getS($name),
+				'unsert assert: ' . $name
+			);
+		}
 	}
 }
 

4dev/tests/CoreLibsDBIOTest.php

@@ -36,6 +36,7 @@ declare(strict_types=1);
 namespace tests;
 
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Test class for DB\IO + DB\SQL\PgSQL
@@ -387,28 +388,24 @@ final class CoreLibsDBIOTest extends TestCase
 	public function testDbVerson(string $input, bool $expected): void
 	{
 		// connect to valid DB
-		$db = new \CoreLibs\DB\IO(
-			self::$db_config['valid'],
-			self::$log
-		);
+		// $db = new \CoreLibs\DB\IO(
+		// 	self::$db_config['valid'],
+		// 	self::$log
+		// );
+
+		/** @var \CoreLibs\DB\IO&MockObject $db_io_mock */
+		$db_io_mock = $this->createPartialMock(\CoreLibs\DB\IO::class, ['dbVersion']);
+		$db_io_mock->method('dbVersion')->willReturn('13.6.0');
 
 		// print "DB VERSION: " . $db->dbVersion()  . "\n";
-
-		// TODO: Mock \CoreLibs\DB\SQL\PgSQL somehow or Mock \CoreLibsDB\IO::dbVersion
-		// Create a stub for the SomeClass class.
-		// $stub = $this->createMock(\CoreLibs\DB\IO::class);
-		// $stub->method('dbVersion')
-		// 	->willReturn('13.1.0');
-		// print "DB: " . $stub->dbVersion() . "\n";
+		// print "DB Mock: " . $stub->dbVersion() . "\n";
 		// print "TEST: " . ($stub->dbCompareVersion('=13.1.0') ? 'YES' : 'NO') . "\n";
 		// print "TEST: " . ($stub->dbCompareVersion('=13.6.0') ? 'YES' : 'NO') . "\n";
-		// $mock = $this->getMockBuilder(CoreLibs\DB\IO::class)
-		// 	->addMethods(['dbVersion'])
-		// 	->ge‌​tMock();
 
 		$this->assertEquals(
 			$expected,
-			$db->dbCompareVersion($input)
+			// $db->dbCompareVersion($input)
+			$db_io_mock->dbCompareVersion($input)
 		);
 
 		// print "IT HAS TO BE 13.1.0: " . $stub->dbVersion() . "\n";

www/admin/class_test.admin.backend.php

@@ -23,14 +23,12 @@ define('USE_DATABASE', true);
 require 'config.php';
 // override ECHO ALL FALSE
 $ECHO_ALL = true;
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-admin';
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
 ob_end_flush();
 
+$session = new CoreLibs\Create\Session($SET_SESSION_NAME);
 $log = new CoreLibs\Debug\Logging([
 	'log_folder' => BASE . LOG,
 	'file_id' => $LOG_FILE_ID,
@@ -49,7 +47,7 @@ $l10n = new \CoreLibs\Language\L10n(
 	$locale['domain'],
 	$locale['path'],
 );
-$backend = new CoreLibs\Admin\Backend($db, $log, $l10n, $locale);
+$backend = new CoreLibs\Admin\Backend($db, $log, $session, $l10n, $locale);
 
 $PAGE_NAME = 'TEST CLASS: ADMIN BACKEND';
 print "<!DOCTYPE html>";

www/admin/class_test.array.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-array';
 ob_end_flush();

www/admin/class_test.autoloader.php

@@ -20,10 +20,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-autoloader';
 ob_end_flush();

www/admin/class_test.byte.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-byte';
 ob_end_flush();

www/admin/class_test.colors.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-colors';
 ob_end_flush();

www/admin/class_test.datetime.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-datetime';
 ob_end_flush();

www/admin/class_test.debug.php

@@ -181,6 +181,10 @@ $debug->debug('TEST PER LEVEL', 'Per level test');
 $debug->debug('()', 'Per level test: invalid chars');
 $debug->setLogPer('level', false);
 
+$ar = ['A', 1, ['B' => 'D']];
+$debug->debug('ARRAY', 'Array: ' . $debug->prAr($ar));
+$debug->debug('BOOL', 'True: ' . $debug->prBl(true) . ', False: ' . $debug->prBl(false));
+
 // error message
 // future DEPRECATED
 // $debug->debug('BASIC CLASS', 'Debug test');

www/admin/class_test.email.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-email';
 ob_end_flush();

www/admin/class_test.encoding.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-encoding';
 ob_end_flush();

www/admin/class_test.file.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-datetime';
 ob_end_flush();

www/admin/class_test.hash.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-hash';
 ob_end_flush();

www/admin/class_test.html.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-html';
 ob_end_flush();

www/admin/class_test.image.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-image';
 ob_end_flush();

www/admin/class_test.json.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-json';
 ob_end_flush();

www/admin/class_test.lang.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-lang';
 ob_end_flush();

www/admin/class_test.login.php

@@ -21,13 +21,11 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-login';
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
 // init login & backend class
+$session = new CoreLibs\Create\Session($SET_SESSION_NAME);
 $log = new CoreLibs\Debug\Logging([
 	'log_folder' => BASE . LOG,
 	'file_id' => $LOG_FILE_ID,
@@ -39,7 +37,7 @@ $log = new CoreLibs\Debug\Logging([
 	'print_all' => $PRINT_ALL ?? false,
 ]);
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
-$login = new CoreLibs\ACL\Login($db, $log);
+$login = new CoreLibs\ACL\Login($db, $log, $session);
 ob_end_flush();
 
 $PAGE_NAME = 'TEST CLASS: LOGIN';

www/admin/class_test.math.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-math';
 ob_end_flush();

www/admin/class_test.mime.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-mime';
 ob_end_flush();

www/admin/class_test.output.form.php

@@ -23,10 +23,6 @@ define('USE_DATABASE', true);
 require 'config.php';
 // override ECHO ALL FALSE
 $ECHO_ALL = true;
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-form';
 ob_end_flush();

www/admin/class_test.password.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-pass';
 ob_end_flush();

www/admin/class_test.php

@@ -21,14 +21,12 @@ ob_start();
 define('USE_DATABASE', true);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest';
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
 
 // init login & backend class
+$session = new CoreLibs\Create\Session($SET_SESSION_NAME);
 $log = new CoreLibs\Debug\Logging([
 	'log_folder' => BASE . LOG,
 	'file_id' => $LOG_FILE_ID,
@@ -40,14 +38,14 @@ $log = new CoreLibs\Debug\Logging([
 	'print_all' => $PRINT_ALL ?? false,
 ]);
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
-$login = new CoreLibs\ACL\Login($db, $log);
+$login = new CoreLibs\ACL\Login($db, $log, $session);
 $locale = \CoreLibs\Language\GetLocale::setLocale();
 $l10n = new \CoreLibs\Language\L10n(
 	$locale['locale'],
 	$locale['domain'],
 	$locale['path'],
 );
-$backend = new CoreLibs\Admin\Backend($db, $log, $l10n, $locale);
+$backend = new CoreLibs\Admin\Backend($db, $log, $session, $l10n, $locale);
 $backend->db->dbInfo(true);
 ob_end_flush();
 

www/admin/class_test.phpv.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-phpv';
 ob_end_flush();

www/admin/class_test.randomkey.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-randomkey';
 ob_end_flush();

www/admin/class_test.readenvfile.php

@@ -14,10 +14,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-readEnvFile';
 ob_end_flush();

www/admin/class_test.runningtime.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-runningtime';
 ob_end_flush();

www/admin/class_test.session.php

@@ -43,10 +43,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-// if (!defined('SET_SESSION_NAME')) {
-// 	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-// }
 // define log file id
 $LOG_FILE_ID = 'classTest-session';
 ob_end_flush();
@@ -62,6 +58,7 @@ $log = new CoreLibs\Debug\Logging([
 	'print_all' => $PRINT_ALL ?? false,
 ]);
 use CoreLibs\Create\Session;
+$session = new Session();
 
 $PAGE_NAME = 'TEST CLASS: SESSION';
 print "<!DOCTYPE html>";
@@ -76,15 +73,15 @@ $value = 'bar';
 
 foreach (['123', '123-123', '123abc'] as $_session_name) {
 	print "[UNSET] Session Name valid for " . $_session_name . ": "
-		. (Session::checkValidSessionName($_session_name) ? 'Valid' : 'Invalid') . "<br>";
+		. ($session->checkValidSessionName($_session_name) ? 'Valid' : 'Invalid') . "<br>";
 }
 
 echo "Global session name: " . ($GLOBALS['SET_SESSION_NAME'] ?? '-') . "<br>";
 
-print "[UNSET] Current session id: " . Session::getSessionId() . "<br>";
-print "[UNSET] Current session name: " . Session::getSessionName() . "<br>";
-print "[UNSET] Current session active: " . (Session::checkActiveSession() ? 'Yes' : 'No') . "<br>";
-print "[UNSET] Current session status: " . getSessionStatusString(Session::getSessionStatus()) . "<br>";
+print "[UNSET] Current session id: " . $session->getSessionId() . "<br>";
+print "[UNSET] Current session name: " . $session->getSessionName() . "<br>";
+print "[UNSET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[UNSET] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
 if (isset($_SESSION)) {
 	print "[UNSET] _SESSION is: set<br>";
 } else {
@@ -92,22 +89,22 @@ if (isset($_SESSION)) {
 }
 #
 print "[UNSET] To set session name valid: "
-	. (Session::checkValidSessionName($session_name) ? 'Valid' : 'Invalid') . "<br>";
-if (false === ($session = Session::startSession($session_name))) {
-	print "[FAILED] Session start failed: " . Session::getErrorStr() . "<br>";
+	. ($session->checkValidSessionName($session_name) ? 'Valid' : 'Invalid') . "<br>";
+if (false === ($session_id = $session->startSession($session_name))) {
+	print "[FAILED] Session start failed: " . $session->getErrorStr() . "<br>";
 } else {
-	print "[SET] Current session id: " . $session . "<br>";
+	print "[SET] Current session id: " . $session_id . "<br>";
 }
 // set again
-if (false === ($session = Session::startSession($session_name))) {
-	print "[2 FAILED] Session start failed: " . Session::getErrorStr() . "<br>";
+if (false === ($session_id = $session->startSession($session_name))) {
+	print "[2 FAILED] Session start failed: " . $session->getErrorStr() . "<br>";
 } else {
-	print "[2 SET] Current session id: " . $session . "<br>";
+	print "[2 SET] Current session id: " . $session_id . "<br>";
 }
-print "[SET] Current session id: " . Session::getSessionId() . "<br>";
-print "[SET] Current session name: " . Session::getSessionName() . "<br>";
-print "[SET] Current session active: " . (Session::checkActiveSession() ? 'Yes' : 'No') . "<br>";
-print "[SET] Current session status: " . getSessionStatusString(Session::getSessionStatus()) . "<br>";
+print "[SET] Current session id: " . $session->getSessionId() . "<br>";
+print "[SET] Current session name: " . $session->getSessionName() . "<br>";
+print "[SET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[SET] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
 if (isset($_SESSION)) {
 	print "[SET] _SESSION is: set<br>";
 } else {
@@ -117,51 +114,66 @@ if (!isset($_SESSION['counter'])) {
 	$_SESSION['counter'] = 0;
 }
 $_SESSION['counter']++;
-print "[READ] " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
+print "[READ] A " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
 $_SESSION[$var] = $value;
-print "[READ] " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
+print "[READ] B " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
 print "[READ] Confirm " . $var . " is " . $value . ": "
 	. (($_SESSION[$var] ?? '') == $value ? 'Matching' : 'Not matching') . "<br>";
 
+// test set wrappers methods
+$session->setS('setwrap', 'YES, method set _SESSION var');
+print "[READ WRAP] A setwrap: " . $session->getS('setwrap') . "<br>";
+print "[READ WRAP] Isset: " . ($session->issetS('setwrap') ? 'Yes' : 'No') . "<br>";
+$session->unsetS('setwrap');
+print "[READ WRAP] unset setwrap: " . $session->getS('setwrap') . "<br>";
+print "[READ WRAP] unset Isset: " . ($session->issetS('setwrap') ? 'Yes' : 'No') . "<br>";
+// test __get/__set
+$session->setwrap = 'YES, magic set _SESSION var';
+print "[READ MAGIC] A setwrap: " . $session->setwrap . "<br>";
+print "[READ MAGIC] Isset: " . (isset($session->setwrap) ? 'Yes' : 'No') . "<br>";
+unset($session->setwrap);
+print "[READ MAGIC] unset setwrap: " . $session->setwrap . "<br>";
+print "[READ MAGIC] unset Isset: " . (isset($session->setwrap) ? 'Yes' : 'No') . "<br>";
+
 // differnt session name
 $session_name = 'class-test-session-ALT';
-if (false === ($session = Session::startSession($session_name))) {
-	print "[3 FAILED] Session start failed: " . Session::getErrorStr() . "<br>";
+if (false === ($session_id = $session->startSession($session_name))) {
+	print "[3 FAILED] Session start failed: " . $session->getErrorStr() . "<br>";
 } else {
-	print "[3 SET] Current session id: " . $session . "<br>";
+	print "[3 SET] Current session id: " . $session_id . "<br>";
 }
-print "[SET AGAIN] Current session id: " . Session::getSessionId() . "<br>";
+print "[SET AGAIN] Current session id: " . $session->getSessionId() . "<br>";
 
 print "[ALL SESSION]: " . \CoreLibs\Debug\Support::printAr($_SESSION) . "<br>";
 
 // close session
-Session::writeClose();
+$session->writeClose();
 // will never be written
 $_SESSION['will_never_be_written'] = 'empty';
 
 // open again
 $session_name = 'class-test-session';
-if (false === ($session = Session::startSession($session_name))) {
-	print "[4 FAILED] Session start failed: " . Session::getErrorStr() . "<br>";
+if (false === ($session_id = $session->startSession($session_name))) {
+	print "[4 FAILED] Session start failed: " . $session->getErrorStr() . "<br>";
 } else {
-	print "[4 SET] Current session id: " . $session . "<br>";
+	print "[4 SET] Current session id: " . $session_id . "<br>";
 }
-print "[START AGAIN] Current session id: " . Session::getSessionId() . "<br>";
+print "[START AGAIN] Current session id: " . $session->getSessionId() . "<br>";
 $_SESSION['will_be_written_again'] = 'Full';
 
 // close session
-Session::writeClose();
+$session->writeClose();
 // invalid
 $session_name = '123';
-if (false === ($session = Session::startSession($session_name))) {
-	print "[5 FAILED] Session start failed: " . Session::getErrorStr() . "<br>";
+if (false === ($session_id = $session->startSession($session_name))) {
+	print "[5 FAILED] Session start failed: " . $session->getErrorStr() . "<br>";
 } else {
-	print "[5 SET] Current session id: " . $session . "<br>";
+	print "[5 SET] Current session id: " . $session_id . "<br>";
 }
-print "[BAD NAME] Current session id: " . Session::getSessionId() . "<br>";
-print "[BAD NAME] Current session name: " . Session::getSessionName() . "<br>";
-print "[BAD NAME] Current session active: " . (Session::checkActiveSession() ? 'Yes' : 'No') . "<br>";
-print "[BAD NAME] Current session status: " . getSessionStatusString(Session::getSessionStatus()) . "<br>";
+print "[BAD NAME] Current session id: " . $session->getSessionId() . "<br>";
+print "[BAD NAME] Current session name: " . $session->getSessionName() . "<br>";
+print "[BAD NAME] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[BAD NAME] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
 
 // error message
 print $log->printErrorMsg();

www/admin/class_test.session.read.php

@@ -43,10 +43,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-session.read';
 ob_end_flush();
@@ -62,6 +58,7 @@ $log = new CoreLibs\Debug\Logging([
 	'print_all' => $PRINT_ALL ?? false,
 ]);
 use CoreLibs\Create\Session;
+$session = new Session();
 
 $PAGE_NAME = 'TEST CLASS: SESSION (READ)';
 print "<!DOCTYPE html>";
@@ -77,28 +74,28 @@ $value = 'bar';
 
 echo "Global session name: " . ($GLOBALS['SET_SESSION_NAME'] ?? '-') . "<br>";
 
-print "[UNSET] Current session id: " . Session::getSessionId() . "<br>";
-print "[UNSET] Current session name: " . Session::getSessionName() . "<br>";
-print "[UNSET] Current session active: " . (Session::checkActiveSession() ? 'Yes' : 'No') . "<br>";
-print "[UNSET] Current session status: " . getSessionStatusString(Session::getSessionStatus()) . "<br>";
+print "[UNSET] Current session id: " . $session->getSessionId() . "<br>";
+print "[UNSET] Current session name: " . $session->getSessionName() . "<br>";
+print "[UNSET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[UNSET] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
 
 print "[READ] " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
 // start
-if (false === ($session = Session::startSession($session_name))) {
-	print "Session start failed: " . Session::getErrorStr() . "<br>";
+if (false === ($session_id = $session->startSession($session_name))) {
+	print "Session start failed: " . $session->getErrorStr() . "<br>";
 } else {
-	print "Current session id: " . $session . "<br>";
+	print "Current session id: " . $session_id . "<br>";
 }
 // set again
-if (false === ($session = Session::startSession($session_name))) {
+if (false === ($session_id = $session->startSession($session_name))) {
 	print "[2] Session start failed<br>";
 } else {
-	print "[2] Current session id: " . $session . "<br>";
+	print "[2] Current session id: " . $session_id . "<br>";
 }
-print "[SET] Current session id: " . Session::getSessionId() . "<br>";
-print "[SET] Current session name: " . Session::getSessionName() . "<br>";
-print "[SET] Current session active: " . (Session::checkActiveSession() ? 'Yes' : 'No') . "<br>";
-print "[SET] Current session status: " . getSessionStatusString(Session::getSessionStatus()) . "<br>";
+print "[SET] Current session id: " . $session->getSessionId() . "<br>";
+print "[SET] Current session name: " . $session->getSessionName() . "<br>";
+print "[SET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[SET] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
 print "[READ] " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
 print "[READ] Confirm " . $var . " is " . $value . ": "
 	. (($_SESSION[$var] ?? '') == $value ? 'Matching' : 'Not matching') . "<br>";

www/admin/class_test.smarty.php

@@ -23,10 +23,6 @@ define('USE_DATABASE', true);
 require 'config.php';
 // override ECHO ALL FALSE
 $ECHO_ALL = true;
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-smarty';
 ob_end_flush();

www/admin/class_test.system.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-system';
 ob_end_flush();
@@ -50,16 +46,23 @@ print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
+print "System::getHostName():<br>";
 print "GETHOSTNAME: " . DgS::printAr(System::getHostName()) . "<br>";
+print "System::getPageName():<br>";
 print "GETPAGENAME(0): " . System::getPageName() . "<br>";
 print "GETPAGENAME(1): " . System::getPageName(System::NO_EXTENSION) . "<br>";
 print "GETPAGENAME(2): " . System::getPageName(System::FULL_PATH) . "<br>";
+print "System::getPageNameArray():<br>";
 print "GETPAGENAMEARRAY: " . \CoreLibs\Debug\Support::printAr(System::getPageNameArray()) . "<br>";
 // seting errro codes file upload
+print "System::fileUploadErrorMessage():<br>";
 print "FILEUPLOADERRORMESSAGE(): " . System::fileUploadErrorMessage(-1) . "<br>";
 print "FILEUPLOADERRORMESSAGE(UPLOAD_ERR_CANT_WRITE): "
 	. System::fileUploadErrorMessage(UPLOAD_ERR_CANT_WRITE) . "<br>";
 
+print "System::checkCLI():<br>";
+print "Are we in an CLI: " . (System::checkCLI() ? 'Yes' : 'No') . "<br>";
+
 // error message
 print $log->printErrorMsg();
 

www/admin/class_test.token.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-token';
 ob_end_flush();

www/admin/class_test.uids.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-uids';
 ob_end_flush();

www/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fb2235a66a37d89e7941a863843d2e15",
+    "content-hash": "a71e6f4fbc06f0efb6ad34538b515c53",
     "packages": [],
     "packages-dev": [
         {
@@ -415,16 +415,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.6.0",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
+                "reference": "77a32518733312af16a44300404e945338981de3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
+                "reference": "77a32518733312af16a44300404e945338981de3",
                 "shasum": ""
             },
             "require": {
@@ -459,9 +459,9 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
             },
-            "time": "2022-01-04T19:58:01+00:00"
+            "time": "2022-03-15T21:29:03+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -850,16 +850,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.19",
+            "version": "9.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
+                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
-                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
                 "shasum": ""
             },
             "require": {
@@ -937,7 +937,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
             },
             "funding": [
                 {
@@ -949,7 +949,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-15T09:57:31+00:00"
+            "time": "2022-04-01T12:37:26+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1317,16 +1317,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.3",
+            "version": "5.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
                 "shasum": ""
             },
             "require": {
@@ -1368,7 +1368,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
             },
             "funding": [
                 {
@@ -1376,7 +1376,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:52:38+00:00"
+            "time": "2022-04-03T09:37:03+00:00"
         },
         {
             "name": "sebastian/exporter",

www/configs/config.host.php

@@ -53,7 +53,10 @@ $SITE_CONFIG = [
 		'login_enabled' => true
 	],
 	// 'other.host.com' => $__LOCAL_CONFIG
-	'soba-dev.tequila.jp' => $__LOCAL_CONFIG
+	'soba-dev.tequila.jp' => $__LOCAL_CONFIG,
+	'soba.tequila.jp' => $__LOCAL_CONFIG,
+	'soba.teq.jp' => $__LOCAL_CONFIG,
+	'soba-local.tokyo.tequila.jp' => $__LOCAL_CONFIG,
 ];
 
 // __END__

www/configs/config.master.php

@@ -150,8 +150,6 @@ define('SERVER_PATH_HASH', hash('crc32b', BASE));
 define('EDIT_SESSION_NAME', BASE_NAME . 'Admin' . SERVER_NAME_HASH . SERVER_PATH_HASH);
 // frontend
 define('SESSION_NAME', BASE_NAME . SERVER_NAME_HASH . SERVER_PATH_HASH);
-// SET_SESSION_NAME should be set in the header if a special session name is needed
-define('SET_SESSION_NAME', SESSION_NAME);
 
 /************* CACHE/COMPILE IDS *************/
 define('CACHE_ID', 'CACHE_' . BASE_NAME . '_' . SERVER_NAME_HASH);

www/includes/admin_header.php

@@ -19,15 +19,17 @@ if (!empty($DEBUG_ALL) && !empty($ENABLE_ERROR_HANDLING)) {
 //------------------------------ library include start
 // set output to quiet for load of classes & session settings
 ob_start();
-// set the session name
-$SET_SESSION_NAME = EDIT_SESSION_NAME;
-$LOG_FILE_ID = BASE_NAME . 'Admin';
 //------------------------------ library include end
 
 //------------------------------ basic variable settings start
+// set the session name
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
+$LOG_FILE_ID = BASE_NAME . 'Admin';
+// ajax page flag
 if (!isset($AJAX_PAGE)) {
 	$AJAX_PAGE = false;
 }
+// zip download flag
 if (!isset($ZIP_STREAM)) {
 	$ZIP_STREAM = false;
 }
@@ -42,15 +44,15 @@ if (isset($_POST['action']) && $_POST['action'] != 'download_csv' && !$AJAX_PAGE
 if ($AJAX_PAGE && !$ZIP_STREAM) {
 	header("Content-Type: application/json; charset=UTF-8");
 }
-// start session
-CoreLibs\Create\Session::startSession();
 //------------------------------ basic variable settings start
 
 //------------------------------ class init start
+// start session
+$session = new \CoreLibs\Create\Session($SET_SESSION_NAME);
 // create logger
-$log = new CoreLibs\Debug\Logging([
+$log = new \CoreLibs\Debug\Logging([
 	'log_folder' => BASE . LOG,
-	'file_id' => LOG_FILE_ID,
+	'file_id' => $LOG_FILE_ID,
 	'print_file_date' => true,
 	'debug_all' => $DEBUG_ALL ?? false,
 	'echo_all' => $ECHO_ALL ?? false,
@@ -69,9 +71,9 @@ if (
 	}
 }
 // db config with logger
-$db = new CoreLibs\DB\IO(DB_CONFIG, $log);
+$db = new \CoreLibs\DB\IO(DB_CONFIG, $log);
 // login & page access check
-$login = new CoreLibs\ACL\Login($db, $log);
+$login = new \CoreLibs\ACL\Login($db, $log, $session);
 // lang, path, domain
 // pre auto detect language after login
 $locale = \CoreLibs\Language\GetLocale::setLocale();
@@ -82,9 +84,9 @@ $l10n = new \CoreLibs\Language\L10n(
 	$locale['path'],
 );
 // create smarty object
-$smarty = new CoreLibs\Template\SmartyExtend($l10n, $locale);
+$smarty = new \CoreLibs\Template\SmartyExtend($l10n, $locale);
 // create new Backend class with db and loger attached
-$cms = new CoreLibs\Admin\Backend($db, $log, $l10n, $locale);
+$cms = new \CoreLibs\Admin\Backend($db, $log, $session, $l10n, $locale);
 // the menu show flag (what menu to show)
 $cms->menu_show_flag = 'main';
 // db info

www/includes/edit_base.php

@@ -33,8 +33,6 @@ extract($_POST, EXTR_SKIP);
 
 ob_start();
 require 'config.php';
-// set session name here
-// $SET_SESSION_NAME = EDIT_SESSION_NAME;
 // overrride debug flags
 if (!DEBUG)	{
 	$DEBUG_ALL = false;
@@ -45,8 +43,8 @@ if (!DEBUG)	{
 
 // should be utf8
 header("Content-type: text/html; charset=" . DEFAULT_ENCODING);
-// set session
-\CoreLibs\Create\Session::startSession(EDIT_SESSION_NAME);
+// start session
+$session = new \CoreLibs\Create\Session(EDIT_SESSION_NAME);
 // init logger
 $log = new CoreLibs\Debug\Logging([
 	'log_folder' => BASE . LOG,
@@ -60,7 +58,7 @@ $log = new CoreLibs\Debug\Logging([
 // db connection
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
 // login page
-$login = new CoreLibs\ACL\Login($db, $log);
+$login = new CoreLibs\ACL\Login($db, $log, $session);
 // lang, path, domain
 // pre auto detect language after login
 $locale = \CoreLibs\Language\GetLocale::setLocale();

www/lib/CoreLibs/ACL/Login.php

@@ -69,7 +69,6 @@ declare(strict_types=1);
 namespace CoreLibs\ACL;
 
 use CoreLibs\Check\Password;
-use CoreLibs\Create\Session;
 
 class Login
 {
@@ -162,24 +161,30 @@ class Login
 	public $db;
 	/** @var \CoreLibs\Language\L10n language */
 	public $l;
+	/** @var \CoreLibs\Create\Session session class */
+	public $session;
 
 	/**
 	 * constructor, does ALL, opens db, works through connection checks,
 	 * finishes itself
 	 *
-	 * @param \CoreLibs\DB\IO              $db   Database connection class
-	 * @param \CoreLibs\Debug\Logging      $log  Logging class
+	 * @param \CoreLibs\DB\IO          $db      Database connection class
+	 * @param \CoreLibs\Debug\Logging  $log     Logging class
+	 * @param \CoreLibs\Create\Session $session Session interface class
 	 */
 	public function __construct(
 		\CoreLibs\DB\IO $db,
-		\CoreLibs\Debug\Logging $log
+		\CoreLibs\Debug\Logging $log,
+		\CoreLibs\Create\Session $session
 	) {
+		// attach db class
+		$this->db = $db;
 		// log login data for this class only
 		$log->setLogPer('class', true);
 		// attach logger
 		$this->log = $log;
-		// attach db class
-		$this->db = $db;
+		// attach session class
+		$this->session = $session;
 		// set internal page name
 		$this->page_name = \CoreLibs\Get\System::getPageName();
 		// set db special errors
@@ -192,12 +197,9 @@ class Login
 		// initial the session if there is no session running already
 		// check if session exists and could be created
 		// TODO: move session creation and check to outside?
-		if (Session::startSession() === false) {
+		if ($this->session->checkActiveSession() === false) {
 			$this->login_error = 1;
-			echo '<b>Session not started or could not be started!</b><br>'
-				. 'Use \'\CoreLibs\Create\Session::startSession();\'.<br>'
-				. 'For less problems with other session, you can set a '
-				. 'session name with \'\CoreLibs\Create\Session::startSession(\'name\');\'.<br>';
+			echo '<b>No active session found</b>';
 			exit;
 		}
 
@@ -219,7 +221,7 @@ class Login
 		// if there is a schema set in the config, or fall back to DB_SCHEMA
 		// if this exists, if this also does not exists use public schema
 		/** @phpstan-ignore-next-line */
-		if (defined('LOGIN_DB_SCHEMA') && !empty(LOGIN_DB_SCHEMA)) {
+		if (!empty(LOGIN_DB_SCHEMA)) {
 			$SCHEMA = LOGIN_DB_SCHEMA;
 		} elseif (!empty($this->db->dbGetSchema(true))) {
 			$SCHEMA = $this->db->dbGetSchema(true);
@@ -289,19 +291,19 @@ class Login
 		// ** LANGUAGE SET AFTER LOGIN **
 		// set the locale
 		if (
-			Session::getSessionId() !== false &&
+			$this->session->checkActiveSession() === true &&
 			!empty($_SESSION['DEFAULT_LANG'])
 		) {
 			$locale = $_SESSION['DEFAULT_LOCALE'] ?? '';
 		} else {
-			$locale = defined('SITE_LOCALE') && !empty(SITE_LOCALE) ?
+			$locale = !empty(SITE_LOCALE) ?
 				SITE_LOCALE :
 				/** @phpstan-ignore-next-line DEFAULT_LOCALE could be empty */
-				(defined('DEFAULT_LOCALE') && !empty(DEFAULT_LOCALE) ?
+				(!empty(DEFAULT_LOCALE) ?
 					DEFAULT_LOCALE : 'en.UTF-8');
 		}
 		// set domain
-		if (defined('CONTENT_PATH') && !empty(CONTENT_PATH)) {
+		if (defined('CONTENT_PATH')) {
 			$domain = str_replace('/', '', CONTENT_PATH);
 		} else {
 			$domain = 'admin';
@@ -1369,7 +1371,7 @@ EOM;
 				$q .= "NULL, ";
 			}
 		}
-		$q .= "'" . Session::getSessionId() . "', ";
+		$q .= "'" . $this->session->getSessionId() . "', ";
 		$q .= "'" . $this->db->dbEscapeString($this->action) . "', ";
 		$q .= "'" . $this->db->dbEscapeString($this->username) . "', ";
 		$q .= "NULL, ";

www/lib/CoreLibs/Admin/Backend.php

@@ -101,6 +101,8 @@ class Backend
 	public $db;
 	/** @var \CoreLibs\Language\L10n language */
 	public $l;
+	/** @var \CoreLibs\Create\Session session class */
+	public $session;
 	// smarty publics [end processing in smarty class]
 	/** @var array<mixed> */
 	public $DATA;
@@ -114,23 +116,27 @@ class Backend
 	// CONSTRUCTOR / DECONSTRUCTOR |====================================>
 	/**
 	 * main class constructor
-	 * @param \CoreLibs\DB\IO         $db     Database connection class
-	 * @param \CoreLibs\Debug\Logging $log    Logging class
-	 * @param \CoreLibs\Language\L10n $l10n   l10n language class
-	 * @param array<string,string>    $locale locale data read from setLocale
+	 * @param \CoreLibs\DB\IO          $db      Database connection class
+	 * @param \CoreLibs\Debug\Logging  $log     Logging class
+	 * @param \CoreLibs\Create\Session $session Session interface class
+	 * @param \CoreLibs\Language\L10n  $l10n    l10n language class
+	 * @param array<string,string>     $locale  locale data read from setLocale
 	 */
 	public function __construct(
 		\CoreLibs\DB\IO $db,
 		\CoreLibs\Debug\Logging $log,
+		\CoreLibs\Create\Session $session,
 		\CoreLibs\Language\L10n $l10n,
 		array $locale
 	) {
+		// attach db class
+		$this->db = $db;
 		// set to log not per class
 		$log->setLogPer('class', false);
 		// attach logger
 		$this->log = $log;
-		// attach db class
-		$this->db = $db;
+		// attach session class
+		$this->session = $session;
 		// get the language sub class & init it
 		$this->l = $l10n;
 		// parse and read, legacy stuff
@@ -232,9 +238,9 @@ class Backend
 			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_ACCEPT'] ?? '') . "', "
 			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_ACCEPT_CHARSET'] ?? '') . "', "
 			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_ACCEPT_ENCODING'] ?? '') . "', "
-			. (\CoreLibs\Create\Session::getSessionId() === false ?
+			. ($this->session->getSessionId() === false ?
 				"NULL" :
-				"'" . \CoreLibs\Create\Session::getSessionId() . "'")
+				"'" . $this->session->getSessionId() . "'")
 			. ", "
 			. "'" . $this->db->dbEscapeString($this->action) . "', "
 			. "'" . $this->db->dbEscapeString($this->action_id) . "', "

www/lib/CoreLibs/Basic.php

@@ -66,6 +66,8 @@ class Basic
 	// logging interface, Debug\Logging class
 	/** @var \CoreLibs\Debug\Logging */
 	public $log;
+	/** @var\CoreLibs\Create\Session */
+	public $session;
 
 	// email valid checks
 	/** @var array<mixed> */
@@ -148,7 +150,7 @@ class Basic
 		$this->email_regex_check = \CoreLibs\Check\Email::getEmailRegexCheck();
 
 		// initial the session if there is no session running already
-		\CoreLibs\Create\Session::startSession($session_name);
+		$this->session = new \CoreLibs\Create\Session($session_name ?? '');
 	}
 
 	/**

www/lib/CoreLibs/Create/Session.php

@@ -6,7 +6,7 @@
  * start a php sesseion
  * name can be given via startSession parameter
  * if not set tries to read $SET_SESSION_NAME from global
- * if this is not set tries to read SET_SESSION_NAME constant
+ * else will use default set in php.ini
  */
 
 declare(strict_types=1);
@@ -15,24 +15,71 @@ namespace CoreLibs\Create;
 
 class Session
 {
-	/** @var string list for errors*/
-	private static $error_str = '';
+	/** @var string list for errors */
+	private $session_intern_error_str = '';
 
 	/**
-	 * init a session
+	 * init a session, if array is empty or array does not have session_name set
+	 * then no auto init is run
+	 *
+	 * @param string $session_name if set and not empty, will start session
 	 */
-	public function __construct()
+	public function __construct(string $session_name = '')
 	{
+		if (!empty($session_name)) {
+			$this->startSession($session_name);
+		}
+	}
+
+	/**
+	 * check if we are in CLI, we set this, so we can mock this
+	 * Not this is just a wrapper for the static System::checkCLI call
+	 *
+	 * @return bool True if we are in a CLI enviroment, or false for everything else
+	 */
+	public function checkCliStatus(): bool
+	{
+		return \CoreLibs\Get\System::checkCLI();
+	}
+
+	/**
+	 * Set session name call. If not valid session name, will return false
+	 *
+	 * @param  string $session_name A valid string for session name
+	 * @return bool                 True if session name is valid,
+	 *                              False if not
+	 */
+	public function setSessionName(string $session_name): bool
+	{
+		if (!$this->checkValidSessionName($session_name)) {
+			return false;
+		}
+		session_name($session_name);
+		return true;
+	}
+
+	/**
+	 * Start session
+	 * startSession should be called for complete check
+	 * If this is called without any name set before the php.ini name is
+	 * used.
+	 *
+	 * @return void
+	 */
+	public function startSessionCall(): void
+	{
+		session_start();
 	}
 
 	/**
 	 * Return set error string, empty if none set
+	 * Error strings are only set in the startSession method
 	 *
 	 * @return string Last error string
 	 */
-	public static function getErrorStr(): string
+	public function getErrorStr(): string
 	{
-		return self::$error_str;
+		return $this->session_intern_error_str;
 	}
 
 	/**
@@ -61,57 +108,54 @@ class Session
 	}
 
 	/**
-	 * Undocumented function
+	 * start session with given session name if set
+	 * aborts on command line or if sessions are not enabled
+	 * also aborts if session cannot be started
+	 * On sucess returns the session id
 	 *
 	 * @param string|null $session_name
 	 * @return string|bool
 	 */
-	public static function startSession(?string $session_name = null)
+	public function startSession(?string $session_name = null)
 	{
 		// we can't start sessions on command line
-		if (php_sapi_name() === 'cli') {
-			self::$error_str = '[SESSION] No sessions in php cli';
+		if ($this->checkCliStatus()) {
+			$this->session_intern_error_str = '[SESSION] No sessions in php cli';
 			return false;
 		}
 		// if session are OFF
-		if (self::getSessionStatus() === PHP_SESSION_DISABLED) {
-			self::$error_str = '[SESSION] Sessions are disabled';
+		if ($this->getSessionStatus() === PHP_SESSION_DISABLED) {
+			$this->session_intern_error_str = '[SESSION] Sessions are disabled';
 			return false;
 		}
 		// session_status
 		// initial the session if there is no session running already
-		if (!self::checkActiveSession()) {
+		if (!$this->checkActiveSession()) {
 			// if session name is emtpy, check if there is a global set
 			// this is a deprecated fallback
 			$session_name = $session_name ?? $GLOBALS['SET_SESSION_NAME'] ?? '';
-			// check if we have an external session name given, else skip this step
-			// this is a deprecated fallback
-			if (
-				empty($session_name) &&
-				defined('SET_SESSION_NAME') &&
-				!empty(SET_SESSION_NAME)
-			) {
-				// set the session name for possible later check
-				$session_name = SET_SESSION_NAME;
-			}
+			// DEPRECTED: constant SET_SESSION_NAME is no longer used
 			// if set, set special session name
 			if (!empty($session_name)) {
 				// invalid session name, abort
-				if (!self::checkValidSessionName($session_name)) {
-					self::$error_str = '[SESSION] Invalid session name: ' . $session_name;
+				if (!$this->checkValidSessionName($session_name)) {
+					$this->session_intern_error_str = '[SESSION] Invalid session name: ' . $session_name;
 					return false;
 				}
-				session_name($session_name);
+				$this->setSessionName($session_name);
 			}
 			// start session
-			session_start();
+			$this->startSessionCall();
 		}
 		// if we still have no active session
-		if (!self::checkActiveSession()) {
-			self::$error_str = '[SESSION] Failed to activate session';
+		if (!$this->checkActiveSession()) {
+			$this->session_intern_error_str = '[SESSION] Failed to activate session';
 			return false;
 		}
-		return self::getSessionId();
+		if (false === ($session_id = $this->getSessionId())) {
+			$this->session_intern_error_str = '[SESSION] getSessionId did not return a session id';
+		}
+		return $session_id;
 	}
 
 	/**
@@ -119,7 +163,7 @@ class Session
 	 *
 	 * @return string|bool
 	 */
-	public static function getSessionId()
+	public function getSessionId()
 	{
 		return session_id();
 	}
@@ -129,7 +173,7 @@ class Session
 	 *
 	 * @return string|bool
 	 */
-	public static function getSessionName()
+	public function getSessionName()
 	{
 		return session_name();
 	}
@@ -140,9 +184,9 @@ class Session
 	 *
 	 * @return bool True if there is an active session, else false
 	 */
-	public static function checkActiveSession(): bool
+	public function checkActiveSession(): bool
 	{
-		if (self::getSessionStatus() === PHP_SESSION_ACTIVE) {
+		if ($this->getSessionStatus() === PHP_SESSION_ACTIVE) {
 			return true;
 		} else {
 			return false;
@@ -157,7 +201,7 @@ class Session
 	 *
 	 * @return bool True und sucess, false on failure
 	 */
-	public static function writeClose(): bool
+	public function writeClose(): bool
 	{
 		return session_write_close();
 	}
@@ -170,12 +214,125 @@ class Session
 	 *
 	 * https://www.php.net/manual/en/function.session-status.php
 	 *
-	 * @return int
+	 * @return int See possible return int values above
 	 */
-	public static function getSessionStatus(): int
+	public function getSessionStatus(): int
 	{
 		return session_status();
 	}
+
+	// _SESSION set/unset methods
+
+	/**
+	 * unset all _SESSION entries
+	 *
+	 * @return void
+	 */
+	public function unsetAllS(): void
+	{
+		foreach (array_keys($_SESSION ?? []) as $name) {
+			unset($_SESSION[$name]);
+		}
+	}
+
+	/**
+	 * set _SESSION entry 'name' with any value
+	 *
+	 * @param  string|int $name  array name in _SESSION
+	 * @param  mixed      $value value to set (can be anything)
+	 * @return void
+	 */
+	public function setS($name, $value): void
+	{
+		$_SESSION[$name] = $value;
+	}
+
+	/**
+	 * get _SESSION 'name' entry or empty string if not set
+	 *
+	 * @param  string|int $name value key to get from _SESSION
+	 * @return mixed            value stored in _SESSION
+	 */
+	public function getS($name)
+	{
+		return $_SESSION[$name] ?? '';
+	}
+
+	/**
+	 * Check if a name is set in the _SESSION array
+	 *
+	 * @param  string|int $name Name to check for
+	 * @return bool             True for set, False fornot set
+	 */
+	public function issetS($name): bool
+	{
+		return isset($_SESSION[$name]);
+	}
+
+	/**
+	 * unset one _SESSION entry 'name' if exists
+	 *
+	 * @param  string|int $name _SESSION key name to remove
+	 * @return void
+	 */
+	public function unsetS($name): void
+	{
+		if (isset($_SESSION[$name])) {
+			unset($_SESSION[$name]);
+		}
+	}
+
+	// set/get below
+	// ->var = value;
+
+	/**
+	 * Undocumented function
+	 *
+	 * @param  string|int $name
+	 * @param  mixed      $value
+	 * @return void
+	 */
+	public function __set($name, $value): void
+	{
+		$_SESSION[$name] = $value;
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @param  string|int $name
+	 * @return mixed
+	 */
+	public function __get($name)
+	{
+		if (isset($_SESSION[$name])) {
+			return $_SESSION[$name];
+		}
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @param  string|int $name
+	 * @return bool
+	 */
+	public function __isset($name): bool
+	{
+		return isset($_SESSION[$name]);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @param  string|int $name
+	 * @return void
+	 */
+	public function __unset($name): void
+	{
+		if (isset($_SESSION[$name])) {
+			unset($_SESSION[$name]);
+		}
+	}
 }
 
 // __END__

www/lib/CoreLibs/DB/IO.php

@@ -1384,7 +1384,7 @@ class IO
 		// we only compare the first two
 		preg_match(
 			"/^(\d{1,})\.(\d{1,})\.?(\d{1,})?/",
-			$this->db_functions->__dbVersion(),
+			$this->dbVersion(),
 			$matches
 		);
 		$master = $matches[1];

www/lib/CoreLibs/Debug/Logging.php

@@ -310,6 +310,7 @@ class Logging
 	 * Needs debug/echo/print ad target for which of the debug flag groups we check
 	 * also needs level string to check in the per level output flag check.
 	 * In case we have invalid target it will return false
+	 *
 	 * @param  string $target target group to check debug/echo/print
 	 * @param  string $level  level to check in detailed level flag
 	 * @return bool           true on access allowed or false on no access
@@ -332,6 +333,7 @@ class Logging
 
 	/**
 	 * writes error msg data to file for current level
+	 *
 	 * @param  string $level        the level to write
 	 * @param  string $error_string error string to write
 	 * @return bool                 True if message written, FAlse if not
@@ -412,6 +414,7 @@ class Logging
 
 	/**
 	 * Temporary method to read all class variables for testing purpose
+	 *
 	 * @param  string $name what variable to return
 	 * @return mixed        can be anything, bool, string, int, array
 	 */
@@ -425,6 +428,7 @@ class Logging
 	 * sets the internal log file prefix id
 	 * string must be a alphanumeric string
 	 * if non valid string is given it returns the previous set one only
+	 *
 	 * @param  string $string log file id string value
 	 * @return string        returns the set log file id string
 	 * @deprecated Use $log->setLogId()
@@ -438,6 +442,7 @@ class Logging
 	 * sets the internal log file prefix id
 	 * string must be a alphanumeric string
 	 * if non valid string is given it returns the previous set one only
+	 *
 	 * @param  string $string log file id string value
 	 * @return string        returns the set log file id string
 	 */
@@ -460,6 +465,7 @@ class Logging
 
 	/**
 	 * old name for setLogLevel
+	 *
 	 * @param  string $type  debug, echo, print
 	 * @param  string $flag  on/off
 	 *         array  $array of levels to turn on/off debug
@@ -475,6 +481,7 @@ class Logging
 	/**
 	 * set log level settings for All types
 	 * if invalid type, skip
+	 *
 	 * @param  string $type Type to get: debug, echo, print
 	 * @param  bool   $set  True or False
 	 * @return bool         Return false if type invalid
@@ -491,6 +498,7 @@ class Logging
 
 	/**
 	 * get the current log level setting for All level blocks
+	 *
 	 * @param  string $type Type to get: debug, echo, print
 	 * @return bool         False on failure, or the boolean flag from the all var
 	 */
@@ -506,6 +514,7 @@ class Logging
 	/**
 	 * passes list of level names, to turn on debug
 	 * eg $foo->debugFor('print', 'on', ['LOG', 'DEBUG', 'INFO']);
+	 *
 	 * @param  string        $type     debug, echo, print
 	 * @param  string        $flag     on/off
 	 * @param  array<mixed>  $debug_on Array of levels to turn on/off debug
@@ -541,6 +550,7 @@ class Logging
 
 	/**
 	 * return the log level for the array type normal and not (disable)
+	 *
 	 * @param  string      $type  debug, echo, print
 	 * @param  string      $flag  on/off
 	 * @param  string|null $level if not null then check if this array entry is set
@@ -572,6 +582,7 @@ class Logging
 	 * - class: split by class
 	 * - page: split per page called
 	 * - run: for each run
+	 *
 	 * @param  string $type Type to get: level, class, page, run
 	 * @param  bool   $set  True or False
 	 * @return bool         Return false if type invalid
@@ -587,6 +598,7 @@ class Logging
 
 	/**
 	 * return current set log per flag in bool
+	 *
 	 * @param  string $type Type to get: level, class, page, run
 	 * @return bool         True of false for turned on or off
 	 */
@@ -601,6 +613,7 @@ class Logging
 	/**
 	 * Set or get the log file date extension flag
 	 * if null or empty parameter gets current flag
+	 *
 	 * @param boolean|null $set Set the date suffix for log files
 	 *                          If set to null return current set
 	 * @return boolean          Current set flag
@@ -615,6 +628,7 @@ class Logging
 
 	/**
 	 * Return current set log file name
+	 *
 	 * @return string Filename set set after the last time debug was called
 	 */
 	public function getLogFileName(): string
@@ -628,6 +642,7 @@ class Logging
 	 * It uses some special code sets so we can convert that to pre flags
 	 * for echo output {##HTMLPRE##} ... {##/HTMLPRE##}
 	 * Do not use this without using it in a string in debug function
+	 *
 	 * @param  array<mixed> $a Array to format
 	 * @return string          print_r formated
 	 */
@@ -636,14 +651,32 @@ class Logging
 		return '##HTMLPRE##' . print_r($a, true) . '##/HTMLPRE##';
 	}
 
+	/**
+	 * Convert bool value to string value
+	 *
+	 * @param  bool   $bool  Bool value to be transformed
+	 * @param  string $true  Override default string 'true'
+	 * @param  string $false Override default string 'false'
+	 * @return string        $true or $false string for true/false bool
+	 */
+	public function prBl(
+		bool $bool,
+		string $true = 'true',
+		string $false = 'false'
+	): string {
+		return $bool ? $true : $false;
+	}
+
 	/**
 	 * write debug data to error_msg array
+	 *
 	 * @param  string $level  id for error message, groups messages together
 	 * @param  string $string the actual error message
 	 * @param  bool   $strip  default on false, if set to true,
 	 *                        all html tags will be stripped and <br> changed to \n
 	 *                        this is only used for debug output
-	 * @param  string $prefix Attach some block before $string. Will not be stripped even
+	 * @param  string $prefix Attach some block before $string.
+	 *                        Will not be stripped even
 	 *                        when strip is true
 	 *                        if strip is false, recommended to add that to $string
 	 * @return bool           True if logged, false if not logged
@@ -729,6 +762,7 @@ class Logging
 	/**
 	 * for ECHO ON only
 	 * returns error data as string so it can be echoed out
+	 *
 	 * @param  string $header_prefix prefix string for header
 	 * @return string                error msg for all levels
 	 */
@@ -780,6 +814,7 @@ class Logging
 	 * unsests the error message array
 	 * can be used if writing is primary to file
 	 * if no level given resets all
+	 *
 	 * @param  string $level optional level
 	 * @return void          has no return
 	 */
@@ -795,6 +830,7 @@ class Logging
 	/**
 	 * for ECHO ON only
 	 * Get current error message array
+	 *
 	 * @return array<mixed> error messages collected
 	 */
 	public function getErrorMsg(): array
@@ -806,6 +842,7 @@ class Logging
 	 * for ECHO ON only
 	 * merges the given error array with the one from this class
 	 * only merges visible ones
+	 *
 	 * @param  array<mixed> $error_msg error array
 	 * @return void                    has no return
 	 */

www/lib/CoreLibs/Get/System.php

@@ -94,6 +94,24 @@ class System
 	{
 		return pathinfo($_SERVER['PHP_SELF']);
 	}
+
+	/**
+	 * Check if the php sapi interface has cli inside
+	 *
+	 * @return bool True for CLI type PHP, else false
+	 */
+	public static function checkCLI(): bool
+	{
+		return substr(
+			// if return is false, use empty string
+			(($sapi_name = php_sapi_name()) === false ?
+				'' :
+				$sapi_name
+			),
+			0,
+			3
+		) === 'cli' ? true : false;
+	}
 }
 
 // __END__

www/vendor/composer/autoload_classmap.php

@@ -179,7 +179,6 @@ return array(
     'PHPUnit\\Framework\\MockObject\\MockObject' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/MockObject.php',
     'PHPUnit\\Framework\\MockObject\\MockTrait' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/MockTrait.php',
     'PHPUnit\\Framework\\MockObject\\MockType' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/MockType.php',
-    'PHPUnit\\Framework\\MockObject\\MockedCloneMethod' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Api/MockedCloneMethod.php',
     'PHPUnit\\Framework\\MockObject\\OriginalConstructorInvocationRequiredException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/OriginalConstructorInvocationRequiredException.php',
     'PHPUnit\\Framework\\MockObject\\ReflectionException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/ReflectionException.php',
     'PHPUnit\\Framework\\MockObject\\ReturnValueNotConfiguredException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php',
@@ -210,7 +209,6 @@ return array(
     'PHPUnit\\Framework\\MockObject\\UnknownClassException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownClassException.php',
     'PHPUnit\\Framework\\MockObject\\UnknownTraitException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownTraitException.php',
     'PHPUnit\\Framework\\MockObject\\UnknownTypeException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownTypeException.php',
-    'PHPUnit\\Framework\\MockObject\\UnmockedCloneMethod' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Api/UnmockedCloneMethod.php',
     'PHPUnit\\Framework\\MockObject\\Verifiable' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Verifiable.php',
     'PHPUnit\\Framework\\NoChildTestSuiteException' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception/NoChildTestSuiteException.php',
     'PHPUnit\\Framework\\OutputError' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception/OutputError.php',

www/vendor/composer/autoload_static.php

@@ -244,7 +244,6 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
         'PHPUnit\\Framework\\MockObject\\MockObject' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/MockObject.php',
         'PHPUnit\\Framework\\MockObject\\MockTrait' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/MockTrait.php',
         'PHPUnit\\Framework\\MockObject\\MockType' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/MockType.php',
-        'PHPUnit\\Framework\\MockObject\\MockedCloneMethod' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Api/MockedCloneMethod.php',
         'PHPUnit\\Framework\\MockObject\\OriginalConstructorInvocationRequiredException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/OriginalConstructorInvocationRequiredException.php',
         'PHPUnit\\Framework\\MockObject\\ReflectionException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/ReflectionException.php',
         'PHPUnit\\Framework\\MockObject\\ReturnValueNotConfiguredException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php',
@@ -275,7 +274,6 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
         'PHPUnit\\Framework\\MockObject\\UnknownClassException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownClassException.php',
         'PHPUnit\\Framework\\MockObject\\UnknownTraitException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownTraitException.php',
         'PHPUnit\\Framework\\MockObject\\UnknownTypeException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownTypeException.php',
-        'PHPUnit\\Framework\\MockObject\\UnmockedCloneMethod' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Api/UnmockedCloneMethod.php',
         'PHPUnit\\Framework\\MockObject\\Verifiable' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Verifiable.php',
         'PHPUnit\\Framework\\NoChildTestSuiteException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Exception/NoChildTestSuiteException.php',
         'PHPUnit\\Framework\\OutputError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Exception/OutputError.php',

www/vendor/composer/installed.json

@@ -429,17 +429,17 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.6.0",
-            "version_normalized": "1.6.0.0",
+            "version": "1.6.1",
+            "version_normalized": "1.6.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
+                "reference": "77a32518733312af16a44300404e945338981de3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
+                "reference": "77a32518733312af16a44300404e945338981de3",
                 "shasum": ""
             },
             "require": {
@@ -450,7 +450,7 @@
                 "ext-tokenizer": "*",
                 "psalm/phar": "^4.8"
             },
-            "time": "2022-01-04T19:58:01+00:00",
+            "time": "2022-03-15T21:29:03+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -476,7 +476,7 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
             },
             "install-path": "../phpdocumentor/type-resolver"
         },
@@ -885,17 +885,17 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.19",
-            "version_normalized": "9.5.19.0",
+            "version": "9.5.20",
+            "version_normalized": "9.5.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
+                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
-                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
                 "shasum": ""
             },
             "require": {
@@ -936,7 +936,7 @@
                 "ext-soap": "*",
                 "ext-xdebug": "*"
             },
-            "time": "2022-03-15T09:57:31+00:00",
+            "time": "2022-04-01T12:37:26+00:00",
             "bin": [
                 "phpunit"
             ],
@@ -975,7 +975,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
             },
             "funding": [
                 {
@@ -1373,17 +1373,17 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.3",
-            "version_normalized": "5.1.3.0",
+            "version": "5.1.4",
+            "version_normalized": "5.1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
                 "shasum": ""
             },
             "require": {
@@ -1395,7 +1395,7 @@
             "suggest": {
                 "ext-posix": "*"
             },
-            "time": "2020-09-28T05:52:38+00:00",
+            "time": "2022-04-03T09:37:03+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1427,7 +1427,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
             },
             "funding": [
                 {

www/vendor/composer/installed.php

@@ -5,8 +5,8 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'b075ee3dc5654a33da9e41fab338edb536695a25',
-        'name' => 'gullevek/corelibs',
+        'reference' => NULL,
+        'name' => 'gullevek/corelibs-dev',
         'dev' => true,
     ),
     'versions' => array(
@@ -19,13 +19,13 @@
             'reference' => '10dcfce151b967d20fde1b34ae6640712c3891bc',
             'dev_requirement' => true,
         ),
-        'gullevek/corelibs' => array(
+        'gullevek/corelibs-dev' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'b075ee3dc5654a33da9e41fab338edb536695a25',
+            'reference' => NULL,
             'dev_requirement' => false,
         ),
         'myclabs/deep-copy' => array(
@@ -83,12 +83,12 @@
             'dev_requirement' => true,
         ),
         'phpdocumentor/type-resolver' => array(
-            'pretty_version' => '1.6.0',
-            'version' => '1.6.0.0',
+            'pretty_version' => '1.6.1',
+            'version' => '1.6.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpdocumentor/type-resolver',
             'aliases' => array(),
-            'reference' => '93ebd0014cab80c4ea9f5e297ea48672f1b87706',
+            'reference' => '77a32518733312af16a44300404e945338981de3',
             'dev_requirement' => true,
         ),
         'phpspec/prophecy' => array(
@@ -146,12 +146,12 @@
             'dev_requirement' => true,
         ),
         'phpunit/phpunit' => array(
-            'pretty_version' => '9.5.19',
-            'version' => '9.5.19.0',
+            'pretty_version' => '9.5.20',
+            'version' => '9.5.20.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpunit/phpunit',
             'aliases' => array(),
-            'reference' => '35ea4b7f3acabb26f4bb640f8c30866c401da807',
+            'reference' => '12bc8879fb65aef2138b26fc633cb1e3620cffba',
             'dev_requirement' => true,
         ),
         'sebastian/cli-parser' => array(
@@ -209,12 +209,12 @@
             'dev_requirement' => true,
         ),
         'sebastian/environment' => array(
-            'pretty_version' => '5.1.3',
-            'version' => '5.1.3.0',
+            'pretty_version' => '5.1.4',
+            'version' => '5.1.4.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/environment',
             'aliases' => array(),
-            'reference' => '388b6ced16caa751030f6a69e588299fa09200ac',
+            'reference' => '1b5dff7bb151a4db11d49d90e5408e4e938270f7',
             'dev_requirement' => true,
         ),
         'sebastian/exporter' => array(

www/vendor/phpdocumentor/type-resolver/src/TypeResolver.php

@@ -550,7 +550,7 @@ final class TypeResolver
             );
         }
 
-        if (!$minValue || !$maxValue || $tokenCounter > 4) {
+        if ($minValue === null || $maxValue === null || $tokenCounter > 4) {
             throw new RuntimeException(
                 'int<min,max> has not the correct format'
             );

www/vendor/phpunit/phpunit/ChangeLog-8.5.md

@@ -2,6 +2,18 @@
 
 All notable changes of the PHPUnit 8.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [8.5.26] - 2022-04-01
+
+### Fixed
+
+* [#4938](https://github.com/sebastianbergmann/phpunit/issues/4938): Test Double code generator does not handle `void` return type declaration on `__clone()` methods
+
+## [8.5.25] - 2022-03-16
+
+### Fixed
+
+* [#4934](https://github.com/sebastianbergmann/phpunit/issues/4934): Code Coverage does not work with PHPUnit 8.5.24 PHAR on PHP 7
+
 ## [8.5.24] - 2022-03-05 - #StandWithUkraine
 
 ### Changed
@@ -207,6 +219,8 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
 * [#3967](https://github.com/sebastianbergmann/phpunit/issues/3967): Cannot double interface that extends interface that extends `\Throwable`
 * [#3968](https://github.com/sebastianbergmann/phpunit/pull/3968): Test class run in a separate PHP process are passing when `exit` called inside
 
+[8.5.26]: https://github.com/sebastianbergmann/phpunit/compare/8.5.25...8.5.26
+[8.5.25]: https://github.com/sebastianbergmann/phpunit/compare/8.5.24...8.5.25
 [8.5.24]: https://github.com/sebastianbergmann/phpunit/compare/8.5.23...8.5.24
 [8.5.23]: https://github.com/sebastianbergmann/phpunit/compare/8.5.22...8.5.23
 [8.5.22]: https://github.com/sebastianbergmann/phpunit/compare/8.5.21...8.5.22

www/vendor/phpunit/phpunit/ChangeLog-9.5.md

@@ -2,6 +2,13 @@
 
 All notable changes of the PHPUnit 9.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [9.5.20] - 2022-04-01
+
+### Fixed
+
+* [#4938](https://github.com/sebastianbergmann/phpunit/issues/4938): Test Double code generator does not handle `void` return type declaration on `__clone()` methods
+* [#4947](https://github.com/sebastianbergmann/phpunit/issues/4947): Test annotated with `@coversNothing` may lead to files missing from code coverage report
+
 ## [9.5.19] - 2022-03-15
 
 ### Fixed
@@ -150,6 +157,7 @@ All notable changes of the PHPUnit 9.5 release series are documented in this fil
 
 * [#4535](https://github.com/sebastianbergmann/phpunit/issues/4535): `getMockFromWsdl()` does not handle methods that do not have parameters correctly
 
+[9.5.20]: https://github.com/sebastianbergmann/phpunit/compare/9.5.19...9.5.20
 [9.5.19]: https://github.com/sebastianbergmann/phpunit/compare/9.5.18...9.5.19
 [9.5.18]: https://github.com/sebastianbergmann/phpunit/compare/9.5.17...9.5.18
 [9.5.17]: https://github.com/sebastianbergmann/phpunit/compare/9.5.16...9.5.17

www/vendor/phpunit/phpunit/src/Framework/MockObject/Api/MockedCloneMethod.php

@@ -1,21 +0,0 @@
-<?php declare(strict_types=1);
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace PHPUnit\Framework\MockObject;
-
-/**
- * @internal This trait is not covered by the backward compatibility promise for PHPUnit
- */
-trait MockedCloneMethod
-{
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationHandler();
-    }
-}

www/vendor/phpunit/phpunit/src/Framework/MockObject/Api/UnmockedCloneMethod.php

@@ -1,23 +0,0 @@
-<?php declare(strict_types=1);
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace PHPUnit\Framework\MockObject;
-
-/**
- * @internal This trait is not covered by the backward compatibility promise for PHPUnit
- */
-trait UnmockedCloneMethod
-{
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationHandler();
-
-        parent::__clone();
-    }
-}

www/vendor/phpunit/phpunit/src/Framework/MockObject/Generator.php

@@ -60,6 +60,58 @@ use Traversable;
  */
 final class Generator
 {
+    private const MOCKED_CLONE_METHOD_WITH_VOID_RETURN_TYPE_TRAIT = <<<'EOT'
+namespace PHPUnit\Framework\MockObject;
+
+trait MockedCloneMethodWithVoidReturnType
+{
+    public function __clone(): void
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationHandler();
+    }
+}
+EOT;
+
+    private const MOCKED_CLONE_METHOD_WITHOUT_RETURN_TYPE_TRAIT = <<<'EOT'
+namespace PHPUnit\Framework\MockObject;
+
+trait MockedCloneMethodWithoutReturnType
+{
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationHandler();
+    }
+}
+EOT;
+
+    private const UNMOCKED_CLONE_METHOD_WITH_VOID_RETURN_TYPE_TRAIT = <<<'EOT'
+namespace PHPUnit\Framework\MockObject;
+
+trait UnmockedCloneMethodWithVoidReturnType
+{
+    public function __clone(): void
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationHandler();
+
+        parent::__clone();
+    }
+}
+EOT;
+
+    private const UNMOCKED_CLONE_METHOD_WITHOUT_RETURN_TYPE_TRAIT = <<<'EOT'
+namespace PHPUnit\Framework\MockObject;
+
+trait UnmockedCloneMethodWithoutReturnType
+{
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationHandler();
+
+        parent::__clone();
+    }
+}
+EOT;
+
     /**
      * @var array
      */
@@ -913,11 +965,11 @@ final class Generator
         $cloneTrait = '';
 
         if ($mockedCloneMethod) {
-            $cloneTrait = PHP_EOL . '    use \PHPUnit\Framework\MockObject\MockedCloneMethod;';
+            $cloneTrait = $this->mockedCloneMethod();
         }
 
         if ($unmockedCloneMethod) {
-            $cloneTrait = PHP_EOL . '    use \PHPUnit\Framework\MockObject\UnmockedCloneMethod;';
+            $cloneTrait = $this->unmockedCloneMethod();
         }
 
         $classTemplate->setVar(
@@ -1062,4 +1114,38 @@ final class Generator
 
         return $methodName === $className;
     }
+
+    private function mockedCloneMethod(): string
+    {
+        if (PHP_MAJOR_VERSION >= 8) {
+            if (!trait_exists('\PHPUnit\Framework\MockObject\MockedCloneMethodWithVoidReturnType')) {
+                eval(self::MOCKED_CLONE_METHOD_WITH_VOID_RETURN_TYPE_TRAIT);
+            }
+
+            return PHP_EOL . '    use \PHPUnit\Framework\MockObject\MockedCloneMethodWithVoidReturnType;';
+        }
+
+        if (!trait_exists('\PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType')) {
+            eval(self::MOCKED_CLONE_METHOD_WITHOUT_RETURN_TYPE_TRAIT);
+        }
+
+        return PHP_EOL . '    use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType;';
+    }
+
+    private function unmockedCloneMethod(): string
+    {
+        if (PHP_MAJOR_VERSION >= 8) {
+            if (!trait_exists('\PHPUnit\Framework\MockObject\UnmockedCloneMethodWithVoidReturnType')) {
+                eval(self::UNMOCKED_CLONE_METHOD_WITH_VOID_RETURN_TYPE_TRAIT);
+            }
+
+            return PHP_EOL . '    use \PHPUnit\Framework\MockObject\UnmockedCloneMethodWithVoidReturnType;';
+        }
+
+        if (!trait_exists('\PHPUnit\Framework\MockObject\UnmockedCloneMethodWithoutReturnType')) {
+            eval(self::UNMOCKED_CLONE_METHOD_WITHOUT_RETURN_TYPE_TRAIT);
+        }
+
+        return PHP_EOL . '    use \PHPUnit\Framework\MockObject\UnmockedCloneMethodWithoutReturnType;';
+    }
 }

www/vendor/phpunit/phpunit/src/Runner/Version.php

@@ -41,7 +41,7 @@ final class Version
         }
 
         if (self::$version === '') {
-            self::$version = (new VersionId('9.5.19', dirname(__DIR__, 2)))->getVersion();
+            self::$version = (new VersionId('9.5.20', dirname(__DIR__, 2)))->getVersion();
         }
 
         return self::$version;

www/vendor/phpunit/phpunit/src/Util/Test.php

@@ -150,7 +150,8 @@ final class Test
         // If there is no @covers annotation but a @coversNothing annotation on
         // the test method then code coverage data does not need to be collected
         if (isset($annotations['method']['coversNothing'])) {
-            return false;
+            // @see https://github.com/sebastianbergmann/phpunit/issues/4947#issuecomment-1084480950
+            // return false;
         }
 
         // If there is at least one @covers annotation then
@@ -162,7 +163,8 @@ final class Test
         // If there is no @covers annotation but a @coversNothing annotation
         // then code coverage data does not need to be collected
         if (isset($annotations['class']['coversNothing'])) {
-            return false;
+            // @see https://github.com/sebastianbergmann/phpunit/issues/4947#issuecomment-1084480950
+            // return false;
         }
 
         // If there is no @coversNothing annotation then

www/vendor/sebastian/environment/ChangeLog.md

@@ -2,6 +2,12 @@
 
 All notable changes in `sebastianbergmann/environment` are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [5.1.4] - 2022-04-03
+
+### Fixed
+
+* [#63](https://github.com/sebastianbergmann/environment/pull/63): `Runtime::getCurrentSettings()` does not correctly process INI settings
+
 ## [5.1.3] - 2020-09-28
 
 ### Changed
@@ -145,6 +151,7 @@ All notable changes in `sebastianbergmann/environment` are documented in this fi
 
 * This component is no longer supported on PHP 5.6
 
+[5.1.4]: https://github.com/sebastianbergmann/environment/compare/5.1.3...5.1.4
 [5.1.3]: https://github.com/sebastianbergmann/environment/compare/5.1.2...5.1.3
 [5.1.2]: https://github.com/sebastianbergmann/environment/compare/5.1.1...5.1.2
 [5.1.1]: https://github.com/sebastianbergmann/environment/compare/5.1.0...5.1.1

www/vendor/sebastian/environment/LICENSE

@@ -1,6 +1,6 @@
 sebastian/environment
 
-Copyright (c) 2014-2020, Sebastian Bergmann <sebastian@phpunit.de>.
+Copyright (c) 2014-2022, Sebastian Bergmann <sebastian@phpunit.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

www/vendor/sebastian/environment/README.md

@@ -1,7 +1,6 @@
 # sebastian/environment
 
 [![Latest Stable Version](https://img.shields.io/packagist/v/sebastian/environment.svg?style=flat-square)](https://packagist.org/packages/sebastian/environment)
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.1-8892BF.svg?style=flat-square)](https://php.net/)
 [![CI Status](https://github.com/sebastianbergmann/environment/workflows/CI/badge.svg)](https://github.com/sebastianbergmann/environment/actions)
 [![Type Coverage](https://shepherd.dev/github/sebastianbergmann/environment/coverage.svg)](https://shepherd.dev/github/sebastianbergmann/environment)
 

www/vendor/sebastian/environment/src/Console.php

@@ -34,7 +34,7 @@ final class Console
     /**
      * @var int
      */
-    public const STDIN  = 0;
+    public const STDIN = 0;
 
     /**
      * @var int
@@ -60,10 +60,10 @@ final class Console
 
         if ($this->isWindows()) {
             // @codeCoverageIgnoreStart
-            return (defined('STDOUT') && function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(STDOUT))
-                || false !== getenv('ANSICON')
-                || 'ON' === getenv('ConEmuANSI')
-                || 'xterm' === getenv('TERM');
+            return (defined('STDOUT') && function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(STDOUT)) ||
+                false !== getenv('ANSICON') ||
+                'ON' === getenv('ConEmuANSI') ||
+                'xterm' === getenv('TERM');
             // @codeCoverageIgnoreEnd
         }
 

www/vendor/sebastian/environment/src/Runtime.php

@@ -289,8 +289,12 @@ final class Runtime
             foreach ($values as $value) {
                 $set = ini_get($value);
 
-                if (isset($config[$value]) && $set != $config[$value]) {
-                    $diff[] = sprintf('%s=%s', $value, $set);
+                if (empty($set)) {
+                    continue;
+                }
+
+                if ((!isset($config[$value]) || ($set !== $config[$value]))) {
+                    $diff[$value] = sprintf('%s=%s', $value, $set);
                 }
             }
         }