PHP 8.5 updates

.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="^1.10.37" installed="1.12.32" 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.34.0
+9.36.0

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/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/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/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/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/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/Logging/CoreLibsLoggingErrorMessagesTest.php

@@ -105,11 +105,15 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 			'log_folder' => self::LOG_FOLDER,
 			'log_level' => Level::Error,
 		]);
+		$errorLogTmpfile = tmpfile();
+		$errorLogLocationBackup = ini_set('error_log', stream_get_meta_data($errorLogTmpfile)['uri']);
 		$em = new \CoreLibs\Logging\ErrorMessage($log);
 		$em->setMessage(
 			$level,
 			$str
 		);
+		// for exceptions if log level is set to catch them
+		$error_log_content = stream_get_contents($errorLogTmpfile);
 		$this->assertEquals(
 			[
 				'level' => $expected,
@@ -377,6 +381,8 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 		?bool $log_warning,
 		string $expected
 	): void {
+		$errorLogTmpfile = tmpfile();
+		$errorLogLocationBackup = ini_set('error_log', stream_get_meta_data($errorLogTmpfile)['uri']);
 		$log = new \CoreLibs\Logging\Logging([
 			'log_file_id' => 'testErrorMessagesLogError',
 			'log_folder' => self::LOG_FOLDER,
@@ -392,6 +398,9 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 			log_error: $log_error,
 			log_warning: $log_warning
 		);
+		ini_set('error_log', $errorLogLocationBackup);
+		// for exceptions if log level is set to catch them
+		$error_log_content = stream_get_contents($errorLogTmpfile);
 		$file_content = '';
 		if (is_file($log->getLogFolder() . $log->getLogFile())) {
 			$file_content = file_get_contents(
@@ -447,6 +456,8 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 			'log_level' => Level::Debug,
 			'log_per_run' => true
 		]);
+		$errorLogTmpfile = tmpfile();
+		$errorLogLocationBackup = ini_set('error_log', stream_get_meta_data($errorLogTmpfile)['uri']);
 		$em = new \CoreLibs\Logging\ErrorMessage($log);
 		$em->setErrorMsg(
 			$id,
@@ -456,6 +467,9 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 			log_error: $log_error,
 			log_warning: $log_warning
 		);
+		ini_set('error_log', $errorLogLocationBackup);
+		// for exceptions if log level is set to catch them
+		$error_log_content = stream_get_contents($errorLogTmpfile);
 		$file_content = '';
 		if (is_file($log->getLogFolder() . $log->getLogFile())) {
 			$file_content = file_get_contents(

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