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:

rules-tests/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector/Fixture/bracket_matches.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\Expression\DowngradeMatchToSwitchRector\Fixture;
+
+final class BracketMatches
+{
+    public function run($delimiter)
+    {
+        $delimiter = match ($delimiter) {
+            '(' => ')',
+            '{' => '}',
+            '[' => ']',
+            '<' => '>',
+            default => $delimiter
+        };
+    }
+}
+
+?>

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

@@ -118,9 +118,9 @@ private function markConstantKnownInInnerStmts(If_ $if): void
         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;
@@ -154,8 +154,6 @@ private function refactorExpression(Expression $expression): ?array
 
         // 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;
         }
@@ -165,12 +163,12 @@ private function refactorExpression(Expression $expression): ?array
             return null;
         }
 
-        if ($funcCall->isFirstClassCallable()) {
+        // Nothing to do if the flag `JSON_THROW_ON_ERROR` is not set in args
+        if (! $this->hasConstFetchInArgs($funcCall->getArgs(), 'JSON_THROW_ON_ERROR')) {
             return null;
         }
 
-        // Nothing to do if the flag `JSON_THROW_ON_ERROR` is not set in args
-        if (! $this->hasConstFetchInArgs($funcCall->getArgs(), 'JSON_THROW_ON_ERROR')) {
+        if ($funcCall->isFirstClassCallable()) {
             return null;
         }
 
@@ -203,8 +201,7 @@ private function hasConstFetchInArgs(array $args, string $constName): bool
     {
         foreach ($args as $arg) {
             $value = $arg->value;
-
-            if ($value instanceof ConstFetch && $this->getName($value) === $constName) {
+            if ($value instanceof ConstFetch && $this->isName($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);
     }