fixup! misc

Author: TomasVotruba

rules/DowngradePhp73/Rector/ConstFetch/DowngradePhp73JsonConstRector.php

@@ -152,17 +152,18 @@ private function refactorExpression(Expression $expression): ?array
             return null;
         }
 
+        // retrieve a `FuncCall`, if any, from the statement
         $funcCall = $this->resolveFuncCall($expression);
         if (! $funcCall instanceof FuncCall) {
             return null;
         }
 
-        if ($funcCall->isFirstClassCallable()) {
+        // Nothing to do if not a refactored function
+        if (! $this->isNames($funcCall, self::JSON_FUNCTIONS)) {
             return null;
         }
 
-        // Nothing to do if not a refactored function
-        if (! $this->isNames($funcCall, self::JSON_FUNCTIONS)) {
+        if ($funcCall->isFirstClassCallable()) {
             return null;
         }
 
@@ -200,7 +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;
             }