DX: reduce array_filter function usages (#7923)

PHP-CS-Fixer · Apr 7, 2024 · c7f60ee · c7f60ee
1 parent c825d7c
commit c7f60ee
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/src/Console/ConfigurationResolver.php b/src/Console/ConfigurationResolver.php
@@ -832,10 +832,10 @@ private function resolveFinder(): iterable
 
         $isIntersectionPathMode = self::PATH_MODE_INTERSECTION === $this->options['path-mode'];
 
-        $paths = array_filter(array_map(
+        $paths = array_map(
             static fn (string $path) => realpath($path),
             $this->getPath()
-        ));
+        );
 
         if (0 === \count($paths)) {
             if ($isIntersectionPathMode) {

diff --git a/src/Documentation/RuleSetDocumentationGenerator.php b/src/Documentation/RuleSetDocumentationGenerator.php
@@ -87,11 +87,11 @@ public function generateRuleSetsDocumentation(RuleSetDescriptionInterface $defin
             $warningsHeaderLine = str_repeat('-', \strlen($warningsHeader));
             $doc .= "\n\n".implode(
                 "\n",
-                array_filter([
+                [
                     $warningsHeader,
                     $warningsHeaderLine,
                     ...$warnings,
-                ])
+                ]
             );
         }
 

diff --git a/src/Fixer/Import/GlobalNamespaceImportFixer.php b/src/Fixer/Import/GlobalNamespaceImportFixer.php
@@ -146,8 +146,6 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
             $this->fullyQualifyClasses($tokens, $useDeclarations);
         }
 
-        $newImports = array_filter($newImports);
-
         if (\count($newImports) > 0) {
             if (\count($useDeclarations) > 0) {
                 $useDeclaration = end($useDeclarations);

diff --git a/src/Fixer/Import/GroupImportFixer.php b/src/Fixer/Import/GroupImportFixer.php
@@ -143,7 +143,7 @@ private function addGroupUseStatements(array $statements, Tokens $tokens): void
                     $tokens,
                     $insertIndex,
                     $useDeclaration,
-                    $this->getNamespaceNameWithSlash($currentUseDeclaration)
+                    rtrim($this->getNamespaceNameWithSlash($currentUseDeclaration), '\\')
                 );
             } else {
                 $newTokens = [
@@ -225,7 +225,7 @@ private function createNewGroup(Tokens $tokens, int $insertIndex, NamespaceUseAn
             $newTokens[] = new Token([T_WHITESPACE, ' ']);
         }
 
-        $namespaceParts = array_filter(explode('\\', $currentNamespace));
+        $namespaceParts = explode('\\', $currentNamespace);
 
         foreach ($namespaceParts as $part) {
             $newTokens[] = new Token([T_STRING, $part]);