From d02ce5815a65fb2025f6af2a9e4faa323cea609d Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Thu, 15 Aug 2024 11:00:14 +0200 Subject: [PATCH 1/5] Fix tests --- specs/exp/instanceof.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specs/exp/instanceof.php b/specs/exp/instanceof.php index a387c4f8..15589c05 100644 --- a/specs/exp/instanceof.php +++ b/specs/exp/instanceof.php @@ -96,7 +96,7 @@ $file = new \stdClass(); - ($file instanceof \SplFileInfo) ? $file : new \SplFileInfo($file); + $file instanceof \SplFileInfo ? $file : new \SplFileInfo($file); ---- Date: Sun, 18 Aug 2024 21:15:26 +0200 Subject: [PATCH 2/5] Fix E2E --- tests/AutoReview/GAE2ETest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/AutoReview/GAE2ETest.php b/tests/AutoReview/GAE2ETest.php index a574103a..f93e0858 100644 --- a/tests/AutoReview/GAE2ETest.php +++ b/tests/AutoReview/GAE2ETest.php @@ -31,7 +31,7 @@ class GAE2ETest extends TestCase public function test_github_actions_executes_all_the_e2e_tests(): void { - $expected = array_diff(E2ECollector::getE2ENames(), self::IGNORED_E2E_TESTS); + $expected = array_values(array_diff(E2ECollector::getE2ENames(), self::IGNORED_E2E_TESTS)); $actual = GAE2ECollector::getExecutedE2ETests(); self::assertEqualsCanonicalizing($expected, $actual); From 4acbcdbe791c2263b95ce0f555adbd50a0d8bd4b Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sun, 18 Aug 2024 21:30:08 +0200 Subject: [PATCH 3/5] Bump nikic/php-parser --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index c1fc38bc..7f40689c 100644 --- a/composer.lock +++ b/composer.lock @@ -207,16 +207,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.0.2", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" + "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1", + "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1", "shasum": "" }, "require": { @@ -227,7 +227,7 @@ }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -259,9 +259,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0" }, - "time": "2024-03-05T20:51:40+00:00" + "time": "2024-07-01T20:03:41+00:00" }, { "name": "psr/container", From daf1be5e910b28403776f586229713ce9b96ab24 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sun, 1 Sep 2024 15:27:26 +0200 Subject: [PATCH 4/5] Add missing functions --- src/Symbol/Reflector.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Symbol/Reflector.php b/src/Symbol/Reflector.php index 04b51c8f..6bd707f5 100644 --- a/src/Symbol/Reflector.php +++ b/src/Symbol/Reflector.php @@ -182,6 +182,12 @@ 'ldap_connect_wallet', 'posix_pathconf', 'posix_fpathconf', + + // Removed in https://github.com/JetBrains/phpstorm-stubs/pull/1627 + 'ares_gethostbyname', + 'uv_ares_init_options', + 'uv_handle_type', + 'uv_read2_start', ]; /** From d974602b859ffd32d58335343a448bafd315f97c Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sun, 1 Sep 2024 15:28:13 +0200 Subject: [PATCH 5/5] Remove array_values --- tests/AutoReview/GAE2ETest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/AutoReview/GAE2ETest.php b/tests/AutoReview/GAE2ETest.php index f93e0858..a574103a 100644 --- a/tests/AutoReview/GAE2ETest.php +++ b/tests/AutoReview/GAE2ETest.php @@ -31,7 +31,7 @@ class GAE2ETest extends TestCase public function test_github_actions_executes_all_the_e2e_tests(): void { - $expected = array_values(array_diff(E2ECollector::getE2ENames(), self::IGNORED_E2E_TESTS)); + $expected = array_diff(E2ECollector::getE2ENames(), self::IGNORED_E2E_TESTS); $actual = GAE2ECollector::getExecutedE2ETests(); self::assertEqualsCanonicalizing($expected, $actual);