phpstan checks and fixes

4dev/tests/Check/CoreLibsCheckEmailTest.php

@@ -24,12 +24,12 @@ final class CoreLibsCheckEmailTest extends TestCase
 			'get email regex invalid -1, will be 0' => [
 				-1,
 				"^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@"
-					. "[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]{1,})*\.([a-zA-Z]{2,}){1}$"
+					. "(?!-)[A-Za-z0-9-]{1,63}(?<!-)(?:\.[A-Za-z0-9-]{1,63}(?<!-))*\.[a-zA-Z]{2,6}$"
 			],
 			'get email regex invalid 10, will be 0' => [
 				10,
 				"^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@"
-					. "[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]{1,})*\.([a-zA-Z]{2,}){1}$"
+					. "(?!-)[A-Za-z0-9-]{1,63}(?<!-)(?:\.[A-Za-z0-9-]{1,63}(?<!-))*\.[a-zA-Z]{2,6}$"
 			],
 			'get email regex valid 1, will be 1' => [
 				1,
@@ -157,7 +157,7 @@ final class CoreLibsCheckEmailTest extends TestCase
 					'error' => 0,
 					'message' => 'Invalid email address',
 					'regex' => "^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@"
-						. "[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]{1,})*\.([a-zA-Z]{2,}){1}$"
+						. "(?!-)[A-Za-z0-9-]{1,63}(?<!-)(?:\.[A-Za-z0-9-]{1,63}(?<!-))*\.[a-zA-Z]{2,6}$"
 				]
 			],
 			'error 1 will return double @ error' => [
@@ -181,7 +181,7 @@ final class CoreLibsCheckEmailTest extends TestCase
 				[
 					'error' => 3,
 					'message' => 'Invalid domain part after @ sign',
-					'regex' => "@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]{1,})*\.([a-zA-Z]{2,}){1}$"
+					'regex' => "@(?!-)[A-Za-z0-9-]{1,63}(?<!-)(?:\.[A-Za-z0-9-]{1,63}(?<!-))*\.[a-zA-Z]{2,6}$"
 				]
 			],
 			'error 4 will be invalid domain' => [
@@ -189,7 +189,7 @@ final class CoreLibsCheckEmailTest extends TestCase
 				[
 					'error' => 4,
 					'message' => 'Invalid domain name part',
-					'regex' => "@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]{1,})*\."
+					'regex' => "@(?!-)[A-Za-z0-9-]{1,63}(?<!-)(?:\.[A-Za-z0-9-]{1,63}(?<!-))*\."
 				]
 			],
 			'error 5 will be invalid domain top level only' => [
@@ -197,7 +197,7 @@ final class CoreLibsCheckEmailTest extends TestCase
 				[
 					'error' => 5,
 					'message' => 'Wrong domain top level part',
-					'regex' => "\.([a-zA-Z]{2,6}){1}$"
+					'regex' => "\.[a-zA-Z]{2,6}$"
 				]
 			],
 			'error 6 will be domain double dot' => [

4dev/tests/Logging/CoreLibsLoggingLoggingTest.php

@@ -18,7 +18,7 @@ use CoreLibs\Logging\Logger\Flag;
 final class CoreLibsLoggingLoggingTest extends TestCase
 {
 	private const LOG_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'log' . DIRECTORY_SEPARATOR;
-	private const REGEX_BASE = "\[[\d\-\s\.:]+\]\s{1}" // date
+	private const REGEX_BASE = "\[[\d\-\s\.:+T]+\]\s{1}" // date, just basic checks
 		. "\[[\w\.]+(:\d+)?\]\s{1}" // host:port
 		. "\[(phar:\/\/)?[\w\-\.\/]+:\d+\]\s{1}" // folder/file [note phar:// is for phpunit]
 		. "\[\w+\]\s{1}" // run id

www/admin/class_test.array.php

@@ -332,7 +332,7 @@ print "(kosrt, lower case, reverse): "
 
 print "<hr>";
 $nested = [
-	'B' => 'foo', 'a', '0', 9,
+	'B' => 'foo', 'a', '0', 9, /** @phpstan-ignore-line This is a test for wrong index */
 	'1' => ['z', 'b', 'a'],
 	'd' => ['zaip', 'bar', 'baz']
 ];

www/admin/class_test.debug.php

@@ -68,6 +68,14 @@ function test2(): array
 	return DebugSupport::getCallerMethodList(1);
 }
 
+// date stueff
+print "printTime(-1): " . DebugSupport::printTime() . "<br>";
+print "printTime(2): " . DebugSupport::printTime(2) . "<br>";
+print "printTime(3): " . DebugSupport::printTime(3) . "<br>";
+print "printTime(5): " . DebugSupport::printTime(5) . "<br>";
+print "printIsoTime(): " . DebugSupport::printIsoTime() . "<br>";
+print "printIsoTime(false): " . DebugSupport::printIsoTime(false) . "<br>";
+
 print "S::GETCALLERMETHOD: " . DebugSupport::getCallerMethod(0) . "<br>";
 print "S::GETCALLERMETHOD: " . test() . "<br>";
 print "S::GETCALLERMETHODLIST: <pre>" . print_r(test2(), true) . "</pre><br>";
@@ -146,7 +154,7 @@ print "LOG LEVEL: " .  DebugSupport::printAr(\CoreLibs\Convert\SetVarType::setAr
 	$new_log->getLogLevel('debug', 'on')
 )) . "<br>";
 
-echo "<b>CLASS DEBUG CALL</b><br>";
+echo "<b>CLASS DEBUG CALL LEGACY</b><br>";
 
 // @codingStandardsIgnoreLine
 class TestL

www/lib/CoreLibs/Check/Email.php

@@ -18,7 +18,7 @@ class Email
 		// 3 => "@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]{1,})*\.([a-zA-Z]{2,}){1}$", // wrong part after @
 		3 => "@(?!-)[A-Za-z0-9-]{1,63}(?<!-)(?:\.[A-Za-z0-9-]{1,63}(?<!-))*\.[a-zA-Z]{2,6}$", // wrong part after @
 		// 4 => "@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]{1,})*\.", // wrong domain name part
-		4 => "@@(?!-)[A-Za-z0-9-]{1,63}(?<!-)(?:\.[A-Za-z0-9-]{1,63}(?<!-))*\.", // wrong domain name part
+		4 => "@(?!-)[A-Za-z0-9-]{1,63}(?<!-)(?:\.[A-Za-z0-9-]{1,63}(?<!-))*\.", // wrong domain name part
 		5 => "\.[a-zA-Z]{2,6}$", // wrong top level part
 		6 => "@(.*)\.{2,}", // double .. in domain name part
 		7 => "@.*\.$" // ends with a dot, top level, domain missing

www/lib/CoreLibs/Convert/Math.php

@@ -199,15 +199,17 @@ class Math
 				callback: fn ($col) => is_array($row) ?
 					array_reduce(
 						array: $row,
-						callback: fn ($a, $v, $i = null) => $a + $v * (
+						// TODO check that v is not an array
+						callback: fn ($a, $v, $i = null) => $a + $v * ( /** @phpstan-ignore-line Possible array + int */
 							// if last entry missing for full copy add a 0 to it
-							$col[$i ?? array_search($v, $row, true)] ?? 0 /** @phpstan-ignore-line */
+							$col[$i ?? array_search($v, $row, true)] ?? 0
 						),
 						initial: 0,
 					) :
 					array_reduce(
 						array: $col,
-						callback: fn ($a, $v) => $a + $v * $row,
+						// TODO check that v is not an array
+						callback: fn ($a, $v) => $a + $v * $row, /** @phpstan-ignore-line Possible array + int */
 						initial: 0,
 					),
 				array: $bCols,

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

@@ -263,11 +263,11 @@ class ConvertPlaceholder
 							}
 						}
 						// add the connectors back (1), and the data sets only if no replacement will be done
-						return $params_lookup[$match] ??
+						return $params_lookup[$match]/* ??
 							throw new \RuntimeException(
 								'Cannot lookup ' . $match . ' in params lookup list',
 								211
-							);
+							)*/;
 					},
 					$converted_placeholders['original']['query']
 				);
@@ -327,11 +327,11 @@ class ConvertPlaceholder
 							}
 						}
 						// add the connectors back (1), and the data sets only if no replacement will be done
-						return $params_lookup[$match]  ??
+						return $params_lookup[$match]/* ??
 							throw new \RuntimeException(
 								'Cannot lookup ' . $match . ' in params lookup list',
 								231
-							);
+							)*/;
 					},
 					$converted_placeholders['original']['query']
 				);

www/lib/CoreLibs/Debug/Support.php

@@ -33,6 +33,36 @@ class Support
 		return $string;
 	}
 
+	/**
+	 * print ISO type datetime with microseconds and timezone
+	 * Y-m-dTH:i:s.uP
+	 * if no micro time the ".u" part is omitted
+	 *
+	 * @param  bool   $set_micro_time
+	 * @return string
+	 */
+	public static function printIsoTime(bool $set_micro_time = true): string
+	{
+		$datetime = new \DateTime();
+
+		// Format the DateTime object to ISO 8601 with microseconds
+		// 'Y-m-d\TH:i:s.uP' is the format string:
+		// Y: Full year (e.g., 2025)
+		// m: Month (01-12)
+		// d: Day of the month (01-31)
+		// T: Literal 'T' to separate date and time (escaped with a backslash)
+		// H: Hour (00-23)
+		// i: Minute (00-59)
+		// s: Second (00-59)
+		// u: Microseconds (e.g., 654321)
+		// P: Difference to Greenwich time (GMT) with colon (e.g., +09:00)
+		if ($set_micro_time) {
+			return $datetime->format('Y-m-d\TH:i:s.uP');
+		} else {
+			return $datetime->format('Y-m-d\TH:i:sP');
+		}
+	}
+
 	/**
 	 * prints a html formatted (pre) data
 	 *

www/lib/CoreLibs/Logging/Logging.php

@@ -96,6 +96,11 @@ class Logging
 			'type' => 'bool', 'mandatory' => false,
 			'default' => false, 'deprecated' => true, 'use' => 'log_per_date'
 		],
+		// if turned off uses old time format without time zone
+		'log_time_format_iso' => [
+			'type' => 'bool', 'mandatory' => false,
+			'default' => true, 'deprecated' => false
+		]
 	];
 
 	// options
@@ -646,7 +651,11 @@ class Logging
 		}
 		// print "CLASS: " . $class . "<br>";
 		// get timestamp
-		$timestamp = Support::printTime();
+		if (!empty($this->options['log_time_format_iso'])) {
+			$timestamp = Support::printIsoTime();
+		} else {
+			$timestamp = Support::printTime();
+		}
 
 		// if group id is empty replace it with current level
 		$group_str = $level->getName();