Add random key character range set

4dev/tests/Combined/CoreLibsCombinedArrayHandlerTest.php

@@ -1286,6 +1286,118 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 			)
 		);
 	}
+
+	/**
+	 * provider for arrayModifyKey
+	 *
+	 * @return array<string,array<mixed>>
+	 */
+	public function providerArrayModifyKey(): array
+	{
+		return [
+			'prefix and suffix add' => [
+				'array' => [
+					'a' => 'foo',
+					'b' => 'bar',
+					'c' => 'foobar',
+				],
+				'prefix' => 'Prefix: ',
+				'suffix' => '.suffix',
+				'expected' => [
+					'Prefix: a.suffix' => 'foo',
+					'Prefix: b.suffix' => 'bar',
+					'Prefix: c.suffix' => 'foobar',
+				],
+			],
+			'prefix add only' => [
+				'array' => [
+					'a' => 'foo',
+					'b' => 'bar',
+					'c' => 'foobar',
+				],
+				'prefix' => 'Prefix: ',
+				'suffix' => '',
+				'expected' => [
+					'Prefix: a' => 'foo',
+					'Prefix: b' => 'bar',
+					'Prefix: c' => 'foobar',
+				],
+			],
+			'suffix add only' => [
+				'array' => [
+					'a' => 'foo',
+					'b' => 'bar',
+					'c' => 'foobar',
+				],
+				'prefix' => '',
+				'suffix' => '.suffix',
+				'expected' => [
+					'a.suffix' => 'foo',
+					'b.suffix' => 'bar',
+					'c.suffix' => 'foobar',
+				],
+			],
+			'empty array' => [
+				'array' => [],
+				'prefix' => '',
+				'suffix' => '.suffix',
+				'expected' => [],
+			],
+			'no suffix or prefix' => [
+				'array' => [
+					'a' => 'foo',
+					'b' => 'bar',
+					'c' => 'foobar',
+				],
+				'prefix' => '',
+				'suffix' => '',
+				'expected' => [
+					'a' => 'foo',
+					'b' => 'bar',
+					'c' => 'foobar',
+				],
+			],
+			'integer index mixed' => [
+				'array' => [
+					'a' => 'foo',
+					'b' => 'bar',
+					3 => 'foobar',
+				],
+				'prefix' => '',
+				'suffix' => '.suffix',
+				'expected' => [
+					'a.suffix' => 'foo',
+					'b.suffix' => 'bar',
+					'3.suffix' => 'foobar',
+				],
+			]
+		];
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::arrayModifyKey
+	 * @dataProvider providerArrayModifyKey
+	 * @testdox arrayModifyKey check that key is correctly modified with $key_mod_prefix and $key_mod_suffix [$_dataName]
+	 *
+	 * @param  array<mixed>  $in_array
+	 * @param  string $key_mod_prefix
+	 * @param  string $key_mod_suffix
+	 * @param  array<mixed>  $expected
+	 * @return void
+	 */
+	public function testArrayModifyKey(
+		array $in_array,
+		string $key_mod_prefix,
+		string $key_mod_suffix,
+		array $expected
+	): void {
+		$this->assertEquals(
+			\CoreLibs\Combined\ArrayHandler::arrayModifyKey($in_array, $key_mod_prefix, $key_mod_suffix),
+			$expected
+		);
+	}
 }
 
 // __END__

4dev/tests/Create/CoreLibsCreateRandomKeyTest.php

@@ -200,6 +200,47 @@ final class CoreLibsCreateRandomKeyTest extends TestCase
 			\CoreLibs\Create\RandomKey::getRandomKeyLength()
 		);
 	}
+
+	/**
+	 * 1
+	 *
+	 * @return array
+	 */
+	public function setRandomKeyCharactersProvider(): array
+	{
+		return [
+			'lower case characters' => [
+				0 => "/^[a-z]+$/",
+				1 => ["a", "z"],
+			],
+			'lower case and upper case' => [
+				0 => "/^[A-Za-z]+$/",
+				1 => ["A", "Z"],
+				1 => ["a", "z"],
+			],
+			'alphanumeric' => [
+				0 => "/^[A-Za-z0-9]+$/",
+				1 => ["A", "Z"],
+				1 => ["a", "z"],
+				1 => ["0", "9"],
+			]
+		];
+	}
+
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::setRandomKeyCharacters
+	 * @dataProvider setRandomKeyCharactersProvider
+	 * @testdox check setRandomKeyCharacters [$_dataName]
+	 *
+	 * @return void
+	 */
+	public function testSetRandomKeyCharacters(string $expected_regex, array ...$random_keys): void
+	{
+
+	}
 }
 
 // __END__

www/admin/class_test.array.php

@@ -263,6 +263,8 @@ $out = array_intersect_key(
 );
 print "array intersect key: " . DgS::printAr($keys) . ": " . DgS::printAr($out) . "<br>";
 
+print "array + suffix: " . DgS::printAr(ArrayHandler::arrayModifyKey($array, key_mod_suffix:'_attached')) . "<br>";
+
 print "</body></html>";
 
 // __END__

www/admin/class_test.login.php

@@ -31,6 +31,7 @@ $log = new CoreLibs\Logging\Logging([
 	'log_per_date' => true,
 ]);
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
+$log->setLogFileId('classTest-login-override');
 $login = new CoreLibs\ACL\Login(
 	$db,
 	$log,
@@ -45,6 +46,7 @@ $login = new CoreLibs\ACL\Login(
 		'locale_path' => BASE . INCLUDES . LOCALE,
 	]
 );
+$log->setLogFileId($LOG_FILE_ID);
 ob_end_flush();
 $login->loginMainCall();
 
@@ -158,5 +160,6 @@ if (is_string($edit_access_cuid)) {
 print "EA ID: " . $edit_access_id . "<br>";
 print "EA CUID: " . $log->prAr($edit_access_cuid) . "<br>";
 print "REV EA CUID: " . $log->prAr($edit_access_id_rev) . "<br>";
+$log->info('This is a test');
 
 print "</body></html>";

www/admin/class_test.randomkey.php

@@ -43,8 +43,10 @@ print "S::RANDOMKEYGEN($key_length): " . RandomKey::randomKeyGen() . "<br>";
 print "S::RANDOMKEYGEN($key_length_b): " . RandomKey::randomKeyGen($key_length_b) . "<br>";
 print "S::RANDOMKEYGEN($key_length): " . RandomKey::randomKeyGen() . "<br>";
 print "S::RANDOMKEYGEN($key_lenght_long): " . RandomKey::randomKeyGen($key_lenght_long) . "<br>";
-$_array = new CoreLibs\Create\RandomKey();
-print "C->RANDOMKEYGEN(auto): " . $_array->randomKeyGen() . "<br>";
+$random_key = new CoreLibs\Create\RandomKey();
+print "C->RANDOMKEYGEN(auto): " . $random_key->randomKeyGen() . "<br>";
+$random_key->setRandomKeyCharacters(['a', 'z']);
+print "C->RANDOMKEYGEN(Fixed set): " . $random_key->randomKeyGen() . "<br>";
 
 print "</body></html>";
 

www/lib/CoreLibs/Combined/ArrayHandler.php

@@ -551,6 +551,36 @@ class ArrayHandler
 			ARRAY_FILTER_USE_KEY
 		);
 	}
+
+	/**
+	 * Modifieds the key of an array with a prefix and/or suffix and returns it with the original value
+	 * does not change order in array
+	 *
+	 * @param  array<string|int,mixed> $in_array
+	 * @param  string                  $key_mod_prefix [default=''] key prefix string
+	 * @param  string                  $key_mod_suffix [default=''] key suffix string
+	 * @return array<string|int,mixed>
+	 */
+	public static function arrayModifyKey(
+		array $in_array,
+		string $key_mod_prefix = '',
+		string $key_mod_suffix = ''
+	): array {
+		// skip if array is empty or neither prefix or suffix are set
+		if (
+			$in_array == [] ||
+			($key_mod_prefix == '' && $key_mod_suffix == '')
+		) {
+			return $in_array;
+		}
+		return array_combine(
+			array_map(
+				fn($key) => $key_mod_prefix . $key . $key_mod_suffix,
+				array_keys($in_array)
+			),
+			array_values($in_array)
+		);
+	}
 }
 
 // __END__

www/lib/CoreLibs/Create/RandomKey.php

@@ -61,6 +61,32 @@ class RandomKey
 		}
 	}
 
+	/**
+	 * sets a different character range
+	 *
+	 * @param  array<array{0:string,1:string}> $ranges
+	 * @return bool
+	 */
+	public static function setRandomKeyCharacters(array ...$ranges): bool
+	{
+		// each range must be an arary of start end range
+		$character_range = [];
+		foreach ($ranges as $range) {
+			if (count($range) != 2) {
+				throw new \ArgumentCountError(__FUNCTION__ . ' array must have two range entries');
+			}
+			$character_range = array_merge($character_range, range($range[0], $range[1]));
+		}
+		self::$key_range = join('', $character_range);
+		self::$one_key_length = strlen(self::$key_range);
+		if (
+			self::$one_key_length == 0
+		) {
+			return false;
+		}
+		return true;
+	}
+
 	/**
 	 * sets the key length and checks that they key given is valid
 	 * if failed it will not change the default key length and return false

www/lib/CoreLibs/DB/Extended/ArrayIO.php

@@ -39,9 +39,9 @@ class ArrayIO extends \CoreLibs\DB\IO
 {
 	// main calss variables
 	/** @var array<mixed> */
-	private array $table_array; // the array from the table to work on
+	private array $table_array = []; // the array from the table to work on
 	/** @var string */
-	private string $table_name; // the table_name
+	private string $table_name = ''; // the table_name
 	/** @var string */
 	private string $pk_name = ''; // the primary key from this table
 	/** @var int|string|null */
@@ -127,9 +127,9 @@ class ArrayIO extends \CoreLibs\DB\IO
 	public function getTableArray(bool $reset = false): array
 	{
 		if (!$reset) {
-			return $this->table_array ?? [];
+			return $this->table_array;
 		}
-		$table_array = $this->table_array ?? [];
+		$table_array = $this->table_array;
 		reset($table_array);
 		return $table_array;
 	}
@@ -194,7 +194,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	 */
 	public function getTableName(): string
 	{
-		return $this->table_name ?? '';
+		return $this->table_name;
 	}
 
 	/**

www/lib/CoreLibs/DB/IO.php

@@ -2544,7 +2544,10 @@ class IO
 		} // only go if NO cursor exists
 
 		// if cursor exists ...
-		if ($this->cursor_ext[$query_hash]['cursor']) {
+		if (
+			$this->cursor_ext[$query_hash]['cursor'] instanceof \PgSql\Result ||
+			$this->cursor_ext[$query_hash]['cursor'] == 1
+		) {
 			if ($first_call === true) {
 				$this->cursor_ext[$query_hash]['log'][] = 'First call';
 				// count the rows returned (if select)