Merge pull request #38 from msievenpiper/nikic/php-parser-5

Update nikic/php-parser from ^4 to ^5

Author: patinthehat

.github/workflows/run-tests.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.2, 8.1, 8.0, 7.4, 7.3]
+        php: [8.2, 8.1, 8.0, 7.4]
 
     name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

composer.json

@@ -19,8 +19,8 @@
         }
     ],
     "require": {
-        "php": "^7.3|^8.0",
-        "nikic/php-parser": "^4.10",
+        "php": "^7.4|^8.0",
+        "nikic/php-parser": "^5.0",
         "permafrost-dev/code-snippets": "^1.2.0"
     },
     "require-dev": {

src/Searcher.php

@@ -23,6 +23,7 @@
 use PhpParser\NodeFinder;
 use PhpParser\NodeTraverser;
 use PhpParser\ParserFactory;
+use PhpParser\PhpVersion;
 
 class Searcher
 {
@@ -55,7 +56,7 @@ class Searcher
 
     public function __construct($parser = null)
     {
-        $this->parser = $parser ?? (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        $this->parser = $parser ?? (new ParserFactory())->createForHostVersion();
     }
 
     public function assignments(array $varNames): self

src/Support/VirtualFile.php

@@ -18,7 +18,7 @@ public function __destruct()
 
     public function unlink()
     {
-        if (dirname($this->path) !== sys_get_temp_dir()) {
+        if (!strpos(dirname($this->path), sys_get_temp_dir())) {
             return;
         }
 

tests/__snapshots__/SearcherTest__it_can_handle_chained_static_and_regular_calls__1.yml

@@ -1,4 +1,4 @@
 -
     location: { column: 0, endLine: 4, startLine: 3 }
-    node: { variableName: { subNodeNames: [name], specialClassName: false, type: Identifier, line: 3, startLine: 3, endLine: 3, startTokenPos: -1, endTokenPos: -1, startFilePos: -1, endFilePos: -1, comments: {  }, docComment: null, attributes: { startLine: 3, endLine: 3 }, name: whereSessionRegistrationUuid }, methodName: firstOrFail, name: $whereSessionRegistrationUuid->firstOrFail, args: {  }, location: { column: 0, endLine: 4, startLine: 3 } }
+    node: { variableName: { subNodeNames: [name], specialClassName: false, type: Identifier, line: 3, startLine: 3, endLine: 3, startTokenPos: 13, endTokenPos: 13, startFilePos: 82, endFilePos: 109, comments: {  }, docComment: null, attributes: { startLine: 3, startTokenPos: 13, startFilePos: 82, endLine: 3, endTokenPos: 13, endFilePos: 109 }, name: whereSessionRegistrationUuid }, methodName: firstOrFail, name: $whereSessionRegistrationUuid->firstOrFail, args: {  }, location: { column: 0, endLine: 4, startLine: 3 } }
     snippet: null

tests/__snapshots__/SearcherTest__it_searches_for_var_assignments__1.yml

@@ -1,4 +1,4 @@
 -
     location: { column: 0, endLine: 13, startLine: 13 }
-    node: { variableName: obj, value: { subNodeNames: [class, args], type: Expr_New, rawArgs: {  }, firstClassCallable: false, args: {  }, line: 13, startLine: 13, endLine: 13, startTokenPos: -1, endTokenPos: -1, startFilePos: -1, endFilePos: -1, comments: {  }, docComment: null, attributes: { startLine: 13, endLine: 13 }, class: { subNodeNames: [parts], parts: [MyClass], first: MyClass, last: MyClass, unqualified: true, qualified: false, fullyQualified: false, relative: false, specialClassName: false, type: Name, line: 13, startLine: 13, endLine: 13, startTokenPos: -1, endTokenPos: -1, startFilePos: -1, endFilePos: -1, comments: {  }, docComment: null, attributes: { startLine: 13, endLine: 13 } } }, name: obj, location: { column: 0, endLine: 13, startLine: 13 } }
+    node: { variableName: obj, value: { subNodeNames: [class, args], type: Expr_New, rawArgs: {  }, firstClassCallable: false, args: {  }, line: 13, startLine: 13, endLine: 13, startTokenPos: 57, endTokenPos: 61, startFilePos: 157, endFilePos: 169, comments: {  }, docComment: null, attributes: { startLine: 13, startTokenPos: 57, startFilePos: 157, endLine: 13, endTokenPos: 61, endFilePos: 169 }, class: { subNodeNames: [name], parts: [MyClass], first: MyClass, last: MyClass, unqualified: true, qualified: false, fullyQualified: false, relative: false, specialClassName: false, type: Name, line: 13, startLine: 13, endLine: 13, startTokenPos: 59, endTokenPos: 59, startFilePos: 161, endFilePos: 167, comments: {  }, docComment: null, attributes: { startLine: 13, startTokenPos: 59, startFilePos: 161, endLine: 13, endTokenPos: 59, endFilePos: 167 }, name: MyClass } }, name: obj, location: { column: 0, endLine: 13, startLine: 13 } }
     snippet: null