->args to ->getArgs

kamil-tekiela · Oct 9, 2021 · 870ee4f · 870ee4f
1 parent f62c76a
commit 870ee4f
Show file tree

Hide file tree

Showing 36 changed files with 291 additions and 274 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "felixfbecker/advanced-json-rpc": "^3.0.3",
         "felixfbecker/language-server-protocol": "^1.5",
         "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
-        "nikic/php-parser": "4.12.*",
+        "nikic/php-parser": "^4.13",
         "openlss/lib-array2xml": "^1.0",
         "sebastian/diff": "^3.0 || ^4.0",
         "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",

diff --git a/dictionaries/PropertyMap.php b/dictionaries/PropertyMap.php
@@ -442,24 +442,12 @@
     'reflectionparameter' => [
         'name' => 'string',
     ],
-    'phpparser\\node\\expr\\funccall' => [
-        'args' => 'list<PhpParser\Node\Arg>',
-    ],
-    'phpparser\\node\\expr\\new_' => [
-        'args' => 'list<PhpParser\Node\Arg>',
-    ],
     'phpparser\\node\\expr\\array_' => [
         'items' => 'array<int, PhpParser\Node\Expr\ArrayItem|null>',
     ],
     'phpparser\\node\\expr\\list_' => [
         'items' => 'array<int, PhpParser\Node\Expr\ArrayItem|null>',
     ],
-    'phpparser\\node\\expr\\methodcall' => [
-        'args' => 'list<PhpParser\Node\Arg>',
-    ],
-    'phpparser\\node\\expr\\staticcall' => [
-        'args' => 'list<PhpParser\Node\Arg>',
-    ],
     'phpparser\\node\\expr\\arrowfunction' => [
         'params' => 'list<PhpParser\Node\Param>',
     ],

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="dev-master@4602e4ae22563289b2f1810dd9129cd0a2c76123">
+<files psalm-version="dev-master@f62c76a334982eae94741b966ea886f0b15e4293">
   <file src="examples/TemplateChecker.php">
     <PossiblyUndefinedIntArrayOffset occurrences="2">
       <code>$comment_block-&gt;tags['variablesfrom'][0]</code>
@@ -46,9 +46,6 @@
     <PossiblyUndefinedIntArrayOffset occurrences="1">
       <code>$line_parts[1]</code>
     </PossiblyUndefinedIntArrayOffset>
-    <RedundantCondition occurrences="1">
-      <code>$line_parts</code>
-    </RedundantCondition>
   </file>
   <file src="src/Psalm/Internal/Analyzer/ProjectAnalyzer.php">
     <PossiblyUndefinedIntArrayOffset occurrences="4">
@@ -80,7 +77,7 @@
   </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Block/SwitchCaseAnalyzer.php">
     <PossiblyUndefinedIntArrayOffset occurrences="3">
-      <code>$new_case_equality_expr-&gt;args[1]</code>
+      <code>$new_case_equality_expr-&gt;getArgs()[1]</code>
       <code>$switch_scope-&gt;leftover_statements[0]</code>
       <code>$traverser-&gt;traverse([$switch_condition])[0]</code>
     </PossiblyUndefinedIntArrayOffset>
@@ -91,30 +88,40 @@
     </InvalidPropertyAssignmentValue>
   </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php">
-    <PossiblyUndefinedIntArrayOffset occurrences="23">
+    <PossiblyUndefinedIntArrayOffset occurrences="33">
       <code>$assertion-&gt;rule[0]</code>
       <code>$assertion-&gt;rule[0]</code>
       <code>$assertion-&gt;rule[0]</code>
       <code>$assertion-&gt;rule[0]</code>
       <code>$assertion-&gt;rule[0]</code>
       <code>$assertion-&gt;rule[0]</code>
-      <code>$count_expr-&gt;args[0]</code>
-      <code>$count_expr-&gt;args[0]</code>
-      <code>$count_expr-&gt;args[0]</code>
-      <code>$count_expr-&gt;args[0]</code>
-      <code>$count_expr-&gt;args[0]</code>
-      <code>$counted_expr-&gt;args[0]</code>
-      <code>$expr-&gt;args[0]</code>
-      <code>$expr-&gt;args[0]</code>
-      <code>$expr-&gt;args[0]</code>
-      <code>$expr-&gt;args[0]</code>
-      <code>$expr-&gt;args[1]</code>
-      <code>$expr-&gt;args[1]</code>
-      <code>$get_debug_type_expr-&gt;args[0]</code>
-      <code>$get_debug_type_expr-&gt;args[0]</code>
-      <code>$getclass_expr-&gt;args[0]</code>
-      <code>$gettype_expr-&gt;args[0]</code>
-      <code>$gettype_expr-&gt;args[0]</code>
+      <code>$count_expr-&gt;getArgs()[0]</code>
+      <code>$count_expr-&gt;getArgs()[0]</code>
+      <code>$count_expr-&gt;getArgs()[0]</code>
+      <code>$count_expr-&gt;getArgs()[0]</code>
+      <code>$count_expr-&gt;getArgs()[0]</code>
+      <code>$counted_expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[0]</code>
+      <code>$expr-&gt;getArgs()[1]</code>
+      <code>$expr-&gt;getArgs()[1]</code>
+      <code>$get_debug_type_expr-&gt;getArgs()[0]</code>
+      <code>$get_debug_type_expr-&gt;getArgs()[0]</code>
+      <code>$getclass_expr-&gt;getArgs()[0]</code>
+      <code>$gettype_expr-&gt;getArgs()[0]</code>
+      <code>$gettype_expr-&gt;getArgs()[0]</code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/ArithmeticOpAnalyzer.php">
@@ -147,7 +154,7 @@
   <file src="src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php">
     <PossiblyUndefinedIntArrayOffset occurrences="2">
       <code>$parts[1]</code>
-      <code>$stmt-&gt;args[0]</code>
+      <code>$stmt-&gt;getArgs()[0]</code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php">
@@ -190,7 +197,7 @@
   </file>
   <file src="src/Psalm/Internal/Analyzer/StatementsAnalyzer.php">
     <PossiblyUndefinedIntArrayOffset occurrences="1">
-      <code>$stmt-&gt;expr-&gt;args[0]</code>
+      <code>$stmt-&gt;expr-&gt;getArgs()[0]</code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
   <file src="src/Psalm/Internal/Codebase/InternalCallMapHandler.php">
@@ -268,12 +275,9 @@
     </PossiblyUndefinedIntArrayOffset>
   </file>
   <file src="src/Psalm/Internal/PhpVisitor/Reflector/ExpressionScanner.php">
-    <PossiblyUndefinedIntArrayOffset occurrences="5">
-      <code>$node-&gt;args[0]</code>
-      <code>$node-&gt;args[0]</code>
-      <code>$node-&gt;args[1]</code>
-      <code>$node-&gt;args[1]</code>
-      <code>$node-&gt;args[1]</code>
+    <PossiblyUndefinedIntArrayOffset occurrences="2">
+      <code>$node-&gt;getArgs()[0]</code>
+      <code>$node-&gt;getArgs()[1]</code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
   <file src="src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockParser.php">

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -17,6 +17,9 @@
     limitMethodComplexity="true"
     errorBaseline="psalm-baseline.xml"
 >
+    <stubs>
+        <file name="stubs/phpparser.phpstub"/>
+    </stubs>
     <projectFiles>
         <directory name="src"/>
         <directory name="tests"/>

diff --git a/src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeCollector.php b/src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeCollector.php
@@ -329,7 +329,7 @@ protected static function getYieldTypeFromExpression(
             || $stmt instanceof PhpParser\Node\Expr\StaticCall) {
             $yield_types = [];
 
-            foreach ($stmt->args as $arg) {
+            foreach ($stmt->getArgs() as $arg) {
                 $yield_types = array_merge($yield_types, self::getYieldTypeFromExpression($arg->value, $nodes));
             }
 

diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/SwitchCaseAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/SwitchCaseAnalyzer.php
@@ -316,7 +316,7 @@ public static function analyze(
             if ($new_case_equality_expr) {
                 ExpressionAnalyzer::analyze(
                     $statements_analyzer,
-                    $new_case_equality_expr->args[1]->value,
+                    $new_case_equality_expr->getArgs()[1]->value,
                     $case_context
                 );