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/checking/phpunit.sh
+++ b/4dev/checking/phpunit.sh
@@ -1,9 +1,11 @@
+#!/bin/env bash
+
 base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
 # -c phpunit.xml
 # --testdox
 # call with "t" to give verbose testdox output
 # SUPPORTED: https://www.php.net/supported-versions.php
-# call with 7.4, 8.0, 8.1 to force a certain php version
+# call with php version number to force a certain php version

 opt_testdox="";
 if [ "${1}" = "t" ] || [ "${2}" = "t" ]; then
--- 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();
 	}

 	/**
--- a/4dev/tests/CoreLibsDBIOTest.php
+++ b/4dev/tests/CoreLibsDBIOTest.php
@@ -3456,7 +3456,7 @@ final class CoreLibsDBIOTest extends TestCase
 					'id' => '51',
 					'error' => 'Max query call needs to be set to at least 1',
 					// run:: can be +1 if called in set and not direct
-					'source' => "/^main::run::run::run::run::run::run::(run::)?runBare::runTest::testDbErrorHandling::dbSetMaxQueryCall$/",
+					'source' => "/^include::main::run::run::run::run::run::run::(run::)?runBare::runTest::testDbErrorHandling::dbSetMaxQueryCall$/",
 					'pg_error' => '',
 					'msg' => '',
 				]
--- a/4dev/tests/CoreLibsDebugSupportTest.php
+++ b/4dev/tests/CoreLibsDebugSupportTest.php
@@ -393,7 +393,7 @@ final class CoreLibsDebugSupportTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @cover ::getCallerMethodList
-	 * @testWith [["main", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"],["main", "run", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"]]
+	 * @testWith [["main", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"],["include", "main", "run", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"]]
 	 * @testdox getCallerMethodList check if it returns $expected [$_dataName]
 	 *
 	 * @param array $expected
--- a/composer.lock
+++ b/composer.lock
@@ -612,16 +612,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.10.0",
+            "version": "1.10.2",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "71b28a67f01ac231f9a8f1ce242270bf4ec1f99c"
+                "reference": "a2ffec7db373d8da4973d1d62add872db5cd22dd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/71b28a67f01ac231f9a8f1ce242270bf4ec1f99c",
-                "reference": "71b28a67f01ac231f9a8f1ce242270bf4ec1f99c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a2ffec7db373d8da4973d1d62add872db5cd22dd",
+                "reference": "a2ffec7db373d8da4973d1d62add872db5cd22dd",
                "shasum": ""
            },
            "require": {
@@ -651,7 +651,7 @@
            ],
            "support": {
                "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.10.0"
+                "source": "https://github.com/phpstan/phpstan/tree/1.10.2"
            },
            "funding": [
                {
@@ -667,7 +667,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-21T13:50:49+00:00"
+            "time": "2023-02-23T14:36:46+00:00"
        },
        {
            "name": "psr/container",
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -635,17 +635,17 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.10.0",
-            "version_normalized": "1.10.0.0",
+            "version": "1.10.2",
+            "version_normalized": "1.10.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "71b28a67f01ac231f9a8f1ce242270bf4ec1f99c"
+                "reference": "a2ffec7db373d8da4973d1d62add872db5cd22dd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/71b28a67f01ac231f9a8f1ce242270bf4ec1f99c",
-                "reference": "71b28a67f01ac231f9a8f1ce242270bf4ec1f99c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a2ffec7db373d8da4973d1d62add872db5cd22dd",
+                "reference": "a2ffec7db373d8da4973d1d62add872db5cd22dd",
                "shasum": ""
            },
            "require": {
@@ -654,7 +654,7 @@
            "conflict": {
                "phpstan/phpstan-shim": "*"
            },
-            "time": "2023-02-21T13:50:49+00:00",
+            "time": "2023-02-23T14:36:46+00:00",
            "bin": [
                "phpstan",
                "phpstan.phar"
@@ -677,7 +677,7 @@
            ],
            "support": {
                "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.10.0"
+                "source": "https://github.com/phpstan/phpstan/tree/1.10.2"
            },
            "funding": [
                {
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
        'name' => '__root__',
        'pretty_version' => 'dev-master',
        'version' => 'dev-master',
-        'reference' => '16c3653ceefd43b6d150bbce587d230fb2f0f3b6',
+        'reference' => 'da67d1bde3260de1ef8d778f5d75f4e2c60de869',
        'type' => 'library',
        'install_path' => __DIR__ . '/../../',
        'aliases' => array(),
@@ -13,7 +13,7 @@
        '__root__' => array(
            'pretty_version' => 'dev-master',
            'version' => 'dev-master',
-            'reference' => '16c3653ceefd43b6d150bbce587d230fb2f0f3b6',
+            'reference' => 'da67d1bde3260de1ef8d778f5d75f4e2c60de869',
            'type' => 'library',
            'install_path' => __DIR__ . '/../../',
            'aliases' => array(),
@@ -110,9 +110,9 @@
            'dev_requirement' => true,
        ),
        'phpstan/phpstan' => array(
-            'pretty_version' => '1.10.0',
-            'version' => '1.10.0.0',
-            'reference' => '71b28a67f01ac231f9a8f1ce242270bf4ec1f99c',
+            'pretty_version' => '1.10.2',
+            'version' => '1.10.2.0',
+            'reference' => 'a2ffec7db373d8da4973d1d62add872db5cd22dd',
            'type' => 'library',
            'install_path' => __DIR__ . '/../phpstan/phpstan',
            'aliases' => array(),
--- a/vendor/phpstan/phpstan/phpstan.phar
+++ b/vendor/phpstan/phpstan/phpstan.phar
--- a/vendor/phpstan/phpstan/phpstan.phar.asc
+++ b/vendor/phpstan/phpstan/phpstan.phar.asc
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----

-iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmP0zCIACgkQzxoQjQ56
-5yDVPBAAjOsIlFKSsJGP+LXYuQ/lhBuwigOxj6SM6ZLTBPB6MGKKTyPqXayF0Js8
-qZV0XxKbHN3RxeM0L4E6nEi5Zp5bf/jeF012+40oyIk8uXl3TsEnRiLP3cyu4I4D
-VBtFAZTiO8i4Rrlg0lkyLiFpzq8etL0PZvY3QePtsb6Wq7Lo0rSOWQKnJYDNc9iX
-gwd7PxRFBEDC1Q2X3B1NLLcjLN0aXzF0ERjXkvLgGGedsH2+G4iVy55WsG5q2XuW
-l/rMGaahIEr7P3C8yyjek+u7F3o2kzLKIKWJpLT2DzzTiqhadsHQaJhMpPOrH7I5
-vSWtdlIlTfXUsS34YliNOM4XC85ZG01sZ1LJsojv6sp1MHnPId1bWJcseeRo/Vje
-svFC6SKbklA9Z/5ThbG0+dALDxIPS0WAQ44/oUciTCuSJ8qIDUidDk+y0RChHrpd
-itrSmO/MbgmDtKMf6gkkzKkwXnkGfaMPyAVrM8OVJbpGjqSZzSeS2Dii04b9we6H
-Qo/NsQLkOQT05l4bObRhzXhQNHdpnYVtxbHHH+MrhKDA/Uo0vfbSnF7eN4l4YzDw
-Putzf/wLNh/bRAyetaTcE0qaDZjR0noBdgkLlAbV0p4vTdKzzerCbt98ztmeJV+6
-8ROEMSoIQLqKoVET3D4l9rfKwzO2sdNYKyjqf1j3qVsTIOKfUS4=
-=XHoC
+iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmP3eecACgkQzxoQjQ56
+5yAH6A//R+CaBjUmbQhmamLiYATpskxv25DC/BQQ1+aK5sz8IlKcxPViN3Ke9QAq
+qikQQ3ZDcNmBFR+p5ew9WuW4c99B/MX+Pg0Nc47keq/TxU/sslE1G7SuHssSCCxp
+o1W3HihbZtDmPWYj3VWSmyEvFAbho/qpTsu9d34qDcryRCZ3A46NZ5zOdNa5uI2R
+8hyhuPsWF0fnd3sxYSRCL0fPp6CAEWxIRiG53gmMjTfVdTsZQZVwzgsfiW3GAIRf
+J7tYbGcBN3tyrJEFyFJCJkWt2ATla1LzucL6rrDUa9HzNsA5NUTOLj6j6PACQ0Vj
+eCMfcDxKj/t6EJlHBpO2A5AiE8DOLs+lWmKiG7DqWOqqOnoYc/Fbv9RL3p25r7N2
+gv4hhyEfBE0hoUxKSzsa7M++Ler+Js0Slxc881dpDuqvBEZFyA4M9YJTM4ckK92M
+LcFC1RJ5xdHx/COpYVN3w2DvZ9BVk2kvdByJGnyQ9Tp/R8HdW+cv88kYopIXZ0R5
+8m7B/zbtxMbtEzEn38JqfTtiQpE6vNH3iaWInIkP/ZZgfetCoHdXUF+NTTpTyUCm
+C+NqRlgtA9NyjkdjX/kbohuxAcGsxlZu4/CfYKEIVAeCpM5sdjf4tRmmYn/5wCRF
+226D4n9yPZ9YHE7HYLrRcmlx2jzsKH8wv8Z5IZ8KqZK/9tPhHoM=
+=aGUS
 -----END PGP SIGNATURE-----
--- a/www/composer.phar
+++ b/www/composer.phar