misc

Author: TomasVotruba

phpstan.neon

@@ -5,7 +5,7 @@ includes:
 parameters:
     level: 8
     errorFormat: symplify
-    # reportUnmatchedIgnoredErrors: false
+    reportUnmatchedIgnoredErrors: false
 
     # see https://phpstan.org/writing-php-code/phpdoc-types#global-type-aliases
     typeAliases:
@@ -113,3 +113,6 @@ parameters:
                  - rules/DowngradePhp74/Rector/MethodCall/DowngradeReflectionGetTypeRector.php
                  - rules/DowngradePhp80/Rector/MethodCall/DowngradeReflectionGetAttributesRector.php
                  - rules/DowngradePhp73/Rector/String_/DowngradeFlexibleHeredocSyntaxRector.php
+
+        # local attribute key
+        - '#Parameter \#2 \$attributeKey of static method Rector\\PhpParser\\NodeTraverser\\SimpleNodeTraverser\:\:decorateWithAttributeValue\(\) expects#'

rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionGetAttributesRector/Fixture/class_is_nullable.php

@@ -18,11 +18,11 @@
 use PhpParser\Node\Name\FullyQualified as NameFullyQualified;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\If_;
-use PhpParser\Node\VariadicPlaceholder;
 use Rector\DowngradePhp72\NodeManipulator\JsonConstCleaner;
 use Rector\Enum\JsonConstant;
 use Rector\NodeAnalyzer\DefineFuncCallAnalyzer;
 use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\PhpParser\NodeTraverser\SimpleNodeTraverser;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -42,7 +42,7 @@ final class DowngradePhp73JsonConstRector extends AbstractRector
     /**
      * @var array<string>
      */
-    private const REFACTOR_FUNCS = ['json_decode', 'json_encode'];
+    private const JSON_FUNCTIONS = ['json_decode', 'json_encode'];
 
     public function __construct(
         private readonly JsonConstCleaner $jsonConstCleaner,
@@ -63,12 +63,12 @@ public function getRuleDefinition(): RuleDefinition
 CODE_SAMPLE
                     ,
                     <<<'CODE_SAMPLE'
-$json json_encode($content, 0);
+$json = json_encode($content);
 if (json_last_error() !== JSON_ERROR_NONE) {
     throw new \Exception(json_last_error_msg());
 }
 
-$content = json_decode($json, null, 512, 0);
+$content = json_decode($json, null, 512);
 if (json_last_error() !== JSON_ERROR_NONE) {
     throw new \Exception(json_last_error_msg());
 }
@@ -115,15 +115,12 @@ private function markConstantKnownInInnerStmts(If_ $if): void
             return;
         }
 
-        $this->traverseNodesWithCallable($if, static function (Node $node): null {
-            $node->setAttribute(self::PHP73_JSON_CONSTANT_IS_KNOWN, true);
-            return null;
-        });
+        SimpleNodeTraverser::decorateWithAttributeValue($if, self::PHP73_JSON_CONSTANT_IS_KNOWN, true);
     }
 
-    private function resolveFuncCall(Expression $Expression): ?FuncCall
+    private function resolveFuncCall(Expression $expression): ?FuncCall
     {
-        $expr = $Expression->expr;
+        $expr = $expression->expr;
         if ($expr instanceof Assign) {
             if ($expr->expr instanceof FuncCall) {
                 return $expr->expr;
@@ -155,21 +152,22 @@ private function refactorExpression(Expression $expression): ?array
             return null;
         }
 
-        // retrieve a `FuncCall`, if any, from the statement
         $funcCall = $this->resolveFuncCall($expression);
-
-        // Nothing to do if no `FuncCall` found
         if (! $funcCall instanceof FuncCall) {
             return null;
         }
 
+        if ($funcCall->isFirstClassCallable()) {
+            return null;
+        }
+
         // Nothing to do if not a refactored function
-        if (! in_array($this->getName($funcCall), self::REFACTOR_FUNCS, true)) {
+        if (! $this->isNames($funcCall, self::JSON_FUNCTIONS)) {
             return null;
         }
 
         // Nothing to do if the flag `JSON_THROW_ON_ERROR` is not set in args
-        if (! $this->hasConstFetchInArgs($funcCall->args, 'JSON_THROW_ON_ERROR')) {
+        if (! $this->hasConstFetchInArgs($funcCall->getArgs(), 'JSON_THROW_ON_ERROR')) {
             return null;
         }
 
@@ -196,18 +194,12 @@ private function refactorExpression(Expression $expression): ?array
 
     /**
      * Search if a given constant is set within a list of `Arg`
-     * @param array<Arg|VariadicPlaceholder> $args
+     * @param Arg[] $args
      */
     private function hasConstFetchInArgs(array $args, string $constName): bool
     {
         foreach ($args as $arg) {
-            // Only `Arg` instances are handled.
-            if (! $arg instanceof Arg) {
-                return false;
-            }
-
             $value = $arg->value;
-
             if ($value instanceof ConstFetch && $this->getName($value) === $constName) {
                 return true;
             }

rules/DowngradePhp73/Rector/ConstFetch/DowngradePhp73JsonConstRector.php

@@ -22,7 +22,7 @@ class Fixture
 {
     public function run(?int $flags = null)
     {
-        $flags = $flags ?? JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_PRESERVE_ZERO_FRACTION;
+        $flags = $flags ?? JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_PRESERVE_ZERO_FRACTION | 0;
 
         json_encode([], $flags);
     }