DB IO Placeholder convert fixers and updates

Add more checks in phpunit for this,

Update the placeholder check and convert and move all regex into the
placeholder convert support class
Move $ placeholder count function to the SQL\PgSQL class

Note: further moves of PgSQL only stuff have to be done for SQLite
SQL class add

4dev/checking/phpunit.sh

@@ -36,7 +36,7 @@ if [ -n "${2}" ] && [ -z "${php_bin}" ]; then
 fi;
 
 # Note 4dev/tests/bootstrap.php has to be set as bootstrap file in phpunit.xml
-phpunit_call="${php_bin}${base}tools/phpunit ${opt_testdox} -c ${base}phpunit.xml ${base}4dev/tests/";
+phpunit_call="${php_bin}${base}vendor/bin/phpunit ${opt_testdox} -c ${base}phpunit.xml ${base}4dev/tests/";
 
 ${phpunit_call};
 

4dev/tests/Convert/CoreLibsConvertMathTest.php

@@ -142,7 +142,6 @@ final class CoreLibsConvertMathTest extends TestCase
 	 */
 	public function testCbrt(float|int $number, float|string $expected, int $round_to): void
 	{
-		print "OUT: " . \CoreLibs\Convert\Math::cbrt($number) . "\n";
 		$this->assertEquals(
 			$expected,
 			round(\CoreLibs\Convert\Math::cbrt($number), $round_to)
@@ -157,12 +156,32 @@ final class CoreLibsConvertMathTest extends TestCase
 	public function providerMultiplyMatrices(): array
 	{
 		return  [
-			'single' => [
+			'[3] x [3] => [3x1]' => [
 				[1, 2, 3],
 				[1, 2, 3],
 				[14]
 			],
-			'double first' => [
+			'[3] x [3x1]' => [
+				[1, 2, 3],
+				[[1], [2], [3]],
+				[14]
+			],
+			'[3] x [3x1]' => [
+				[1, 2, 3],
+				[[1], [2], [3]],
+				[14]
+			],
+			'[1x3L] x [3x1]' => [
+				[[1, 2, 3]],
+				[[1], [2], [3]],
+				[14]
+			],
+			'[1x3] x [3x1]' => [
+				[[1], [2], [3]],
+				[[1], [2], [3]],
+				[1, 2, 3]
+			],
+			'[2x3] x [3] => [3x1]' => [
 				[
 					[1, 2, 3],
 					[1, 2, 3]
@@ -173,7 +192,18 @@ final class CoreLibsConvertMathTest extends TestCase
 					14
 				]
 			],
-			'double both' => [
+			'[2x3] x [3x1]' => [
+				[
+					[1, 2, 3],
+					[1, 2, 3]
+				],
+				[[1], [2], [3]],
+				[
+					14,
+					14
+				]
+			],
+			'[2x3] x [2x3] => [3x3]' => [
 				[
 					[1, 2, 3],
 					[1, 2, 3],
@@ -187,7 +217,37 @@ final class CoreLibsConvertMathTest extends TestCase
 					[3, 6, 9]
 				]
 			],
-			'tripple first, single second' => [
+			'[2x3] x [3x3]' => [
+				[
+					[1, 2, 3],
+					[1, 2, 3],
+				],
+				[
+					[1, 2, 3],
+					[1, 2, 3],
+					[0, 0, 0],
+				],
+				[
+					[3, 6, 9],
+					[3, 6, 9]
+				]
+			],
+			'[2x3] x [3x2]' => [
+				'a' => [
+					[1, 2, 3],
+					[1, 2, 3],
+				],
+				'b' => [
+					[1, 1],
+					[2, 2],
+					[3, 3],
+				],
+				'prod' => [
+					[14, 14],
+					[14, 14],
+				]
+			],
+			'[3x3] x [3] => [1x3]' => [
 				[
 					[1, 2, 3],
 					[1, 2, 3],
@@ -200,7 +260,7 @@ final class CoreLibsConvertMathTest extends TestCase
 					14
 				]
 			],
-			'tripple first, double second' => [
+			'[3x3] x [2x3] => [3x3]' => [
 				[
 					[1, 2, 3],
 					[1, 2, 3],
@@ -216,7 +276,24 @@ final class CoreLibsConvertMathTest extends TestCase
 					[3, 6, 9],
 				]
 			],
-			'single first, tripple second' => [
+			'[3x3] x [3x3]' => [
+				[
+					[1, 2, 3],
+					[1, 2, 3],
+					[1, 2, 3],
+				],
+				[
+					[1, 2, 3],
+					[1, 2, 3],
+					// [0, 0, 0],
+				],
+				[
+					[3, 6, 9],
+					[3, 6, 9],
+					[3, 6, 9],
+				]
+			],
+			'[3] x [3x3]' => [
 				[1, 2, 3],
 				[
 					[1, 2, 3],
@@ -227,7 +304,7 @@ final class CoreLibsConvertMathTest extends TestCase
 					[6, 12, 18],
 				]
 			],
-			'double first, tripple second' => [
+			'[2x3] x [3x3]' => [
 				[
 					[1, 2, 3],
 					[1, 2, 3],
@@ -242,6 +319,36 @@ final class CoreLibsConvertMathTest extends TestCase
 					[6, 12, 18],
 				]
 			],
+			'inblanaced [2x2,3] x [3x2]' => [
+				'a' => [
+					[1, 2, 3],
+					[4, 5]
+				],
+				'b' => [
+					[6, 7],
+					[8, 9],
+					[10, 11]
+				],
+				'result' => [
+					[52, 58],
+					[64, 73],
+				]
+			],
+			'inblanaced [2x3] x [3x1,2]' => [
+				'a' => [
+					[1, 2, 3],
+					[4, 5, 7]
+				],
+				'b' => [
+					[7, 8],
+					[9, 10],
+					[11]
+				],
+				'result' => [
+					[58, 28],
+					[150, 82],
+				]
+			],
 		];
 	}
 
@@ -264,6 +371,130 @@ final class CoreLibsConvertMathTest extends TestCase
 			\CoreLibs\Convert\Math::multiplyMatrices($input_a, $input_b)
 		);
 	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function providerEqualWithEpsilon(): array
+	{
+		return [
+			'equal' => [
+				'a' => 0.000000000000000222,
+				'b' => 0.000000000000000222,
+				'epsilon' => PHP_FLOAT_EPSILON,
+				'equal' => true,
+			],
+			'almost equal' => [
+				'a' => 0.000000000000000222,
+				'b' => 0.000000000000000232,
+				'epsilon' => PHP_FLOAT_EPSILON,
+				'equal' => true,
+			],
+			'not equal' => [
+				'a' => 0.000000000000000222,
+				'b' => 0.000000000000004222,
+				'epsilon' => PHP_FLOAT_EPSILON,
+				'equal' => false,
+			],
+			'equal, different epsilon' => [
+				'a' => 0.000000000000000222,
+				'b' => 0.000000000000004222,
+				'epsilon' => 0.0001,
+				'equal' => true,
+			],
+			'not equal, different epsilon' => [
+				'a' => 0.0001,
+				'b' => 0.0002,
+				'epsilon' => 0.0001,
+				'equal' => false,
+			]
+		];
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::equalWithEpsilon
+	 * @dataProvider providerEqualWithEpsilon
+	 * @testdox equalWithEpsilon with $a and $b and Epsilon: $epsilon must be equal: $equal [$_dataName]
+	 *
+	 * @return void
+	 */
+	public function testEqualWithEpsilon(float $a, float $b, float $epsilon, bool $equal): void
+	{
+		$this->assertEquals(
+			$equal,
+			\CoreLibs\Convert\Math::equalWithEpsilon($a, $b, $epsilon)
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function providerCompareWithEpsilon(): array
+	{
+		return [
+			'smaller, true' => [
+				'value' => 0.0001,
+				'compare' => '<',
+				'limit' => 0.0002,
+				'epsilon' => 0.00001,
+				'match' => true,
+			],
+			'smaller, false' => [
+				'value' => 0.0001,
+				'compare' => '<',
+				'limit' => 0.0001,
+				'epsilon' => 0.00001,
+				'match' => false,
+			],
+			'bigger, true' => [
+				'value' => 0.0002,
+				'compare' => '>',
+				'limit' => 0.0001,
+				'epsilon' => 0.00001,
+				'match' => true,
+			],
+			'bigger, false' => [
+				'value' => 0.0001,
+				'compare' => '>',
+				'limit' => 0.0001,
+				'epsilon' => 0.00001,
+				'match' => false,
+			],
+		];
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::compareWithEpsilon
+	 * @dataProvider providerCompareWithEpsilon
+	 * @testdox compareWithEpsilon $value $compare $limit with $epsilon must match: $match [$_dataName]
+	 *
+	 * @param  float  $value
+	 * @param  string $compare
+	 * @param  float  $limit
+	 * @param  float  $epslion
+	 * @param  bool   $match
+	 * @return void
+	 */
+	public function testCompareWithEpsilon(
+		float $value,
+		string $compare,
+		float $limit,
+		float $epsilon,
+		bool $match
+	): void {
+		$this->assertEquals(
+			$match,
+			\CoreLibs\Convert\Math::compareWithEpsilon($value, $compare, $limit, $epsilon)
+		);
+	}
 }
 
 // __END__

4dev/tests/DB/CoreLibsDBIOTest.php

@@ -37,8 +37,9 @@ namespace tests;
 
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
-use CoreLibs\Logging\Logger\Level;
+use CoreLibs\Logging;
 use CoreLibs\DB\Options\Convert;
+use CoreLibs\DB\Support\ConvertPlaceholder;
 
 /**
  * Test class for DB\IO + DB\SQL\PgSQL
@@ -117,7 +118,7 @@ final class CoreLibsDBIOTest extends TestCase
 			);
 		}
 		// define basic connection set valid and one invalid
-		self::$log = new \CoreLibs\Logging\Logging([
+		self::$log = new Logging\Logging([
 			// 'log_folder' => __DIR__ . DIRECTORY_SEPARATOR . 'log',
 			'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
 			'log_file_id' => 'CoreLibs-DB-IO-Test',
@@ -570,11 +571,11 @@ final class CoreLibsDBIOTest extends TestCase
 		);
 		$db->dbClose();
 		// second conenction with log set NOT debug
-		$log = new \CoreLibs\Logging\Logging([
+		$log = new Logging\Logging([
 			// 'log_folder' => __DIR__ . DIRECTORY_SEPARATOR . 'log',
 			'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
 			'log_file_id' => 'CoreLibs-DB-IO-Test',
-			'log_level' => \CoreLibs\Logging\Logger\Level::Notice,
+			'log_level' => Logging\Logger\Level::Notice,
 		]);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config[$connection],
@@ -3293,6 +3294,7 @@ final class CoreLibsDBIOTest extends TestCase
 					'query' =>  'INSERT INTO table_with_primary_key (row_int, uid) '
 						. 'VALUES ($1, $2) RETURNING table_with_primary_key_id',
 					'returning_id' => true,
+					'placeholder_converted' => [],
 				],
 			],
 			// update
@@ -3327,6 +3329,7 @@ final class CoreLibsDBIOTest extends TestCase
 					'query' => 'UPDATE table_with_primary_key SET row_int = $1, '
 						. 'row_varchar = $2 WHERE uid = $3',
 					'returning_id' => false,
+					'placeholder_converted' => [],
 				],
 			],
 			// select
@@ -3356,6 +3359,7 @@ final class CoreLibsDBIOTest extends TestCase
 					'count' => 1,
 					'query' => 'SELECT row_int, uid FROM table_with_primary_key WHERE uid = $1',
 					'returning_id' => false,
+					'placeholder_converted' => [],
 				],
 			],
 			// any query but with no parameters
@@ -3388,6 +3392,7 @@ final class CoreLibsDBIOTest extends TestCase
 					'count' => 0,
 					'query' => 'SELECT row_int, uid FROM table_with_primary_key',
 					'returning_id' => false,
+					'placeholder_converted' => [],
 				],
 			],
 			// no statement name (25)
@@ -3411,6 +3416,7 @@ final class CoreLibsDBIOTest extends TestCase
 					'count' => 0,
 					'query' => '',
 					'returning_id' => false,
+					'placeholder_converted' => [],
 				],
 			],
 			// no query (prepare 11)
@@ -3435,6 +3441,7 @@ final class CoreLibsDBIOTest extends TestCase
 					'count' => 0,
 					'query' => '',
 					'returning_id' => false,
+					'placeholder_converted' => [],
 				],
 			],
 			// no db connection (prepare/execute 16)
@@ -3464,6 +3471,7 @@ final class CoreLibsDBIOTest extends TestCase
 					'count' => 0,
 					'query' => 'SELECT row_int, uid FROM table_with_primary_key',
 					'returning_id' => false,
+					'placeholder_converted' => [],
 				],
 			],
 			// prepare with different statement name
@@ -3489,6 +3497,7 @@ final class CoreLibsDBIOTest extends TestCase
 					'count' => 0,
 					'query' => 'SELECT row_int, uid FROM table_with_primary_key',
 					'returning_id' => false,
+					'placeholder_converted' => [],
 				],
 			],
 			// insert wrong data count compared to needed (execute 23)
@@ -3514,10 +3523,12 @@ final class CoreLibsDBIOTest extends TestCase
 					'query' => 'INSERT INTO table_with_primary_key (row_int, uid) VALUES '
 						. '($1, $2) RETURNING table_with_primary_key_id',
 					'returning_id' => true,
+					'placeholder_converted' => [],
 				],
 			],
 			// execute does not return a result (22)
 			// TODO execute does not return a result
+			// TODO prepared statement with placeholder params auto convert
 		];
 	}
 
@@ -3662,7 +3673,7 @@ final class CoreLibsDBIOTest extends TestCase
 			}
 
 			// check dbGetPrepareCursorValue
-			foreach (['pk_name', 'count', 'query', 'returning_id'] as $key) {
+			foreach (['pk_name', 'count', 'query', 'returning_id', 'placeholder_converted'] as $key) {
 				$this->assertEquals(
 					$prepare_cursor[$key],
 					$db->dbGetPrepareCursorValue($stm_name, $key),
@@ -5031,8 +5042,151 @@ final class CoreLibsDBIOTest extends TestCase
 		$db->dbClose();
 	}
 
-	// query placeholder convert
+	// MARK: QUERY PLACEHOLDERS
 
+	// test query placeholder detection for all possible sets
+	// ::dbPrepare
+
+	/**
+	 * placeholder sql
+	 *
+	 * @return array
+	 */
+	public function providerDbCountQueryParams(): array
+	{
+		return [
+			'one place holder' => [
+				'query' => 'SELECT row_varchar FROM table_with_primary_key WHERE row_varchar = $1',
+				'count' => 1,
+				'convert' => false,
+			],
+			'one place holder, json call' => [
+				'query' => "SELECT row_varchar FROM table_with_primary_key WHERE row_jsonb->>'data' = $1",
+				'count' => 1,
+				'convert' => false,
+			],
+			'one place holder, <> compare' => [
+				'query' => "SELECT row_varchar FROM table_with_primary_key WHERE row_varchar <> $1",
+				'count' => 1,
+				'convert' => false,
+			],
+			'one place holder, named' => [
+				'query' => "SELECT row_varchar FROM table_with_primary_key WHERE row_varchar <> :row_varchar",
+				'count' => 1,
+				'convert' => true,
+			],
+			'no replacement' => [
+				'query' => "SELECT row_varchar FROM table_with_primary_key WHERE row_varchar = '$1'",
+				'count' => 0,
+				'convert' => false,
+			],
+			'insert' => [
+				'query' => "INSERT INTO table_with_primary_key (row_varchar, row_jsonb, row_int) VALUES ($1, $2, $3)",
+				'count' => 3,
+				'convert' => false,
+			],
+			'update' => [
+				'query' => "UPDATE table_with_primary_key SET row_varchar = $1, row_jsonb = $2, row_int = $3 WHERE row_numeric = $4",
+				'count' => 4,
+				'convert' => false,
+			],
+			'multiple, multline' => [
+				'query' => <<<SQL
+				SELECT
+					row_varchar
+				FROM
+					table_with_primary_key
+				WHERE
+					row_varchar = $1 AND row_int = $2
+					AND row_numeric = ANY($3)
+				SQL,
+				'count' => 3,
+				'convert' => false,
+			],
+			'two digit numbers' => [
+				'query' => <<<SQL
+				INSERT INTO table_with_primary_key (
+					row_int, row_numeric, row_varchar, row_varchar_literal, row_json,
+					row_jsonb, row_bytea, row_timestamp, row_date, row_interval
+				) VALUES (
+					$1, $2, $3, $4, $5,
+					$6, $7, $8, $9, $10
+				)
+				SQL,
+				'count' => 10,
+				'convert' => false,
+			],
+			'things in brackets' => [
+				'query' => <<<SQL
+				SELECT row_varchar
+				FROM table_with_primary_key
+				WHERE
+					row_varchar = $1 AND
+					(row_int = ANY($2) OR row_int = $3)
+					AND row_varchar_literal = $4
+				SQL,
+				'count' => 4,
+				'convert' => false,
+			],
+			'number compare' => [
+				'query' => <<<SQL
+				SELECT row_varchar
+				FROM table_with_primary_key
+				WHERE
+					row_int >= $1 OR row_int <= $2 OR
+					row_int > $3 OR row_int < $4
+					OR row_int = $5 OR row_int <> $6
+				SQL,
+				'count' => 6,
+				'convert' => false,
+			]
+		];
+	}
+
+	/**
+	 * Placeholder check and convert tests
+	 *
+	 * @covers ::dbPrepare
+	 * @covers ::__dbCountQueryParams
+	 * @onvers ::convertPlaceholderInQuery
+	 * @dataProvider providerDbCountQueryParams
+	 * @testdox Query replacement count test [$_dataName]
+	 *
+	 * @param  string $query
+	 * @param  int    $count
+	 * @return void
+	 */
+	public function testDbCountQueryParams(string $query, int $count, bool $convert): void
+	{
+		$db = new \CoreLibs\DB\IO(
+			self::$db_config['valid'],
+			self::$log
+		);
+		$id = sha1($query);
+		$db->dbSetConvertPlaceholder($convert);
+		$db->dbPrepare($id, $query);
+		// print "\n**\n";
+		// print "PCount: " . $db->dbGetPrepareCursorValue($id, 'count') . "\n";
+		// print "\n**\n";
+		$this->assertEquals(
+			$count,
+			$db->dbGetPrepareCursorValue($id, 'count'),
+			'DB count params'
+		);
+		$placeholder = ConvertPlaceholder::convertPlaceholderInQuery($query, null, 'pg');
+		// print "RES: " . print_r($placeholder, true) . "\n";
+		$this->assertEquals(
+			$count,
+			$placeholder['needed'],
+			'convert params'
+		);
+	}
+
+	/**
+	 * query placeholder convert
+	 *
+	 * @return array
+	 */
 	public function queryPlaceholderReplaceProvider(): array
 	{
 		// 				WHERE row_varchar = $1
@@ -5076,7 +5230,9 @@ final class CoreLibsDBIOTest extends TestCase
 				WHERE row_varchar = $1
 				SQL,
 				'expected_params' => ['string a'],
-			]
+			],
+			// TODO: test with multiple entries
+			// TODO: test with same entry ($1, $1, :var, :var)
 		];
 	}
 
@@ -5178,6 +5334,8 @@ final class CoreLibsDBIOTest extends TestCase
 	// - data debug
 	//   dbDumpData
 
+	// MARK: ASYNC
+
 	// ASYNC at the end because it has 1s timeout
 	// - asynchronous executions
 	//   dbExecAsync, dbCheckAsync

composer.json

@@ -7,12 +7,11 @@
         "php": ">=8.3"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.12",
+        "phpstan/phpstan": "^2.0",
-        "phan/phan": "^5.4",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
         "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan-strict-rules": "^1.6",
+        "phan/phan": "^5.4",
         "phpunit/phpunit": "^9",
-        "phpstan/phpstan-deprecation-rules": "^1.2",
         "yamadashy/phpstan-friendly-formatter": "^1.1"
     },
     "config": {

phpstan.neon

@@ -2,6 +2,7 @@
 includes:
 	- phpstan-conditional.php
 	#- ./vendor/yamadashy/phpstan-friendly-formatter/extension.neon
+	# - phar://phpstan.phar/conf/bleedingEdge.neon
 parameters:
 	tmpDir: %currentWorkingDirectory%/tmp/phpstan-corelibs
 	#errorFormat: friendly

www/admin/class_test.array.php

@@ -115,9 +115,6 @@ print "ARRAYFLATFORKEY: " . DgS::printAr(ArrayHandler::arrayFlatForKey($test_arr
  */
 function rec(string $pre, string $cur, array $node = [])
 {
-	if (!is_array($node)) {
-		$node = [];
-	}
 	print "<div style='color: green;'>#### PRE: " . $pre . ", CUR: " . $cur . ", N-c: "
 		. count($node) . " [" . join('|', array_keys($node)) . "]</div>";
 	if (!$pre) {

www/admin/class_test.convert.colors.php

@@ -54,7 +54,7 @@ function display(string $color, string $text, string $text_add): string
 		["{COLOR}", "{TEXT}", "{CSS}"],
 		[
 			$color,
-			$text . ($text_add ? '<br>' . $text_add : ''),
+			$text . (!empty($text_add) ? '<br>' . $text_add : ''),
 			$css
 		],
 		$template
@@ -68,21 +68,71 @@ print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
+// out of bounds test
+
 // define a list of from to color sets for conversion test
 
+$hwb = Color::hsbToHwb(new Coordinates\HSB([
+	160,
+	0,
+	50,
+]));
+print "HWB: " . DgS::printAr($hwb) . "<br>";
+$hsb = Color::hwbToHsb($hwb);
+print "HSB: " . DgS::printAr($hsb) . "<br>";
+
+$oklch = Color::rgbToOkLch(Coordinates\RGB::create([
+	250,
+	0,
+	0
+]));
+print "OkLch: " . DgS::printAr($oklch) . "<br>";
+$rgb = Color::okLchToRgb($oklch);
+print "OkLch -> RGB: " . DgS::printAr($rgb) . "<br>";
+
+$oklab = Color::rgbToOkLab(Coordinates\RGB::create([
+	250,
+	0,
+	0
+]));
+print "OkLab: " . DgS::printAr($oklab) . "<br>";
+print display($oklab->toCssString(), $oklab->toCssString(), 'Oklab');
+$rgb = Color::okLabToRgb($oklab);
+print "OkLab -> RGB: " . DgS::printAr($rgb) . "<br>";
+print display($rgb->toCssString(), $rgb->toCssString(), 'OkLab to RGB');
+
+$rgb = Coordinates\RGB::create([250, 100, 10])->toLinear();
+print "RGBlinear: " . DgS::printAr($rgb) . "<br>";
+$rgb = Coordinates\RGB::create([0, 0, 0])->toLinear();
+print "RGBlinear: " . DgS::printAr($rgb) . "<br>";
+
+$cie_lab = Color::okLabToLab($oklab);
+print "CieLab: " . DgS::printAr($cie_lab) . "<br>";
+print display($cie_lab->toCssString(), $cie_lab->toCssString(), 'OkLab to Cie Lab');
+
+$rgb = Coordinates\RGB::create([0, 0, 60]);
+$hsb = Color::rgbToHsb($rgb);
+$rgb_b = Color::hsbToRgb($hsb);
+print "RGB: " . DgS::printAr($rgb) . "<br>";
+print "RGB->HSB: " . DgS::printAr($hsb) . "<br>";
+print "HSB->RGB: " . DgS::printAr($rgb_b) . "<br>";
+
+$hsl = Coordinates\HSL::create([0, 20, 0]);
+$hsb = Coordinates\HSB::create([0, 20, 0]);
+$hsl_from_hsb = Color::hsbToHsl($hsb);
+print "HSL from HSB: " . DgS::printAr($hsl_from_hsb) . "<br>";
+
+print "<hr>";
+
 // A(out of bounds)
 try {
 	print "C::S/COLOR invalid rgb->hex (gray 125): -1, -1, -1: "
-		. CoreLibs\Convert\Colors::rgb2hex(-1, -1, -1) . "<br>";
+		. (new Coordinates\RGB([-1, -1, -1]))->returnAsHex() . "<br>";
 } catch (\LengthException $e) {
-	print "*Exception: " . $e->getMessage() . "<br>" . $e . "<br>";
+	print "*Exception: " . $e->getMessage() . "<br><pre>" . print_r($e, true) . "</pre><br>";
-}
-try {
-	print "\$C::S/COLOR invalid rgb->hex (gray 125): -1, -1, -1: "
-		. $color_class::rgb2hex(-1, -1, -1) . "<br>";
-} catch (\LengthException $e) {
-	print "**Exception: " . $e->getMessage() . "<br><pre>" . print_r($e, true) . "</pre><br>";
 }
+print "<hr>";
+print "<h2>LEGACY</h2>";
 // B(valid)
 $rgb = [50, 20, 30];
 $hex = '#0a141e';
@@ -125,58 +175,26 @@ print "S::COLOR hsb->rgb: $hsb[0], $hsb[1], $hsb[2]: "
 		Colors::hsb2rgb($hsb[0], $hsb[1], $hsb[2])
 	)) . "<br>";
 
+print "<hr>";
+
 // Random text
 $h = rand(0, 359);
 $s = rand(15, 70);
 $b = 100;
 $l = 50;
 print "RANDOM IN: H: " . $h . ", S: " . $s . ", B/L: " . $b . "/" . $l . "<br>";
-print "RANDOM hsb->rgb: <pre>" . DgS::printAr(SetVarType::setArray(Colors::hsb2rgb($h, $s, $b))) . "</pre><br>";
+print "RANDOM hsb->rgb: <pre>"
-print "RANDOM hsl->rgb: <pre>" . DgS::printAr(SetVarType::setArray(Colors::hsl2rgb($h, $s, $l))) . "</pre><br>";
+	. DgS::printAr(SetVarType::setArray(Color::hsbToRgb(new Coordinates\HSB([$h, $s, $b])))) . "</pre><br>";
+print "RANDOM hsl->rgb: <pre>"
+	. DgS::printAr(SetVarType::setArray(Color::hslToRgb(new Coordinates\HSL([$h, $s, $l])))) . "</pre><br>";
+
+print "<hr>";
 
 $rgb = [0, 0, 0];
-print "rgb 0,0,0: " . Dgs::printAr($rgb) . " => " . Dgs::printAr(Colors::rgb2hsb($rgb[0], $rgb[1], $rgb[2])) . "<br>";
+print "rgb 0,0,0: " . Dgs::printAr($rgb) . " => "
-
+	. Dgs::printAr(Color::rgbToHsb(new Coordinates\RGB([$rgb[0], $rgb[1], $rgb[2]]))) . "<br>";
-// TODO: run compare check input must match output
-
-$hwb = Color::hsbToHwb(Coordinates\HSB::__constructFromArray([
-	160,
-	0,
-	50,
-]));
-print "HWB: " . DgS::printAr($hwb) . "<br>";
-$hsb = Color::hwbToHsb($hwb);
-print "HSB: " . DgS::printAr($hsb) . "<br>";
-
-$oklch = Color::rgbToOkLch(Coordinates\RGB::__constructFromArray([
-	250,
-	0,
-	0
-]));
-print "OkLch: " . DgS::printAr($oklch) . "<br>";
-$rgb = Color::okLchToRgb($oklch);
-print "OkLch -> RGB: " . DgS::printAr($rgb) . "<br>";
-
-$oklab = Color::rgbToOkLab(Coordinates\RGB::__constructFromArray([
-	250,
-	0,
-	0
-]));
-print "OkLab: " . DgS::printAr($oklab) . "<br>";
-print display($oklab->toCssString(), $oklab->toCssString(), 'Oklab');
-$rgb = Color::okLabToRgb($oklab);
-print "OkLab -> RGB: " . DgS::printAr($rgb) . "<br>";
-print display($rgb->toCssString(), $rgb->toCssString(), 'OkLab to RGB');
-
-$rgb = Coordinates\RGB::__constructFromArray([250, 100, 10])->toLinear();
-print "RGBlinear: " . DgS::printAr($rgb) . "<br>";
-$rgb = Coordinates\RGB::__constructFromArray([0, 0, 0])->toLinear();
-print "RGBlinear: " . DgS::printAr($rgb) . "<br>";
-
-$cie_lab = Color::okLabToLab($oklab);
-print "CieLab: " . DgS::printAr($cie_lab) . "<br>";
-print display($cie_lab->toCssString(), $cie_lab->toCssString(), 'OkLab to Cie Lab');
 
+print "<hr>";
 
 print "</body></html>";
 

www/admin/class_test.db.convert-placeholder.php

@@ -0,0 +1,233 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+// turn on all error reporting
+error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', true);
+// sample config
+require 'config.php';
+// define log file id
+$LOG_FILE_ID = 'classTest-db-convert-placeholder';
+ob_end_flush();
+
+use CoreLibs\Debug\Support;
+use CoreLibs\DB\Support\ConvertPlaceholder;
+
+$log = new CoreLibs\Logging\Logging([
+	'log_folder' => BASE . LOG,
+	'log_file_id' => $LOG_FILE_ID,
+	'log_per_date' => true,
+]);
+
+
+$PAGE_NAME = 'TEST CLASS: DB CONVERT PLACEHOLDER';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
+
+print "LOGFILE NAME: " . $log->getLogFile() . "<br>";
+print "LOGFILE ID: " . $log->getLogFileId() . "<br>";
+
+print "Lookup Regex: <pre>" . ConvertPlaceholder::REGEX_LOOKUP_PLACEHOLDERS . "</pre>";
+print "Replace Named Regex: <pre>" . ConvertPlaceholder::REGEX_REPLACE_NAMED . "</pre>";
+print "Replace Named Regex: <pre>" . ConvertPlaceholder::REGEX_REPLACE_QUESTION_MARK . "</pre>";
+print "Replace Named Regex: <pre>" . ConvertPlaceholder::REGEX_REPLACE_NUMBERED . "</pre>";
+
+$uniqid = \CoreLibs\Create\Uids::uniqIdShort();
+// $binary_data = $db->dbEscapeBytea(file_get_contents('class_test.db.php') ?: '');
+// $binary_data = file_get_contents('class_test.db.php') ?: '';
+$binary_data = '';
+$params = [
+	$uniqid,
+	true,
+	'STRING A',
+	2,
+	2.5,
+	1,
+	date('H:m:s'),
+	date('Y-m-d H:i:s'),
+	json_encode(['a' => 'string', 'b' => 1, 'c' => 1.5, 'f' => true, 'g' => ['a', 1, 1.5]]),
+	null,
+	'{"a", "b"}',
+	'{1,2}',
+	'{"(array Text A, 5, 8.8)","(array Text B, 10, 15.2)"}',
+	'("Text", 4, 6.3)',
+	$binary_data
+];
+
+$query = <<<SQL
+INSERT INTO test_foo (
+	test, some_bool, string_a, number_a, number_a_numeric, smallint_a,
+	some_time, some_timestamp, json_string, null_var,
+	array_char_1, array_int_1,
+	array_composite,
+	composite_item,
+	some_binary
+) VALUES (
+	$1, $2, $3, $4, $5, $6,
+	$7, $8, $9, $10,
+	$11, $12,
+	$13,
+	$14,
+	$15
+)
+RETURNING
+	test_foo_id,
+	test, some_bool, string_a, number_a, number_a_numeric, smallint_a,
+	some_time, some_timestamp, json_string, null_var,
+	array_char_1, array_int_1,
+	array_composite,
+	composite_item,
+	some_binary
+SQL;
+
+print "[ALL] Convert: "
+	. Support::printAr(ConvertPlaceholder::convertPlaceholderInQuery($query, $params))
+	. "<br>";
+echo "<hr>";
+
+$query = "SELECT foo FROM bar WHERE baz = :baz AND buz = :baz AND biz = :biz AND boz = :bez";
+$params = [':baz' => 'SETBAZ', ':bez' => 'SETBEZ', ':biz' => 'SETBIZ'];
+print "[NO PARAMS] Convert: "
+	. Support::printAr(ConvertPlaceholder::convertPlaceholderInQuery($query, $params))
+	. "<br>";
+echo "<hr>";
+
+$query = "SELECT foo FROM bar WHERE baz = :baz AND buz = :baz AND biz = :biz AND boz = :bez";
+$params = null;
+print "[NO PARAMS] Convert: "
+	. Support::printAr(ConvertPlaceholder::convertPlaceholderInQuery($query, $params))
+	. "<br>";
+echo "<hr>";
+
+$query = "SELECT row_varchar FROM table_with_primary_key WHERE row_varchar <> :row_varchar";
+$params = null;
+print "[NO PARAMS] Convert: "
+	. Support::printAr(ConvertPlaceholder::convertPlaceholderInQuery($query, $params))
+	. "<br>";
+echo "<hr>";
+
+$query = "SELECT row_varchar, row_varchar_literal, row_int, row_date FROM table_with_primary_key";
+$params = null;
+print "[NO PARAMS] TEST: "
+	. Support::printAr(ConvertPlaceholder::convertPlaceholderInQuery($query, $params))
+	. "<br>";
+echo "<hr>";
+
+print "[P-CONV]: "
+	. Support::printAr(
+		ConvertPlaceholder::updateParamList([
+			'original' => [
+				'query' => 'SELECT foo FROM bar WHERE baz = :baz AND buz = :biz AND biz = :biz AND boz = :bez',
+				'params' => [':baz' => 'SETBAZ', ':bez' => 'SETBEZ', ':biz' => 'SETBIZ'],
+				'empty_params' => false,
+			],
+			'type' => 'named',
+			'found' => 3,
+			// 'matches' => [
+			// 	':baz'
+			// ],
+			// 'params_lookup' => [
+			// 	':baz' => '$1'
+			// ],
+			// 'query' => "SELECT foo FROM bar WHERE baz = $1",
+			// 'parms' => [
+			// 	'SETBAZ'
+			// ],
+		])
+	);
+
+echo "<hr>";
+
+// test connectors: = , <> () for query detection
+
+// convert placeholder tests
+// ? -> $n
+// :name -> $n
+
+// other way around (just visual)
+$test_queries = [
+	'skip' => [
+		'query' => <<<SQL
+SELECT test, string_a, number_a
+FROM test_foo
+SQL,
+		'params' => [],
+		'direction' => 'pg',
+	],
+	'numbers' => [
+		'query' => <<<SQL
+SELECT test, string_a, number_a
+FROM test_foo
+WHERE
+	foo = $1 AND bar = $1 AND foobar = $2
+SQL,
+		'params' => [\CoreLibs\Create\Uids::uniqIdShort(), 'string A-1', 1234],
+		'direction' => 'pdo',
+	],
+	'a?' => [
+		'query' => <<<SQL
+INSERT INTO test_foo (
+	test, string_a, number_a
+) VALUES (
+	?, ?, ?
+)
+SQL,
+		'params' => [\CoreLibs\Create\Uids::uniqIdShort(), 'string A-1', 1234],
+		'direction' => 'pg',
+	],
+	'b:' => [
+		'query' => <<<SQL
+INSERT INTO test_foo (
+	test, string_a, number_a
+) VALUES (
+	:test, :string_a, :number_a
+)
+SQL,
+		'params' => [
+			':test' => \CoreLibs\Create\Uids::uniqIdShort(),
+			':string_a' => 'string B-1',
+			':number_a' => 5678
+		],
+		'direction' => 'pg',
+	],
+	'select, compare $' => [
+		'query' => <<<SQL
+		SELECT row_varchar
+		FROM table_with_primary_key
+		WHERE
+			row_int >= $1 OR row_int <= $2 OR
+			row_int > $3 OR row_int < $4
+			OR row_int = $5 OR row_int <> $6
+		SQL,
+		'params' => null,
+		'direction' => 'pg'
+	]
+];
+
+
+foreach ($test_queries as $info => $data) {
+	$query = $data['query'];
+	$params = $data['params'];
+	$direction = $data['direction'];
+	print "[$info] Convert: "
+		. Support::printAr(ConvertPlaceholder::convertPlaceholderInQuery($query, $params, $direction))
+		. "<br>";
+	echo "<hr>";
+}
+
+print "</body></html>";
+$log->debug('DEBUGEND', '==================================== [END]');
+
+// __END__

www/admin/class_test.db.dbReturn.php

@@ -70,8 +70,7 @@ for ($i = 1; $i <= 6; $i++) {
 	print $i . ") " . $cache_flag . ": "
 		. "res: " . (is_bool($res) ?
 			"<b>Bool:</b> " . Support::prBl($res) :
-			(is_array($res) ?
+			"Array: Yes"
-				"Array: " . Support::prBl(is_array($res)) : '{-}')
 		) . ", "
 		. "cursor_ext: <pre>" . Support::printAr(
 			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))
@@ -89,8 +88,7 @@ for ($i = 1; $i <= 6; $i++) {
 	print $i . ") " . $cache_flag . ": "
 		. "res: " . (is_bool($res) ?
 			"<b>Bool:</b> " . Support::prBl($res) :
-			(is_array($res) ?
+			"Array: Yes"
-				"Array: " . Support::prBl(is_array($res)) : '{-}')
 		) . ", "
 		. "cursor_ext: <pre>" . Support::printAr(
 			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))
@@ -108,8 +106,7 @@ for ($i = 1; $i <= 6; $i++) {
 	print $i . ") " . $cache_flag . ": "
 		. "res: " . (is_bool($res) ?
 			"<b>Bool:</b> " . Support::prBl($res) :
-			(is_array($res) ?
+			"Array: Yes"
-				"Array: " . Support::prBl(is_array($res)) : '{-}')
 		) . ", "
 		. "cursor_ext: <pre>" . Support::printAr(
 			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))
@@ -127,8 +124,7 @@ for ($i = 1; $i <= 6; $i++) {
 	print $i . ") " . $cache_flag . ": "
 		. "res: " . (is_bool($res) ?
 			"<b>Bool:</b> " . Support::prBl($res) :
-			(is_array($res) ?
+			"Array: Yes"
-				"Array: " . Support::prBl(is_array($res)) : '{-}')
 		) . ", "
 		. "cursor_ext: <pre>" . Support::printAr(
 			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))
@@ -146,8 +142,7 @@ for ($i = 1; $i <= 6; $i++) {
 	print $i . ") " . $cache_flag . ": "
 		. "res: " . (is_bool($res) ?
 			"<b>Bool:</b> " . Support::prBl($res) :
-			(is_array($res) ?
+			"Array: Yes"
-				"Array: " . Support::prBl(is_array($res)) : '{-}')
 		) . ", "
 		. "cursor_ext: <pre>" . Support::printAr(
 			SetVarType::setArray($db->dbGetCursorExt($q_db_ret))

www/admin/class_test.db.php

@@ -316,7 +316,8 @@ print "EOM STRING EXEC RETURN TEST: " . print_r(
 	$db->dbReturnRowParams(
 		$query_select,
 		[$__last_insert_id]
-	)
+	),
+	true
 ) . "<br>";
 // B
 $status = $db->dbExecParams(
@@ -345,7 +346,8 @@ print "EOM STRING EXEC RETURN TEST: " . print_r(
 	$db->dbReturnRowParams(
 		$query_select,
 		[$__last_insert_id]
-	)
+	),
+	true
 ) . "<br>";
 // params > 10 for debug
 // error catcher
@@ -674,7 +676,7 @@ echo "<hr>";
 
 print "COMPOSITE ELEMENT READ<br>";
 $res = $db->dbReturnRow("SELECT item, count, (item).name, (item).price, (item).supplier_id FROM on_hand");
-print "ROW: <pre>" . print_r($res) . "</pre>";
+print "ROW: <pre>" . print_r($res, true) . "</pre>";
 var_dump($res);
 print "Field Name/Types: <pre>" . print_r($db->dbGetFieldNameTypes(), true) . "</pre>";
 echo "<hr>";

www/admin/class_test.math.php

@@ -23,7 +23,6 @@ $log = new CoreLibs\Logging\Logging([
 	'log_file_id' => $LOG_FILE_ID,
 	'log_per_date' => true,
 ]);
-$_math = new CoreLibs\Convert\Math();
 $math_class = 'CoreLibs\Convert\Math';
 
 // define a list of from to color sets for conversion test
@@ -35,13 +34,9 @@ print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
-print "FCEIL: " . $_math->fceil(5.1234567890, 5) . "<br>";
-print "FLOORP: " . $_math->floorp(5123456, -3) . "<br>";
-print "FLOORP: " . $_math->floorp(5123456, -10) . "<br>";
-print "INITNUMERIC: " . $_math->initNumeric('123') . "<br>";
-
 print "S-FCEIL: " . $math_class::fceil(5.1234567890, 5) . "<br>";
 print "S-FLOORP: " . $math_class::floorp(5123456, -3) . "<br>";
+print "S-FLOORP: " . $math_class::floorp(5123456, -10) . "<br>";
 print "S-INITNUMERIC: " . $math_class::initNumeric(123) . "<br>";
 print "S-INITNUMERIC: " . $math_class::initNumeric(123.456) . "<br>";
 print "S-INITNUMERIC: " . $math_class::initNumeric('123') . "<br>";

www/admin/class_test.php

@@ -73,6 +73,7 @@ $test_files = [
 	'class_test.db.query-placeholder.php' => 'Class Test: DB query placeholder convert',
 	'class_test.db.dbReturn.php' => 'Class Test: DB dbReturn',
 	'class_test.db.single.php' => 'Class Test: DB single query tests',
+	'class_test.db.convert-placeholder.php' => 'Class Test: DB convert placeholder',
 	'class_test.convert.colors.php' => 'Class Test: CONVERT COLORS',
 	'class_test.check.colors.php' => 'Class Test: CHECK COLORS',
 	'class_test.mime.php' => 'Class Test: MIME',

www/includes/edit_base.php

@@ -24,7 +24,7 @@
 declare(strict_types=1);
 
 ob_start();
-require 'config.php';
+require getcwd() . DIRECTORY_SEPARATOR . 'config.php';
 
 // should be utf8
 header("Content-type: text/html; charset=" . DEFAULT_ENCODING);

www/lib/CoreLibs/ACL/Login.php

@@ -960,10 +960,7 @@ class Login
 					. "AND ear.edit_access_right_id = epa.edit_access_right_id "
 					. "AND epa.enabled = 1 AND epa.edit_group_id = " . $res["edit_group_id"] . " "
 					. "ORDER BY ep.order_number";
-				while ($res = $this->db->dbReturn($q)) {
+				while (is_array($res = $this->db->dbReturn($q))) {
-					if (!is_array($res)) {
-						break;
-					}
 					// page id array for sub data readout
 					$edit_page_ids[$res['edit_page_id']] = $res['cuid'];
 					// create the array for pages
@@ -1303,11 +1300,9 @@ class Login
 	{
 		$is_valid_password = true;
 		// check for valid in regex arrays in list
-		if (is_array($this->password_valid_chars)) {
+		foreach ($this->password_valid_chars as $password_valid_chars) {
-			foreach ($this->password_valid_chars as $password_valid_chars) {
+			if (!preg_match("/$password_valid_chars/", $password)) {
-				if (!preg_match("/$password_valid_chars/", $password)) {
+				$is_valid_password = false;
-					$is_valid_password = false;
-				}
 			}
 		}
 		// check for min length

www/lib/CoreLibs/Admin/Backend.php

@@ -425,10 +425,7 @@ class Backend
 		?string $set_content_path = null,
 		int $flag = 0,
 	): array {
-		if (
+		if ($set_content_path === null) {
-			$set_content_path === null ||
-			!is_string($set_content_path)
-		) {
 			/** @deprecated adbTopMenu missing set_content_path parameter */
 			trigger_error(
 				'Calling adbTopMenu without set_content_path parameter is deprecated',

www/lib/CoreLibs/Basic.php

@@ -1139,118 +1139,6 @@ class Basic
 
 	// *** BETTER PASSWORD OPTIONS END ***
 
-	// *** COLORS ***
-	// [!!! DEPRECATED !!!]
-	// moved to \CoreLibs\Convert\Colors
-
-	/**
-	 * converts a hex RGB color to the int numbers
-	 * @param  string            $hexStr         RGB hexstring
-	 * @param  bool              $returnAsString flag to return as string
-	 * @param  string            $seperator      string seperator: default: ","
-	 * @return string|array<mixed>|bool          false on error or array with RGB or
-	 *                                           a string with the seperator
-	 * @deprecated use \CoreLibs\Convert\Colors::hex2rgb() instead
-	 */
-	public static function hex2rgb(string $hexStr, bool $returnAsString = false, string $seperator = ',')
-	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::hex2rgb()', E_USER_DEPRECATED);
-		return \CoreLibs\Convert\Colors::hex2rgb($hexStr, $returnAsString, $seperator);
-	}
-
-	/**
-	 * converts the rgb values from int data to the valid rgb html hex string
-	 * optional can turn of leading #
-	 * @param  int    $red        red 0-255
-	 * @param  int    $green      green 0-255
-	 * @param  int    $blue       blue 0-255
-	 * @param  bool   $hex_prefix default true, prefix with "#"
-	 * @return string|bool        rgb in hex values with leading # if set
-	 * @deprecated use \CoreLibs\Convert\Colors::rgb2hex() instead
-	 */
-	public static function rgb2hex(int $red, int $green, int $blue, bool $hex_prefix = true)
-	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hex()', E_USER_DEPRECATED);
-		return \CoreLibs\Convert\Colors::rgb2hex($red, $green, $blue, $hex_prefix);
-	}
-
-	/**
-	 * converts and int RGB to the HTML color string in hex format
-	 * @param  int    $red   red 0-255
-	 * @param  int    $green green 0-255
-	 * @param  int    $blue  blue 0-255
-	 * @return string|bool   hex rgb string
-	 * @deprecated use rgb2hex instead
-	 */
-	public static function rgb2html(int $red, int $green, int $blue)
-	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hex()', E_USER_DEPRECATED);
-		// check that each color is between 0 and 255
-		return \CoreLibs\Convert\Colors::rgb2hex($red, $green, $blue, true);
-	}
-
-	/**
-	 * converts RGB to HSB/V values
-	 * returns:
-	 * array with hue (0-360), sat (0-100%), brightness/value (0-100%)
-	 * @param  int   $red   red 0-255
-	 * @param  int   $green green 0-255
-	 * @param  int   $blue  blue 0-255
-	 * @return array<mixed>|bool  Hue, Sat, Brightness/Value
-	 * @deprecated use \CoreLibs\Convert\Colors::rgb2hsb() instead
-	 */
-	public static function rgb2hsb(int $red, int $green, int $blue)
-	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hsb()', E_USER_DEPRECATED);
-		return \CoreLibs\Convert\Colors::rgb2hsb($red, $green, $blue);
-	}
-
-	/**
-	 * converts HSB/V to RGB values RGB is full INT
-	 * @param  int    $H hue 0-360
-	 * @param  float  $S saturation 0-1 (float)
-	 * @param  float  $V brightness/value 0-1 (float)
-	 * @return array<mixed>|bool  0 red/1 green/2 blue array
-	 * @deprecated use \CoreLibs\Convert\Colors::hsb2rgb() instead
-	 */
-	public static function hsb2rgb(int $H, float $S, float $V)
-	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::hsb2rgb()', E_USER_DEPRECATED);
-		return \CoreLibs\Convert\Colors::hsb2rgb($H, (int)round($S * 100), (int)round($V * 100));
-	}
-
-	/**
-	 * converts a RGB (0-255) to HSL
-	 * return:
-	 * array with hue (0-360), saturation (0-100%) and luminance (0-100%)
-	 * @param  int    $r red 0-255
-	 * @param  int    $g green 0-255
-	 * @param  int    $b blue 0-255
-	 * @return array<mixed>|bool  hue/sat/luminance
-	 * @deprecated use \CoreLibs\Convert\Colors::rgb2hsl() instead
-	 */
-	public static function rgb2hsl(int $r, int $g, int $b)
-	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hsl()', E_USER_DEPRECATED);
-		return \CoreLibs\Convert\Colors::rgb2hsb($r, $g, $b);
-	}
-
-	/**
-	 * converts an HSL to RGB
-	 * @param  int    $h hue: 0-360 (degrees)
-	 * @param  float  $s saturation: 0-1
-	 * @param  float  $l luminance: 0-1
-	 * @return array<mixed>|bool  red/blue/green 0-255 each
-	 * @deprecated use \CoreLibs\Convert\Colors::hsl2rgb() instead
-	 */
-	public static function hsl2rgb(int $h, float $s, float $l)
-	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::hsl2rgb()', E_USER_DEPRECATED);
-		return \CoreLibs\Convert\Colors::hsl2rgb($h, $s * 100, $l * 100);
-	}
-
-	// *** COLORS END ***
-
 	// *** EMAIL FUNCTIONS ***
 	// [!!! DEPRECATED !!!]
 	// Moved to \CoreLibs\Check\Email

www/lib/CoreLibs/Check/Colors.php

@@ -119,6 +119,13 @@ class Colors
 
 	/**
 	 * check if html/css color string is valid
+	 *
+	 * TODO: update check for correct validate values
+	 * - space instead of ","
+	 * - / opcatiy checks
+	 * - loose numeric values
+	 * - lab/lch,oklab/oklch validation too
+	 *
 	 * @param string $color A color string of any format
 	 * @param int $flags    defaults to ALL, else use | to combined from
 	 *                      HEX_RGB, HEX_RGBA, RGB, RGBA, HSL, HSLA
@@ -168,9 +175,9 @@ class Colors
 		if (preg_match("/$regex/", $color)) {
 			// if valid regex, we now need to check if the content is actually valid
 			// only for rgb/hsl type
-			/** @var int|false */
+			/** @var int<0, max>|false */
 			$rgb_flag = strpos($color, 'rgb');
-			/** @var int|false */
+			/** @var int<0, max>|false */
 			$hsl_flag = strpos($color, 'hsl');
 			// if both not match, return true
 			if (

www/lib/CoreLibs/Convert/Color/CieXyz.php

@@ -83,7 +83,7 @@ class CieXyz
 	}
 
 	/**
-	 * Undocumented function
+	 * Convert from oklab to cie lab
 	 *
 	 * @param  Lab $lab
 	 * @return Lab
@@ -98,7 +98,7 @@ class CieXyz
 	}
 
 	/**
-	 * Undocumented function
+	 * Convert from cie lab to oklab
 	 *
 	 * @param  Lab $lab
 	 * @return Lab
@@ -112,6 +112,21 @@ class CieXyz
 		);
 	}
 
+	// MARK: helper convert any array to array{float, float, float}
+
+	/**
+	 * This is a hack for phpstan until we write a proper matrix to class
+	 * conversion wrapper function
+	 *
+	 * @param  array<array<float|int>|float|int> $_array
+	 * @return array{0:float,1:float,2:float}
+	 */
+	private static function convertArray(array $_array): array
+	{
+		/** @var array{0:float,1:float,2:float} */
+		return [$_array[0], $_array[1], $_array[2]];
+	}
+
 	// MARK: xyzD65 <-> xyzD50
 
 	/**
@@ -122,14 +137,14 @@ class CieXyz
 	 */
 	private static function xyzD65ToXyzD50(XYZ $xyz): XYZ
 	{
-		return XYZ::__constructFromArray(Math::multiplyMatrices(
+		return new XYZ(self::convertArray(Math::multiplyMatrices(
 			a: [
 				[1.0479298208405488, 0.022946793341019088, -0.05019222954313557],
 				[0.029627815688159344, 0.990434484573249, -0.01707382502938514],
 				[-0.009243058152591178, 0.015055144896577895, 0.7518742899580008],
 			],
 			b: $xyz->returnAsArray(),
-		), whitepoint: 'D50');
+		)), options: ["whitepoint" => 'D50']);
 	}
 
 	/**
@@ -140,14 +155,14 @@ class CieXyz
 	 */
 	private static function xyzD50ToXyxD65(XYZ $xyz): XYZ
 	{
-		return XYZ::__constructFromArray(Math::multiplyMatrices(
+		return new XYZ(self::convertArray(Math::multiplyMatrices(
 			a: [
 				[0.9554734527042182, -0.023098536874261423, 0.0632593086610217],
 				[-0.028369706963208136, 1.0099954580058226, 0.021041398966943008],
 				[0.012314001688319899, -0.020507696433477912, 1.3303659366080753],
 			],
 			b: $xyz->returnAsArray()
-		), whitepoint: 'D65');
+		)), options: ["whitepoint" => 'D65']);
 	}
 
 	// MARK: xyzD50 <-> Lab
@@ -184,7 +199,7 @@ class CieXyz
 			$_xyz,
 		);
 
-		return Lab::__constructFromArray([
+		return new Lab([
 			(116 * $f[1]) - 16,
 			500 * ($f[0] - $f[1]),
 			200 * ($f[1] - $f[2]),
@@ -227,13 +242,13 @@ class CieXyz
 			(1.0 - 0.3457 - 0.3585) / 0.3585,
 		];
 
-		return XYZ::__constructFromArray(
+		return new XYZ(
-			array_map(
+			self::convertArray(array_map(
 				fn ($k, $v) => $v * $d50[$k],
 				array_keys($xyz),
-				array_values($xyz),
+				$xyz,
-			),
+			)),
-			whitepoint: 'D50'
+			options: ["whitepoint" => 'D50']
 		);
 	}
 
@@ -249,17 +264,17 @@ class CieXyz
 	private static function linRgbToXyzD65(RGB $rgb): XYZ
 	{
 		// if not linear, convert to linear
-		if (!$rgb->linear) {
+		if (!(bool)$rgb->get('linear')) {
-			$rgb->toLinear();
+			$rgb = (new RGB($rgb->returnAsArray()))->toLinear();
 		}
-		return XYZ::__constructFromArray(Math::multiplyMatrices(
+		return new XYZ(self::convertArray(Math::multiplyMatrices(
 			[
 				[0.41239079926595934, 0.357584339383878, 0.1804807884018343],
 				[0.21263900587151027, 0.715168678767756, 0.07219231536073371],
 				[0.01933081871559182, 0.11919477979462598, 0.9505321522496607],
 			],
 			$rgb->returnAsArray()
-		), whitepoint: 'D65');
+		)), options: ["whitepoint" => 'D65']);
 	}
 
 	/**
@@ -271,14 +286,14 @@ class CieXyz
 	private static function xyzD65ToLinRgb(XYZ $xyz): RGB
 	{
 		// xyz D65 to linrgb
-		return RGB::__constructFromArray(Math::multiplyMatrices(
+		return new RGB(self::convertArray(Math::multiplyMatrices(
 			a : [
 				[  3.2409699419045226,  -1.537383177570094,   -0.4986107602930034  ],
 				[ -0.9692436362808796,   1.8759675015077202,   0.04155505740717559 ],
 				[  0.05563007969699366, -0.20397695888897652,  1.0569715142428786  ],
 			],
 			b : $xyz->returnAsArray()
-		), linear: true);
+		)), options: ["linear" => true]);
 	}
 
 	// MARK: xyzD65 <-> OkLab
@@ -291,14 +306,14 @@ class CieXyz
 	 */
 	private static function xyzD65ToOkLab(XYZ $xyz): Lab
 	{
-		return Lab::__constructFromArray(Math::multiplyMatrices(
+		return new Lab(self::convertArray(Math::multiplyMatrices(
 			[
 				[0.2104542553, 0.7936177850, -0.0040720468],
 				[1.9779984951, -2.4285922050, 0.4505937099],
 				[0.0259040371, 0.7827717662, -0.8086757660],
 			],
 			array_map(
-				callback: fn ($v) => pow($v, 1 / 3),
+				callback: fn ($v) => pow((float)$v, 1 / 3),
 				array: Math::multiplyMatrices(
 					a: [
 						[0.8190224432164319, 0.3619062562801221, -0.12887378261216414],
@@ -308,7 +323,7 @@ class CieXyz
 					b: $xyz->returnAsArray(),
 				),
 			)
-		), colorspace: 'OkLab');
+		)), colorspace: 'OkLab');
 	}
 
 	/**
@@ -319,7 +334,7 @@ class CieXyz
 	 */
 	private static function okLabToXyzD65(Lab $lab): XYZ
 	{
-		return XYZ::__constructFromArray(Math::multiplyMatrices(
+		return new XYZ(self::convertArray(Math::multiplyMatrices(
 			a: [
 					[1.2268798733741557, -0.5578149965554813, 0.28139105017721583],
 					[-0.04057576262431372, 1.1122868293970594, -0.07171106666151701],
@@ -337,7 +352,7 @@ class CieXyz
 					b: $lab->returnAsArray(),
 				),
 			),
-		), whitepoint: 'D65');
+		)), options: ["whitepoint" => 'D65']);
 	}
 }
 

www/lib/CoreLibs/Convert/Color/Color.php

@@ -55,13 +55,13 @@ class Color
 	private static function __labToLch(Lab $lab): array
 	{
 		// cieLab to cieLch
-		$a = $lab->a;
+		$a = (float)$lab->get('a');
-		$b = $lab->b;
+		$b = (float)$lab->get('b');
 
 		$hue = atan2($b, $a) * 180 / pi();
 
 		return [
-			$lab->L,
+			(float)$lab->get('L'),
 			sqrt($a ** 2 + $b ** 2),
 			$hue >= 0 ? $hue : $hue + 360,
 		];
@@ -76,9 +76,9 @@ class Color
 	private static function __lchToLab(LCH $lch): array
 	{
 		return [
-			$lch->L,
+			(float)$lch->get('L'),
-			$lch->C * cos($lch->H * pi() / 180), // a
+			(float)$lch->get('C') * cos((float)$lch->get('H') * pi() / 180), // a
-			$lch->C * sin($lch->H * pi() / 180), // b
+			(float)$lch->get('C') * sin((float)$lch->get('H') * pi() / 180), // b
 		];
 	}
 
@@ -94,9 +94,9 @@ class Color
 	 */
 	public static function rgbToHsl(RGB $rgb): HSL
 	{
-		$red = $rgb->R / 255;
+		$red = (float)$rgb->get('R') / 255;
-		$green = $rgb->G / 255;
+		$green = (float)$rgb->get('G') / 255;
-		$blue = $rgb->B / 255;
+		$blue = (float)$rgb->get('B') / 255;
 
 		$min = min($red, $green, $blue);
 		$max = max($red, $green, $blue);
@@ -109,7 +109,7 @@ class Color
 		// achromatic
 		if ($chroma == 0) {
 			// H, S, L
-			return HSL::__constructFromArray([
+			return new HSL([
 				0.0,
 				0.0,
 				$lum * 100,
@@ -128,7 +128,7 @@ class Color
 			}
 			$hue = $hue * 60;
 			// $sat = 1 - abs(2 * $lum - 1);
-			return HSL::__constructFromArray([
+			return new HSL([
 				$hue,
 				$sat * 100,
 				$lum * 100,
@@ -147,9 +147,9 @@ class Color
 	 */
 	public static function hslToRgb(HSL $hsl): RGB
 	{
-		$hue = $hsl->H;
+		$hue = (float)$hsl->get('H');
-		$sat = $hsl->S;
+		$sat = (float)$hsl->get('S');
-		$lum = $hsl->L;
+		$lum = (float)$hsl->get('L');
 		// calc to internal convert value for hue
 		$hue = (1 / 360) * $hue;
 		// convert to internal 0-1 format
@@ -158,7 +158,7 @@ class Color
 		// if saturation is 0
 		if ($sat == 0) {
 			$lum = round($lum * 255);
-			return RGB::__constructFromArray([$lum, $lum, $lum]);
+			return new RGB([$lum, $lum, $lum]);
 		} else {
 			$m2 = $lum < 0.5 ? $lum * ($sat + 1) : ($lum + $sat) - ($lum * $sat);
 			$m1 = $lum * 2 - $m2;
@@ -180,7 +180,7 @@ class Color
 				return $m1;
 			};
 
-			return RGB::__constructFromArray([
+			return new RGB([
 				255 * $hueue($hue + (1 / 3)),
 				255 * $hueue($hue),
 				255 * $hueue($hue - (1 / 3)),
@@ -201,9 +201,9 @@ class Color
 	 */
 	public static function rgbToHsb(RGB $rgb): HSB
 	{
-		$red = $rgb->R / 255;
+		$red = (float)$rgb->get('R') / 255;
-		$green = $rgb->G / 255;
+		$green = (float)$rgb->get('G') / 255;
-		$blue = $rgb->B / 255;
+		$blue = (float)$rgb->get('B') / 255;
 
 		$MAX = max($red, $green, $blue);
 		$MIN = min($red, $green, $blue);
@@ -212,7 +212,7 @@ class Color
 
 		// achromatic
 		if ($MAX == $MIN) {
-			return HSB::__constructFromArray([0, 0, $MAX * 100]);
+			return new HSB([0, 0, $MAX * 100]);
 		}
 		if ($red == $MAX) {
 			$HUE = fmod(($green - $blue) / $DELTA, 6);
@@ -227,7 +227,7 @@ class Color
 			$HUE += 360;
 		}
 
-		return HSB::__constructFromArray([
+		return new HSB([
 			$HUE, // Hue
 			($DELTA / $MAX) * 100, // Saturation
 			$MAX * 100, // Brightness
@@ -246,16 +246,16 @@ class Color
 	 */
 	public static function hsbToRgb(HSB $hsb): RGB
 	{
-		$H = $hsb->H;
+		$H = (float)$hsb->get('H');
-		$S = $hsb->S;
+		$S = (float)$hsb->get('S');
-		$V = $hsb->B;
+		$V = (float)$hsb->get('B');
 		// convert to internal 0-1 format
 		$S /= 100;
 		$V /= 100;
 
 		if ($S == 0) {
 			$V = $V * 255;
-			return RGB::__constructFromArray([$V, $V, $V]);
+			return new RGB([$V, $V, $V]);
 		}
 
 		$Hi = floor($H / 60);
@@ -301,7 +301,7 @@ class Color
 				$blue = 0;
 		}
 
-		return RGB::__constructFromArray([
+		return new RGB([
 			$red * 255,
 			$green * 255,
 			$blue * 255,
@@ -352,17 +352,23 @@ class Color
 	 */
 	public static function hslToHsb(HSL $hsl): HSB
 	{
-		$saturation = $hsl->S / 100;
+		$saturation = (float)$hsl->get('S') / 100;
-		$lightness = $hsl->L / 100;
+		$lightness = (float)$hsl->get('L') / 100;
-		$value  = $lightness + $saturation * min($lightness, 1 - $lightness);
+		// if lightness is 0, then we cannot return convert to hsb
+		$value = $lightness + $saturation * min($lightness, 1 - $lightness);
+		// print "Orig: " . print_r($hsl, true) . "\n";
+		// print "SAT: " . $saturation . ", Lightness: " . $lightness . ", Value: " . $value . "\n";
+		// var_dump($value);
+
 		// check for black and white
-		$saturation = ($value === 0) ?
+		$saturation = $value == 0 ?
 			0 :
 			200 * (1 - $lightness / $value);
-		return HSB::__constructFromArray([
+		$value *= 100;
-			$hsl->H,
+		return new HSB([
+			(float)$hsl->get('H'),
 			$saturation,
-			$value * 100,
+			$value,
 		]);
 	}
 
@@ -375,18 +381,18 @@ class Color
 	public static function hsbToHsl(HSB $hsb): HSL
 	{
 		// hsv/toHsl
-		$hue = $hsb->H;
+		$hue = (float)$hsb->get('H');
-		$saturation = $hsb->S / 100;
+		$saturation = (float)$hsb->get('S') / 100;
-		$value = $hsb->V / 100;
+		$value = (float)$hsb->get('B') / 100;
 
 		$lightness = $value * (1 - $saturation / 2);
 		// check for B/W
-		$saturation = in_array($lightness, [0, 1], true) ?
+		$saturation = in_array($lightness, [0, 1]) ?
 			0 :
 			100 * ($value - $lightness) / min($lightness, 1 - $lightness)
 		;
 
-		return HSL::__constructFromArray([
+		return new HSL([
 			$hue,
 			$saturation,
 			$lightness * 100,
@@ -436,10 +442,10 @@ class Color
 	public static function hsbToHwb(HSB $hsb): HWB
 	{
 		// hsv\Hwb
-		return HWB::__constructFromArray([
+		return new HWB([
-			$hsb->H, // hue,
+			(float)$hsb->get('H'), // hue,
-			$hsb->B * (100 - $hsb->S) / 100, // 2: brightness, 1: saturation
+			(float)$hsb->get('B') * (100 - (float)$hsb->get('S')) / 100, // 2: brightness, 1: saturation
-			100 - $hsb->B,
+			100 - (float)$hsb->get('B'),
 		]);
 	}
 
@@ -451,22 +457,23 @@ class Color
 	 */
 	public static function hwbToHsb(HWB $hwb): HSB
 	{
-		$hue = $hwb->H;
+		$hue = (float)$hwb->get('H');
-		$whiteness = $hwb->W / 100;
+		$whiteness = (float)$hwb->get('W') / 100;
-		$blackness = $hwb->B / 100;
+		$blackness = (float)$hwb->get('B') / 100;
 
 		$sum = $whiteness + $blackness;
+		// print "S: B/W: " . $sum . " /W: " . $whiteness . " /B: " . $blackness . "\n";
 		// for black and white
 		if ($sum >= 1) {
 			$saturation = 0;
 			$value = $whiteness / $sum * 100;
 		} else {
 			$value = 1 - $blackness;
-			$saturation = $value === 0 ? 0 : (1 - $whiteness / $value) * 100;
+			$saturation = $value === 0.0 ? 0 : (1 - $whiteness / $value) * 100;
 			$value *= 100;
 		}
 
-		return HSB::__constructFromArray([
+		return new HSB([
 			$hue,
 			$saturation,
 			$value,
@@ -475,8 +482,6 @@ class Color
 
 	// MARK: LAB <-> LCH
 
-	// toLch
-
 	/**
 	 * CIE Lab to LCH
 	 *
@@ -486,7 +491,7 @@ class Color
 	public static function labToLch(Lab $lab): LCH
 	{
 		// cieLab to cieLch
-		return LCH::__constructFromArray(self::__labToLch($lab), colorspace: 'CIELab');
+		return new LCH(self::__labToLch($lab), colorspace: 'CIELab');
 	}
 
 	/**
@@ -497,7 +502,7 @@ class Color
 	 */
 	public static function lchToLab(LCH $lch): Lab
 	{
-		return Lab::__constructFromArray(self::__lchToLab($lch), colorspace: 'CIELab');
+		return new Lab(self::__lchToLab($lch), colorspace: 'CIELab');
 	}
 
 	// MARK: OkLch <-> OkLab
@@ -511,7 +516,7 @@ class Color
 	public static function okLabToOkLch(Lab $lab): LCH
 	{
 		// okLab\toOkLch
-		return LCH::__constructFromArray(self::__labToLch($lab), colorspace: 'OkLab');
+		return new LCH(self::__labToLch($lab), colorspace: 'OkLab');
 	}
 
 	/**
@@ -524,7 +529,7 @@ class Color
 	{
 		// oklch/toOkLab
 		// oklch to oklab
-		return Lab::__constructFromArray(self::__lchToLab($lch), colorspace: 'OkLab');
+		return new Lab(self::__lchToLab($lch), colorspace: 'OkLab');
 	}
 
 	// MARK: rgb <-> oklab
@@ -557,7 +562,7 @@ class Color
 	 * convert rgb to OkLch
 	 * via rgb -> linear rgb -> xyz D65 -> OkLab -> OkLch
 	 *
-	 * @param  RGB $rbh
+	 * @param  RGB $rgb
 	 * @return LCH
 	 */
 	public static function rgbToOkLch(RGB $rgb): LCH
@@ -761,11 +766,6 @@ class Color
 	public static function rgbToLab(RGB $rgb): Lab
 	{
 		return CieXyz::rgbViaXyzD65ViaXyzD50ToLab($rgb);
-		/* return CieXyz::xyzD50ToLab(
-			CieXyz::xyzD65ToXyzD50(
-				CieXyz::linRgbToXyzD65($rgb)
-			)
-		); */
 	}
 
 	/**
@@ -778,11 +778,6 @@ class Color
 	public static function labToRgb(Lab $lab): RGB
 	{
 		return CieXyz::labViaXyzD50ViaXyzD65ToRgb($lab);
-		/* return CieXyz::xyzD65ToLinRgb(
-			CieXyz::xyzD50ToXyxD65(
-				CieXyz::labToXyzD50($lab)
-			)
-		)->fromLinear(); */
 	}
 
 	// MARK: RGB <-> Lch (Cie)

www/lib/CoreLibs/Convert/Color/Coordinates/HSB.php

@@ -11,7 +11,9 @@ declare(strict_types=1);
 
 namespace CoreLibs\Convert\Color\Coordinates;
 
-class HSB
+use CoreLibs\Convert\Color\Utils;
+
+class HSB implements Interface\CoordinatesInterface
 {
 	/** @var array<string> allowed colorspaces */
 	private const COLORSPACES = ['sRGB'];
@@ -29,22 +31,43 @@ class HSB
 	/**
 	 * HSB (HSV) color coordinates
 	 * Hue/Saturation/Brightness or Value
+	 *
+	 * @param string|array{0:float,1:float,2:float} $colors
+	 * @param string $colorspace [default=sRGB]
+	 * @param array<string,string> $options [default=[]]
+	 * @throws \InvalidArgumentException only array colors allowed
 	 */
-	public function __construct()
+	public function __construct(string|array $colors, string $colorspace = 'sRGB', array $options = [])
 	{
+		if (!is_array($colors)) {
+			throw new \InvalidArgumentException('Only array colors allowed', 0);
+		}
+		$this->setColorspace($colorspace)->parseOptions($options)->setFromArray($colors);
 	}
 
 	/**
 	 * set from array
 	 * where 0: Hue, 1: Saturation, 2: Brightness
 	 *
-	 * @param  array{0:float,1:float,2:float} $colors
+	 * @param  string|array{0:float,1:float,2:float} $colors
 	 * @param  string $colorspace [default=sRGB]
+	 * @param  array<string,string> $options [default=[]]
 	 * @return self
 	 */
-	public static function __constructFromArray(array $colors, string $colorspace = 'sRGB'): self
+	public static function create(string|array $colors, string $colorspace = 'sRGB', array $options = []): self
 	{
-		return (new HSB())->setColorspace($colorspace)->setFromArray($colors);
+		return new HSB($colors, $colorspace, $options);
+	}
+
+	/**
+	 * parse options
+	 *
+	 * @param  array<string,string> $options
+	 * @return self
+	 */
+	private function parseOptions(array $options): self
+	{
+		return $this;
 	}
 
 	/**
@@ -54,7 +77,7 @@ class HSB
 	 * @param  float  $value
 	 * @return void
 	 */
-	public function __set(string $name, float $value): void
+	private function set(string $name, float $value): void
 	{
 		$name = strtoupper($name);
 		if (!property_exists($this, $name)) {
@@ -62,18 +85,20 @@ class HSB
 		}
 		switch ($name) {
 			case 'H':
-				if ($value == 360) {
+				if ($value == 360.0) {
 					$value = 0;
 				}
-				if ($value < 0 || $value > 359) {
+				// if ($value < 0 || $value > 360) {
+				if (Utils::compare(0.0, $value, 360.0, Utils::EPSILON_SMALL)) {
 					throw new \LengthException(
-						'Argument value ' . $value . ' for hue is not in the range of 0 to 359',
+						'Argument value ' . $value . ' for hue is not in the range of 0 to 360',
 						1
 					);
 				}
 				break;
 			case 'S':
-				if ($value < 0 || $value > 100) {
+				// if ($value < 0 || $value > 100) {
+				if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL)) {
 					throw new \LengthException(
 						'Argument value ' . $value . ' for saturation is not in the range of 0 to 100',
 						2
@@ -81,7 +106,8 @@ class HSB
 				}
 				break;
 			case 'B':
-				if ($value < 0 || $value > 100) {
+				// if ($value < 0 || $value > 100) {
+				if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL)) {
 					throw new \LengthException(
 						'Argument value ' . $value . ' for brightness is not in the range of 0 to 100',
 						3
@@ -98,7 +124,7 @@ class HSB
 	 * @param string $name
 	 * @return float
 	 */
-	public function __get(string $name): float
+	public function get(string $name): float|string|bool
 	{
 		$name = strtoupper($name);
 		if (!property_exists($this, $name)) {
@@ -140,11 +166,11 @@ class HSB
 	 * @param  array{0:float,1:float,2:float} $colors
 	 * @return self
 	 */
-	public function setFromArray(array $colors): self
+	private function setFromArray(array $colors): self
 	{
-		$this->__set('H', $colors[0]);
+		$this->set('H', $colors[0]);
-		$this->__set('S', $colors[1]);
+		$this->set('S', $colors[1]);
-		$this->__set('B', $colors[2]);
+		$this->set('B', $colors[2]);
 		return $this;
 	}
 

www/lib/CoreLibs/Convert/Color/Coordinates/HSL.php

@@ -11,9 +11,9 @@ declare(strict_types=1);
 
 namespace CoreLibs\Convert\Color\Coordinates;
 
-use CoreLibs\Convert\Color\Stringify;
+use CoreLibs\Convert\Color\Utils;
 
-class HSL
+class HSL implements Interface\CoordinatesInterface
 {
 	/** @var array<string> allowed colorspaces */
 	private const COLORSPACES = ['sRGB'];
@@ -31,22 +31,43 @@ class HSL
 	/**
 	 * Color Coordinate HSL
 	 * Hue/Saturation/Lightness
+	 *
+	 * @param string|array{0:float,1:float,2:float} $colors
+	 * @param string $colorspace [default=sRGB]
+	 * @param array<string,string> $options [default=[]]
+	 * @throws \InvalidArgumentException only array colors allowed
 	 */
-	public function __construct()
+	public function __construct(string|array $colors, string $colorspace = 'sRGB', array $options = [])
 	{
+		if (!is_array($colors)) {
+			throw new \InvalidArgumentException('Only array colors allowed', 0);
+		}
+		$this->setColorspace($colorspace)->parseOptions($options)->setFromArray($colors);
 	}
 
 	/**
 	 * set from array
 	 * where 0: Hue, 1: Saturation, 2: Lightness
 	 *
-	 * @param  array{0:float,1:float,2:float} $colors
+	 * @param  string|array{0:float,1:float,2:float} $colors
 	 * @param  string $colorspace [default=sRGB]
+	 * @param  array<string,string> $options [default=[]]
 	 * @return self
 	 */
-	public static function __constructFromArray(array $colors, string $colorspace = 'sRGB'): self
+	public static function create(string|array $colors, string $colorspace = 'sRGB', array $options = []): self
 	{
-		return (new HSL())->setColorspace($colorspace)->setFromArray($colors);
+		return new HSL($colors, $colorspace, $options);
+	}
+
+	/**
+	 * parse options
+	 *
+	 * @param  array<string,string> $options
+	 * @return self
+	 */
+	private function parseOptions(array $options): self
+	{
+		return $this;
 	}
 
 	/**
@@ -56,25 +77,27 @@ class HSL
 	 * @param  float  $value
 	 * @return void
 	 */
-	public function __set(string $name, float $value): void
+	private function set(string $name, float $value): void
 	{
 		if (!property_exists($this, $name)) {
 			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
 		}
 		switch ($name) {
 			case 'H':
-				if ($value == 360) {
+				if ($value == 360.0) {
 					$value = 0;
 				}
-				if ($value < 0 || $value > 359) {
+				// if ($value < 0 || $value > 360) {
+				if (Utils::compare(0.0, $value, 360.0, Utils::EPSILON_SMALL)) {
 					throw new \LengthException(
-						'Argument value ' . $value . ' for hue is not in the range of 0 to 359',
+						'Argument value ' . $value . ' for hue is not in the range of 0 to 360',
 						1
 					);
 				}
 				break;
 			case 'S':
-				if ($value < 0 || $value > 100) {
+				// if ($value < 0 || $value > 100) {
+				if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL)) {
 					throw new \LengthException(
 						'Argument value ' . $value . ' for saturation is not in the range of 0 to 100',
 						2
@@ -82,9 +105,10 @@ class HSL
 				}
 				break;
 			case 'L':
-				if ($value < 0 || $value > 100) {
+				// if ($value < 0 || $value > 100) {
+				if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL)) {
 					throw new \LengthException(
-						'Argument value ' . $value . ' for luminance is not in the range of 0 to 100',
+						'Argument value ' . $value . ' for lightness is not in the range of 0 to 100',
 						3
 					);
 				}
@@ -99,7 +123,7 @@ class HSL
 	 * @param string $name
 	 * @return float
 	 */
-	public function __get(string $name): float
+	public function get(string $name): float|string|bool
 	{
 		if (!property_exists($this, $name)) {
 			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
@@ -140,11 +164,11 @@ class HSL
 	 * @param  array{0:float,1:float,2:float} $colors
 	 * @return self
 	 */
-	public function setFromArray(array $colors): self
+	private function setFromArray(array $colors): self
 	{
-		$this->__set('H', $colors[0]);
+		$this->set('H', $colors[0]);
-		$this->__set('S', $colors[1]);
+		$this->set('S', $colors[1]);
-		$this->__set('L', $colors[2]);
+		$this->set('L', $colors[2]);
 		return $this;
 	}
 
@@ -162,7 +186,7 @@ class HSL
 			. $this->S
 			. ' '
 			. $this->L
-			. Stringify::setOpacity($opacity)
+			. Utils::setOpacity($opacity)
 			. ')';
 		return $string;
 	}

www/lib/CoreLibs/Convert/Color/Coordinates/HWB.php

@@ -11,9 +11,9 @@ declare(strict_types=1);
 
 namespace CoreLibs\Convert\Color\Coordinates;
 
-use CoreLibs\Convert\Color\Stringify;
+use CoreLibs\Convert\Color\Utils;
 
-class HWB
+class HWB implements Interface\CoordinatesInterface
 {
 	/** @var array<string> allowed colorspaces */
 	private const COLORSPACES = ['sRGB'];
@@ -31,22 +31,43 @@ class HWB
 	/**
 	 * Color Coordinate: HWB
 	 * Hue/Whiteness/Blackness
+	 *
+	 * @param string|array{0:float,1:float,2:float} $colors
+	 * @param string $colorspace [default=sRGB]
+	 * @param array<string,string> $options [default=[]]
+	 * @throws \InvalidArgumentException only array colors allowed
 	 */
-	public function __construct()
+	public function __construct(string|array $colors, string $colorspace = 'sRGB', array $options = [])
 	{
+		if (!is_array($colors)) {
+			throw new \InvalidArgumentException('Only array colors allowed', 0);
+		}
+		$this->setColorspace($colorspace)->parseOptions($options)->setFromArray($colors);
 	}
 
 	/**
 	 * set from array
 	 * where 0: Hue, 1: Whiteness, 2: Blackness
 	 *
-	 * @param  array{0:float,1:float,2:float} $colors
+	 * @param  string|array{0:float,1:float,2:float} $colors
 	 * @param  string $colorspace [default=sRGB]
+	 * @param  array<string,string> $options [default=[]]
 	 * @return self
 	 */
-	public static function __constructFromArray(array $colors, string $colorspace = 'sRGB'): self
+	public static function create(string|array $colors, string $colorspace = 'sRGB', array $options = []): self
 	{
-		return (new HWB())->setColorspace($colorspace)->setFromArray($colors);
+		return new HWB($colors, $colorspace, $options);
+	}
+
+	/**
+	 * parse options
+	 *
+	 * @param  array<string,string> $options
+	 * @return self
+	 */
+	private function parseOptions(array $options): self
+	{
+		return $this;
 	}
 
 	/**
@@ -56,17 +77,18 @@ class HWB
 	 * @param  float  $value
 	 * @return void
 	 */
-	public function __set(string $name, float $value): void
+	private function set(string $name, float $value): void
 	{
 		if (!property_exists($this, $name)) {
 			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
 		}
 		switch ($name) {
 			case 'H':
-				if ($value == 360) {
+				if ($value == 360.0) {
 					$value = 0;
 				}
-				if ($value < 0 || $value > 360) {
+				// if ($value < 0 || $value > 360) {
+				if (Utils::compare(0.0, $value, 360.0, Utils::EPSILON_SMALL)) {
 					throw new \LengthException(
 						'Argument value ' . $value . ' for hue is not in the range of 0 to 360',
 						1
@@ -74,17 +96,19 @@ class HWB
 				}
 				break;
 			case 'W':
-				if ($value < 0 || $value > 100) {
+				// if ($value < 0 || $value > 100) {
+				if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL)) {
 					throw new \LengthException(
-						'Argument value ' . $value . ' for saturation is not in the range of 0 to 100',
+						'Argument value ' . $value . ' for whiteness is not in the range of 0 to 100',
 						2
 					);
 				}
 				break;
 			case 'B':
-				if ($value < 0 || $value > 100) {
+				// if ($value < 0 || $value > 100) {
+				if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL)) {
 					throw new \LengthException(
-						'Argument value ' . $value . ' for luminance is not in the range of 0 to 100',
+						'Argument value ' . $value . ' for blackness is not in the range of 0 to 100',
 						3
 					);
 				}
@@ -99,7 +123,7 @@ class HWB
 	 * @param string $name
 	 * @return float
 	 */
-	public function __get(string $name): float
+	public function get(string $name): float|string|bool
 	{
 		if (!property_exists($this, $name)) {
 			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
@@ -140,11 +164,11 @@ class HWB
 	 * @param  array{0:float,1:float,2:float} $colors
 	 * @return self
 	 */
-	public function setFromArray(array $colors): self
+	private function setFromArray(array $colors): self
 	{
-		$this->__set('H', $colors[0]);
+		$this->set('H', $colors[0]);
-		$this->__set('W', $colors[1]);
+		$this->set('W', $colors[1]);
-		$this->__set('B', $colors[2]);
+		$this->set('B', $colors[2]);
 		return $this;
 	}
 
@@ -162,7 +186,7 @@ class HWB
 			. $this->W
 			. ' '
 			. $this->B
-			. Stringify::setOpacity($opacity)
+			. Utils::setOpacity($opacity)
 			. ')';
 		return $string;
 	}

www/lib/CoreLibs/Convert/Color/Coordinates/Interface/CoordinatesInterface.php

@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * AUTHOR: Clemens Schwaighofer
+ * CREATED: Ymd
+ * DESCRIPTION:
+ * DescriptionHere
+*/
+
+declare(strict_types=1);
+
+namespace CoreLibs\Convert\Color\Coordinates\Interface;
+
+interface CoordinatesInterface
+{
+	/**
+	 * create class via "Class::create()" call
+	 * was used for multiple create interfaces
+	 * no longer needed, use "new Class()" instead
+	 *
+	 * @param  string|array{0:float,1:float,2:float} $colors
+	 * @param  string $colorspace [default='']
+	 * @param  array<string,string|bool|int> $options [default=[]]
+	 * @return self
+	 */
+	public static function create(string|array $colors, string $colorspace = '', array $options = []): self;
+
+	/**
+	 * get color
+	 *
+	 * @param string $name
+	 * @return float
+	 */
+	public function get(string $name): float|string|bool;
+
+	/**
+	 * Returns the color as array
+	 * where 0: Lightness, 1: a, 2: b
+	 *
+	 * @return array{0:float,1:float,2:float}
+	 */
+	public function returnAsArray(): array;
+
+	/**
+	 * Convert into css string with optional opacity
+	 *
+	 * @param  null|float|string|null $opacity
+	 * @return string
+	 */
+	public function toCssString(null|float|string $opacity = null): string;
+}
+
+// __END__

www/lib/CoreLibs/Convert/Color/Coordinates/LCH.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace CoreLibs\Convert\Color\Coordinates;
 
-use CoreLibs\Convert\Color\Stringify;
+use CoreLibs\Convert\Color\Utils;
 
-class LCH
+class LCH implements Interface\CoordinatesInterface
 {
 	/** @var array<string> allowed colorspaces */
 	private const COLORSPACES = ['OkLab', 'CIELab'];
@@ -42,22 +42,43 @@ class LCH
 	/**
 	 * Color Coordinate Lch
 	 * for oklch
+	 *
+	 * @param string|array{0:float,1:float,2:float} $colors
+	 * @param string $colorspace [default='']
+	 * @param array<string,string> $options [default=[]]
+	 * @throws \InvalidArgumentException only array colors allowed
 	 */
-	public function __construct()
+	public function __construct(string|array $colors, string $colorspace = '', array $options = [])
 	{
+		if (!is_array($colors)) {
+			throw new \InvalidArgumentException('Only array colors allowed', 0);
+		}
+		$this->setColorspace($colorspace)->parseOptions($options)->setFromArray($colors);
 	}
 
 	/**
 	 * set from array
 	 * where 0: Lightness, 1: Chroma, 2: Hue
 	 *
-	 * @param  array{0:float,1:float,2:float} $colors
+	 * @param  string|array{0:float,1:float,2:float} $colors
-	 * @param  string $colorspace
+	 * @param  string $colorspace [default='']
+	 * @param  array<string,string> $options [default=[]]
 	 * @return self
 	 */
-	public static function __constructFromArray(array $colors, string $colorspace): self
+	public static function create(string|array $colors, string $colorspace = '', array $options = []): self
 	{
-		return (new LCH())->setColorspace($colorspace)->setFromArray($colors);
+		return new LCH($colors, $colorspace, $options);
+	}
+
+	/**
+	 * parse options
+	 *
+	 * @param  array<string,string> $options
+	 * @return self
+	 */
+	private function parseOptions(array $options): self
+	{
+		return $this;
 	}
 
 	/**
@@ -67,49 +88,49 @@ class LCH
 	 * @param  float  $value
 	 * @return void
 	 */
-	public function __set(string $name, float $value): void
+	private function set(string $name, float $value): void
 	{
 		if (!property_exists($this, $name)) {
 			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
 		}
 		switch ($name) {
-			// case 'L':
+			case 'L':
-			// 	if ($this->colorspace == 'cie' && ($value < 0 || $value > 100)) {
+				// if ($this->colorspace == 'CIELab' && ($value < 0 || $value > 100)) {
-			// 		throw new \LengthException(
+				if ($this->colorspace == 'CIELab' && Utils::compare(0.0, $value, 100.0, Utils::ESPILON_BIG)) {
-			// 			'Argument value ' . $value . ' for lightness is not in the range of '
-			// 				. '0 to 100',
-			// 			3
-			// 		);
-			// 	} elseif ($this->colorspace == 'ok' && ($value < 0 || $value > 1)) {
-			// 		throw new \LengthException(
-			// 			'Argument value ' . $value . ' for lightness is not in the range of '
-			// 				. '0 to 1',
-			// 			3
-			// 		);
-			// 	}
-			// 	break;
-			// case 'c':
-			// 	if ($this->colorspace == 'cie' && ($value < 0 || $value > 230)) {
-			// 		throw new \LengthException(
-			// 			'Argument value ' . $value . ' for chroma is not in the range of '
-			// 				. '0 to 230 with normal upper limit of 150',
-			// 			3
-			// 		);
-			// 	} elseif ($this->colorspace == 'ok' && ($value < 0 || $value > 0.5)) {
-			// 		throw new \LengthException(
-			// 			'Argument value ' . $value . ' for chroma is not in the range of '
-			// 				. '0 to 0.5 with normal upper limit of 0.5',
-			// 			3
-			// 		);
-			// 	}
-			// 	break;
-			case 'h':
-				if ($value == 360) {
-					$value = 0;
-				}
-				if ($value < 0 || $value > 360) {
 					throw new \LengthException(
-						'Argument value ' . $value . ' for lightness is not in the range of 0 to 360',
+						'Argument value ' . $value . ' for lightness is not in the range of 0 to 100 for CIE Lab',
+						1
+					);
+				// } elseif ($this->colorspace == 'OkLab' && ($value < 0 || $value > 1)) {
+				} elseif ($this->colorspace == 'OkLab' && Utils::compare(0.0, $value, 1.0, Utils::EPSILON_SMALL)) {
+					throw new \LengthException(
+						'Argument value ' . $value . ' for lightness is not in the range of 0.0 to 1.0 for OkLab',
+						1
+					);
+				}
+				break;
+			case 'C':
+				// if ($this->colorspace == 'CIELab' && ($value < 0 || $value > 230)) {
+				if ($this->colorspace == 'CIELab' && Utils::compare(0.0, $value, 230.0, Utils::EPSILON_SMALL)) {
+					throw new \LengthException(
+						'Argument value ' . $value . ' for chroma is not in the range of '
+							. '0 to 150 and a maximum of 230 for CIE Lab',
+						1
+					);
+				// } elseif ($this->colorspace == 'OkLab' && ($value < 0 || $value > 0.55)) {
+				} elseif ($this->colorspace == 'OkLab' && Utils::compare(0.0, $value, 0.55, Utils::EPSILON_SMALL)) {
+					throw new \LengthException(
+						'Argument value ' . $value . ' for lightness is not in the range of '
+							. '0.0 to 0.4 and a maximum of 0.5 for OkLab',
+						1
+					);
+				}
+				break;
+			case 'H':
+				// if ($value < 0 || $value > 360) {
+				if (Utils::compare(0.0, $value, 360.0, Utils::EPSILON_SMALL)) {
+					throw new \LengthException(
+						'Argument value ' . $value . ' for hue is not in the range of 0.0 to 360.0',
 						1
 					);
 				}
@@ -124,7 +145,7 @@ class LCH
 	 * @param string $name
 	 * @return float
 	 */
-	public function __get(string $name): float
+	public function get(string $name): float|string|bool
 	{
 		if (!property_exists($this, $name)) {
 			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
@@ -165,11 +186,11 @@ class LCH
 	 * @param  array{0:float,1:float,2:float} $colors
 	 * @return self
 	 */
-	public function setFromArray(array $colors): self
+	private function setFromArray(array $colors): self
 	{
-		$this->__set('L', $colors[0]);
+		$this->set('L', $colors[0]);
-		$this->__set('C', $colors[1]);
+		$this->set('C', $colors[1]);
-		$this->__set('H', $colors[2]);
+		$this->set('H', $colors[2]);
 		return $this;
 	}
 
@@ -193,10 +214,10 @@ class LCH
 		$string .= '('
 			. $this->L
 			. ' '
-			. $this->c
+			. $this->C
 			. ' '
-			. $this->h
+			. $this->H
-			. Stringify::setOpacity($opacity)
+			. Utils::setOpacity($opacity)
 			. ');';
 
 		return $string;

www/lib/CoreLibs/Convert/Color/Coordinates/Lab.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace CoreLibs\Convert\Color\Coordinates;
 
-use CoreLibs\Convert\Color\Stringify;
+use CoreLibs\Convert\Color\Utils;
 
-class Lab
+class Lab implements Interface\CoordinatesInterface
 {
 	/** @var array<string> allowed colorspaces */
 	private const COLORSPACES = ['OkLab', 'CIELab'];
@@ -44,22 +44,43 @@ class Lab
 	/**
 	 * Color Coordinate: Lab
 	 * for oklab or cie
+	 *
+	 * @param string|array{0:float,1:float,2:float} $colors
+	 * @param string $colorspace [default='']
+	 * @param array<string,string> $options [default=[]]
+	 * @throws \InvalidArgumentException only array colors allowed
 	 */
-	public function __construct()
+	public function __construct(string|array $colors, string $colorspace = '', array $options = [])
 	{
+		if (!is_array($colors)) {
+			throw new \InvalidArgumentException('Only array colors allowed', 0);
+		}
+		$this->setColorspace($colorspace)->parseOptions($options)->setFromArray($colors);
 	}
 
 	/**
 	 * set from array
 	 * where 0: Lightness, 1: a, 2: b
 	 *
-	 * @param  array{0:float,1:float,2:float} $rgb
+	 * @param array{0:float,1:float,2:float} $colors
-	 * @param  string $colorspace
+	 * @param string $colorspace [default='']
+	 * @param array<string,string> $options [default=[]]
 	 * @return self
 	 */
-	public static function __constructFromArray(array $colors, string $colorspace): self
+	public static function create(string|array $colors, string $colorspace = '', array $options = []): self
 	{
-		return (new Lab())->setColorspace($colorspace)->setFromArray($colors);
+		return new Lab($colors, $colorspace, $options);
+	}
+
+	/**
+	 * parse options
+	 *
+	 * @param  array<string,string> $options
+	 * @return self
+	 */
+	private function parseOptions(array $options): self
+	{
+		return $this;
 	}
 
 	/**
@@ -69,40 +90,58 @@ class Lab
 	 * @param  float  $value
 	 * @return void
 	 */
-	public function __set(string $name, float $value): void
+	private function set(string $name, float $value): void
 	{
 		if (!property_exists($this, $name)) {
 			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
 		}
-		// switch ($name) {
+		switch ($name) {
-		// 	case 'L':
+			case 'L':
-		// 		if ($value == 360) {
+				// if ($this->colorspace == 'CIELab' && ($value < 0 || $value > 100)) {
-		// 			$value = 0;
+				if ($this->colorspace == 'CIELab' && Utils::compare(0.0, $value, 100.0, Utils::ESPILON_BIG)) {
-		// 		}
+					throw new \LengthException(
-		// 		if ($value < 0 || $value > 360) {
+						'Argument value ' . $value . ' for lightness is not in the range of 0 to 100 for CIE Lab',
-		// 			throw new \LengthException(
+						1
-		// 				'Argument value ' . $value . ' for lightness is not in the range of 0 to 360',
+					);
-		// 				1
+				// } elseif ($this->colorspace == 'OkLab' && ($value < 0 || $value > 1)) {
-		// 			);
+				} elseif ($this->colorspace == 'OkLab' && Utils::compare(0.0, $value, 1.0, Utils::EPSILON_SMALL)) {
-		// 		}
+					throw new \LengthException(
-		// 		break;
+						'Argument value ' . $value . ' for lightness is not in the range of 0.0 to 1.0 for OkLab',
-		// 	case 'a':
+						1
-		// 		if ($value < 0 || $value > 100) {
+					);
-		// 			throw new \LengthException(
+				}
-		// 				'Argument value ' . $value . ' for a is not in the range of 0 to 100',
+				break;
-		// 				2
+			case 'a':
-		// 			);
+				// if ($this->colorspace == 'CIELab' && ($value < -125 || $value > 125)) {
-		// 		}
+				if ($this->colorspace == 'CIELab' && Utils::compare(-125.0, $value, 125.0, Utils::EPSILON_SMALL)) {
-		// 		break;
+					throw new \LengthException(
-		// 	case 'b':
+						'Argument value ' . $value . ' for a is not in the range of -125 to 125 for CIE Lab',
-		// 		if ($value < 0 || $value > 100) {
+						2
-		// 			throw new \LengthException(
+					);
-		// 				'Argument value ' . $value . ' for b is not in the range of 0 to 100',
+				// } elseif ($this->colorspace == 'OkLab' && ($value < -0.55 || $value > 0.55)) {
-		// 				3
+				} elseif ($this->colorspace == 'OkLab' && Utils::compare(-0.55, $value, 0.55, Utils::EPSILON_SMALL)) {
-		// 			);
+					throw new \LengthException(
-		// 		}
+						'Argument value ' . $value . ' for a is not in the range of -0.5 to 0.5 for OkLab',
-		// 		break;
+						2
-		// }
+					);
+				}
+				break;
+			case 'b':
+				// if ($this->colorspace == 'CIELab' && ($value < -125 || $value > 125)) {
+				if ($this->colorspace == 'CIELab' && Utils::compare(-125.0, $value, 125.0, Utils::EPSILON_SMALL)) {
+					throw new \LengthException(
+						'Argument value ' . $value . ' for b is not in the range of -125 to 125 for CIE Lab',
+						3
+					);
+				// } elseif ($this->colorspace == 'OkLab' && ($value < -0.55 || $value > 0.55)) {
+				} elseif ($this->colorspace == 'OkLab' && Utils::compare(-0.55, $value, 0.55, Utils::EPSILON_SMALL)) {
+					throw new \LengthException(
+						'Argument value ' . $value . ' for b is not in the range of -0.5 to 0.5 for OkLab',
+						3
+					);
+				}
+				break;
+		}
 		$this->$name = $value;
 	}
 
@@ -112,7 +151,7 @@ class Lab
 	 * @param string $name
 	 * @return float
 	 */
-	public function __get(string $name): float
+	public function get(string $name): float|string|bool
 	{
 		if (!property_exists($this, $name)) {
 			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
@@ -153,11 +192,11 @@ class Lab
 	 * @param  array{0:float,1:float,2:float} $colors
 	 * @return self
 	 */
-	public function setFromArray(array $colors): self
+	private function setFromArray(array $colors): self
 	{
-		$this->__set('L', $colors[0]);
+		$this->set('L', $colors[0]);
-		$this->__set('a', $colors[1]);
+		$this->set('a', $colors[1]);
-		$this->__set('b', $colors[2]);
+		$this->set('b', $colors[2]);
 		return $this;
 	}
 
@@ -184,7 +223,7 @@ class Lab
 			. $this->a
 			. ' '
 			. $this->b
-			. Stringify::setOpacity($opacity)
+			. Utils::setOpacity($opacity)
 			. ');';
 
 		return $string;

www/lib/CoreLibs/Convert/Color/Coordinates/RGB.php

@@ -11,9 +11,9 @@ declare(strict_types=1);
 
 namespace CoreLibs\Convert\Color\Coordinates;
 
-use CoreLibs\Convert\Color\Stringify;
+use CoreLibs\Convert\Color\Utils;
 
-class RGB
+class RGB implements Interface\CoordinatesInterface
 {
 	/** @var array<string> allowed colorspaces */
 	private const COLORSPACES = ['sRGB'];
@@ -33,41 +33,48 @@ class RGB
 
 	/**
 	 * Color Coordinate RGB
+	*  @param array{0:float,1:float,2:float}|string $colors RGB color array or hex string
+	 * @param string $colorspace [default=sRGB]
+	 * @param array<string,bool> $options [default=[]] only "linear" allowed at the moment
 	 */
-	public function __construct()
+	public function __construct(string|array $colors, string $colorspace = 'sRGB', array $options = [])
 	{
+		$this->setColorspace($colorspace)->parseOptions($options);
+		if (is_array($colors)) {
+			$this->setFromArray($colors);
+		} else {
+			$this->setFromHex($colors);
+		}
 	}
 
 	/**
-	 * set from array
+	 * set from array or string
 	 * where 0: Red, 1: Green, 2: Blue
+	 * OR #ffffff or ffffff
 	 *
-	 * @param  array{0:float,1:float,2:float} $colors
+	 * @param  array{0:float,1:float,2:float}|string $colors RGB color array or hex string
 	 * @param  string $colorspace [default=sRGB]
-	 * @param  bool $linear [default=false]
+	 * @param  array<string,bool> $options [default=[]] only "linear" allowed at the moment
 	 * @return self
 	 */
-	public static function __constructFromArray(array $colors, string $colorspace = 'sRGB', bool $linear = false): self
+	public static function create(string|array $colors, string $colorspace = 'sRGB', array $options = []): self
 	{
-		return (new RGB())->setColorspace($colorspace)->flagLinear($linear)->setFromArray($colors);
+		return new RGB($colors, $colorspace, $options);
 	}
 
 	/**
-	 * Undocumented function
+	 * parse options
 	 *
-	 * @param  string $hex_string
+	 * @param  array<string,bool> $options
-	 * @param  string $colorspace
-	 * @param  bool   $linear
 	 * @return self
 	 */
-	public static function __constructFromHexString(
+	private function parseOptions(array $options): self
-		string $hex_string,
+	{
-		string $colorspace = 'sRGB',
+		$this->flagLinear($options['linear'] ?? false);
-		bool $linear = false
+		return $this;
-	): self {
-		return (new RGB())->setColorspace($colorspace)->flagLinear($linear)->setFromHex($hex_string);
 	}
 
+
 	/**
 	 * set color
 	 *
@@ -75,7 +82,7 @@ class RGB
 	 * @param  float  $value
 	 * @return void
 	 */
-	public function __set(string $name, float $value): void
+	private function set(string $name, float $value): void
 	{
 		// do not allow setting linear from outside
 		if ($name == 'linear') {
@@ -85,13 +92,15 @@ class RGB
 			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
 		}
 		// if not linear
-		if (!$this->linear && ($value < 0 || $value > 255)) {
+		if (!$this->linear && ((int)$value < 0 || (int)$value > 255)) {
 			throw new \LengthException('Argument value ' . $value . ' for color ' . $name
-				. ' is not in the range of 0 to 255', 1);
+			. ' is not in the range of 0 to 255', 1);
-		} elseif ($this->linear && ($value < -10E10 || $value > 1)) {
+		} elseif (
-			// not allow very very small negative numbers
+			// $this->linear && ($value < 0.0 || $value > 1.0)
+			$this->linear && Utils::compare(0.0, $value, 1.0, 0.000001)
+		) {
 			throw new \LengthException('Argument value ' . $value . ' for color ' . $name
-				. ' is not in the range of 0 to 1 for linear rgb', 1);
+				. ' is not in the range of 0 to 1 for linear rgb', 2);
 		}
 		$this->$name = $value;
 	}
@@ -102,7 +111,7 @@ class RGB
 	 * @param string $name
 	 * @return float|bool
 	 */
-	public function __get(string $name): float|bool
+	public function get(string $name): float|string|bool
 	{
 		if (!property_exists($this, $name)) {
 			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
@@ -143,11 +152,11 @@ class RGB
 	 * @param  array{0:float,1:float,2:float} $colors
 	 * @return self
 	 */
-	public function setFromArray(array $colors): self
+	private function setFromArray(array $colors): self
 	{
-		$this->__set('R', $colors[0]);
+		$this->set('R', $colors[0]);
-		$this->__set('G', $colors[1]);
+		$this->set('G', $colors[1]);
-		$this->__set('B', $colors[2]);
+		$this->set('B', $colors[2]);
 		return $this;
 	}
 
@@ -180,11 +189,11 @@ class RGB
 	 * @param  string $hex_string
 	 * @return self
 	 */
-	public function setFromHex(string $hex_string): self
+	private function setFromHex(string $hex_string): self
 	{
 		$hex_string = preg_replace("/[^0-9A-Fa-f]/", '', $hex_string); // Gets a proper hex string
-		if (!is_string($hex_string)) {
+		if (empty($hex_string) || !is_string($hex_string)) {
-			throw new \InvalidArgumentException('hex_string argument cannot be empty', 1);
+			throw new \InvalidArgumentException('hex_string argument cannot be empty', 3);
 		}
 		$rgbArray = [];
 		if (strlen($hex_string) == 6) {
@@ -205,7 +214,7 @@ class RGB
 			];
 		} else {
 			// Invalid hex color code
-			throw new \UnexpectedValueException('Invalid hex_string: ' . $hex_string, 2);
+			throw new \UnexpectedValueException('Invalid hex_string: ' . $hex_string, 4);
 		}
 		return $this->setFromArray($rgbArray);
 	}
@@ -238,6 +247,10 @@ class RGB
 	 */
 	public function toLinear(): self
 	{
+		// if linear, as is
+		if ($this->linear) {
+			return $this;
+		}
 		$this->flagLinear(true)->setFromArray(array_map(
 			callback: function (int|float $v) {
 				$v = (float)($v / 255);
@@ -262,6 +275,10 @@ class RGB
 	 */
 	public function fromLinear(): self
 	{
+		// if not linear, as is
+		if (!$this->linear) {
+			return $this;
+		}
 		$this->flagLinear(false)->setFromArray(array_map(
 			callback: function (int|float $v) {
 				$abs  = abs($v);
@@ -276,7 +293,6 @@ class RGB
 			},
 			array: $this->returnAsArray(),
 		));
-		// $this->linear = false;
 		return $this;
 	}
 
@@ -301,7 +317,7 @@ class RGB
 			. (int)round($this->G, 0)
 			. ' '
 			. (int)round($this->B, 0)
-			. Stringify::setOpacity($opacity)
+			. Utils::setOpacity($opacity)
 			. ')';
 		if ($was_linear) {
 			$this->toLinear();

www/lib/CoreLibs/Convert/Color/Coordinates/XYZ.php

@@ -15,7 +15,9 @@ declare(strict_types=1);
 
 namespace CoreLibs\Convert\Color\Coordinates;
 
-class XYZ
+// use CoreLibs\Convert\Color\Utils;
+
+class XYZ implements Interface\CoordinatesInterface
 {
 	/** @var array<string> allowed colorspaces */
 	private const COLORSPACES = ['CIEXYZ'];
@@ -35,34 +37,58 @@ class XYZ
 	/** @var string color space: either ok or cie */
 	private string $colorspace = '';
 
+	/** @var string illuminat white point: only D50 and D65 are allowed */
 	private string $whitepoint = '';
 
 	/**
 	 * Color Coordinate Lch
-	 * for oklch
+	 * for oklch conversion
+	 *
+	 * @param string|array{0:float,1:float,2:float} $colors
+	 * @param string $colorspace [default=CIEXYZ]
+	 * @param array<string,string> $options [default=[]] Only "whitepoint" option allowed
+	 * @throws \InvalidArgumentException only array colors allowed
 	 */
-	public function __construct()
+	public function __construct(
-	{
+		string|array $colors,
+		string $colorspace = 'CIEXYZ',
+		array $options = [],
+	) {
+		if (!is_array($colors)) {
+			throw new \InvalidArgumentException('Only array colors allowed', 0);
+		}
+		$this->setColorspace($colorspace)
+			->parseOptions($options)
+			->setFromArray($colors);
 	}
 
 	/**
 	 * set from array
 	 * where 0: X, 1: Y, 2: Z
 	 *
-	 * @param  array{0:float,1:float,2:float} $colors
+	 * @param array{0:float,1:float,2:float} $colors
-	 * @param  string $colorspace [default=CIEXYZ]
+	 * @param string $colorspace [default=CIEXYZ]
-	 * @param  string $whitepoint [default=''] only D65 or D50 allowed
+	 * @param array<string,string> $options [default=[]] Only "whitepoint" option allowed
 	 * @return self
 	 */
-	public static function __constructFromArray(
+	public static function create(
-		array $colors,
+		string|array $colors,
 		string $colorspace = 'CIEXYZ',
-		string $whitepoint = ''
+		array $options = [],
 	): self {
-		return (new XYZ())
+		return new XYZ($colors, $colorspace, $options);
-			->setColorspace($colorspace)
+	}
-			->setWhitepoint($whitepoint)
+
-			->setFromArray($colors);
+	/**
+	 * parse options
+	 *
+	 * @param  array<string,string> $options
+	 * @return self
+	 */
+	private function parseOptions(array $options): self
+	{
+		$this->setWhitepoint($options['whitepoint'] ?? '');
+		return $this;
 	}
 
 	/**
@@ -72,14 +98,16 @@ class XYZ
 	 * @param  float  $value
 	 * @return void
 	 */
-	public function __set(string $name, float $value): void
+	private function set(string $name, float $value): void
 	{
 		if (!property_exists($this, $name)) {
 			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
 		}
-		// if ($value < 0 || $value > 255) {
+		// TODO: setup XYZ value limits
+		// X: 0 to 95.047, Y: 0 to 100, Z: 0 to 108.88
+		// if (Utils::compare(0.0, $value, 100.0, Utils::EPSILON_SMALL))) {
 		// 	throw new \LengthException('Argument value ' . $value . ' for color ' . $name
-		// 		. ' is not in the range of 0 to 255', 1);
+		// 		. ' is not in the range of 0 to 100.0', 1);
 		// }
 		$this->$name = $value;
 	}
@@ -90,7 +118,7 @@ class XYZ
 	 * @param string $name
 	 * @return float
 	 */
-	public function __get(string $name): float
+	public function get(string $name): float|string|bool
 	{
 		if (!property_exists($this, $name)) {
 			throw new \ErrorException('Creation of dynamic property is not allowed', 0);
@@ -150,13 +178,25 @@ class XYZ
 	 * @param  array{0:float,1:float,2:float} $colors
 	 * @return self
 	 */
-	public function setFromArray(array $colors): self
+	private function setFromArray(array $colors): self
 	{
-		$this->__set('X', $colors[0]);
+		$this->set('X', $colors[0]);
-		$this->__set('Y', $colors[1]);
+		$this->set('Y', $colors[1]);
-		$this->__set('Z', $colors[2]);
+		$this->set('Z', $colors[2]);
 		return $this;
 	}
+
+	/**
+	 * no hsb in css
+	 *
+	 * @param  float|string|null $opacity
+	 * @return string
+	 * @throws \ErrorException
+	 */
+	public function toCssString(null|float|string $opacity = null): string
+	{
+		throw new \ErrorException('XYZ is not available as CSS color string', 0);
+	}
 }
 
 // __END__

www/lib/CoreLibs/Convert/Color/Stringify.php

@@ -19,25 +19,6 @@ use CoreLibs\Convert\Color\Coordinates\LCH;
 
 class Stringify
 {
-	/**
-	 * Build the opactiy sub string part and return it
-	 *
-	 * @param  null|float|string|null $opacity
-	 * @return string
-	 */
-	public static function setOpacity(null|float|string $opacity = null): string
-	{
-		// set opacity, either a string or float
-		if (is_string($opacity)) {
-			$opacity = ' / ' . $opacity;
-		} elseif ($opacity !== null) {
-			$opacity = ' / ' . $opacity;
-		} else {
-			$opacity = '';
-		}
-		return $opacity;
-	}
-
 	/**
 	 * return the CSS string including optional opacity
 	 *

www/lib/CoreLibs/Convert/Color/Utils.php

@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * AUTHOR: Clemens Schwaighofer
+ * CREATED: 2024/11/14
+ * DESCRIPTION:
+ * Utils for color
+*/
+
+declare(strict_types=1);
+
+namespace CoreLibs\Convert\Color;
+
+use CoreLibs\Convert\Math;
+
+class Utils
+{
+	/** @var float deviation allowed for valid data checks, small */
+	public const EPSILON_SMALL  = 0.000000000001;
+	/** @var float deviation allowed for valid data checks, medium */
+	public const EPSILON_MEDIUM = 0.0000001;
+	/** @var float deviation allowed for valid data checks, big */
+	public const ESPILON_BIG    = 0.0001;
+
+	public static function compare(float $lower, float $value, float $upper, float $epslion): bool
+	{
+		if (
+			Math::compareWithEpsilon($value, '<', $lower, $epslion) ||
+			Math::compareWithEpsilon($value, '>', $upper, $epslion)
+		) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Build the opactiy sub string part and return it
+	 *
+	 * @param  null|float|string|null $opacity
+	 * @return string
+	 */
+	public static function setOpacity(null|float|string $opacity = null): string
+	{
+		// set opacity, either a string or float
+		if (is_string($opacity)) {
+			$opacity = ' / ' . $opacity;
+		} elseif ($opacity !== null) {
+			$opacity = ' / ' . $opacity;
+		} else {
+			$opacity = '';
+		}
+		return $opacity;
+	}
+}
+
+// __END__

www/lib/CoreLibs/Convert/Colors.php

@@ -33,6 +33,7 @@ class Colors
 	 * @param  bool   $hex_prefix default true, prefix with "#"
 	 * @return string             rgb in hex values with leading # if set,
 	 * @throws \LengthException If any argument is not in the range of 0~255
+	 * @deprecated v9.20.0 use: new Coordinates\RGB([$red, $green, $blue]))->returnAsHex(true/false for #)
 	 */
 	public static function rgb2hex(
 		int $red,
@@ -40,7 +41,7 @@ class Colors
 		int $blue,
 		bool $hex_prefix = true
 	): string {
-		return Coordinates\RGB::__constructFromArray([$red, $green, $blue])->returnAsHex($hex_prefix);
+		return (new Coordinates\RGB([$red, $green, $blue]))->returnAsHex($hex_prefix);
 	}
 
 	/**
@@ -53,6 +54,7 @@ class Colors
 	 *                                        or a string with the seperator
 	 * @throws \InvalidArgumentException if hex string is empty
 	 * @throws \UnexpectedValueException if the hex string value is not valid
+	 * @deprecated v9.20.0 use: new Coordinates\RGB($hex_string) (build string/array from return data)
 	 */
 	public static function hex2rgb(
 		string $hex_string,
@@ -61,7 +63,8 @@ class Colors
 	): string|array {
 		$rgbArray = [];
 		// rewrite to previous r/g/b key output
-		foreach (Coordinates\RGB::__constructFromHexString($hex_string)->returnAsArray() as $p => $el) {
+		foreach ((new Coordinates\RGB($hex_string))->returnAsArray() as $p => $el) {
+			$k = '';
 			switch ($p) {
 				case 0:
 					$k = 'r';
@@ -90,13 +93,14 @@ class Colors
 	 * @param  int $blue        blue 0-255
 	 * @return array<int|float> Hue, Sat, Brightness/Value
 	 * @throws \LengthException If any argument is not in the range of 0~255
+	 * @deprecated v9.20.0 use: Color::rgbToHsb(...)->returnAsArray() will return float unrounded
 	 */
 	public static function rgb2hsb(int $red, int $green, int $blue): array
 	{
 		return array_map(
 			fn ($v) => (int)round($v),
 			Color::rgbToHsb(
-				Coordinates\RGB::__constructFromArray([$red, $green, $blue])
+				new Coordinates\RGB([$red, $green, $blue])
 			)->returnAsArray()
 		);
 	}
@@ -111,13 +115,14 @@ class Colors
 	 * @param  float $V   brightness/value 0-100 (int)
 	 * @return array<int> 0 red/1 green/2 blue array as 0-255
 	 * @throws \LengthException If any argument is not in the valid range
+	 * @deprecated v9.20.0 use: Color::hsbToRgb(...)->returnAsArray() will return float unrounded
 	 */
 	public static function hsb2rgb(float $H, float $S, float $V): array
 	{
 		return array_map(
 			fn ($v) => (int)round($v),
 			Color::hsbToRgb(
-				Coordinates\HSB::__constructFromArray([$H, $S, $V])
+				new Coordinates\HSB([$H, $S, $V])
 			)->returnAsArray()
 		);
 	}
@@ -132,13 +137,14 @@ class Colors
 	 * @param  int $blue    blue 0-255
 	 * @return array<float> hue/sat/luminance
 	 * @throws \LengthException If any argument is not in the range of 0~255
+	 * @deprecated v9.20.0 use: Color::rgbToHsl(...)->returnAsArray() will return float unrounded
 	 */
 	public static function rgb2hsl(int $red, int $green, int $blue): array
 	{
 		return array_map(
 			fn ($v) => round($v, 1),
 			Color::rgbToHsl(
-				Coordinates\RGB::__constructFromArray([$red, $green, $blue])
+				new Coordinates\RGB([$red, $green, $blue])
 			)->returnAsArray()
 		);
 	}
@@ -152,13 +158,14 @@ class Colors
 	 * @param  float $lum           luminance: 0-100
 	 * @return array<int,float|int> red/blue/green 0-255 each
 	 * @throws \LengthException If any argument is not in the valid range
+	 * @deprecated v9.20.0 use: Color::hslToRgb(...)->returnAsArray() will return float unrounded
 	 */
 	public static function hsl2rgb(float $hue, float $sat, float $lum): array
 	{
 		return array_map(
 			fn ($v) => round($v),
 			Color::hslToRgb(
-				Coordinates\HSL::__constructFromArray([$hue, $sat, $lum])
+				new Coordinates\HSL([$hue, $sat, $lum])
 			)->returnAsArray()
 		);
 	}

www/lib/CoreLibs/Convert/Math.php

@@ -68,6 +68,65 @@ class Math
 		return pow((float)$number, 1.0 / 3);
 	}
 
+	/**
+	 * use PHP_FLOAT_EPSILON to compare if two float numbers are matching
+	 *
+	 * @param  float $x
+	 * @param  float $y
+	 * @param  float $epsilon [default=PHP_FLOAT_EPSILON]
+	 * @return bool  True equal
+	 */
+	public static function equalWithEpsilon(float $x, float $y, float $epsilon = PHP_FLOAT_EPSILON): bool
+	{
+		if (abs($x - $y) < $epsilon) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Compare two value base on direction given
+	 * The default delta is PHP_FLOAT_EPSILON
+	 *
+	 * @param  float  $value
+	 * @param  string $compare
+	 * @param  float  $limit
+	 * @param  float  $epsilon [default=PHP_FLOAT_EPSILON]
+	 * @return bool   True on smaller/large or equal
+	 */
+	public static function compareWithEpsilon(
+		float $value,
+		string $compare,
+		float $limit,
+		float $epsilon = PHP_FLOAT_EPSILON
+	): bool {
+		switch ($compare) {
+			case '<':
+				if ($value < ($limit - $epsilon)) {
+					return true;
+				}
+				break;
+			case '<=':
+				if ($value <= ($limit - $epsilon)) {
+					return true;
+				}
+				break;
+			case '==':
+				return self::equalWithEpsilon($value, $limit, $epsilon);
+			case '>':
+				if ($value > ($limit + $epsilon)) {
+					return true;
+				}
+				break;
+			case '>=':
+				if ($value >= ($limit + $epsilon)) {
+					return true;
+				}
+				break;
+		}
+		return false;
+	}
+
 	/**
 	 * This function is directly inspired by the multiplyMatrices() function in color.js
 	 * form Lea Verou and Chris Lilley.
@@ -77,10 +136,34 @@ class Math
 	 *
 	 * It returns an array which is the product of the two number matrices passed as parameters.
 	 *
-	 * @param  array<array<int|float>> $a m x n matrice
+	 * NOTE:
-	 * @param  array<array<int|float>> $b n x p matrice
+	 * if the right side (B matrix) has a missing row, this row will be fillwed with 0 instead of
+	 * throwing an error:
+	 * A:
+	 * [
+	 *   [1, 2, 3],
+	 *   [4, 5, 6],
+	 * ]
+	 * B:
+	 * [
+	 *   [7, 8, 9],
+	 *   [10, 11, 12],
+	 * ]
+	 * The B will get a third row with [0, 0, 0] added to make the multiplication work as it will be
+	 * rewritten as
+	 * B-rewrite:
+	 * [
+	 *   [7, 10, 0],
+	 *   [8, 11, 12],
+	 *   [0, 0, 0] <- automatically added
+	 * ]
 	 *
-	 * @return array<array<int|float>>    m x p product
+	 * The same is done for unbalanced entries, they are filled with 0
+	 *
+	 * @param  array<float|int|array<int|float>> $a m x n matrice
+	 * @param  array<float|int|array<int|float>> $b n x p matrice
+	 *
+	 * @return array<float|int|array<int|float>>    m x p product
 	 */
 	public static function multiplyMatrices(array $a, array $b): array
 	{
@@ -88,7 +171,7 @@ class Math
 
 		if (!is_array($a[0] ?? null)) {
 			// $a is vector, convert to [[a, b, c, ...]]
-			$a = [ $a ];
+			$a = [$a];
 		}
 
 		if (!is_array($b[0])) {
@@ -102,9 +185,10 @@ class Math
 		$p = count($b[0]);
 
 		// transpose $b:
+		// so that we can multiply row by row
 		$bCols = array_map(
-			callback: fn ($k) => \array_map(
+			callback: fn ($k) => array_map(
-				(fn ($i) => $i[$k]),
+				(fn ($i) => is_array($i) ? $i[$k] ?? 0 : 0),
 				$b,
 			),
 			array: array_keys($b[0]),
@@ -116,7 +200,8 @@ class Math
 					array_reduce(
 						array: $row,
 						callback: fn ($a, $v, $i = null) => $a + $v * (
-							$col[$i ?? array_search($v, $row)] ?? 0
+							// if last entry missing for full copy add a 0 to it
+							$col[$i ?? array_search($v, $row, true)] ?? 0 /** @phpstan-ignore-line */
 						),
 						initial: 0,
 					) :
@@ -132,13 +217,13 @@ class Math
 
 		if ($m === 1) {
 			// Avoid [[a, b, c, ...]]:
-			$product = $product[0];
+			return $product[0];
 		}
 
 		if ($p === 1) {
 			// Avoid [[a], [b], [c], ...]]:
 			return array_map(
-				callback: fn ($v) => $v[0],
+				callback: fn ($v) => $v[0] ?? 0,
 				array: $product,
 			);
 		}

www/lib/CoreLibs/Create/Uids.php

@@ -38,7 +38,7 @@ class Uids
 			$uniqid_length++;
 		}
 		/** @var int<1,max> make sure that internal this is correct */
-		$random_bytes_length = ($uniqid_length - ($uniqid_length % 2)) / 2;
+		$random_bytes_length = (int)(($uniqid_length - ($uniqid_length % 2)) / 2);
 		$uniqid = bin2hex(random_bytes($random_bytes_length));
 		// if not forced shorten return next lower length
 		if (!$force_length) {

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

@@ -374,7 +374,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	public function dbDelete(array $table_array = [], bool $acl_limit = false): array
 	{
 		// is array and has values, override set and set new
-		if (is_array($table_array) && count($table_array)) {
+		if (count($table_array)) {
 			$this->table_array = $table_array;
 		}
 		if (!$this->dbCheckPkSet()) {
@@ -440,7 +440,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	public function dbRead(bool $edit = false, array $table_array = []): array
 	{
 		// if array give, overrules internal array
-		if (is_array($table_array) && count($table_array)) {
+		if (count($table_array)) {
 			$this->table_array = $table_array;
 		}
 		if (!$this->dbCheckPkSet()) {

www/lib/CoreLibs/DB/IO.php

@@ -284,7 +284,8 @@ class IO
 	public const ERROR_HASH_TYPE = 'adler32';
 	/** @var string regex to get returning with matches at position 1 */
 	public const REGEX_RETURNING = '/\s+returning\s+(.+\s*(?:.+\s*)+);?$/i';
-	/** @var array<string> allowed convert target for placeholder: pg or pdo (currently not available) */
+	/** @var array<string> allowed convert target for placeholder:
+	 * pg or pdo (currently not available) */
 	public const DB_CONVERT_PLACEHOLDER_TARGET = ['pg'];
 	// REGEX_SELECT
 	// REGEX_UPDATE
@@ -914,7 +915,7 @@ class IO
 		if ($cursor !== false) {
 			[$db_prefix, $db_error_string] = $this->db_functions->__dbPrintError($cursor);
 		}
-		if ($cursor === false && method_exists($this->db_functions, '__dbPrintError')) {
+		if ($cursor === false && method_exists($this->db_functions, '__dbPrintError')) { /** @phpstan-ignore-line */
 			[$db_prefix, $db_error_string] = $this->db_functions->__dbPrintError();
 		}
 		// prefix the master if not the same
@@ -1311,33 +1312,14 @@ class IO
 	}
 
 	/**
-	 * count $ leading parameters only
+	 * count placeholder entries in the query
 	 *
 	 * @param  string $query Query to check
 	 * @return int           Number of parameters found
 	 */
 	private function __dbCountQueryParams(string $query): int
 	{
-		$match = [];
+		return $this->db_functions->__dbCountQueryParams($query);
-		// regex for params: only stand alone $number allowed
-		// exclude all '' enclosed strings, ignore all numbers [note must start with digit]
-		// can have space/tab/new line
-		// must have <> = , ( [not equal, equal, comma, opening round bracket]
-		// can have space/tab/new line
-		// $ number with 1-9 for first and 0-9 for further digits
-		// /s for matching new line in . list
-		// [disabled, we don't used ^ or $] /m for multi line match
-		// Matches in 1:, must be array_filtered to remove empty, count with array_unique
-		$query_split = '[(=,?-]|->|->>|#>|#>>|@>|<@|\?\|\?\&|\|\||#-';
-		preg_match_all(
-			'/'
-			. '(?:\'.*?\')?\s*(?:\?\?|<>|' . $query_split . ')\s*'
-			. '(?:\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))'
-			. '/s',
-			$query,
-			$match
-		);
-		return count(array_unique(array_filter($match[1])));
 	}
 
 	/**
@@ -1737,7 +1719,7 @@ class IO
 	{
 		if (
 			!empty($this->dbh) &&
-			$this->dbh instanceof \PgSql\Connection
+			$this->dbh instanceof \PgSql\Connection /** @phpstan-ignore-line future could be other */
 		) {
 			// reset any client encodings set
 			$this->dbResetEncoding();
@@ -3160,7 +3142,8 @@ class IO
 				'count' => 0,
 				'query' => '',
 				'result' =>  null,
-				'returning_id' => false
+				'returning_id' => false,
+				'placeholder_converted' => [],
 			];
 			// if this is an insert query, check if we can add a return
 			if ($this->dbCheckQueryForInsert($query, true)) {
@@ -3200,6 +3183,39 @@ class IO
 					$this->prepare_cursor[$stm_name]['pk_name'] = $pk_name;
 				}
 			}
+			// QUERY PARAMS: run query params check and rewrite
+			if ($this->dbGetConvertPlaceholder() === true) {
+				try {
+					$this->placeholder_converted = ConvertPlaceholder::convertPlaceholderInQuery(
+						$query,
+						null,
+						$this->dbGetConvertPlaceholderTarget()
+					);
+					// write the new queries over the old
+					if (!empty($this->placeholder_converted['query'])) {
+						$query = $this->placeholder_converted['query'];
+					}
+					$this->prepare_cursor[$stm_name]['placeholder_converted'] = $this->placeholder_converted;
+				} catch (\OutOfRangeException $e) {
+					$this->__dbError($e->getCode(), context:[
+						'statement_name' => $stm_name,
+						'query' => $query,
+						'location' => 'dbPrepare',
+						'error' => 'OutOfRangeException',
+						'exception' => $e
+					]);
+					return false;
+				} catch (\RuntimeException $e) {
+					$this->__dbError($e->getCode(), context:[
+						'statement_name' => $stm_name,
+						'query' => $query,
+						'location' => 'dbPrepare',
+						'error' => 'RuntimeException',
+						'exception' => $e
+					]);
+					return false;
+				}
+			}
 			// check prepared curser parameter count
 			$this->prepare_cursor[$stm_name]['count'] = $this->__dbCountQueryParams($query);
 			$this->prepare_cursor[$stm_name]['query'] = $query;
@@ -3735,7 +3751,7 @@ class IO
 	}
 
 	/**
-	 * convert db values (set)
+	 * convert db values (set) to php matching types
 	 *
 	 * @param  Convert $convert
 	 * @return void
@@ -3746,7 +3762,7 @@ class IO
 	}
 
 	/**
-	 * unsert convert db values flag
+	 * unsert convert db values flag for converting db to php matching types
 	 *
 	 * @param  Convert $convert
 	 * @return void
@@ -3757,7 +3773,7 @@ class IO
 	}
 
 	/**
-	 * Reset to origincal config file set
+	 * Reset to original config file set for converting db to php matching type
 	 *
 	 * @return void
 	 */
@@ -3769,7 +3785,7 @@ class IO
 	}
 
 	/**
-	 * check if a conert flag is set
+	 * check if a convert flag is set for converting db to php matching type
 	 *
 	 * @param  Convert $convert
 	 * @return bool
@@ -3783,7 +3799,7 @@ class IO
 	}
 
 	/**
-	 * Set if we want to auto convert PDO/\Pg placeholders
+	 * Set if we want to auto convert to PDO/\Pg placeholders
 	 *
 	 * @param  bool $flag
 	 * @return void
@@ -4294,7 +4310,7 @@ class IO
 	 * @param string $stm_name  The name of the stored statement
 	 * @param string $key       Key field name in prepared cursor array
 	 *                          Allowed are: pk_name, count, query, returning_id
-	 * @return null|string|int|bool Entry from each of the valid keys
+	 * @return null|string|int|bool|array<string,mixed> Entry from each of the valid keys
 	 *                          Will return false on error
 	 *                          Not ethat returnin_id also can return false
 	 *                          but will not set an error entry
@@ -4302,7 +4318,7 @@ class IO
 	public function dbGetPrepareCursorValue(
 		string $stm_name,
 		string $key
-	): null|string|int|bool {
+	): null|string|int|bool|array {
 		// if no statement name
 		if (empty($stm_name)) {
 			$this->__dbError(
@@ -4313,7 +4329,7 @@ class IO
 			return false;
 		}
 		// if not a valid key
-		if (!in_array($key, ['pk_name', 'count', 'query', 'returning_id'])) {
+		if (!in_array($key, ['pk_name', 'count', 'query', 'returning_id', 'placeholder_converted'])) {
 			$this->__dbError(
 				102,
 				false,

www/lib/CoreLibs/DB/SQL/PgSQL.php

@@ -51,6 +51,8 @@ declare(strict_types=1);
 
 namespace CoreLibs\DB\SQL;
 
+use CoreLibs\DB\Support\ConvertPlaceholder;
+
 // below no ignore is needed if we want to use PgSql interface checks with PHP 8.0
 // as main system. Currently all @var sets are written as object
 /** @#phan-file-suppress PhanUndeclaredTypeProperty,PhanUndeclaredTypeParameter,PhanUndeclaredTypeReturnType */
@@ -102,7 +104,7 @@ class PgSQL implements Interface\SqlFunctions
 	 * SELECT foo FROM bar WHERE foobar = $1
 	 *
 	 * @param  string       $query  Query string with placeholders $1, ..
-	 * @param  array<mixed> $params Matching parameters for each placerhold
+	 * @param  array<mixed> $params Matching parameters for each placeholder
 	 * @return \PgSql\Result|false Query result
 	 */
 	public function __dbQueryParams(string $query, array $params): \PgSql\Result|false
@@ -140,7 +142,7 @@ class PgSQL implements Interface\SqlFunctions
 	 * sends an async query to the server with params
 	 *
 	 * @param  string       $query  Query string with placeholders $1, ..
-	 * @param  array<mixed> $params Matching parameters for each placerhold
+	 * @param  array<mixed> $params Matching parameters for each placeholder
 	 * @return bool         true/false Query sent successful status
 	 */
 	public function __dbSendQueryParams(string $query, array $params): bool
@@ -966,6 +968,34 @@ class PgSQL implements Interface\SqlFunctions
 	{
 		return $this->__dbShow('client_encoding');
 	}
+
+	/**
+	 * Count placeholder queries. $ only
+	 *
+	 * @param  string $query
+	 * @return int
+	 */
+	public function __dbCountQueryParams(string $query): int
+	{
+		$matches = [];
+		// regex for params: only stand alone $number allowed
+		// exclude all '' enclosed strings, ignore all numbers [note must start with digit]
+		// can have space/tab/new line
+		// must have <> = , ( [not equal, equal, comma, opening round bracket]
+		// can have space/tab/new line
+		// $ number with 1-9 for first and 0-9 for further digits
+		// Collects also PDO ? and :named, but they are ignored
+		// /s for matching new line in . list
+		// [disabled, we don't used ^ or $] /m for multi line match
+		// Matches in 1:, must be array_filtered to remove empty, count with array_unique
+		// Regex located in the ConvertPlaceholder class
+		preg_match_all(
+			ConvertPlaceholder::REGEX_LOOKUP_PLACEHOLDERS,
+			$query,
+			$matches
+		);
+		return count(array_unique(array_filter($matches[3])));
+	}
 }
 
 // __END__

www/lib/CoreLibs/DB/Support/ConvertPlaceholder.php

@@ -14,6 +14,67 @@ namespace CoreLibs\DB\Support;
 
 class ConvertPlaceholder
 {
+	/** @var string split regex */
+	private const PATTERN_QUERY_SPLIT = '[(<>=,?-]|->|->>|#>|#>>|@>|<@|\?\|\?\&|\|\||#-';
+	/** @var string the main regex including  the pattern query split */
+	private const PATTERN_ELEMENT = '(?:\'.*?\')?\s*(?:\?\?|' . self::PATTERN_QUERY_SPLIT . ')\s*';
+	/** @var string parts to ignore in the SQL */
+	private const PATTERN_IGNORE =
+		// digit -> ignore
+		'\d+|'
+		// other string -> ignore
+		. '(?:\'.*?\')|';
+	/** @var string named parameters */
+	private const PATTERN_NAMED = '(:\w+)';
+	/** @var string question mark parameters */
+	private const PATTERN_QUESTION_MARK = '(?:(?:\?\?)?\s*(\?{1}))';
+	/** @var string numbered parameters */
+	private const PATTERN_NUMBERED = '(\$[1-9]{1}(?:[0-9]{1,})?)';
+	// below here are full regex that will be used
+	/** @var string replace regex for named (:...) entries */
+	public const REGEX_REPLACE_NAMED = '/'
+		. '(' . self::PATTERN_ELEMENT . ')'
+		. '('
+		. self::PATTERN_IGNORE
+		. self::PATTERN_NAMED
+		. ')'
+		. '/s';
+	/** @var string replace regex for question mark (?) entries */
+	public const REGEX_REPLACE_QUESTION_MARK = '/'
+		. '(' . self::PATTERN_ELEMENT . ')'
+		. '('
+		. self::PATTERN_IGNORE
+		. self::PATTERN_QUESTION_MARK
+		. ')'
+		. '/s';
+	/** @var string replace regex for numbered ($n) entries */
+	public const REGEX_REPLACE_NUMBERED = '/'
+		. '(' . self::PATTERN_ELEMENT . ')'
+		. '('
+		. self::PATTERN_IGNORE
+		. self::PATTERN_NUMBERED
+		. ')'
+		. '/s';
+	/** @var string the main lookup query for all placeholders */
+	public const REGEX_LOOKUP_PLACEHOLDERS = '/'
+		// prefix string part, must match towards
+		// seperator for ( = , ? - [and json/jsonb in pg doc section 9.15]
+		. self::PATTERN_ELEMENT
+		// match for replace part
+		. '(?:'
+		// ignore parts
+		. self::PATTERN_IGNORE
+		// :name named part (PDO) [1]
+		. self::PATTERN_NAMED . '|'
+		// ? question mark part (PDO) [2]
+		. self::PATTERN_QUESTION_MARK . '|'
+		// $n numbered part (\PG php) [3]
+		. self::PATTERN_NUMBERED
+		// end match
+		. ')'
+		// single line -> add line break to matches in "."
+		. '/s';
+
 	/**
 	 * Convert PDO type query with placeholders to \PG style and vica versa
 	 * For PDO to: ? and :named
@@ -27,44 +88,24 @@ class ConvertPlaceholder
 	 * found has -1 if an error occoured in the preg_match_all call
 	 *
 	 * @param  string       $query      Query with placeholders to convert
-	 * @param  array<mixed> $params     The parameters that are used for the query, and will be updated
+	 * @param  ?array<mixed> $params     The parameters that are used for the query, and will be updated
 	 * @param  string       $convert_to Either pdo or pg, will be converted to lower case for check
-	 * @return array{original:array{query:string,params:array<mixed>},type:''|'named'|'numbered'|'question_mark',found:int,matches:array<string>,params_lookup:array<mixed>,query:string,params:array<mixed>}
+	 * @return array{original:array{query:string,params:array<mixed>,empty_params:bool},type:''|'named'|'numbered'|'question_mark',found:int,matches:array<string>,params_lookup:array<mixed>,query:string,params:array<mixed>}
-	 * @throws \OutOfRangeException 200
+	 * @throws \OutOfRangeException 200 If mixed placeholder types
+	 * @throws \InvalidArgumentException 300 or 301 if wrong convert to with found placeholders
 	 */
 	public static function convertPlaceholderInQuery(
 		string $query,
-		array $params,
+		?array $params,
 		string $convert_to = 'pg'
 	): array {
 		$convert_to = strtolower($convert_to);
 		$matches = [];
-		$query_split = '[(=,?-]|->|->>|#>|#>>|@>|<@|\?\|\?\&|\|\||#-';
-		$pattern = '/'
-			// prefix string part, must match towards
-			// seperator for ( = , ? - [and json/jsonb in pg doc section 9.15]
-			. '(?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\s*'
-			// match for replace part
-			. '(?:'
-			// digit -> ignore
-			. '\d+|'
-			// other string -> ignore
-			. '(?:\'.*?\')|'
-			// :name named part (PDO)
-			. '(:\w+)|'
-			// ? question mark part (PDO)
-			. '(?:(?:\?\?)?\s*(\?{1}))|'
-			// $n numbered part (\PG php)
-			. '(\$[1-9]{1}(?:[0-9]{1,})?)'
-			// end match
-			. ')'
-			// single line -> add line break to matches in "."
-			. '/s';
 		// matches:
 		// 1: :named
 		// 2: ? question mark
 		// 3: $n numbered
-		$found = preg_match_all($pattern, $query, $matches, PREG_UNMATCHED_AS_NULL);
+		$found = preg_match_all(self::REGEX_LOOKUP_PLACEHOLDERS, $query, $matches, PREG_UNMATCHED_AS_NULL);
 		// if false or null set to -1
 		//  || $found === null
 		if ($found === false) {
@@ -77,10 +118,10 @@ class ConvertPlaceholder
 		/** @var array<string> 3: $n matches */
 		$numbered_matches = array_filter($matches[3]);
 		// count matches
-		$count_named = count($named_matches);
+		$count_named = count(array_unique($named_matches));
 		$count_qmark = count($qmark_matches);
-		$count_numbered = count($numbered_matches);
+		$count_numbered = count(array_unique($numbered_matches));
-		// throw if mixed
+		// throw exception if mixed found
 		if (
 			($count_named && $count_qmark) ||
 			($count_named && $count_numbered) ||
@@ -88,140 +129,195 @@ class ConvertPlaceholder
 		) {
 			throw new \OutOfRangeException('Cannot have named, question mark and numbered in the same query', 200);
 		}
-		// rebuild
+		// // throw if invalid conversion
-		$matches_return = [];
+		// if (($count_named || $count_qmark) && $convert_to != 'pg') {
-		$type = '';
+		// 	throw new \InvalidArgumentException('Cannot convert from named or question mark placeholders to PDO', 300);
+		// }
+		// if ($count_numbered && $convert_to != 'pdo') {
+		// 	throw new \InvalidArgumentException('Cannot convert from numbered placeholders to Pg', 301);
+		// }
+		// return array
+		$return_placeholders = [
+			// original
+			'original' => [
+					'query' => $query,
+					'params' => $params ?? [],
+					'empty_params' => $params === null ? true : false,
+				],
+				// type found, empty if nothing was done
+				'type' => '',
+				// int: found, not found; -1: problem (set from false)
+				'found' => (int)$found,
+				'matches' => [],
+				// old to new lookup check
+				'params_lookup' => [],
+				// this must match the count in params in new
+				'needed' => 0,
+				// new
+				'query' => '',
+				'params' => [],
+		];
+		// replace basic regex and name settings
+		if ($count_named) {
+			$return_placeholders['type'] = 'named';
+			$return_placeholders['matches'] = $named_matches;
+			$return_placeholders['needed'] = $count_named;
+		} elseif ($count_qmark) {
+			$return_placeholders['type'] = 'question_mark';
+			$return_placeholders['matches'] = $qmark_matches;
+			$return_placeholders['needed'] = $count_qmark;
+			// for each ?:DTN: -> replace with $1 ... $n, any remaining :DTN: remove
+		} elseif ($count_numbered) {
+			$return_placeholders['type'] = 'numbered';
+			$return_placeholders['matches'] = $numbered_matches;
+			$return_placeholders['needed'] = $count_numbered;
+		}
+		// run convert only if matching type and direction
+		if (
+			(($count_named || $count_qmark) && $convert_to == 'pg') ||
+			($count_numbered && $convert_to == 'pdo')
+		) {
+			$param_list = self::updateParamList($return_placeholders);
+			$return_placeholders['params_lookup'] = $param_list['params_lookup'];
+			$return_placeholders['query'] = $param_list['query'];
+			$return_placeholders['params'] = $param_list['params'];
+		}
+		// return data
+		return $return_placeholders;
+	}
+
+	/**
+	 * Updates the params list from one style to the other to match the query output
+	 * if original.empty_params is set to true, no params replacement is done
+	 * if param replacement has been done in a dbPrepare then this has to be run
+	 * with the return palceholders array with params in original filled and empty_params turned off
+	 *
+	 * phpcs:disable Generic.Files.LineLength
+	 * @param array{original:array{query:string,params:array<mixed>,empty_params:bool},type:''|'named'|'numbered'|'question_mark',found:int,matches?:array<string>,params_lookup?:array<mixed>,query?:string,params?:array<mixed>} $converted_placeholders
+	 * phpcs:enable Generic.Files.LineLength
+	 * @return array{params_lookup:array<mixed>,query:string,params:array<mixed>}
+	 */
+	public static function updateParamList(array $converted_placeholders): array
+	{
+		// skip if nothing set
+		if (!$converted_placeholders['found']) {
+			return [
+				'params_lookup' => [],
+				'query' => '',
+				'params' => []
+			];
+		}
 		$query_new = '';
 		$params_new = [];
 		$params_lookup = [];
-		if ($count_named && $convert_to == 'pg') {
+		// set to null if params is empty
-			$type = 'named';
+		$params = $converted_placeholders['original']['params'];
-			$matches_return = $named_matches;
+		$empty_params = $converted_placeholders['original']['empty_params'];
-			// only check for :named
+		switch ($converted_placeholders['type']) {
-			$pattern_replace = '/'
+			case 'named':
-				. '((?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\s*)'
+				// 0: full
-				. '(\d+|(?:\'.*?\')|(:\w+))'
+				// 0: full
-				. '/s';
+				// 1: pre part
-			// 0: full
+				// 2: keep part UNLESS '3' is set
-			// 1: pre part
+				// 3: replace part :named
-			// 2: keep part UNLESS '3' is set
+				$pos = 0;
-			// 3: replace part :named
+				$query_new = preg_replace_callback(
-			$pos = 0;
+					self::REGEX_REPLACE_NAMED,
-			$query_new = preg_replace_callback(
+					function ($matches) use (&$pos, &$params_new, &$params_lookup, $params, $empty_params) {
-				$pattern_replace,
+						// only count up if $match[3] is not yet in lookup table
-				function ($matches) use (&$pos, &$params_new, &$params_lookup, $params) {
+						if (!empty($matches[3]) && empty($params_lookup[$matches[3]])) {
-					// only count up if $match[3] is not yet in lookup table
+							$pos++;
-					if (!empty($matches[3]) && empty($params_lookup[$matches[3]])) {
+							$params_lookup[$matches[3]] = '$' . $pos;
-						$pos++;
+							// skip params setup if param list is empty
-						$params_lookup[$matches[3]] = '$' . $pos;
+							if (!$empty_params) {
-						$params_new[] = $params[$matches[3]] ??
+								$params_new[] = $params[$matches[3]] ??
-							throw new \RuntimeException(
+									throw new \RuntimeException(
-								'Cannot lookup ' . $matches[3] . ' in params list',
+										'Cannot lookup ' . $matches[3] . ' in params list',
-								210
+										210
-							);
+									);
-					}
+							}
-					// add the connectors back (1), and the data sets only if no replacement will be done
+						}
-					return $matches[1] . (
+						// add the connectors back (1), and the data sets only if no replacement will be done
-						empty($matches[3]) ?
+						return $matches[1] . (
-							$matches[2] :
+							empty($matches[3]) ?
-							$params_lookup[$matches[3]] ??
+								$matches[2] :
+								$params_lookup[$matches[3]] ??
+									throw new \RuntimeException(
+										'Cannot lookup ' . $matches[3] . ' in params lookup list',
+										211
+									)
+						);
+					},
+					$converted_placeholders['original']['query']
+				);
+				break;
+			case 'question_mark':
+				if (!$empty_params) {
+					// order and data stays the same
+					$params_new = $params ?? [];
+				}
+				// 0: full
+				// 1: pre part
+				// 2: keep part UNLESS '3' is set
+				// 3: replace part ?
+				$pos = 0;
+				$query_new = preg_replace_callback(
+					self::REGEX_REPLACE_QUESTION_MARK,
+					function ($matches) use (&$pos, &$params_lookup) {
+						// only count pos up for actual replacements we will do
+						if (!empty($matches[3])) {
+							$pos++;
+							$params_lookup[] = '$' . $pos;
+						}
+						// add the connectors back (1), and the data sets only if no replacement will be done
+						return $matches[1] . (
+							empty($matches[3]) ?
+								$matches[2] :
+								'$' . $pos
+						);
+					},
+					$converted_placeholders['original']['query']
+				);
+				break;
+			case 'numbered':
+				// 0: full
+				// 1: pre part
+				// 2: keep part UNLESS '3' is set
+				// 3: replace part $numbered
+				$pos = 0;
+				$query_new = preg_replace_callback(
+					self::REGEX_REPLACE_NUMBERED,
+					function ($matches) use (&$pos, &$params_new, &$params_lookup, $params, $empty_params) {
+						// only count up if $match[3] is not yet in lookup table
+						if (!empty($matches[3]) && empty($params_lookup[$matches[3]])) {
+							$pos++;
+							$params_lookup[$matches[3]] = ':' . $pos . '_named';
+							// skip params setup if param list is empty
+							if (!$empty_params) {
+								$params_new[] = $params[($pos - 1)] ??
+									throw new \RuntimeException(
+										'Cannot lookup ' . ($pos - 1) . ' in params list',
+										220
+									);
+							}
+						}
+						// add the connectors back (1), and the data sets only if no replacement will be done
+						return $matches[1] . (
+							empty($matches[3]) ?
+								$matches[2] :
+								$params_lookup[$matches[3]] ??
 								throw new \RuntimeException(
 									'Cannot lookup ' . $matches[3] . ' in params lookup list',
-									211
+									221
 								)
-					);
+						);
-				},
+					},
-				$query
+					$converted_placeholders['original']['query']
-			);
+				);
-		} elseif ($count_qmark && $convert_to == 'pg') {
+				break;
-			$type = 'question_mark';
-			$matches_return = $qmark_matches;
-			// order and data stays the same
-			$params_new = $params;
-			// only check for ?
-			$pattern_replace = '/'
-				. '((?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\s*)'
-				. '(\d+|(?:\'.*?\')|(?:(?:\?\?)?\s*(\?{1})))'
-				. '/s';
-			// 0: full
-			// 1: pre part
-			// 2: keep part UNLESS '3' is set
-			// 3: replace part ?
-			$pos = 0;
-			$query_new = preg_replace_callback(
-				$pattern_replace,
-				function ($matches) use (&$pos, &$params_lookup) {
-					// only count pos up for actual replacements we will do
-					if (!empty($matches[3])) {
-						$pos++;
-						$params_lookup[] = '$' . $pos;
-					}
-					// add the connectors back (1), and the data sets only if no replacement will be done
-					return $matches[1] . (
-						empty($matches[3]) ?
-							$matches[2] :
-							'$' . $pos
-					);
-				},
-				$query
-			);
-			// for each ?:DTN: -> replace with $1 ... $n, any remaining :DTN: remove
-		} elseif ($count_numbered && $convert_to == 'pdo') {
-			// convert numbered to named
-			$type = 'numbered';
-			$matches_return = $numbered_matches;
-			// only check for $n
-			$pattern_replace = '/'
-				. '((?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\s*)'
-				. '(\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))'
-				. '/s';
-			// 0: full
-			// 1: pre part
-			// 2: keep part UNLESS '3' is set
-			// 3: replace part $numbered
-			$pos = 0;
-			$query_new = preg_replace_callback(
-				$pattern_replace,
-				function ($matches) use (&$pos, &$params_new, &$params_lookup, $params) {
-					// only count up if $match[3] is not yet in lookup table
-					if (!empty($matches[3]) && empty($params_lookup[$matches[3]])) {
-						$pos++;
-						$params_lookup[$matches[3]] = ':' . $pos . '_named';
-						$params_new[] = $params[($pos - 1)] ??
-							throw new \RuntimeException(
-								'Cannot lookup ' . ($pos - 1) . ' in params list',
-								220
-							);
-					}
-					// add the connectors back (1), and the data sets only if no replacement will be done
-					return $matches[1] . (
-						empty($matches[3]) ?
-							$matches[2] :
-							$params_lookup[$matches[3]] ??
-							throw new \RuntimeException(
-								'Cannot lookup ' . $matches[3] . ' in params lookup list',
-								221
-							)
-					);
-				},
-				$query
-			);
 		}
-		// return, old query is always set
 		return [
-			// original
-			'original' => [
-				'query' => $query,
-				'params' => $params,
-			],
-			// type found, empty if nothing was done
-			'type' => $type,
-			// int: found, not found; -1: problem (set from false)
-			'found' => (int)$found,
-			'matches' => $matches_return,
-			// old to new lookup check
 			'params_lookup' => $params_lookup,
-			// new
 			'query' => $query_new ?? '',
 			'params' => $params_new,
 		];

www/lib/CoreLibs/Language/Core/GetTextReader.php

@@ -190,7 +190,6 @@ class GetTextReader
 	private function loadTables(): void
 	{
 		if (
-			is_array($this->cache_translations) &&
 			is_array($this->table_originals) &&
 			is_array($this->table_translations)
 		) {
@@ -318,10 +317,7 @@ class GetTextReader
 
 		if ($this->enable_cache) {
 			// Caching enabled, get translated string from cache
-			if (
+			if (array_key_exists($string, $this->cache_translations)) {
-				is_array($this->cache_translations) &&
-				array_key_exists($string, $this->cache_translations)
-			) {
 				return $this->cache_translations[$string];
 			} else {
 				return $string;
@@ -481,7 +477,7 @@ class GetTextReader
 		$key = $single . chr(0) . $plural;
 
 		if ($this->enable_cache) {
-			if (is_array($this->cache_translations) && !array_key_exists($key, $this->cache_translations)) {
+			if (!array_key_exists($key, $this->cache_translations)) {
 				return ($number != 1) ? $plural : $single;
 			} else {
 				$result = $this->cache_translations[$key];

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

@@ -474,7 +474,7 @@ class Generate
 					$page_name_camel_case
 			);
 		try {
-			/** @var TableArrays\Interface\TableArraysInterface|false $class */
+			/** @var TableArrays\Interface\TableArraysInterface $class */
 			$class = new $class_string($this);
 		} catch (\Throwable $t) {
 			$this->log->critical('CLASS LOADING: Failed loading: ' . $class_string . ' => ' . $t->getMessage());
@@ -1757,14 +1757,9 @@ class Generate
 				$this->dba->setTableArrayEntry($this->dba->getTableArray()[$key]['preset'], $key, 'value');
 			}
 		}
-		if (is_array($this->reference_array)) {
+		reset($this->reference_array);
-			if (!is_array($this->reference_array)) {
+		foreach ($this->reference_array as $key => $value) {
-				$this->reference_array = [];
+			unset($this->reference_array[$key]['selected']);
-			}
-			reset($this->reference_array);
-			foreach ($this->reference_array as $key => $value) {
-				unset($this->reference_array[$key]['selected']);
-			}
 		}
 		$this->warning = 1;
 		$this->msg = $this->l->__('Cleared for new Dataset!');
@@ -1787,20 +1782,15 @@ class Generate
 			$this->dba->unsetTableArrayEntry($key, 'input_value');
 		}
 
-		if (is_array($this->reference_array)) {
+		// load each reference_table
-			// load each reference_table
+		reset($this->reference_array);
-			if (!is_array($this->reference_array)) {
+		foreach ($this->reference_array as $key => $value) {
-				$this->reference_array = [];
+			unset($this->reference_array[$key]['selected']);
-			}
+			$q = 'SELECT ' . $this->reference_array[$key]['other_table_pk']
-			reset($this->reference_array);
+				. ' FROM ' . $this->reference_array[$key]['table_name']
-			foreach ($this->reference_array as $key => $value) {
+				. ' WHERE ' . $this->int_pk_name . ' = ' . $this->dba->getTableArray()[$this->int_pk_name]['value'];
-				unset($this->reference_array[$key]['selected']);
+			while (is_array($res = $this->dba->dbReturn($q))) {
-				$q = 'SELECT ' . $this->reference_array[$key]['other_table_pk']
+				$this->reference_array[$key]['selected'][] = $res[$this->reference_array[$key]['other_table_pk']];
-					. ' FROM ' . $this->reference_array[$key]['table_name']
-					. ' WHERE ' . $this->int_pk_name . ' = ' . $this->dba->getTableArray()[$this->int_pk_name]['value'];
-				while (is_array($res = $this->dba->dbReturn($q))) {
-					$this->reference_array[$key]['selected'][] = $res[$this->reference_array[$key]['other_table_pk']];
-				}
 			}
 		}
 		$this->warning = 1;
@@ -1979,24 +1969,19 @@ class Generate
 		// write the object
 		$this->dba->dbWrite($addslashes, [], true);
 		// write reference array (s) if necessary
-		if (is_array($this->reference_array)) {
+		reset($this->reference_array);
-			if (!is_array($this->reference_array)) {
+		foreach ($this->reference_array as $reference_array) {
-				$this->reference_array = [];
+			$q = 'DELETE FROM ' . $reference_array['table_name']
+				. ' WHERE ' . $this->int_pk_name . ' = ' . $this->dba->getTableArray()[$this->int_pk_name]['value'];
+			$this->dba->dbExec($q);
+			$q = 'INSERT INTO ' . $reference_array['table_name']
+				. ' (' . $reference_array['other_table_pk'] . ', ' . $this->int_pk_name . ') VALUES ';
+			for ($i = 0, $i_max = count($reference_array['selected']); $i < $i_max; $i++) {
+				$t_q = '(' . $reference_array['selected'][$i] . ', '
+					. $this->dba->getTableArray()[$this->int_pk_name]['value'] . ')';
+				$this->dba->dbExec($q . $t_q);
 			}
-			reset($this->reference_array);
+		} // foreach reference arrays
-			foreach ($this->reference_array as $reference_array) {
-				$q = 'DELETE FROM ' . $reference_array['table_name']
-					. ' WHERE ' . $this->int_pk_name . ' = ' . $this->dba->getTableArray()[$this->int_pk_name]['value'];
-				$this->dba->dbExec($q);
-				$q = 'INSERT INTO ' . $reference_array['table_name']
-					. ' (' . $reference_array['other_table_pk'] . ', ' . $this->int_pk_name . ') VALUES ';
-				for ($i = 0, $i_max = count($reference_array['selected']); $i < $i_max; $i++) {
-					$t_q = '(' . $reference_array['selected'][$i] . ', '
-						. $this->dba->getTableArray()[$this->int_pk_name]['value'] . ')';
-					$this->dba->dbExec($q . $t_q);
-				}
-			} // foreach reference arrays
-		} // if reference arrays
 		// write element list
 		if (!empty($this->element_list)) {
 			$type = [];
@@ -2230,16 +2215,11 @@ class Generate
 	public function formDeleteTableArray()
 	{
 		// remove any reference arrays
-		if (is_array($this->reference_array)) {
+		reset($this->reference_array);
-			if (!is_array($this->reference_array)) {
+		foreach ($this->reference_array as $reference_array) {
-				$this->reference_array = [];
+			$q = 'DELETE FROM ' . $reference_array['table_name']
-			}
+				. ' WHERE ' . $this->int_pk_name . ' = ' . $this->dba->getTableArray()[$this->int_pk_name]['value'];
-			reset($this->reference_array);
+			$this->dba->dbExec($q);
-			foreach ($this->reference_array as $reference_array) {
-				$q = 'DELETE FROM ' . $reference_array['table_name']
-					. ' WHERE ' . $this->int_pk_name . ' = ' . $this->dba->getTableArray()[$this->int_pk_name]['value'];
-				$this->dba->dbExec($q);
-			}
 		}
 		// remove any element list references
 		if (!empty($this->element_list)) {

www/lib/CoreLibs/Output/Image.php

@@ -256,8 +256,8 @@ class Image
 			}
 			// check resize parameters
 			if ($inc_width > $thumb_width || $inc_height > $thumb_height) {
-				$thumb_width_r = 0;
+				$thumb_width_r = 1;
-				$thumb_height_r = 0;
+				$thumb_height_r = 1;
 				// we need to keep the aspect ration on longest side
 				if (
 					($inc_height > $inc_width &&
@@ -288,6 +288,12 @@ class Image
 					!file_exists($thumbnail_write_path . $thumbnail)
 				) {
 					// image, copy source image, offset in image, source x/y, new size, source image size
+					if ($thumb_width_r < 1) {
+						$thumb_width_r = 1;
+					}
+					if ($thumb_height_r < 1) {
+						$thumb_height_r = 1;
+					}
 					$thumb = imagecreatetruecolor($thumb_width_r, $thumb_height_r);
 					if ($thumb === false) {
 						throw new \RuntimeException(
@@ -380,9 +386,7 @@ class Image
 				}
 			}
 			// add output path
-			if ($thumbnail !== false) {
+			$thumbnail = $thumbnail_web_path . $thumbnail;
-				$thumbnail = $thumbnail_web_path . $thumbnail;
-			}
 		} elseif ($create_dummy === true) {
 			// create dummy image in the thumbnail size
 			// if one side is missing, use the other side to create a square
@@ -399,10 +403,10 @@ class Image
 				!file_exists($thumbnail_write_path . $thumbnail)
 			) {
 				// if both are unset, set to 250
-				if ($thumb_height == 0) {
+				if ($thumb_height < 1) {
 					$thumb_height = 250;
 				}
-				if ($thumb_width == 0) {
+				if ($thumb_width < 1) {
 					$thumb_width = 250;
 				}
 				$thumb = imagecreatetruecolor($thumb_width, $thumb_height);

www/lib/CoreLibs/UrlRequests/Curl.php

@@ -599,7 +599,7 @@ class Curl implements Interface\RequestsInterface
 		// for post we set POST option
 		if ($type == "post") {
 			curl_setopt($handle, CURLOPT_POST, true);
-		} elseif (in_array($type, self::CUSTOM_REQUESTS)) {
+		} elseif (!empty($type) && in_array($type, self::CUSTOM_REQUESTS)) {
 			curl_setopt($handle, CURLOPT_CUSTOMREQUEST, strtoupper($type));
 		}
 		// set body data if not null, will send empty [] for empty data
@@ -700,12 +700,12 @@ class Curl implements Interface\RequestsInterface
 		// if we have a timeout signal
 		if (!empty($this->config['timeout'])) {
 			$timeout_requires_no_signal = $this->config['timeout'] < 1;
-			curl_setopt($handle, CURLOPT_TIMEOUT_MS, $this->config['timeout'] * 1000);
+			curl_setopt($handle, CURLOPT_TIMEOUT_MS, (int)round($this->config['timeout'] * 1000));
 		}
 		if (!empty($this->config['connection_timeout'])) {
 			$timeout_requires_no_signal = $timeout_requires_no_signal ||
 				$this->config['connection_timeout'] < 1;
-			curl_setopt($handle, CURLOPT_CONNECTTIMEOUT_MS, $this->config['connection_timeout'] * 1000);
+			curl_setopt($handle, CURLOPT_CONNECTTIMEOUT_MS, (int)round($this->config['connection_timeout'] * 1000, 1));
 		}
 		if ($timeout_requires_no_signal && strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
 			curl_setopt($handle, CURLOPT_NOSIGNAL, true);