fix some errors reported by PhpStorm + Php Inspections (EA Ultimate)

docs/AllRectorsOverview.md

@@ -1,4 +1,4 @@
-# All 370 Rectors Overview
+# All 373 Rectors Overview
 
 - [Projects](#projects)
 - [General](#general)
@@ -45,6 +45,7 @@
 - [Sensio](#sensio)
 - [Shopware](#shopware)
 - [Silverstripe](#silverstripe)
+- [StrictCodeQuality](#strictcodequality)
 - [Sylius](#sylius)
 - [Symfony](#symfony)
 - [SymfonyCodeQuality](#symfonycodequality)
@@ -1241,6 +1242,36 @@ include/require should be followed by absolute path
 
 <br>
 
+### `FunctionCallToConstantRector`
+
+- class: `Rector\CodingStyle\Rector\FuncCall\FunctionCallToConstantRector`
+
+Changes use of function calls to use constants
+
+```diff
+ class SomeClass
+ {
+     public function run()
+     {
+-        $value = php_sapi_name();
++        $value = PHP_SAPI;
+     }
+ }
+```
+
+```diff
+ class SomeClass
+ {
+     public function run()
+     {
+-        $value = pi();
++        $value = M_PI;
+     }
+ }
+```
+
+<br>
+
 ### `IdenticalFalseToBooleanNotRector`
 
 - class: `Rector\CodingStyle\Rector\Identical\IdenticalFalseToBooleanNotRector`
@@ -1629,6 +1660,25 @@ Constant should have a @var comment with type
 
 <br>
 
+### `VersionCompareFuncCallToConstantRector`
+
+- class: `Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector`
+
+Changes use of call to version compare function to use of PHP version constant
+
+```diff
+ class SomeClass
+ {
+     public function run()
+     {
+-        version_compare(PHP_VERSION, '5.3.0', '<');
++        PHP_VERSION_ID < 50300;
+     }
+ }
+```
+
+<br>
+
 ### `YieldClassMethodToArrayClassMethodRector`
 
 - class: `Rector\CodingStyle\Rector\ClassMethod\YieldClassMethodToArrayClassMethodRector`
@@ -5940,6 +5990,28 @@ Turns defined function call to static method call.
 
 <br>
 
+## StrictCodeQuality
+
+### `VarInlineAnnotationToAssertRector`
+
+- class: `Rector\StrictCodeQuality\Rector\Stmt\VarInlineAnnotationToAssertRector`
+
+Turn @var inline checks above code to assert() of hte type
+
+```diff
+ class SomeClass
+ {
+     public function run()
+     {
+         /** @var SpecificClass $value */
++        assert($value instanceof SpecificClass);
+         $value->call();
+     }
+ }
+```
+
+<br>
+
 ## Sylius
 
 ### `ReplaceCreateMethodWithoutReviewerRector`

packages/Autodiscovery/src/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector.php

@@ -92,7 +92,11 @@ private function processGroupNamesBySuffix(
             }
 
             // is suffix in the same category, e.g. "Exception/SomeException.php"
-            $expectedLocationFilePattern = sprintf('#\/%s\/.+%s#', preg_quote($groupName), preg_quote($suffixPattern));
+            $expectedLocationFilePattern = sprintf(
+                '#\/%s\/.+%s#',
+                preg_quote($groupName, '#'),
+                preg_quote($suffixPattern, '#')
+            );
             if (Strings::match($smartFileInfo->getRealPath(), $expectedLocationFilePattern)) {
                 continue;
             }

packages/BetterPhpDocParser/src/PhpDocParser/ClassAnnotationMatcher.php

@@ -34,7 +34,7 @@ public function isTagMatchToNodeAndClass(string $tag, Node $node, string $matchi
     private function isUseMatchingName(string $tag, UseUse $useUse): bool
     {
         $shortName = $useUse->alias ? $useUse->alias->name : $useUse->name->getLast();
-        $shortNamePattern = preg_quote($shortName);
+        $shortNamePattern = preg_quote($shortName, '#');
 
         return (bool) Strings::match($tag, '#' . $shortNamePattern . '(\\\\[\w]+)?#i');
     }

packages/BetterPhpDocParser/src/Printer/OriginalSpacingRestorer.php

@@ -77,18 +77,22 @@ private function detectOldWhitespaces(Node $node, array $tokens, StartEndValueOb
                     }
                 }
 
-                $oldWhitespaces[] = $value;
+                $oldWhitespaces[] = [$value];
             }
 
             // quoted string with spaces?
             if ($this->isQuotedStringWithSpaces($tokens, $i)) {
                 $matches = Strings::matchAll($tokens[$i][0], '#\s+#m');
                 if ($matches !== []) {
-                    $oldWhitespaces = array_merge($oldWhitespaces, Arrays::flatten($matches));
+                    $oldWhitespaces[] = Arrays::flatten($matches);
                 }
             }
         }
 
+        if ($oldWhitespaces !== []) {
+            $oldWhitespaces = array_merge([], ...$oldWhitespaces);
+        }
+
         return $oldWhitespaces;
     }
 

packages/DeadCode/src/UnusedNodeResolver/ClassUnusedPrivateClassMethodResolver.php

@@ -101,7 +101,11 @@ private function filterOutInterfaceRequiredMethods(Class_ $class, array $unusedM
 
         $interfaceMethods = [];
         foreach ($interfaces as $interface) {
-            $interfaceMethods = array_merge($interfaceMethods, get_class_methods($interface));
+            $interfaceMethods[] = get_class_methods($interface);
+        }
+
+        if ($interfaceMethods !== []) {
+            $interfaceMethods = array_merge([], ...$interfaceMethods);
         }
 
         return array_diff($unusedMethods, $interfaceMethods);

packages/NodeTypeResolver/src/NodeTypeResolver.php

@@ -710,13 +710,14 @@ private function unionWithParentClassesInterfacesAndUsedTraits(Type $type): Type
 
                     $classReflection = $this->broker->getClass($unionedType->getClassName());
 
-                    $allTypes = array_merge(
-                        $allTypes,
-                        $this->classReflectionTypesResolver->resolve($classReflection)
-                    );
+                    $allTypes[] = $this->classReflectionTypesResolver->resolve($classReflection);
                 }
             }
 
+            if ($allTypes !== []) {
+                $allTypes = array_merge([], ...$allTypes);
+            }
+
             return $this->typeFactory->createObjectTypeOrUnionType($allTypes);
         }
 

packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockNameImporter.php

@@ -195,8 +195,8 @@ private function isCurrentNamespaceSameShortClassAlreadyUsed(
         // short with space " Type"| fqn
         $shortNameOrFullyQualifiedNamePattern = sprintf(
             '#(\s%s\b|\b%s\b)#',
-            preg_quote($shortenedObjectType->getShortName()),
-            preg_quote($fullyQualifiedName)
+            preg_quote($shortenedObjectType->getShortName(), '#'),
+            preg_quote($fullyQualifiedName, '#')
         );
 
         $isShortClassUsed = (bool) Strings::match($printedClass, $shortNameOrFullyQualifiedNamePattern);

packages/PHPUnit/src/Composer/ComposerAutoloadedDirectoryProvider.php

@@ -41,7 +41,11 @@ public function provide(): array
             }
 
             $sectionDirectories = $this->collectDirectoriesFromAutoload($composerJson[$autoloadSection]);
-            $autoloadDirectories = array_merge($autoloadDirectories, $sectionDirectories);
+            $autoloadDirectories[] = $sectionDirectories;
+        }
+
+        if ($autoloadDirectories !== []) {
+            $autoloadDirectories = array_merge([], ...$autoloadDirectories);
         }
 
         return $autoloadDirectories;

packages/PHPUnit/src/Rector/Class_/ArrayArgumentInTestToDataProviderRector.php

@@ -200,7 +200,7 @@ public function refactor(Node $node): ?Node
 
         $dataProviderClassMethods = $this->createDataProviderClassMethodsFromRecipes();
 
-        $node->stmts = array_Merge($node->stmts, $dataProviderClassMethods);
+        $node->stmts = array_merge($node->stmts, $dataProviderClassMethods);
 
         return $node;
     }

packages/PHPUnit/src/Rector/TryCatchToExpectExceptionRector.php

@@ -246,7 +246,7 @@ private function processExceptionMessageContains(MethodCall $methodCall, Variabl
         if ($methodCall->args[0]->value instanceof String_) {
             /** @var String_ $oldString */
             $oldString = $methodCall->args[0]->value;
-            $methodCall->args[0]->value = new String_('#' . preg_quote($oldString->value) . '#');
+            $methodCall->args[0]->value = new String_('#' . preg_quote($oldString->value, '#') . '#');
         }
 
         $this->newExpressions[] = $expression;

packages/Php71/src/Rector/TryCatch/MultiExceptionCatchRector.php

@@ -104,7 +104,11 @@ private function collectTypesFromCatchedByIds(TryCatch $tryCatch, array $keys):
         $collectedTypes = [];
 
         foreach ($keys as $key) {
-            $collectedTypes = array_merge($collectedTypes, $tryCatch->catches[$key]->types);
+            $collectedTypes[] = $tryCatch->catches[$key]->types;
+        }
+
+        if ($collectedTypes !== []) {
+            $collectedTypes = array_merge([], ...$collectedTypes);
         }
 
         return $collectedTypes;

packages/Symfony/src/Rector/Form/FormIsValidRector.php

@@ -116,13 +116,16 @@ private function findMethodCallNamesOnVariable(Variable $variable): array
         $previousMethodCallNames = [];
 
         do {
-            $methodCallNames = $this->collectMethodCallsOnVariableName($parentNode, $variableName);
-            $previousMethodCallNames = array_merge($previousMethodCallNames, $methodCallNames);
+            $previousMethodCallNames[] = $this->collectMethodCallsOnVariableName($parentNode, $variableName);
 
             $parentNode = $parentNode->getAttribute(AttributeKey::PARENT_NODE);
         } while ($parentNode instanceof Node && ! $parentNode instanceof FunctionLike);
 
-        return array_unique($previousMethodCallNames);
+        if ($previousMethodCallNames !== []) {
+            $previousMethodCallNames = array_unique(array_merge([], ...$previousMethodCallNames));
+        }
+
+        return $previousMethodCallNames;
     }
 
     /**

packages/TypeDeclaration/src/TypeInferer/PropertyTypeInferer.php

@@ -68,7 +68,7 @@ private function unionWithDefaultValueType(Type $type, Type $defaultValueType):
             return $defaultValueType;
         }
 
-        $types = array_merge([$type], [$defaultValueType]);
+        $types = [$type, $defaultValueType];
         return $this->typeFactory->createMixedPassedOrUnionType($types);
     }
 }

src/FileSystem/FilesystemTweaker.php

@@ -18,13 +18,20 @@ public function resolveDirectoriesWithFnmatch(array $directories): array
         $absoluteDirectories = [];
         foreach ($directories as $directory) {
             if (Strings::contains($directory, '*')) { // is fnmatch for directories
-                $absoluteDirectories = array_merge($absoluteDirectories, glob($directory, GLOB_ONLYDIR));
+                $globDirectory = glob($directory, GLOB_ONLYDIR);
+                if ($globDirectory !== false) {
+                    $absoluteDirectories[] = $globDirectory;
+                }
             } else { // is classic directory
                 $this->ensureDirectoryExists($directory);
-                $absoluteDirectories[] = $directory;
+                $absoluteDirectories[] = [$directory];
             }
         }
 
+        if ($absoluteDirectories !== []) {
+            $absoluteDirectories = array_merge([], ...$absoluteDirectories);
+        }
+
         return $absoluteDirectories;
     }
 

src/Rector/Psr4/MultipleClassFileToPsr4ClassesRector.php

@@ -214,7 +214,7 @@ private function processNodesWithoutNamespace(array $nodes, SmartFileInfo $smart
             $fileDestination = $this->createClassLikeFileDestination($node, $smartFileInfo);
 
             if ($declareNode) {
-                $nodes = array_merge([$declareNode], [$node]);
+                $nodes = [$declareNode, $node];
             } else {
                 $nodes = [$node];
             }