From e89cbadffa09aaf58d09666f2a876b682f4474c1 Mon Sep 17 00:00:00 2001 From: Haydar Kulekci Date: Sat, 16 Mar 2024 07:07:05 +0300 Subject: [PATCH 1/4] php parser version 5 added into composer --- composer.json | 1 + src/Searchable/SearchableListFactory.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ed44db61..0977ee4f 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "elasticsearch/elasticsearch": "^8.0", "handcraftedinthealps/elasticsearch-dsl": "^8.0", "laravel/scout": "^8.0|^9.0|^10.0", + "nikic/php-parser": "^5.0", "roave/better-reflection": "^4.3|^5.0|^6.18" }, "require-dev": { diff --git a/src/Searchable/SearchableListFactory.php b/src/Searchable/SearchableListFactory.php index c03bf3a9..ac34ffab 100644 --- a/src/Searchable/SearchableListFactory.php +++ b/src/Searchable/SearchableListFactory.php @@ -116,7 +116,7 @@ private function getProjectClasses(): Collection */ private function getStmts(): array { - $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7); + $parser = (new ParserFactory())->createForHostVersion(); $nameResolverVisitor = new NameResolver(); $nodeTraverser = new NodeTraverser(); $nodeTraverser->addVisitor($nameResolverVisitor); From a95523fb05af19ce15db3ae944d39b8c6311c34f Mon Sep 17 00:00:00 2001 From: Serhii Shliakhov Date: Tue, 14 May 2024 16:19:44 +0100 Subject: [PATCH 2/4] Adjust nikic/php-parser version based on php version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0977ee4f..a2045076 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "elasticsearch/elasticsearch": "^8.0", "handcraftedinthealps/elasticsearch-dsl": "^8.0", "laravel/scout": "^8.0|^9.0|^10.0", - "nikic/php-parser": "^5.0", + "nikic/php-parser": "4.15.1 || (^5.0 && php >= 8.2)", "roave/better-reflection": "^4.3|^5.0|^6.18" }, "require-dev": { From 663021fee87966ff3088a16bb5593775aba7a1e8 Mon Sep 17 00:00:00 2001 From: Serhii Shliakhov Date: Tue, 14 May 2024 16:28:14 +0100 Subject: [PATCH 3/4] Revert --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a2045076..0977ee4f 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "elasticsearch/elasticsearch": "^8.0", "handcraftedinthealps/elasticsearch-dsl": "^8.0", "laravel/scout": "^8.0|^9.0|^10.0", - "nikic/php-parser": "4.15.1 || (^5.0 && php >= 8.2)", + "nikic/php-parser": "^5.0", "roave/better-reflection": "^4.3|^5.0|^6.18" }, "require-dev": { From 9a049f5c5ea419aa394890b0172bc65708c21c5c Mon Sep 17 00:00:00 2001 From: Serhii Shliakhov Date: Tue, 14 May 2024 16:34:30 +0100 Subject: [PATCH 4/4] Add last better-reflection --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 0977ee4f..20848228 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,7 @@ "elasticsearch/elasticsearch": "^8.0", "handcraftedinthealps/elasticsearch-dsl": "^8.0", "laravel/scout": "^8.0|^9.0|^10.0", - "nikic/php-parser": "^5.0", - "roave/better-reflection": "^4.3|^5.0|^6.18" + "roave/better-reflection": "^4.3|^5.0|^6.18|^6.36" }, "require-dev": { "laravel/legacy-factories": "^1.0",