phpunit test fixes

2023-02-24 09:43:24 +09:00
parent da67d1bde3
commit 7cae3e701a
10 changed files with 49 additions and 36 deletions
--- a/4dev/tests/CoreLibsCombinedArrayHandlerTest.php
+++ b/4dev/tests/CoreLibsCombinedArrayHandlerTest.php
@@ -712,12 +712,23 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 */
 	public function testArrayMergeRecursiveWarningA(): void
 	{
+		set_error_handler(
+			static function (int $errno, string $errstr): never {
+				throw new Exception($errstr, $errno);
+			},
+			E_USER_WARNING
+		);
+
 		$arrays = func_get_args();
 		// first is expected warning
 		$warning = array_shift($arrays);
-		$this->expectWarning();
-		$this->expectWarningMessage($warning);
+
+		// phpunit 10.0 compatible
+		$this->expectExceptionMessage(($warning));
+
 		\CoreLibs\Combined\ArrayHandler::arrayMergeRecursive(...$arrays);
+
+		restore_error_handler();
 	}

 	/**