phan min php set to 8.2

Add session_unset for unsetAll and rename this method to "clear"

.phan/config.php

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

4dev/database/function/upgrade_serial_to_identity.sql

@@ -6,7 +6,8 @@
 -- @param name col The column to be changed
 -- @param varchar identity_type [default=a] Allowed a, d, assigned, default
 -- @param varchar col_type [default=''] Allowed smallint, int, bigint, int2, int4, int8
--- @raises EXCEPTON on column not found, no linked sequence, more than one linked sequence found
+-- @returns varchar status tring
+-- @raises EXCEPTON on column not found, no linked sequence, more than one linked sequence found, invalid col type
 --
 CREATE OR REPLACE FUNCTION upgrade_serial_to_identity(
     tbl regclass,
@@ -14,17 +15,18 @@ CREATE OR REPLACE FUNCTION upgrade_serial_to_identity(
     identity_type varchar = 'a',
     col_type varchar = ''
 )
-RETURNS void
+RETURNS varchar
 LANGUAGE plpgsql
 AS $$
 DECLARE
-colnum smallint;
+    colnum SMALLINT;
-seqid oid;
+    seqid OID;
-count int;
+    count INT;
-col_type_oid int;
+    col_type_oid INT;
-col_type_len int;
+    col_type_len INT;
-current_col_atttypid oid;
+    current_col_atttypid OID;
-current_col_attlen int;
+    current_col_attlen INT;
+    status_string VARCHAR;
 BEGIN
     -- switch between always (default) or default identiy type
     IF identity_type NOT IN ('a', 'd', 'assigned', 'default') THEN
@@ -59,6 +61,10 @@ BEGIN
         RAISE EXCEPTION 'more than one linked sequence found';
     END IF;
 
+    IF col_type <> '' AND col_type NOT IN ('smallint', 'int', 'bigint', 'int2', 'int4', 'int8') THEN
+        RAISE EXCEPTION 'Invalid col type: %', col_type;
+    END IF;
+
     -- drop the default
     EXECUTE 'ALTER TABLE ' || tbl || ' ALTER COLUMN ' || quote_ident(col) || ' DROP DEFAULT';
 
@@ -74,34 +80,31 @@ BEGIN
         SET attidentity = identity_type
         WHERE attrelid = tbl
             AND attname = col;
-    RAISE NOTICE 'Update to identity for table "%" and columen "%" with type "%"', tbl, col, identity_type;
+    status_string := 'Updated to identity for table "' || tbl || '" and columen "' || col || '" with type "' || identity_type || '"';
 
     -- set type if requested and not empty
     IF col_type <> '' THEN
-        IF col_type IN ('smallint', 'int', 'bigint', 'int2', 'int4', 'int8') THEN
+        -- rewrite smallint, int, bigint
-            -- rewrite smallint, int, bigint
+        IF col_type = 'smallint' THEN
-            IF col_type = 'smallint' THEN
+            col_type := 'int2';
-                col_type := 'int2';
+        ELSIF col_type = 'int' THEN
-            ELSIF col_type = 'int' THEN
+            col_type := 'int4';
-                col_type := 'int4';
+        ELSIF col_type = 'bigint' THEN
-            ELSIF col_type = 'bigint' THEN
+            col_type := 'int8';
-                col_type := 'int8';
+        END IF;
-            END IF;
+        -- get the length and oid for selected
-            -- get the length and oid for selected
+        SELECT oid, typlen INTO col_type_oid, col_type_len FROM pg_type WHERE typname = col_type;
-            SELECT oid, typlen INTO col_type_oid, col_type_len FROM pg_type WHERE typname = col_type;
+        -- set only if diff or hight
-            -- set only if diff or hight
+        IF current_col_atttypid <> col_type_oid AND col_type_len > current_col_attlen THEN
-            IF current_col_atttypid <> col_type_oid AND col_type_len > current_col_attlen THEN
+            status_string := status_string || '. Change col type: ' || col_type;
-                RAISE NOTICE 'Change col type: %', col_type;
+            -- update type
-                -- update type
+            UPDATE pg_attribute
-                UPDATE pg_attribute
+                SET
-                    SET
+                    atttypid = col_type_oid, attlen = col_type_len
-                        atttypid = col_type_oid, attlen = col_type_len
+                WHERE attrelid = tbl
-                    WHERE attrelid = tbl
+                    AND attname = col;
-                        AND attname = col;
-            END IF;
-        ELSE
-            RAISE NOTICE 'Invalid col type: %', col_type;
         END IF;
     END IF;
+    RETURN status_string;
 END;
 $$;

4dev/database/table/edit_menu_group.sql

@@ -12,5 +12,3 @@ CREATE TABLE edit_menu_group (
     flag VARCHAR,
     order_number INT NOT NULL
 ) INHERITS (edit_generic) WITHOUT OIDS;
-
-

4dev/database/table/edit_page_access.sql

@@ -16,5 +16,3 @@ CREATE TABLE edit_page_access (
     FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
     enabled SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;
-
-

4dev/tests/Create/CoreLibsCreateSessionTest.php

@@ -272,24 +272,27 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 *
 	 * @return array
 	 */
-	public function sessionDataProvider(): array
+	public function providerSessionData(): array
 	{
 		return [
 			'test' => [
 				'foo',
 				'bar',
 				'bar',
+				null,
 			],
 			'int key test' => [
 				123,
 				'bar',
 				'bar',
+				\UnexpectedValueException::class
 			],
 			// more complex value tests
 			'array values' => [
 				'array',
 				[1, 2, 3],
 				[1, 2, 3],
+				null,
 			]
 		];
 	}
@@ -299,21 +302,28 @@ final class CoreLibsCreateSessionTest extends TestCase
 	/**
 	 * method call test
 	 *
-	 * @covers ::setS
+	 * @covers ::set
-	 * @covers ::getS
+	 * @covers ::get
-	 * @covers ::issetS
+	 * @covers ::isset
-	 * @covers ::unsetS
+	 * @covers ::unset
-	 * @dataProvider sessionDataProvider
+	 * @dataProvider providerSessionData
-	 * @testdox setS/getS/issetS/unsetS $name with $input is $expected [$_dataName]
+	 * @testdox set/get/isset/unset $name with $input is $expected ($exception) [$_dataName]
 	 *
 	 * @param  string|int $name
 	 * @param  mixed $input
 	 * @param  mixed $expected
+	 * @param  ?mixed $exception
 	 * @return void
 	 */
-/* 	public function testMethodSetGet($name, $input, $expected): void
+	public function testMethodSetGet($name, $input, $expected, $exception): void
 	{
+		if (\CoreLibs\Get\System::checkCLI()) {
+			$this->markTestSkipped('Cannot run testMethodSetGet in CLI');
+		}
 		$session = new \CoreLibs\Create\Session('TEST_METHOD');
+		if ($expected !== null) {
+			$this->expectException($exception);
+		}
 		$session->set($name, $input);
 		$this->assertEquals(
 			$expected,
@@ -331,12 +341,80 @@ final class CoreLibsCreateSessionTest extends TestCase
 			$session->get($name),
 			'method unset assert'
 		);
-		// iset false
+		// isset false
 		$this->assertFalse(
 			$session->isset($name),
 			'method isset assert false'
 		);
-	} */
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function providerSessionDataMany(): array
+	{
+		return [
+			'valid set' => [
+				[
+					'foo 1' => 'bar 1',
+					'foo 2' => 'bar 1',
+				],
+				[
+					'foo 1' => 'bar 1',
+					'foo 2' => 'bar 1',
+				],
+				null,
+			],
+			'invalid entry' => [
+				[
+					'foo 1' => 'bar 1',
+					123 => 'bar 1',
+				],
+				[
+					'foo 1' => 'bar 1',
+				],
+				\UnexpectedValueException::class
+			]
+		];
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::setMany
+	 * @covers ::getMany
+	 * @dataProvider providerSessionDataMany
+	 * @testdox setMany/getMany/unsetMany $set is $expected ($exception) [$_dataName]
+	 *
+	 * @param  array<string|int,mixed> $set
+	 * @param  array<string,mixed> $expected
+	 * @param  ?mixed $exception
+	 * @return void
+	 */
+	public function testMany($set, $expected, $exception): void
+	{
+		if (\CoreLibs\Get\System::checkCLI()) {
+			$this->markTestSkipped('Cannot run testMethodSetGet in CLI');
+		}
+		$session = new \CoreLibs\Create\Session('TEST_METHOD');
+		if ($expected !== null) {
+			$this->expectException($exception);
+		}
+		$session->setMany($set);
+		$this->assertEquals(
+			$expected,
+			$session->getMany(array_keys($set)),
+			'set many failed'
+		);
+		$session->unsetMany(array_keys($set));
+		$this->assertEquals(
+			[],
+			$session->getMany(array_keys($set)),
+			'unset many failed'
+		);
+	}
 
 	/**
 	 * unset all test
@@ -346,8 +424,11 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 *
 	 * @return void
 	 */
-/* 	public function testUnsetAll(): void
+	public function testUnsetAll(): void
 	{
+		if (\CoreLibs\Get\System::checkCLI()) {
+			$this->markTestSkipped('Cannot run testUnsetAll in CLI');
+		}
 		$test_values = [
 			'foo' => 'abc',
 			'bar' => '123'
@@ -363,7 +444,7 @@ final class CoreLibsCreateSessionTest extends TestCase
 			);
 		}
 		// unset all
-		$session->unsetAll();
+		$session->clear();
 		// check unset
 		foreach (array_keys($test_values) as $name) {
 			$this->assertEquals(
@@ -372,7 +453,7 @@ final class CoreLibsCreateSessionTest extends TestCase
 				'unsert assert: ' . $name
 			);
 		}
-	} */
+	}
 }
 
 // __END__

www/admin/class_test.lang.php

@@ -16,6 +16,8 @@ define('USE_DATABASE', false);
 require 'config.php';
 // define log file id
 $LOG_FILE_ID = 'classTest-lang';
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
+$session = new CoreLibs\Create\Session($SET_SESSION_NAME);
 ob_end_flush();
 
 $PAGE_NAME = 'TEST CLASS: LANG';
@@ -70,10 +72,12 @@ print "[OVERRIDE]: " . Support::printAr($get_locale) . "<br>";
 // DEFAULT_DOMAIN
 // DEFAULT_CHARSET (should be set from DEFAULT_LOCALE)
 // LOCALE_PATH
-$_SESSION['DEFAULT_LOCALE'] = 'ja_JP.UTF-8';
+$session->setMany([
-$_SESSION['DEFAULT_CHARSET'] = 'UTF-8';
+	'DEFAULT_LOCALE' => 'ja_JP.UTF-8',
-$_SESSION['DEFAULT_DOMAIN'] = 'admin';
+	'DEFAULT_CHARSET' => 'UTF-8',
-$_SESSION['LOCALE_PATH'] = BASE . INCLUDES . LOCALE;
+	'DEFAULT_DOMAIN' => 'admin',
+	'LOCALE_PATH' => BASE . INCLUDES . LOCALE,
+]);
 $get_locale = Language\GetLocale::setLocaleFromSession(
 	SITE_LOCALE,
 	SITE_DOMAIN,
@@ -86,10 +90,12 @@ print "[SESSION SET]: " . Support::printAr($get_locale) . "<br>";
 // DEFAULT_DOMAIN
 // DEFAULT_CHARSET (should be set from DEFAULT_LOCALE)
 // LOCALE_PATH
-$_SESSION['DEFAULT_LOCALE'] = '00000#####';
+$session->setMany([
-$_SESSION['DEFAULT_CHARSET'] = '';
+	'DEFAULT_LOCALE' => '00000#####',
-$_SESSION['DEFAULT_DOMAIN'] = 'admin';
+	'DEFAULT_CHARSET' => '',
-$_SESSION['LOCALE_PATH'] = BASE . INCLUDES . LOCALE;
+	'DEFAULT_DOMAIN' => 'admin',
+	'LOCALE_PATH' => BASE . INCLUDES . LOCALE,
+]);
 $get_locale = Language\GetLocale::setLocaleFromSession(
 	SITE_LOCALE,
 	SITE_DOMAIN,

www/admin/class_test.php

@@ -205,8 +205,8 @@ print "HOST: " . HOST_NAME . " => DB HOST: " . DB_CONFIG_NAME . " => " . Support
 print "DS is: " . DIRECTORY_SEPARATOR . "<br>";
 print "SERVER HOST: " . $_SERVER['HTTP_HOST'] . "<br>";
 
-print "ECUID: " . $_SESSION['ECUID'] . "<br>";
+print "ECUID: " . $session->get('ECUID') . "<br>";
-print "ECUUID: " . $_SESSION['ECUUID'] . "<br>";
+print "ECUUID: " . $session->get('ECUUID') . "<br>";
 
 print "</body></html>";
 

www/admin/class_test.session.php

@@ -45,6 +45,7 @@ $log = new CoreLibs\Logging\Logging([
 	'log_file_id' => $LOG_FILE_ID,
 	'log_per_date' => true,
 ]);
+use CoreLibs\Debug\Support;
 use CoreLibs\Create\Session;
 
 $PAGE_NAME = 'TEST CLASS: SESSION';
@@ -56,7 +57,7 @@ print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $session_name = 'class-test-session';
 print "Valid session name static check for '" . $session_name . "': "
-	. \CoreLibs\Debug\Support::prBl(Session::checkValidSessionName($session_name)) . "<br>";
+	. Support::prBl(Session::checkValidSessionName($session_name)) . "<br>";
 $var = 'foo';
 $value = 'bar';
 $session = new Session($session_name);
@@ -96,13 +97,27 @@ print "[READ WRAP] Isset: " . ($session->isset('setwrap') ? 'Yes' : 'No') . "<br
 $session->unset('setwrap');
 print "[READ WRAP] unset setwrap: " . $session->get('setwrap') . "<br>";
 print "[READ WRAP] unset Isset: " . ($session->isset('setwrap') ? 'Yes' : 'No') . "<br>";
-// test __get/__set
+$session->set('foo 3', 'brause');
-$session->setwrap = 'YES, magic set _SESSION var'; /** @phpstan-ignore-line GET/SETTER */
+// set many
-print "[READ MAGIC] A setwrap: " . ($session->setwrap ?? '') . "<br>";
+$session->setMany([
-print "[READ MAGIC] Isset: " . (isset($session->setwrap) ? 'Yes' : 'No') . "<br>";
+	'foo 1' => 'bar',
-unset($session->setwrap);
+	'foo 2' => 'kamel',
-print "[READ MAGIC] unset setwrap: " . ($session->setwrap ?? '') . "<br>";
+]);
-print "[READ MAGIC] unset Isset: " . (isset($session->setwrap) ? 'Yes' : 'No') . "<br>";
+print "[READ MANY]: " . Support::printAr($session->getMany(['foo 1', 'foo 2'])) . "<br>";
+try {
+	$session->setMany([ /** @phpstan-ignore-line deliberate error */
+		'ok' => 'ok',
+		'a123' => 'bar',
+		1 => 'bar',
+	]);
+} catch (\Exception $e) {
+	print "FAILED] Session manySet failed:<br>" . $e->getMessage() . "<br><pre>" . $e . "</pre><br>";
+}
+try {
+	$session->set('123', 'illigal');
+} catch (\Exception $e) {
+	print "FAILED] Session set failed:<br>" . $e->getMessage() . "<br><pre>" . $e . "</pre><br>";
+}
 
 print "<hr>";
 // differnt session name
@@ -115,7 +130,8 @@ try {
 	print "[3 FAILED] Session start failed:<br>" . $e->getMessage() . "<br><pre>" . $e . "</pre><br>";
 }
 
-print "[ALL SESSION]: " . \CoreLibs\Debug\Support::printAr($_SESSION) . "<br>";
+
+print "[ALL SESSION]: " . Support::printAr($_SESSION) . "<br>";
 
 // close session
 $session->writeClose();
@@ -142,7 +158,7 @@ try {
 }
 $_SESSION['will_be_written_again'] = 'Full';
 
-print "[ALL SESSION]: " . \CoreLibs\Debug\Support::printAr($_SESSION) . "<br>";
+print "[ALL SESSION]: " . Support::printAr($_SESSION) . "<br>";
 
 // close session
 $session->writeClose();

www/lib/CoreLibs/ACL/Login.php

@@ -372,9 +372,6 @@ class Login
 			],
 		];
 
-		// init default ACL list array
-		$_SESSION['DEFAULT_ACL_LIST'] = [];
-		$_SESSION['DEFAULT_ACL_LIST_TYPE'] = [];
 		// read the current edit_access_right list into an array
 		$q = "SELECT level, type, name FROM edit_access_right "
 			. "WHERE level >= 0 ORDER BY level";
@@ -387,8 +384,10 @@ class Login
 			$this->default_acl_list_type[(string)$res['type']] = (int)$res['level'];
 		}
 		// write that into the session
-		$_SESSION['DEFAULT_ACL_LIST'] = $this->default_acl_list;
+		$this->session->setMany([
-		$_SESSION['DEFAULT_ACL_LIST_TYPE'] = $this->default_acl_list_type;
+			'DEFAULT_ACL_LIST' => $this->default_acl_list,
+			'DEFAULT_ACL_LIST_TYPE' => $this->default_acl_list_type,
+		]);
 
 		$this->loginSetEditLogWriteTypeAvailable();
 
@@ -580,7 +579,7 @@ class Login
 			// set path
 			$options['locale_path'] = BASE . INCLUDES . LOCALE;
 		}
-		$_SESSION['LOCALE_PATH'] = $options['locale_path'];
+		$this->session->set('LOCALE_PATH', $options['locale_path']);
 		// LANG: LOCALE
 		if (empty($options['site_locale'])) {
 			trigger_error(
@@ -615,7 +614,7 @@ class Login
 				$options['set_domain'] = str_replace(DIRECTORY_SEPARATOR, '', CONTENT_PATH);
 			}
 		}
-		$_SESSION['DEFAULT_DOMAIN'] = $options['site_domain'];
+		$this->session->set('DEFAULT_DOMAIN', $options['site_domain']);
 		// LANG: ENCODING
 		if (empty($options['site_encoding'])) {
 			trigger_error(
@@ -901,9 +900,14 @@ class Login
 			}
 			// normal user processing
 			// set class var and session var
-			$_SESSION['EUID'] = $this->euid = (int)$res['edit_user_id'];
+			$this->euid = (int)$res['edit_user_id'];
-			$_SESSION['ECUID'] = $this->ecuid = (string)$res['cuid'];
+			$this->ecuid = (string)$res['cuid'];
-			$_SESSION['ECUUID'] = $this->ecuuid = (string)$res['cuuid'];
+			$this->ecuuid = (string)$res['cuuid'];
+			$this->session->setMany([
+				'EUID' => $this->euid,
+				'ECUID' => $this->ecuid,
+				'ECUUID' => $this->ecuuid,
+			]);
 			// check if user is okay
 			$this->loginCheckPermissions();
 			if ($this->login_error == 0) {
@@ -916,27 +920,39 @@ class Login
 						. "WHERE edit_user_id = " . $this->euid;
 					$this->db->dbExec($q);
 				}
-				// now set all session vars and read page permissions
+				$locale = $res['locale'] ?? 'en';
-				$_SESSION['DEBUG_ALL'] = $this->db->dbBoolean($res['debug']);
+				$encoding = $res['encoding'] ?? 'UTF-8';
-				$_SESSION['DB_DEBUG'] = $this->db->dbBoolean($res['db_debug']);
+				$this->session->setMany([
-				// general info for user logged in
+					// now set all session vars and read page permissions
-				$_SESSION['USER_NAME'] = $res['username'];
+					'DEBUG_ALL' => $this->db->dbBoolean($res['debug']),
-				$_SESSION['ADMIN'] = $res['admin'];
+					'DB_DEBUG' => $this->db->dbBoolean($res['db_debug']),
-				$_SESSION['GROUP_NAME'] = $res['edit_group_name'];
+					// general info for user logged in
-				$_SESSION['USER_ACL_LEVEL'] = $res['user_level'];
+					'USER_NAME' => $res['username'],
-				$_SESSION['USER_ACL_TYPE'] = $res['user_type'];
+					'ADMIN' => $res['admin'],
-				$_SESSION['USER_ADDITIONAL_ACL'] = Json::jsonConvertToArray($res['user_additional_acl']);
+					'GROUP_NAME' => $res['edit_group_name'],
-				$_SESSION['GROUP_ACL_LEVEL'] = $res['group_level'];
+					'USER_ACL_LEVEL' => $res['user_level'],
-				$_SESSION['GROUP_ACL_TYPE'] = $res['group_type'];
+					'USER_ACL_TYPE' => $res['user_type'],
-				$_SESSION['GROUP_ADDITIONAL_ACL'] = Json::jsonConvertToArray($res['group_additional_acl']);
+					'USER_ADDITIONAL_ACL' => Json::jsonConvertToArray($res['user_additional_acl']),
-				// deprecated TEMPLATE setting
+					'GROUP_ACL_LEVEL' => $res['group_level'],
-				$_SESSION['TEMPLATE'] = $res['template'] ? $res['template'] : '';
+					'GROUP_ACL_TYPE' => $res['group_type'],
-				$_SESSION['HEADER_COLOR'] = !empty($res['second_header_color']) ?
+					'GROUP_ADDITIONAL_ACL' => Json::jsonConvertToArray($res['group_additional_acl']),
-					$res['second_header_color'] :
+					// deprecated TEMPLATE setting
-					$res['first_header_color'];
+					'TEMPLATE' => $res['template'] ? $res['template'] : '',
+					'HEADER_COLOR' => !empty($res['second_header_color']) ?
+						$res['second_header_color'] :
+						$res['first_header_color'],
+					// LANGUAGE/LOCALE/ENCODING:
+					'LANG' => $locale,
+					'DEFAULT_CHARSET' => $encoding,
+					'DEFAULT_LOCALE' => $locale . '.' . strtoupper($encoding),
+					'DEFAULT_LANG' => $locale . '_' . strtolower(str_replace('-', '', $encoding))
+				]);
 				// missing # before, this is for legacy data, will be deprecated
-				if (preg_match("/^[\dA-Fa-f]{6,8}$/", $_SESSION['HEADER_COLOR'])) {
+				if (
-					$_SESSION['HEADER_COLOR'] = '#' . $_SESSION['HEADER_COLOR'];
+					!empty($this->session->get('HEADER_COLOR')) &&
+					preg_match("/^[\dA-Fa-f]{6,8}$/", $this->session->get('HEADER_COLOR'))
+				) {
+					$this->session->set('HEADER_COLOR', '#' . $this->session->get('HEADER_COLOR'));
 				}
 				// TODO: make sure that header color is valid:
 				// # + 6 hex
@@ -945,13 +961,6 @@ class Login
 				// rgb: nnn.n for each
 				// hsl: nnn.n for first, nnn.n% for 2nd, 3rd
 				// Check\Colors::validateColor()
-				// LANGUAGE/LOCALE/ENCODING:
-				$_SESSION['LANG'] = $res['locale'] ?? 'en';
-				$_SESSION['DEFAULT_CHARSET'] = $res['encoding'] ?? 'UTF-8';
-				$_SESSION['DEFAULT_LOCALE'] = $_SESSION['LANG']
-					. '.' . strtoupper($_SESSION['DEFAULT_CHARSET']);
-				$_SESSION['DEFAULT_LANG'] = $_SESSION['LANG'] . '_'
-					. strtolower(str_replace('-', '', $_SESSION['DEFAULT_CHARSET']));
 				// reset any login error count for this user
 				if ($res['login_error_count'] > 0) {
 					$q = "UPDATE edit_user "
@@ -1041,8 +1050,10 @@ class Login
 					];
 				}
 				// write back the pages data to the output array
-				$_SESSION['PAGES'] = $pages;
+				$this->session->setMany([
-				$_SESSION['PAGES_ACL_LEVEL'] = $pages_acl;
+					'PAGES' => $pages,
+					'PAGES_ACL_LEVEL' => $pages_acl,
+				]);
 				// load the edit_access user rights
 				$q = "SELECT ea.edit_access_id, level, type, ea.name, "
 					. "ea.color, ea.uid, edit_default, ea.additional_acl "
@@ -1054,6 +1065,7 @@ class Login
 				$unit_access = [];
 				$eauid = [];
 				$unit_acl = [];
+				$unit_uid = [];
 				while (is_array($res = $this->db->dbReturn($q))) {
 					// read edit access data fields and drop them into the unit access array
 					$q_sub = "SELECT name, value "
@@ -1077,16 +1089,19 @@ class Login
 					];
 					// set the default unit
 					if ($res['edit_default']) {
-						$_SESSION['UNIT_DEFAULT'] = (int)$res['edit_access_id'];
+						$this->session->set('UNIT_DEFAULT', (int)$res['edit_access_id']);
 					}
-					$_SESSION['UNIT_UID'][$res['uid']] = (int)$res['edit_access_id'];
+					$unit_uid[$res['uid']] = (int)$res['edit_access_id'];
 					// sub arrays for simple access
 					array_push($eauid, $res['edit_access_id']);
 					$unit_acl[$res['edit_access_id']] = $res['level'];
 				}
-				$_SESSION['UNIT'] = $unit_access;
+				$this->session->setMany([
-				$_SESSION['UNIT_ACL_LEVEL'] = $unit_acl;
+					'UNIT_UID' => $unit_uid,
-				$_SESSION['EAID'] = $eauid;
+					'UNIT' => $unit_access,
+					'UNIT_ACL_LEVEL' => $unit_acl,
+					'EAID' => $eauid,
+				]);
 			} // user has permission to THIS page
 		} // user was not enabled or other login error
 		if ($this->login_error && is_array($res)) {
@@ -1182,7 +1197,7 @@ class Login
 				$this->acl['base'] = (int)$_SESSION['USER_ACL_LEVEL'];
 			}
 		}
-		$_SESSION['BASE_ACL_LEVEL'] = $this->acl['base'];
+		$this->session->set('BASE_ACL_LEVEL', $this->acl['base']);
 
 		// set the current page acl
 		// start with base acl
@@ -1889,13 +1904,13 @@ HTML;
 			),
 			[
 				// row 1
-				empty($username) ? $_SESSION['USER_NAME'] ?? '' : $username,
+				empty($username) ? $this->session->get('USER_NAME') ?? '' : $username,
-				!empty($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ?
+				is_numeric($this->session->get('EUID')) ?
-					$_SESSION['EUID'] : null,
+					$this->session->get('EUID') : null,
-				!empty($_SESSION['ECUID']) && is_string($_SESSION['ECUID']) ?
+				is_string($this->session->get('ECUID')) ?
-					$_SESSION['ECUID'] : null,
+					$this->session->get('ECUID') : null,
-				!empty($_SESSION['ECUUID']) && Uids::validateUuuidv4($_SESSION['ECUUID']) ?
+				!empty($this->session->get('ECUUID')) && Uids::validateUuuidv4($this->session->get('ECUUID')) ?
-					$_SESSION['ECUUID'] : null,
+					$this->session->get('ECUUID') : null,
 				(string)$event,
 				(string)$error,
 				$data_write,
@@ -2022,10 +2037,10 @@ HTML;
 			}
 		}
 		// if there is none, there is none, saves me POST/GET check
-		$this->euid = array_key_exists('EUID', $_SESSION) ? (int)$_SESSION['EUID'] : 0;
+		$this->euid = (int)($this->session->get('EUID') ?? 0);
 		// TODO: allow load from cuid
-		// $this->ecuid = array_key_exists('ECUID', $_SESSION) ? (string)$_SESSION['ECUID'] : '';
+		// $this->ecuid = (string)($this->session->get('ECUID') ?? '');
-		// $this->ecuuid = array_key_exists('ECUUID', $_SESSION) ? (string)$_SESSION['ECUUID'] : '';
+		// $this->ecuuid = (string)($this->session->get('ECUUID') ?? '');
 		// get login vars, are so, can't be changed
 		// prepare
 		// pass on vars to Object vars
@@ -2368,8 +2383,12 @@ HTML;
 			$this->login_error = 103;
 		}
 		// set ECUID
-		$_SESSION['ECUID'] = $this->ecuid = (string)$res['cuid'];
+		$this->ecuid = (string)$res['cuid'];
-		$_SESSION['ECUUID'] = $this->ecuuid = (string)$res['cuuid'];
+		$this->ecuuid = (string)$res['cuuid'];
+		$this->session->setMany([
+			'ECUID' => $this->ecuid,
+			'ECUUID' => $this->ecuuid,
+		]);
 		// if called from public, so we can check if the permissions are ok
 		return $this->permission_okay;
 	}
@@ -2515,13 +2534,12 @@ HTML;
 	{
 		if (
 			$edit_access_id !== null &&
-			isset($_SESSION['UNIT']) &&
+			is_array($this->session->get('UNIT')) &&
-			is_array($_SESSION['UNIT']) &&
+			!array_key_exists($edit_access_id, $this->session->get('UNIT'))
-			!array_key_exists($edit_access_id, $_SESSION['UNIT'])
 		) {
 			$edit_access_id = null;
-			if (is_numeric($_SESSION['UNIT_DEFAULT'])) {
+			if (is_numeric($this->session->get('UNIT_DEFAULT'))) {
-				$edit_access_id = (int)$_SESSION['UNIT_DEFAULT'];
+				$edit_access_id = (int)$this->session->get('UNIT_DEFAULT');
 			}
 		}
 		return $edit_access_id;
@@ -2652,7 +2670,7 @@ HTML;
 	 */
 	public function loginGetHeaderColor(): ?string
 	{
-		return $_SESSION['HEADER_COLOR'] ?? null;
+		return $this->session->get('HEADER_COLOR');
 	}
 
 	/**
@@ -2663,7 +2681,7 @@ HTML;
 	public function loginGetPages(): array
 	{
 
-		return $_SESSION['PAGES'] ?? [];
+		return $this->session->get('PAGES');
 	}
 
 	/**

www/lib/CoreLibs/Admin/Backend.php

@@ -380,12 +380,12 @@ class Backend
 			[
 				// row 1
 				'',
-				!empty($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ?
+				is_numeric($this->session->get('EUID')) ?
-					$_SESSION['EUID'] : null,
+					$this->session->get('EUID') : null,
-				!empty($_SESSION['ECUID']) && is_string($_SESSION['ECUID']) ?
+				is_string($this->session->get('ECUID')) ?
-					$_SESSION['ECUID'] : null,
+					$this->session->get('ECUID') : null,
-				!empty($_SESSION['ECUUID']) && Uids::validateUuuidv4($_SESSION['ECUID']) ?
+				!empty($this->session->get('ECUUID')) && Uids::validateUuuidv4($this->session->get('ECUID')) ?
-					$_SESSION['ECUID'] : null,
+				$this->session->get('ECUID') : null,
 				(string)$event,
 				'',
 				$data_write,
@@ -468,7 +468,7 @@ class Backend
 		}
 
 		// get the session pages array
-		$PAGES = $_SESSION['PAGES'] ?? null;
+		$PAGES = $this->session->get('PAGES');
 		if (!isset($PAGES) || !is_array($PAGES)) {
 			$PAGES = [];
 		}

www/lib/CoreLibs/Create/Session.php

@@ -97,6 +97,23 @@ class Session
 		return true;
 	}
 
+	/**
+	 * validate _SESSION key, must be valid variable
+	 *
+	 * @param  int|float|string $key
+	 * @return true
+	 */
+	private function checkValidSessionEntryKey(int|float|string $key): true
+	{
+		if (!is_string($key) || is_numeric($key)) {
+			throw new \UnexpectedValueException(
+				'[SESSION] Given key for _SESSION is not a valid value for a varaible: ' . $key,
+				1
+			);
+		}
+		return true;
+	}
+
 	// MARK: init session (on class start)
 
 	/**
@@ -162,6 +179,9 @@ class Session
 	public function restartSession(): bool
 	{
 		if (!$this->checkActiveSession()) {
+			if (empty($this->session_name)) {
+				throw new \RuntimeException('[SESSION] Cannot restart session without a session name', 1);
+			}
 			$this->startSessionCall();
 			return true;
 		}
@@ -235,6 +255,21 @@ class Session
 		return \CoreLibs\Get\System::checkCLI();
 	}
 
+	/**
+	 * get session status
+	 * PHP_SESSION_DISABLED if sessions are disabled.
+	 * PHP_SESSION_NONE if sessions are enabled, but none exists.
+	 * PHP_SESSION_ACTIVE if sessions are enabled, and one exists.
+	 *
+	 * https://www.php.net/manual/en/function.session-status.php
+	 *
+	 * @return int See possible return int values above
+	 */
+	public function getSessionStatus(): int
+	{
+		return session_status();
+	}
+
 	// MARK: write close session
 
 	/**
@@ -256,13 +291,18 @@ class Session
 	 * Proper destroy a session
 	 * - unset the _SESSION array
 	 * - unset cookie if cookie on and we have not strict mode
+	 * - unset session_name and session_id internal vars
 	 * - destroy session
 	 *
-	 * @return bool
+	 * @return bool True on successful session destroy
 	 */
 	public function sessionDestroy(): bool
 	{
-		$_SESSION = [];
+		// abort to false if not unsetable
+		if (!session_unset()) {
+			return false;
+		}
+		$this->clear();
 		if (
 			ini_get('session.use_cookies') &&
 			!ini_get('session.use_strict_mode')
@@ -282,24 +322,12 @@ class Session
 				$params['httponly']
 			);
 		}
+		// unset internal vars
+		$this->session_name = '';
+		$this->session_id = '';
 		return session_destroy();
 	}
 
-	/**
-	 * get session status
-	 * PHP_SESSION_DISABLED if sessions are disabled.
-	 * PHP_SESSION_NONE if sessions are enabled, but none exists.
-	 * PHP_SESSION_ACTIVE if sessions are enabled, and one exists.
-	 *
-	 * https://www.php.net/manual/en/function.session-status.php
-	 *
-	 * @return int See possible return int values above
-	 */
-	public function getSessionStatus(): int
-	{
-		return session_status();
-	}
-
 	// MARK: _SESSION set/unset methods
 
 	/**
@@ -307,11 +335,14 @@ class Session
 	 *
 	 * @return void
 	 */
-	public function unsetAll(): void
+	public function clear(): void
 	{
 		$this->restartSession();
-		foreach (array_keys($_SESSION ?? []) as $name) {
+		if (!session_unset()) {
-			unset($_SESSION[$name]);
+			throw new \RuntimeException('[SESSION] Cannot unset session vars', 1);
+		}
+		if (!empty($_SESSION)) {
+			$_SESSION = [];
 		}
 		$this->closeSessionCall();
 	}
@@ -319,35 +350,64 @@ class Session
 	/**
 	 * set _SESSION entry 'name' with any value
 	 *
-	 * @param  string|int $name  array name in _SESSION
+	 * @param  string $name  array name in _SESSION
-	 * @param  mixed      $value value to set (can be anything)
+	 * @param  mixed  $value value to set (can be anything)
 	 * @return void
 	 */
-	public function set(string|int $name, mixed $value): void
+	public function set(string $name, mixed $value): void
 	{
+		$this->checkValidSessionEntryKey($name);
 		$this->restartSession();
 		$_SESSION[$name] = $value;
 		$this->closeSessionCall();
 	}
 
+	/**
+	 * set many session entries in one set
+	 *
+	 * @param  array<string,mixed> $set key is the key in the _SESSION, value is any data to set
+	 * @return void
+	 */
+	public function setMany(array $set): void
+	{
+		$this->restartSession();
+		// skip any that are not valid
+		foreach ($set as $key => $value) {
+			$this->checkValidSessionEntryKey($key);
+			$_SESSION[$key] = $value;
+		}
+		$this->closeSessionCall();
+	}
+
 	/**
 	 * get _SESSION 'name' entry or empty string if not set
 	 *
-	 * @param  string|int $name value key to get from _SESSION
+	 * @param  string $name value key to get from _SESSION
-	 * @return mixed            value stored in _SESSION
+	 * @return mixed        value stored in _SESSION, if not found set to null
 	 */
-	public function get(string|int $name): mixed
+	public function get(string $name): mixed
 	{
 		return $_SESSION[$name] ?? null;
 	}
 
+	/**
+	 * get multiple session entries
+	 *
+	 * @param  array<string> $set
+	 * @return array<string,mixed>
+	 */
+	public function getMany(array $set): array
+	{
+		return array_intersect_key($_SESSION, array_flip($set));
+	}
+
 	/**
 	 * Check if a name is set in the _SESSION array
 	 *
-	 * @param  string|int $name Name to check for
+	 * @param  string $name Name to check for
-	 * @return bool             True for set, False fornot set
+	 * @return bool                   True for set, False fornot set
 	 */
-	public function isset(string|int $name): bool
+	public function isset(string $name): bool
 	{
 		return isset($_SESSION[$name]);
 	}
@@ -355,10 +415,10 @@ class Session
 	/**
 	 * unset one _SESSION entry 'name' if exists
 	 *
-	 * @param  string|int $name _SESSION key name to remove
+	 * @param  string $name _SESSION key name to remove
 	 * @return void
 	 */
-	public function unset(string|int $name): void
+	public function unset(string $name): void
 	{
 		if (!isset($_SESSION[$name])) {
 			return;
@@ -368,65 +428,21 @@ class Session
 		$this->closeSessionCall();
 	}
 
-	// MARK: [DEPRECATED] __set/__get magic methods
-	// ->var = value;
-
 	/**
-	 * Undocumented function
+	 * reset many session entry
 	 *
-	 * @param  string|int $name
+	 * @param  array<string> $set list of session keys to reset
-	 * @param  mixed      $value
 	 * @return void
-	 * @deprecated use ->set()
 	 */
-	public function __set(string|int $name, mixed $value): void
+	public function unsetMany(array $set): void
 	{
 		$this->restartSession();
-		$_SESSION[$name] = $value;
+		foreach ($set as $key) {
-		$this->closeSessionCall();
+			if (!isset($_SESSION[$key])) {
-	}
+				continue;
-
+			}
-	/**
+			unset($_SESSION[$key]);
-	 * Undocumented function
-	 *
-	 * @param  string|int $name
-	 * @return mixed            If name is not found, it will return null
-	 * @deprecated use ->get()
-	 */
-	public function __get(string|int $name): mixed
-	{
-		if (isset($_SESSION[$name])) {
-			return $_SESSION[$name];
 		}
-		return null;
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @param  string|int $name
-	 * @return bool
-	 * @deprecated use ->isset()
-	 */
-	public function __isset(string|int $name): bool
-	{
-		return isset($_SESSION[$name]);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @param  string|int $name
-	 * @return void
-	 * @deprecated use ->unset()
-	 */
-	public function __unset(string|int $name): void
-	{
-		if (!isset($_SESSION[$name])) {
-			return;
-		}
-		$this->restartSession();
-		unset($_SESSION[$name]);
 		$this->closeSessionCall();
 	}
 }

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

@@ -2,7 +2,7 @@
 
 /*
  * sets a form token in the _SESSION variable
- * session must be started for this to work
+ * session must be started and running for this to work
  */
 
 declare(strict_types=1);