Merge pull request #254 from kingkero

Refactor array_merge out of loops
captainhookphp · Aug 30, 2024 · 454d537 · 454d537
2 parents 53cdd84 + 21cfb06
commit 454d537
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/Git/ChangedFiles/Detector/PrePush.php b/src/Git/ChangedFiles/Detector/PrePush.php
@@ -103,13 +103,10 @@ private function collectChangedFiles(array $ranges, array $filter): array
                 $newHash = 'HEAD';
             }
             if (!empty($oldHash)) {
-                $files = array_merge(
-                    $files,
-                    $this->repository->getDiffOperator()->getChangedFiles($oldHash, $newHash, $filter)
-                );
+                $files[] = $this->repository->getDiffOperator()->getChangedFiles($oldHash, $newHash, $filter);
             }
         }
-        return array_unique($files);
+        return array_unique(array_merge(...$files));
     }
 
     /**

diff --git a/src/Hook/File/Action/DoesNotContainRegex.php b/src/Hook/File/Action/DoesNotContainRegex.php
@@ -90,9 +90,9 @@ protected function getFilesToCheck(Repository $repository): array
         $index = $repository->getIndexOperator();
         $files = [];
         foreach ($this->fileExtensions as $ext) {
-            $files = array_merge($files, $index->getStagedFilesOfType($ext));
+            $files[] = $index->getStagedFilesOfType($ext);
         }
-        return $files;
+        return array_merge(...$files);
     }
 
     /**

diff --git a/src/Runner/Config/Setup/Advanced.php b/src/Runner/Config/Setup/Advanced.php
@@ -107,11 +107,11 @@ protected function getPHPActionOptions(): array
         $options = [];
         $addOption = $this->io->ask('  <info>Add a validator option?</info> <comment>[y,n]</comment> ', 'n');
         while (IOUtil::answerToBool($addOption)) {
-            $options = array_merge($options, $this->getPHPActionOption());
+            $options[] = $this->getPHPActionOption();
             // add another action?
             $addOption = $this->io->ask('  <info>Add another validator option?</info> <comment>[y,n]</comment> ', 'n');
         }
-        return $options;
+        return array_merge(...$options);
     }
 
     /**