Release: v9.40.0

.phan/config.php

@@ -56,6 +56,8 @@ return [
 	// Automatically inferred from composer.json requirement for "php" of ">=8.2"
 	'target_php_version' => '8.2',
 	"minimum_target_php_version" => "8.2",
+	// turn color on (-C)
+	"color_issue_messages_if_supported" => true,
 
 	// If enabled, missing properties will be created when
 	// they are first seen. If false, we'll report an

.phive/phars.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^9.6" installed="9.6.19" location="./tools/phpunit" copy="false"/>
-  <phar name="phpcs" version="^3.7.2" installed="3.10.0" location="./tools/phpcs" copy="false"/>
-  <phar name="phpcbf" version="^3.7.2" installed="3.10.0" location="./tools/phpcbf" copy="false"/>
-  <phar name="psalm" version="^5.15.0" installed="5.24.0" location="./tools/psalm" copy="false"/>
-  <phar name="phpstan" version="^1.10.37" installed="1.11.1" location="./tools/phpstan" copy="false"/>
-  <phar name="phan" version="^5.4.2" installed="5.4.3" location="./tools/phan" copy="false"/>
+  <phar name="phpunit" version="^9.6" installed="9.6.31" location="./tools/phpunit" copy="false"/>
+  <phar name="phpcs" version="^4.0.0" installed="4.0.1" location="./tools/phpcs" copy="false"/>
+  <phar name="phpcbf" version="^4.0.0" installed="4.0.1" location="./tools/phpcbf" copy="false"/>
+  <phar name="psalm" version="^5.15.0" installed="5.26.1" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="^2.0.0" installed="2.1.33" location="./tools/phpstan" copy="false"/>
+  <phar name="phan" version="^5.4.2" installed="5.5.2" location="./tools/phan" copy="false"/>
 </phive>

publish/last.published

@@ -1 +1 @@
-9.35.0
+9.40.0

publish/publish.sh

@@ -3,7 +3,7 @@
 BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/";
 PACKAGE_DOWNLOAD="${BASE_FOLDER}package-download/";
 if [ ! -d "${PACKAGE_DOWNLOAD}" ]; then
-     mkdir "${PACKAGE_DOWNLOAD}";
+	mkdir "${PACKAGE_DOWNLOAD}";
 fi;
 VERSION=$(git tag --list | sort -V | tail -n1 | sed -e "s/^v//");
 file_last_published="${BASE_FOLDER}last.published";
@@ -11,84 +11,84 @@ go_flag="$1";
 
 function gitea_publish
 {
-     _GITEA_PUBLISH="${1}"
-     _GITEA_UPLOAD_FILENAME="${2}"
-     _GITEA_URL_DL="${3}"
-     _GITEA_URL_PUSH="${4}"
-     _GITEA_USER="${5}"
-     _GITEA_TOKEN="${6}"
-     _PACKAGE_DOWNLOAD="${7}"
-     _VERSION="${8}"
-     _file_last_published="${9}"
+	_GITEA_PUBLISH="${1}"
+	_GITEA_UPLOAD_FILENAME="${2}"
+	_GITEA_URL_DL="${3}"
+	_GITEA_URL_PUSH="${4}"
+	_GITEA_USER="${5}"
+	_GITEA_TOKEN="${6}"
+	_PACKAGE_DOWNLOAD="${7}"
+	_VERSION="${8}"
+	_file_last_published="${9}"
 
-     if [ -z "${_GITEA_PUBLISH}" ]; then
-          return
-     fi;
-     if [ -n "${_GITEA_UPLOAD_FILENAME}" ] &&
-          [ -n "${_GITEA_URL_DL}" ] && [ -n "${_GITEA_URL_PUSH}" ] &&
-          [ -n "${_GITEA_USER}" ] && [ -n "${_GITEA_TOKEN}" ]; then
-          echo "> Publish ${_GITEA_UPLOAD_FILENAME} with ${_VERSION} to: ${_GITEA_URL_PUSH}";
-          if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then
-               echo "> Download: ${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip";
-               curl -LJO \
-                    --output-dir "${_PACKAGE_DOWNLOAD}" \
-                    "${_GITEA_URL_DL}"/v"${_VERSION}".zip;
-          fi;
-          if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then
-               echo "[!] Package file does not exist for version: ${_VERSION}";
-          else
-               response=$(curl --user "${_GITEA_USER}":"${_GITEA_TOKEN}" \
-                    --upload-file "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" \
-                    "${_GITEA_URL_PUSH}"?version="${_VERSION}");
-               status=$(echo "${response}" | jq .errors[].status);
-               message=$(echo "${response}" | jq .errors[].message);
-               if [ -n "${status}" ]; then
-                    echo "[!] Error ${status}: ${message}";
-               else
-                    echo "> Publish completed";
-               fi;
-               echo "${_VERSION}" > "${_file_last_published}";
-          fi;
-     else
-          echo "[!] Missing either GITEA_UPLOAD_FILENAME, GITEA_URL_DL, GITEA_URL_PUSH, GITEA_USER or GITEA_TOKEN environment variable";
-     fi;
+	if [ -z "${_GITEA_PUBLISH}" ]; then
+		return
+	fi;
+	if [ -n "${_GITEA_UPLOAD_FILENAME}" ] &&
+		[ -n "${_GITEA_URL_DL}" ] && [ -n "${_GITEA_URL_PUSH}" ] &&
+		[ -n "${_GITEA_USER}" ] && [ -n "${_GITEA_TOKEN}" ]; then
+		echo "> Publish ${_GITEA_UPLOAD_FILENAME} with ${_VERSION} to: ${_GITEA_URL_PUSH}";
+		if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then
+			echo "> Download: ${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip";
+			curl -LJO \
+					--output-dir "${_PACKAGE_DOWNLOAD}" \
+					"${_GITEA_URL_DL}"/v"${_VERSION}".zip;
+		fi;
+		if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then
+			echo "[!] Package file does not exist for version: ${_VERSION}";
+		else
+			response=$(curl --user "${_GITEA_USER}":"${_GITEA_TOKEN}" \
+					--upload-file "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" \
+					"${_GITEA_URL_PUSH}"?version="${_VERSION}");
+			status=$(echo "${response}" | jq .errors[].status);
+			message=$(echo "${response}" | jq .errors[].message);
+			if [ -n "${status}" ]; then
+				echo "[!] Error ${status}: ${message}";
+			else
+				echo "> Publish completed";
+			fi;
+			echo "${_VERSION}" > "${_file_last_published}";
+		fi;
+	else
+		echo "[!] Missing either GITEA_UPLOAD_FILENAME, GITEA_URL_DL, GITEA_URL_PUSH, GITEA_USER or GITEA_TOKEN environment variable";
+	fi;
 }
 
 function gitlab_publish
 {
-     _GITLAB_PUBLISH="${1}";
-     _GITLAB_URL="${2}";
-     _GITLAB_DEPLOY_TOKEN="${3}";
-     _PACKAGE_DOWNLOAD="${4}"
-     _VERSION="${5}"
-     _file_last_published="${6}"
-     if [ -z "${GITLAB_PUBLISH}" ]; then
-          return;
-     fi;
-     if  [ -n "${_GITLAB_URL}" ] && [ -n  "${_GITLAB_DEPLOY_TOKEN}" ]; then
-          curl --data tag=v"${_VERSION}" \
-               --header "Deploy-Token: ${_GITLAB_DEPLOY_TOKEN}" \
-               "${_GITLAB_URL}";
-          curl --data branch=master \
-               --header "Deploy-Token: ${_GITLAB_DEPLOY_TOKEN}" \
-               "${_GITLAB_URL}";
-          echo "${_VERSION}" > "${_file_last_published}";
-     else
-          echo "[!] Missing GITLAB_URL or GITLAB_DEPLOY_TOKEN environment variable";
-     fi;
+	_GITLAB_PUBLISH="${1}";
+	_GITLAB_URL="${2}";
+	_GITLAB_DEPLOY_TOKEN="${3}";
+	_PACKAGE_DOWNLOAD="${4}"
+	_VERSION="${5}"
+	_file_last_published="${6}"
+	if [ -z "${_GITLAB_PUBLISH}" ]; then
+		return;
+	fi;
+	if  [ -n "${_GITLAB_URL}" ] && [ -n  "${_GITLAB_DEPLOY_TOKEN}" ]; then
+		curl --data tag=v"${_VERSION}" \
+			--header "Deploy-Token: ${_GITLAB_DEPLOY_TOKEN}" \
+			"${_GITLAB_URL}";
+		curl --data branch=master \
+			--header "Deploy-Token: ${_GITLAB_DEPLOY_TOKEN}" \
+			"${_GITLAB_URL}";
+		echo "${_VERSION}" > "${_file_last_published}";
+	else
+		echo "[!] Missing GITLAB_URL or GITLAB_DEPLOY_TOKEN environment variable";
+	fi;
 }
 
 
 if [ -z "${VERSION}" ]; then
-     echo "[!] Version must be set in the form x.y.z without any leading characters";
-     exit;
+	echo "[!] Version must be set in the form x.y.z without any leading characters";
+	exit;
 fi;
 # compare version, if different or newer, deploy
 if [ -f "${file_last_published}" ]; then
-     LAST_PUBLISHED_VERSION=$(cat "${file_last_published}");
-     if dpkg --compare-versions "${VERSION}" le "${LAST_PUBLISHED_VERSION}"; then
-          echo "[!] git tag version ${VERSION} is not newer than previous published version ${LAST_PUBLISHED_VERSION}";
-     fi;
+	LAST_PUBLISHED_VERSION=$(cat "${file_last_published}");
+	if dpkg --compare-versions "${VERSION}" le "${LAST_PUBLISHED_VERSION}"; then
+		echo "[!] git tag version ${VERSION} is not newer than previous published version ${LAST_PUBLISHED_VERSION}";
+	fi;
 fi;
 
 # read in the .env.deploy file and we must have
@@ -105,8 +105,8 @@ fi;
 # GITLAB_TOKEN
 # GITLAB_URL
 if [ ! -f "${BASE_FOLDER}.env.deploy" ]; then
-     echo "[!] Deploy enviroment file .env.deploy is missing";
-     exit;
+	echo "[!] Deploy enviroment file .env.deploy is missing";
+	exit;
 fi;
 set -o allexport;
 cd "${BASE_FOLDER}" || exit
@@ -116,10 +116,10 @@ cd - >/dev/null 2>&1 || exit;
 set +o allexport;
 
 if [ "${go_flag}" != "go" ]; then
-     echo "[!] No go flag given";
-     echo "> Would publish ${VERSION}";
-     echo "[END]";
-     exit;
+	echo "[!] No go flag given";
+	echo "> Would publish ${VERSION}";
+	echo "[END]";
+	exit;
 fi;
 
 echo "[START]";

src/Check/Encoding.php

@@ -114,7 +114,7 @@ class Encoding
 				(($char != $r_char && (!self::$mb_error_char ||
 				in_array(self::$mb_error_char, ['none', 'long', 'entity']))) ||
 				($char != $r_char && $r_char == self::$mb_error_char && self::$mb_error_char)) &&
-				ord($char) != 194
+				ord($char[0]) != 194
 			) {
 				$failed[] = $char;
 			}

src/Combined/DateTime.php

@@ -395,39 +395,68 @@ class DateTime
 	 * does a reverse of the timeStringFormat and converts the string from
 	 * xd xh xm xs xms to a timestamp.microtime format
 	 *
-	 * @param  string|int|float $timestring formatted interval
-	 * @return string|int|float             converted float interval, or string as is
+	 * @param  string|int|float $timestring      formatted interval
+	 * @param  bool             $throw_exception [default=false] if set to true will throw exception
+	 *                                                           instead of returning input value as is
+	 * @return string|int|float                  converted float interval, or string as is
 	 */
-	public static function stringToTime(string|int|float $timestring): string|int|float
-	{
+	public static function stringToTime(
+		string|int|float $timestring,
+		bool $throw_exception = false
+	): string|int|float {
 		$timestamp = 0;
-		if (!preg_match("/(d|h|m|s|ms)/", (string)$timestring)) {
-			return $timestring;
-		}
-		$timestring = (string)$timestring;
-		// pos for preg match read + multiply factor
-		$timegroups = [2 => 86400, 4 => 3600, 6 => 60, 8 => 1];
 		$matches = [];
-		// if start with -, strip and set negative
-		$negative = false;
-		if (preg_match("/^-/", $timestring)) {
-			$negative = true;
-			$timestring = substr($timestring, 1);
-		}
 		// preg match: 0: full string
 		// 2, 4, 6, 8 are the to need values
-		preg_match("/^((\d+)d ?)?((\d+)h ?)?((\d+)m ?)?((\d+)s ?)?((\d+)ms)?$/", $timestring, $matches);
+		if (
+			!preg_match(
+				"/^\s*(-)?\s*"
+				. "((\d+)\s*d(?:ay(?:s)?)?)?\s*"
+				. "((\d+)\s*h(?:our(?:s)?)?)?\s*"
+				. "((\d+)\s*m(?:in(?:ute)?(?:s)?)?)?\s*"
+				. "((\d+)\s*s(?:ec(?:ond)?(?:s)?)?)?\s*"
+				. "((\d+)\s*m(?:illi)?s(?:ec(?:ond)?(?:s)?)?)?\s*"
+				. "$/",
+				(string)$timestring,
+				$matches
+			)
+		) {
+			if ($throw_exception) {
+				throw new \InvalidArgumentException(
+					'Invalid time string format, cannot parse: "' . (string)$timestring . '"',
+					1
+				);
+			}
+			return $timestring;
+		}
+		if (count($matches) < 2) {
+			if ($throw_exception) {
+				throw new \InvalidArgumentException(
+					'Invalid time string format, no interval value found: "' . (string)$timestring . '"',
+					2
+				);
+			}
+			return $timestring;
+		}
+		// pos for preg match read + multiply factor
+		$timegroups = [3 => 86400, 5 => 3600, 7 => 60, 9 => 1];
+		// if start with -, strip and set negative
+		$negative = false;
+		if (!empty($matches[1])) {
+			$negative = true;
+		}
 		// multiply the returned matches and sum them up. the last one (ms) is added with .
 		foreach ($timegroups as $i => $time_multiply) {
 			if (isset($matches[$i]) && is_numeric($matches[$i])) {
 				$timestamp += (float)$matches[$i] * $time_multiply;
 			}
 		}
-		if (isset($matches[10]) && is_numeric($matches[10])) {
-			$timestamp .= '.' . $matches[10];
+		if (isset($matches[11]) && is_numeric($matches[11])) {
+			// for milliseconds, we need to divide by 1000 and add them
+			$timestamp += (float)($matches[11] / 1000);
 		}
 		if ($negative) {
-			// cast to flaot so we can do a negative multiplication
+			// cast to float so we can do a negative multiplication
 			$timestamp = (float)$timestamp * -1;
 		}
 		return $timestamp;

src/Convert/Byte.php

@@ -14,6 +14,7 @@ class Byte
 	public const BYTE_FORMAT_NOSPACE = 1;
 	public const BYTE_FORMAT_ADJUST = 2;
 	public const BYTE_FORMAT_SI = 4;
+	public const RETURN_AS_STRING = 8;
 
 	/**
 	 * This function replaces the old byteStringFormat
@@ -77,7 +78,7 @@ class Byte
 			// labels in order of size [Y, Z]
 			$labels = ['', 'K', 'M', 'G', 'T', 'P', 'E'];
 			// exp position calculation
-			$exp = floor(log($abs_bytes, $unit));
+			$exp = (int)floor(log($abs_bytes, $unit));
 			// avoid printing out anything larger than max labels
 			if ($exp >= count($labels)) {
 				$exp = count($labels) - 1;
@@ -119,7 +120,9 @@ class Byte
 	 * @param  int              $flags  bitwise flag with use space turned on
 	 *                                  BYTE_FORMAT_SI: use 1000 instead of 1024
 	 * @return string|int|float         converted value or original value
-	 * @throws \InvalidArgumentException 1: no valid flag set
+	 * @throws \InvalidArgumentException no valid flag set
+	 * @throws \LengthException          number too large to convert to int
+	 * @throws \RuntimeException		 BCMath extension not loaded if flag is set to string
 	 */
 	public static function stringByteFormat(string|int|float $number, int $flags = 0): string|int|float
 	{
@@ -129,7 +132,12 @@ class Byte
 		} else {
 			$si = false;
 		}
-		if ($flags != 0 && $flags != 4) {
+		if ($flags & self::RETURN_AS_STRING) {
+			$return_as_string = true;
+		} else {
+			$return_as_string = false;
+		}
+		if ($flags != 0 && $flags != 4 && $flags != 8 && $flags != 12) {
 			throw new \InvalidArgumentException("Invalid flags parameter: $flags", 1);
 		}
 		// matches in regex
@@ -142,6 +150,10 @@ class Byte
 			strtolower((string)$number),
 			$matches
 		);
+		$number_negative = false;
+		if (!empty($matches[1])) {
+			$number_negative = true;
+		}
 		if (isset($matches[2]) && isset($matches[3])) {
 			// remove all non valid characters from the number
 			$number = preg_replace('/[^0-9\.]/', '', $matches[2]);
@@ -152,12 +164,48 @@ class Byte
 			if ($unit) {
 				$number = $number * pow($si ? 1000 : 1024, stripos($valid_units_, $unit[0]) ?: 0);
 			}
+			// if the number is too large, we cannot convert to int directly
+			if ($number <= PHP_INT_MIN || $number >= PHP_INT_MAX) {
+				// if we do not want to convert to string
+				if (!$return_as_string) {
+					throw new \LengthException(
+						'Number too large be converted to int: ' . (string)$number
+					);
+				}
+				// for string, check if bcmath is loaded, if not this will not work
+				if (!extension_loaded('bcmath')) {
+					throw new \RuntimeException(
+						'Number too large be converted to int and BCMath extension not loaded: ' . (string)$number
+					);
+				}
+			}
+			// string return
+			if ($return_as_string) {
+				// return as string to avoid overflow
+				// $number = (string)round($number);
+				$number = bcmul(number_format(
+					$number,
+					12,
+					'.',
+					''
+				), "1");
+				if ($number_negative) {
+					$number = '-' . $number;
+				}
+				return $number;
+			}
 			// convert to INT to avoid +E output
 			$number = (int)round($number);
 			// if negative input, keep nnegative
-			if (!empty($matches[1])) {
+			if ($number_negative) {
 				$number *= -1;
 			}
+			// check if number is negative but should be, this is Lenght overflow
+			if (!$number_negative && $number < 0) {
+				throw new \LengthException(
+					'Number too large be converted to int: ' . (string)$number
+				);
+			}
 		}
 		// if not matching return as is
 		return $number;

src/Convert/Json.php

@@ -27,10 +27,14 @@ class Json
 	 *                               set original value as array
 	 * @return array<mixed>          returns an array from the json values
 	 */
-	public static function jsonConvertToArray(?string $json, bool $override = false): array
+	public static function jsonConvertToArray(?string $json, bool $override = false, int $flags = 0): array
 	{
 		if ($json !== null) {
-			$_json = json_decode($json, true);
+			// if flags has JSON_THROW_ON_ERROR remove it
+			if ($flags & JSON_THROW_ON_ERROR) {
+				$flags = $flags & ~JSON_THROW_ON_ERROR;
+			}
+			$_json = json_decode($json, true, flags:$flags);
 			if (self::$json_last_error = json_last_error()) {
 				if ($override == true) {
 					// init return as array with original as element
@@ -65,6 +69,21 @@ class Json
 		return (string)$json_string;
 	}
 
+	/**
+	 * Validate if a json string could be decoded.
+	 * Weill set the internval last error state and info can be read with jsonGetLastError
+	 *
+	 * @param  string $json
+	 * @param  int    $flags only JSON_INVALID_UTF8_IGNORE is currently allowed
+	 * @return bool
+	 */
+	public static function jsonValidate(string $json, int $flags = 0): bool
+	{
+		$json_valid = json_validate($json, flags:$flags);
+		self::$json_last_error = json_last_error();
+		return $json_valid;
+	}
+
 	/**
 	 * returns human readable string for json errors thrown in jsonConvertToArray
 	 * Source: https://www.php.net/manual/en/function.json-last-error.php

src/Convert/Math.php

@@ -62,10 +62,15 @@ class Math
 	 *
 	 * @param  float $number Number to cubic root
 	 * @return float         Calculated value
+	 * @throws \InvalidArgumentException if $number is negative
 	 */
 	public static function cbrt(float|int $number): float
 	{
-		return pow((float)$number, 1.0 / 3);
+		$value = pow((float)$number, 1.0 / 3);
+		if (is_nan($value)) {
+			throw new \InvalidArgumentException('cube root from this number is not supported: ' . $number);
+		}
+		return $value;
 	}
 
 	/**

src/Convert/Strings.php

@@ -268,6 +268,55 @@ class Strings
 		));
 	}
 
+	/**
+	 * Split up character ranges in format A-Z, a-z, 0-9
+	 *
+	 * @param  string $input
+	 * @return string[]
+	 */
+	public static function parseCharacterRanges(string $input): array
+	{
+		// if not alphanumeric, throw value error
+		if (!preg_match("/^[A-Za-z0-9\-\s]+$/u", $input)) {
+			throw new \InvalidArgumentException(
+				"The input string contains invalid characters, "
+				. "only alphanumeric, dash (-), space and 'or' are allowed: "
+				. $input
+			);
+		}
+		// Remove all spaces
+		$input = str_replace(' ', '', $input);
+		$result = [];
+		// if there is no - inside, return unique characters as array
+		if (strpos($input, '-') === false) {
+			return array_unique(mb_str_split($input));
+		}
+		// Find all patterns like "A-Z" (character-dash-character)
+		preg_match_all('/(.)-(.)/u', $input, $matches, PREG_SET_ORDER);
+		foreach ($matches as $match) {
+			$start = $match[1];
+			$end = $match[2];
+			// Get ASCII/Unicode values
+			$startOrd = ord($start[0]);
+			$endOrd = ord($end[0]);
+			// make sure start is before end
+			if ($startOrd > $endOrd) {
+				[$startOrd, $endOrd] = [$endOrd, $startOrd];
+			}
+
+			// Generate range of characters
+			for ($i = $startOrd; $i <= $endOrd; $i++) {
+				$char = chr($i);
+				if (!in_array($char, $result)) {
+					$result[] = $char;
+				}
+			}
+		}
+		// make the result unique
+		$result = array_unique($result);
+		return $result;
+	}
+
 	/**
 	 * Check if a regex is valid. Does not return the detail regex parser error
 	 *

src/Create/RandomKey.php

@@ -27,7 +27,7 @@ class RandomKey
 	/** @var int character count in they key character range */
 	private static int $key_character_range_length = 0;
 	/** @var int default key lenghth */
-	/** @deprecated Will be removed */
+	/** @deprecated Will be removed, as setting has moved to randomKeyGen */
 	private static int $key_length = 4;
 
 	/**
@@ -49,7 +49,7 @@ class RandomKey
 	private static function validateRandomKeyData(array ...$key_range): string
 	{
 		$key_character_range = Strings::buildCharStringFromLists(...$key_range);
-		if (strlen(self::$key_character_range) <= 1) {
+		if (strlen($key_character_range) <= 1) {
 			return '';
 		}
 		return $key_character_range;
@@ -107,7 +107,7 @@ class RandomKey
 	 * @param  int  $key_length key length
 	 * @return bool             true for valid, false for invalid length
 	 */
-	private static function validateRandomKeyLenght(int $key_length): bool
+	private static function validateRandomKeyLength(int $key_length): bool
 	{
 		if (
 			$key_length > 0 &&
@@ -125,12 +125,12 @@ class RandomKey
 	 *
 	 * @param  int  $key_length key length
 	 * @return bool             true/false for set status
-	 * @deprecated This function does no longer set the key length, the randomKeyGen parameter has to b used
+	 * @deprecated This function does no longer set the key length, the randomKeyGen parameter has to be used
 	 */
 	public static function setRandomKeyLength(int $key_length): bool
 	{
 		// only if valid int key with valid length
-		if (self::validateRandomKeyLenght($key_length) === true) {
+		if (self::validateRandomKeyLength($key_length) === true) {
 			self::$key_length = $key_length;
 			return true;
 		} else {
@@ -176,7 +176,7 @@ class RandomKey
 			$key_character_range_length = self::getRandomKeyDataLength();
 		}
 		// if not valid key length, fallback to default
-		if (!self::validateRandomKeyLenght($key_length)) {
+		if (!self::validateRandomKeyLength($key_length)) {
 			$key_length = self::KEY_LENGTH_DEFAULT;
 		}
 		// create random string

src/Create/Uids.php

@@ -81,7 +81,7 @@ class Uids
 	 */
 	public static function validateUuuidv4(string $uuidv4): bool
 	{
-		if (!preg_match("/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/", $uuidv4)) {
+		if (!preg_match("/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i", $uuidv4)) {
 			return false;
 		}
 		return true;

src/Logging/ErrorMessage.php

@@ -131,6 +131,7 @@ class ErrorMessage
 		// set a jump target
 		$this->setJumpTarget($jump_target['target'] ?? null, $jump_target['info'] ?? null, $level);
 		// write to log for abort/crash
+		$this->log->setErrorMessageCallSetErrorMsg();
 		switch ($level) {
 			case 'notice':
 				$this->log->notice($message ?? $str, array_merge([
@@ -210,6 +211,7 @@ class ErrorMessage
 		?bool $log_error = null,
 		?bool $log_warning = null,
 	): void {
+		$this->log->setErrorMessageCallSetMessage();
 		$this->setErrorMsg(
 			$error_id ?? '',
 			$level,
@@ -289,7 +291,7 @@ class ErrorMessage
 	 */
 	public function getLastErrorMsg(): array
 	{
-		return $this->error_str[array_key_last($this->error_str)] ?? [
+		return $this->error_str[array_key_last($this->error_str) ?? -1] ?? [
 			'level' => '',
 			'str' => '',
 			'id' => '',

src/Logging/Logging.php

@@ -29,11 +29,19 @@ use Stringable;
 class Logging
 {
 	/** @var int minimum size for a max file size, so we don't set 1 byte, 10kb */
-	public const MIN_LOG_MAX_FILESIZE = 10 * 1024;
+	public const int MIN_LOG_MAX_FILESIZE = 10 * 1024;
 	/** @var string log file extension, not changeable */
-	private const LOG_FILE_NAME_EXT = "log";
+	private const string LOG_FILE_NAME_EXT = "log";
 	/** @var string log file block separator, not changeable */
-	private const LOG_FILE_BLOCK_SEPARATOR = '.';
+	private const string LOG_FILE_BLOCK_SEPARATOR = '.';
+	/** @var int the base stack trace level for the line number */
+	private const int DEFAULT_STACK_TRACE_LEVEL_LINE = 1;
+
+	/** @var array<string,int> */
+	private const array STACK_OVERRIDE_CHECK = [
+		'setErrorMsg' => 2,
+		'setMessage' => 3,
+	];
 
 	// MARK: OPTION array
 	// NOTE: the second party array{} hs some errors
@@ -138,6 +146,12 @@ class Logging
 	/** @var string Y-m-d file in file name */
 	private string $log_file_date = '';
 
+	// speical flags for ErrorMessage calls
+	/** @var bool Flag to set if called from ErrorMessage::setErrorMsg */
+	private bool $error_message_call_set_error_msg = false;
+	/** @var bool Flag to set if called from ErrorMessage::setMessage */
+	private bool $error_message_call_set_message = false;
+
 	/**
 	 *  1: create a new log file per run (time stamp + unique ID)
 	 *  2: add Y-m-d and do automatic daily rotation
@@ -627,25 +641,55 @@ class Logging
 		$file_line = '';
 		$caller_class_method = '-';
 		$traces = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-		// print "[" . $level->getName() . "] [$message] prepareLog:<br>" . Support::printAr($traces);
-		// file + line: call not this but one before (the one that calls this)
-		// start from this level, if unset fall down until we are at null
-		$start_trace_level = 2;
-		for ($trace_level = $start_trace_level; $trace_level >= 0; $trace_level--) {
-			if (isset($traces[$trace_level])) {
-				$file_line = ($traces[$trace_level]['file'] ?? $traces[$trace_level]['function'])
-					. ':' . ($traces[$trace_level]['line'] ?? '-');
-				// as namespace\class->method
-				$caller_class_method =
-					// get the last call before we are in the Logging class
-					($traces[$trace_level]['class'] ?? '')
-					// connector, if unkown use ==
-					. ($traces[$trace_level]['type'] ?? '')
-					// method/function: prepareLog->(debug|info|...)->[THIS]
-					. $traces[$trace_level]['function'];
-				break;
+		$stack_trace_start_level_line = self::DEFAULT_STACK_TRACE_LEVEL_LINE;
+		// set stack trace level +1 if called from ErrorMessage::setMessage
+		if ($this->error_message_call_set_message) {
+			$stack_trace_start_level_line = 3;
+		} elseif ($this->error_message_call_set_error_msg) {
+			$stack_trace_start_level_line = 2;
+		}
+		// if we have line > default, then check if valid, else reset to default
+		if ($stack_trace_start_level_line > self::DEFAULT_STACK_TRACE_LEVEL_LINE) {
+			// check if function at level is one of the override checks
+			$fn_check = $traces[$stack_trace_start_level_line]['function'] ?? '';
+			if (
+				!isset(self::STACK_OVERRIDE_CHECK[$fn_check]) ||
+				self::STACK_OVERRIDE_CHECK[$fn_check] != $stack_trace_start_level_line
+			) {
+				$stack_trace_start_level_line = self::DEFAULT_STACK_TRACE_LEVEL_LINE;
 			}
 		}
+		$this->error_message_call_set_message = false;
+		$this->error_message_call_set_error_msg = false;
+		// set stack trace level +1 if called from ErrorMessage::setMessage
+		// print "[" . $level->getName() . "] [$message] [" . $stack_trace_start_level_line . "] "
+		// 	. "prepareLog:<br>" . Support::printAr($traces);
+		// file + line: call not this but one before (the one that calls this)
+		// start from this level, if unset fall down until we are at null
+		// NOTE this has to be pushed to 3 for setMessage wrap calls
+		for ($trace_level = $stack_trace_start_level_line; $trace_level >= 0; $trace_level--) {
+			if (!isset($traces[$trace_level])) {
+				continue;
+			}
+			$file_line = ($traces[$trace_level]['file'] ?? $traces[$trace_level]['function'])
+				. ':' . ($traces[$trace_level]['line'] ?? '-');
+			// call function is one stack level above
+			$trace_level++;
+			// skip setting if we are in the top level already
+			if (!isset($traces[$trace_level])) {
+				break;
+			}
+			// as namespace\class->method
+			$caller_class_method =
+				// get the last call before we are in the Logging class
+				($traces[$trace_level]['class'] ?? '')
+				// connector, if unkown use ==
+				. ($traces[$trace_level]['type'] ?? '')
+				// method/function: prepareLog->(debug|info|...)->[THIS]
+				. $traces[$trace_level]['function'];
+			break;
+		}
+		// if not line is set
 		if (empty($file_line)) {
 			$file_line = System::getPageName(System::FULL_PATH);
 		}
@@ -1017,6 +1061,30 @@ class Logging
 		return $this->log_max_filesize;
 	}
 
+	// *********************************************************************
+	// MARK: ErrorMessage class overrides
+	// *********************************************************************
+
+	/**
+	 * call if called from Error Message setMessage wrapper
+	 *
+	 * @return void
+	 */
+	public function setErrorMessageCallSetMessage(): void
+	{
+		$this->error_message_call_set_message = true;
+	}
+
+	/**
+	 * call if called from Error Message setMessage wrapper
+	 *
+	 * @return void
+	 */
+	public function setErrorMessageCallSetErrorMsg(): void
+	{
+		$this->error_message_call_set_error_msg = true;
+	}
+
 	// *********************************************************************
 	// MARK: OPTIONS CALLS
 	// *********************************************************************

src/Output/Image.php

@@ -365,9 +365,6 @@ class Image
 								imagepng($thumb, $thumbnail_write_path . $thumbnail);
 								break;
 						}
-						// free up resources (in case we are called in a loop)
-						imagedestroy($source);
-						imagedestroy($thumb);
 					} else {
 						throw new \RuntimeException(
 							'Invalid source image file. Only JPEG/PNG are allowed: ' . $filename,
@@ -543,8 +540,6 @@ class Image
 				imagepng($img, $filename);
 				break;
 		}
-		// clean up image if we have an image
-		imagedestroy($img);
 	}
 }
 

src/UrlRequests/Curl.php

@@ -614,8 +614,6 @@ class Curl implements Interface\RequestsInterface
 		// print "CURLINFO_HEADER_OUT: <pre>" . curl_getinfo($handle, CURLINFO_HEADER_OUT) . "</pre>";
 		// get response code and bail on not authorized
 		$http_response = $this->handleCurlResponse($handle, $http_result, $options['http_errors']);
-		// close handler
-		$this->handleCurlClose($handle);
 		// return response and result
 		return [
 			'code' => (string)$http_response,
@@ -838,17 +836,6 @@ class Curl implements Interface\RequestsInterface
 		);
 	}
 
-	/**
-	 * close the current curl handle
-	 *
-	 * @param  \CurlHandle $handle
-	 * @return void
-	 */
-	private function handleCurlClose(\CurlHandle $handle): void
-	{
-		curl_close($handle);
-	}
-
 	// *********************************************************************
 	// MARK: PUBLIC METHODS
 	// *********************************************************************

test/phpunit/Combined/CoreLibsCombinedDateTimeTest.php

@@ -490,11 +490,11 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 			],
 			'micro interval with microtime' => [
 				'18999d 0h 38m 10s 1235ms',
-				1641515890.1235,
+				1641515891.235,
 			],
 			'micro interval with microtime' => [
 				'18999d 0h 38m 10s 1234567890ms',
-				1641515890.1234567,
+				1642750457.89,
 			],
 			'negative interval no microtime' => [
 				'-18999d 0h 38m 10s',
@@ -503,23 +503,246 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 			// short for mini tests
 			'microtime only' => [
 				'0s 1235ms',
-				0.1235,
+				1.235,
 			],
 			'seconds only' => [
 				'30s 1235ms',
-				30.1235,
+				31.235,
 			],
 			'minutes only' => [
 				'1m 30s 1235ms',
-				90.1235,
+				91.235,
 			],
 			'hours only' => [
 				'1h 1m 30s 1235ms',
-				3690.1235,
+				3691.235,
 			],
 			'days only' => [
 				'1d 1h 1m 30s 1235ms',
-				90090.1235,
+				90091.235,
+			],
+			'days only with long name' => [
+				'1day 1hour 1min 30second 1235millisecond',
+				90091.235,
+			],
+			// Test day variations
+			'day singular' => [
+				'5day',
+				432000,
+			],
+			'days plural' => [
+				'3days',
+				259200,
+			],
+			'days with space' => [
+				'2days 5h',
+				190800,
+			],
+			'day without space' => [
+				'1day1h',
+				90000,
+			],
+			// Test hour variations
+			'hour singular' => [
+				'2hour',
+				7200,
+			],
+			'hours plural' => [
+				'4hours',
+				14400,
+			],
+			'hours with space' => [
+				'3hours 30m',
+				12600,
+			],
+			'hour without space' => [
+				'1hour30m',
+				5400,
+			],
+			// Test minute variations
+			'min short' => [
+				'45min',
+				2700,
+			],
+			'minute singular' => [
+				'1minute',
+				60,
+			],
+			'minutes plural' => [
+				'10minutes',
+				600,
+			],
+			'minutes with space' => [
+				'5minutes 20s',
+				320,
+			],
+			'min without space' => [
+				'2min30s',
+				150,
+			],
+			// Test second variations
+			'sec short' => [
+				'30sec',
+				30,
+			],
+			'second singular' => [
+				'1second',
+				1,
+			],
+			'seconds plural' => [
+				'45seconds',
+				45,
+			],
+			'seconds with space' => [
+				'15seconds 500ms',
+				15.5,
+			],
+			'sec without space' => [
+				'10sec250ms',
+				10.25,
+			],
+			// Test millisecond variations
+			'ms short' => [
+				'500ms',
+				0.5,
+			],
+			'millis short' => [
+				'250millis',
+				0.25,
+			],
+			'millisec medium singular' => [
+				'250millisec',
+				0.25,
+			],
+			'millisecs medium plural' => [
+				'250millisecs',
+				0.25,
+			],
+			'misec medium singular' => [
+				'250millisec',
+				0.25,
+			],
+			'msecs medium plural' => [
+				'250millisecs',
+				0.25,
+			],
+			'millisecond long singular' => [
+				'1millisecond',
+				0.001,
+			],
+			'milliseconds long plural' => [
+				'999milliseconds',
+				0.999,
+			],
+			// Test negative values
+			'negative days' => [
+				'-5d',
+				-432000,
+			],
+			'negative hours' => [
+				'-3h',
+				-10800,
+			],
+			'negative minutes' => [
+				'-45m',
+				-2700,
+			],
+			'negative seconds' => [
+				'-30s',
+				-30,
+			],
+			'negative milliseconds' => [
+				'-500ms',
+				-0.5,
+			],
+			'negative complex' => [
+				'-2days 3hours 15minutes 30seconds 250milliseconds',
+				-184530.25,
+			],
+			// Test combined formats
+			'all components short' => [
+				'1d 2h 3m 4s 5ms',
+				93784.005,
+			],
+			'all components long' => [
+				'2days 3hours 4minutes 5seconds 678milliseconds',
+				183845.678,
+			],
+			'mixed short and long' => [
+				'1day 2h 3minutes 4sec 100ms',
+				93784.1,
+			],
+			'no spaces between components' => [
+				'1d2h3m4s5ms',
+				93784.005,
+			],
+			'only days and milliseconds' => [
+				'5d 123ms',
+				432000.123,
+			],
+			'only hours and seconds' => [
+				'2h 45s',
+				7245,
+			],
+			'only minutes and milliseconds' => [
+				'30m 500ms',
+				1800.5,
+			],
+			// Test zero values
+			'zero seconds' => [
+				'0s',
+				0,
+			],
+			'zero with milliseconds' => [
+				'0s 123ms',
+				0.123,
+			],
+			// Test large values
+			'large days' => [
+				'365days',
+				31536000,
+			],
+			'large hours' => [
+				'48hours',
+				172800,
+			],
+			'large minutes' => [
+				'1440minutes',
+				86400,
+			],
+			'large seconds' => [
+				'86400seconds',
+				86400,
+			],
+			// Test edge cases with spaces
+			'extra spaces' => [
+				'1d 2h 3m 4s 5ms',
+				93784.005,
+			],
+			'mixed spaces and no spaces' => [
+				'1d 2h3m 4s5ms',
+				93784.005,
+			],
+			// Test single component each
+			'only days short' => [
+				'7d',
+				604800,
+			],
+			'only hours short' => [
+				'12h',
+				43200,
+			],
+			'only minutes short' => [
+				'90m',
+				5400,
+			],
+			'only seconds short' => [
+				'120s',
+				120,
+			],
+			'only milliseconds short' => [
+				'1500ms',
+				1.5,
 			],
 			'already set' => [
 				1641515890,
@@ -529,10 +752,18 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 				'xyz',
 				'xyz',
 			],
+			'empty data' => [
+				' ',
+				' ',
+			],
 			'out of bound data' => [
 				'99999999999999999999d',
 				8.64E+24
 			],
+			'spaces inbetween' => [
+				'  -       9 d 2h 58minutes 35    seconds     123     ms          ',
+				-788315.123,
+			]
 		];
 	}
 
@@ -555,6 +786,36 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 		);
 	}
 
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::stringToTime
+	 * @testdox stringToTime invalid input will throw exception if requested
+	 *
+	 * @return void
+	 */
+	public function testStringToTimeException(): void
+	{
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessageMatches("/^Invalid time string format, cannot parse: /");
+		\CoreLibs\Combined\DateTime::stringToTime('1x 2y 3z', true);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::stringToTime
+	 * @testdox stringToTime empty input will throw exception if requested
+	 *
+	 * @return void
+	 */
+	public function testStringToTimeExceptionEmpty(): void
+	{
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessageMatches("/^Invalid time string format, no interval value found: /");
+		\CoreLibs\Combined\DateTime::stringToTime(' ', true);
+	}
+
 	/**
 	 * Undocumented function
 	 *

test/phpunit/Convert/CoreLibsConvertByteTest.php

@@ -123,47 +123,6 @@ final class CoreLibsConvertByteTest extends TestCase
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function byteStringProvider(): array
-	{
-		return [
-			'negative number' => [
-				0 => '-117.42 MB',
-				1 => -123123794,
-				2 => -117420000,
-			],
-			'megabyte' => [
-				0 => '242.98 MB',
-				1 => 254782996,
-				2 => 242980000
-			],
-			'megabyte si' => [
-				0 => '254.78 MiB',
-				1 => 267156193,
-				2 => 254780000
-			],
-			'petabyte' => [
-				0 => '1 EiB',
-				1 => 1152921504606846976,
-				2 => 1000000000000000000,
-			],
-			'max int' => [
-				0 => '8 EB',
-				1 => -9223372036854775807 - 1,
-				2 => 8000000000000000000,
-			],
-			'exabyte, overflow' => [
-				0 => '867.36EB',
-				1 => 3873816255479021568,
-				2 => 363028535651074048,
-			]
-		];
-	}
-
 	/**
 	 * Undocumented function
 	 *
@@ -180,7 +139,7 @@ final class CoreLibsConvertByteTest extends TestCase
 	 * @return void
 	 */
 	public function testHumanReadableByteFormat(
-		$input,
+		string|int|float $input,
 		string $expected,
 		string $expected_si,
 		string $expected_no_space,
@@ -217,6 +176,73 @@ final class CoreLibsConvertByteTest extends TestCase
 		);
 	}
 
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function byteStringProvider(): array
+	{
+		return [
+			'negative number' => [
+				0 => '-117.42 MB',
+				1 => -123123794,
+				2 => -117420000,
+				3 => "-123123793",
+				4 => "-117420000",
+				5 => null,
+			],
+			'megabyte' => [
+				0 => '242.98 MB',
+				1 => 254782996,
+				2 => 242980000,
+				3 => "254782996",
+				4 => "242980000",
+				5 => null,
+			],
+			'megabyte si' => [
+				0 => '254.78 MiB',
+				1 => 267156193,
+				2 => 254780000,
+				3 => "267156193",
+				4 => "254780000",
+				5 => null,
+			],
+			'petabyte' => [
+				0 => '1 EiB',
+				1 => 1152921504606846976,
+				2 => 1000000000000000000,
+				3 => "1152921504606846976",
+				4 => "1000000000000000000",
+				5 => null,
+			],
+			'max int' => [
+				0 => '8 EB',
+				1 => 0,
+				2 => 0,
+				3 => "9223372036854775808",
+				4 => "8000000000000000000",
+				5 => \LengthException::class,
+			],
+			'exabyte, overflow' => [
+				0 => '867.36EB',
+				1 => 0,
+				2 => 0,
+				3 => "999997996235794808832",
+				4 => "867360000000000000000",
+				5 => \LengthException::class,
+			],
+			'huge exabyte, overflow' => [
+				0 => '1000EB',
+				1 => 0,
+				2 => 0,
+				3 => "1152921504606846976000",
+				4 => "1000000000000000000000",
+				5 => \LengthException::class,
+			],
+		];
+	}
+
 	/**
 	 * Undocumented function
 	 *
@@ -227,10 +253,22 @@ final class CoreLibsConvertByteTest extends TestCase
 	 * @param string|int|float $input
 	 * @param string|int|float $expected
 	 * @param string|int|float $expected_si
+	 * @param string|int|float $expected_string
+	 * @param string|int|float $expected_string_si
+	 * @param ?string          $exception
 	 * @return void
 	 */
-	public function testStringByteFormat($input, $expected, $expected_si): void
-	{
+	public function testStringByteFormat(
+		string|int|float $input,
+		string|int|float $expected,
+		string|int|float $expected_si,
+		string|int|float $expected_string,
+		string|int|float $expected_string_si,
+		?string $exception
+	): void {
+		if ($exception !== null) {
+			$this->expectException($exception);
+		}
 		$this->assertEquals(
 			$expected,
 			\CoreLibs\Convert\Byte::stringByteFormat($input)
@@ -239,6 +277,17 @@ final class CoreLibsConvertByteTest extends TestCase
 			$expected_si,
 			\CoreLibs\Convert\Byte::stringByteFormat($input, \CoreLibs\Convert\Byte::BYTE_FORMAT_SI)
 		);
+		$this->assertEquals(
+			$expected_string,
+			\CoreLibs\Convert\Byte::stringByteFormat($input, \CoreLibs\Convert\Byte::RETURN_AS_STRING)
+		);
+		$this->assertEquals(
+			$expected_string_si,
+			\CoreLibs\Convert\Byte::stringByteFormat(
+				$input,
+				\CoreLibs\Convert\Byte::BYTE_FORMAT_SI | \CoreLibs\Convert\Byte::RETURN_AS_STRING
+			)
+		);
 	}
 
 	/**

test/phpunit/Convert/CoreLibsConvertJsonTest.php

@@ -164,6 +164,51 @@ final class CoreLibsConvertJsonTest extends TestCase
 		);
 	}
 
+	/**
+	 * test with flags
+	 *
+	 * @covers ::jsonConvertToArray
+	 * @testdox jsonConvertToArray flag test, if flag is used
+	 *
+	 * @return void
+	 */
+	public function testJsonConvertToArrayWithFlags(): void
+	{
+		$input = '{"valid":"json","invalid":"\xB1\x31"}';
+		/* $expected_without_flag = [
+			'valid' => 'json'
+		];
+		$expected_with_flag = [
+			'valid' => 'json',
+			'invalid' => "\xB1\x31"
+		]; */
+		// no idea why in both it throws an erro
+		$expected_without_flag = [];
+		$expected_with_flag = [];
+		$this->assertEquals(
+			$expected_without_flag,
+			\CoreLibs\Convert\Json::jsonConvertToArray($input)
+		);
+		$this->assertEquals(
+			$expected_with_flag,
+			\CoreLibs\Convert\Json::jsonConvertToArray($input, flags:JSON_INVALID_UTF8_IGNORE)
+		);
+	}
+
+	public function testJsonConvertToArrayRemoveThrowFlag(): void
+	{
+		$input = '{"valid":"json","invalid":"\xB1\x31"}';
+		// show NOT throw an exception
+		try {
+			$this->assertEquals(
+				[],
+				\CoreLibs\Convert\Json::jsonConvertToArray($input, flags:JSON_THROW_ON_ERROR)
+			);
+		} catch (\Exception $e) {
+			$this->fail('Exception was thrown despite flag removal');
+		}
+	}
+
 	/**
 	 * test json error states
 	 *
@@ -189,6 +234,49 @@ final class CoreLibsConvertJsonTest extends TestCase
 		);
 	}
 
+	/**
+	 * test json error states
+	 *
+	 * @covers ::jsonValidate
+	 * @dataProvider jsonErrorProvider
+	 * @testdox jsonValidate $input will be $expected_i/$expected_s [$_dataName]
+	 *
+	 * @param string|null $input
+	 * @param int $expected_i
+	 * @param string $expected_s
+	 * @return void
+	 */
+	public function testJsonValidateGetLastError(?string $input, int $expected_i, string $expected_s): void
+	{
+		\CoreLibs\Convert\Json::jsonValidate($input);
+		$this->assertEquals(
+			$expected_i,
+			\CoreLibs\Convert\Json::jsonGetLastError()
+		);
+		$this->assertEquals(
+			$expected_s,
+			\CoreLibs\Convert\Json::jsonGetLastError(true)
+		);
+	}
+
+	/**
+	 * test json validation
+	 *
+	 * @covers ::jsonValidate
+	 * @testdox jsonValidate test valid and invalid json
+	 *
+	 * @return void
+	 */
+	public function testJsonValidate(): void
+	{
+		$this->assertTrue(
+			\CoreLibs\Convert\Json::jsonValidate('{"valid": "json"}')
+		);
+		$this->assertFalse(
+			\CoreLibs\Convert\Json::jsonValidate('not valid json')
+		);
+	}
+
 	/**
 	 * Undocumented function
 	 *

test/phpunit/Convert/CoreLibsConvertMathTest.php

@@ -122,9 +122,9 @@ final class CoreLibsConvertMathTest extends TestCase
 	public function providerCbrt(): array
 	{
 		return [
-			'cube root of 2' => [2, 1.25992, 5],
-			'cube root of 3' => [3, 1.44225, 5],
-			'cube root of -1' => [-1, 'NAN', 0],
+			'cube root of 2' => [2, 1.25992, 5, null],
+			'cube root of 3' => [3, 1.44225, 5, null],
+			'cube root of -1' => [-1, 'NAN', 0, \InvalidArgumentException::class],
 		];
 	}
 
@@ -138,10 +138,14 @@ final class CoreLibsConvertMathTest extends TestCase
 	 * @param  float|int $number
 	 * @param  float     $expected
 	 * @param  int       $round_to
+	 * @param  ?string   $exception
 	 * @return void
 	 */
-	public function testCbrt(float|int $number, float|string $expected, int $round_to): void
+	public function testCbrt(float|int $number, float|string $expected, int $round_to, ?string $exception): void
 	{
+		if ($exception !== null) {
+			$this->expectException($exception);
+		}
 		$this->assertEquals(
 			$expected,
 			round(\CoreLibs\Convert\Math::cbrt($number), $round_to)

test/phpunit/Convert/CoreLibsConvertStringsTest.php

@@ -698,6 +698,89 @@ final class CoreLibsConvertStringsTest extends TestCase
 			'Cannot match last preg error string'
 		);
 	}
+
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function parseCharacterRangesProvider(): array
+	{
+		return [
+			'simple a-z' => [
+				['a-z'],
+				implode('', range('a', 'z')),
+				null,
+			],
+			'simple A-Z' => [
+				['A-Z'],
+				implode('', range('A', 'Z')),
+				null,
+			],
+			'simple 0-9' => [
+				['0-9'],
+				implode('', range('0', '9')),
+				null,
+			],
+			'mixed ranges' => [
+				['a-c', 'X-Z', '3-5'],
+				'abcXYZ345',
+				null,
+			],
+			'reverse ranges' => [
+				['z-a'],
+				'abcdefghijklmnopqrstuvwxyz',
+				null,
+			],
+			'overlapping ranges' => [
+				['a-f', 'd-j'],
+				'abcdefghij',
+				null,
+			],
+			'mixed valid and overlap ranges' => [
+				['a-f', 'z-a', '0-3'],
+				'abcdefghijklmnopqrstuvwxyz0123',
+				null,
+			],
+			'range without dashes' => [
+				['abcddfff'],
+				'abcdf',
+				null,
+			],
+			'invalid ranges' => [
+				['a-あ', 'A-あ', '0-あ'],
+				'',
+				\InvalidArgumentException::class,
+			],
+		];
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::parseCharacterRanges
+	 * @dataProvider parseCharacterRangesProvider
+	 * @testdox parseCharacterRanges $input to $expected [$_dataName]
+	 *
+	 * @param  array       $input
+	 * @param  string      $expected
+	 * @param  string|null $expected_exception
+	 * @return void
+	 */
+	public function testParseCharacterRanges(
+		array $input,
+		string $expected,
+		?string $expected_exception
+	): void {
+		if ($expected_exception !== null) {
+			$this->expectException($expected_exception);
+		}
+		$this->assertEquals(
+			$expected,
+			implode('', \CoreLibs\Convert\Strings::parseCharacterRanges(implode('', $input)))
+		);
+	}
 }
 
 // __END__

test/phpunit/UrlRequests/CoreLibsUrlRequestsCurlTest.php

@@ -59,8 +59,6 @@ final class CoreLibsUrlRequestsCurlTest extends TestCase
 				continue;
 			}
 			$this->url_basic = $url;
-			// split out the last / part for url set test
-			curl_close($handle);
 			// print "Open: $url\n";
 			break;
 		}
@@ -969,76 +967,77 @@ final class CoreLibsUrlRequestsCurlTest extends TestCase
 			"query" => ["foo-get" => "bar"]
 		]);
 		$this->assertEquals("200", $response["code"], "multi call: get response code not matching");
-		if (PHP_VERSION_ID >= 80400) {
-			$this->assertEquals(
-				'{"HEADERS":{"HTTP_HOST":"soba.egplusww.jp",'
-				. '"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1","HTTP_FIRST_CALL":"get",'
-				. '"HTTP_ACCEPT":"*\/*"},"REQUEST_TYPE":"GET","PARAMS":{"foo-get":"bar"},"BODY":null}',
-				$response['content'],
-				'multi call: get content not matching'
-			);
-		} else {
-			$this->assertEquals(
-				'{"HEADERS":{"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
-				. '"HTTP_FIRST_CALL":"get","HTTP_ACCEPT":"*\/*",'
-				. '"HTTP_HOST":"soba.egplusww.jp"},'
-				. '"REQUEST_TYPE":"GET",'
-				. '"PARAMS":{"foo-get":"bar"},"BODY":null}',
-				$response['content'],
-				'multi call: get content not matching'
-			);
-		}
+		$request_expected = json_decode(
+			<<<JSON
+			{
+				"HEADERS":{
+					"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",
+					"HTTP_FIRST_CALL":"get","HTTP_ACCEPT":"*\/*",
+					"HTTP_HOST":"soba.egplusww.jp"
+				},
+				"REQUEST_TYPE":"GET",
+				"PARAMS":{"foo-get":"bar"},"BODY":null
+			}
+			JSON,
+			true
+		);
+		$this->assertEquals(
+			$request_expected,
+			json_decode($response['content'], true),
+			'multi call: get content not matching'
+		);
 		// post
 		$response = $curl->post($this->url_basic, [
 			"headers" => ["second-call" => "post"],
 			"body" => ["foo-post" => "baz"]
 		]);
 		$this->assertEquals("200", $response["code"], "multi call: post response code not matching");
-		if (PHP_VERSION_ID >= 80400) {
-			$this->assertEquals(
-				'{"HEADERS":{"HTTP_HOST":"soba.egplusww.jp",'
-				. '"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
-				. '"HTTP_SECOND_CALL":"post","HTTP_ACCEPT":"*\/*"},'
-				. '"REQUEST_TYPE":"POST","PARAMS":[],"BODY":{"foo-post":"baz"}}',
-				$response['content'],
-				'multi call: post content not matching'
-			);
-		} else {
-			$this->assertEquals(
-				'{"HEADERS":{"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
-				. '"HTTP_SECOND_CALL":"post","HTTP_ACCEPT":"*\/*",'
-				. '"HTTP_HOST":"soba.egplusww.jp"},'
-				. '"REQUEST_TYPE":"POST",'
-				. '"PARAMS":[],"BODY":{"foo-post":"baz"}}',
-				$response['content'],
-				'multi call: post content not matching'
-			);
-		}
+		$request_expected = json_decode(
+			<<<JSON
+			{
+				"HEADERS":{
+					"HTTP_HOST":"soba.egplusww.jp",
+					"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",
+					"HTTP_SECOND_CALL":"post",
+					"HTTP_ACCEPT":"*\/*"
+				},
+				"REQUEST_TYPE":"POST",
+				"PARAMS":[],
+				"BODY":{"foo-post":"baz"}
+			}
+			JSON,
+			true
+		);
+		$this->assertEquals(
+			$request_expected,
+			json_decode($response['content'], true),
+			'multi call: post content not matching'
+		);
 		// delete
 		$response = $curl->delete($this->url_basic, [
 			"headers" => ["third-call" => "delete"],
 		]);
 		$this->assertEquals("200", $response["code"], "multi call: delete response code not matching");
-		if (PHP_VERSION_ID >= 80400) {
-			$this->assertEquals(
-				'{"HEADERS":{"HTTP_HOST":"soba.egplusww.jp",'
-				. '"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
-				. '"HTTP_THIRD_CALL":"delete","HTTP_ACCEPT":"*\/*"},'
-				. '"REQUEST_TYPE":"DELETE","PARAMS":[],"BODY":[]}',
-				$response['content'],
-				'multi call: delete content not matching'
-			);
-		} else {
-			$this->assertEquals(
-				'{"HEADERS":{"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
-				. '"HTTP_THIRD_CALL":"delete","HTTP_ACCEPT":"*\/*",'
-				. '"HTTP_HOST":"soba.egplusww.jp"},'
-				. '"REQUEST_TYPE":"DELETE",'
-				. '"PARAMS":[],"BODY":[]}',
-				$response['content'],
-				'multi call: delete content not matching'
-			);
-		}
+		$request_expected = json_decode(
+			<<<JSON
+			{
+				"HEADERS":{
+					"HTTP_HOST":"soba.egplusww.jp",
+					"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",
+					"HTTP_THIRD_CALL":"delete","HTTP_ACCEPT":"*\/*"
+				},
+				"REQUEST_TYPE":"DELETE",
+				"PARAMS":[],
+				"BODY":[]
+			}
+			JSON,
+			true
+		);
+		$this->assertEquals(
+			$request_expected,
+			json_decode($response['content'], true),
+			'multi call: delete content not matching'
+		);
 	}
 
 	// MARK: auth header set via config