Remove ability to toggle sort files. On by default

Author: timacdonald

src/Box.php

@@ -74,7 +74,6 @@ private function __construct(
         private Phar $phar,
         private readonly string $pharFilePath,
         private readonly bool $enableParallelization,
-        private readonly bool $sortCompiledFiles,
     ) {
         $this->compactors = new Compactors();
         $this->placeholderCompactor = new Placeholder([]);
@@ -96,7 +95,6 @@ public static function create(
         int $pharFlags = 0,
         ?string $pharAlias = null,
         bool $enableParallelization = false,
-        bool $sortCompiledFiles = false,
     ): self {
         // Ensure the parent directory of the PHAR file exists as `new \Phar()` does not create it and would fail
         // otherwise.
@@ -106,7 +104,6 @@ public static function create(
             new Phar($pharFilePath, $pharFlags, $pharAlias),
             $pharFilePath,
             $enableParallelization,
-            $sortCompiledFiles,
         );
     }
 
@@ -145,9 +142,7 @@ public function endBuffering(?callable $dumpAutoload): void
             $files = [];
 
             foreach ($this->bufferedFiles as $file) {
-                if ($this->sortCompiledFiles) {
-                    $files[$file->getPath()] = $tmp.DIRECTORY_SEPARATOR.$file->getPath();
-                }
+                $files[$file->getPath()] = $tmp.DIRECTORY_SEPARATOR.$file->getPath();
 
                 FS::dumpFile(
                     $file->getPath(),
@@ -165,26 +160,22 @@ public function endBuffering(?callable $dumpAutoload): void
 
             chdir($cwd);
 
-            if ($this->sortCompiledFiles) {
-                $unknownFiles = Finder::create()
-                    ->files()
-                    ->in($tmp)
-                    ->notPath(array_keys($files))
-                    ->sortByName();
+            $unknownFiles = Finder::create()
+                ->files()
+                ->in($tmp)
+                ->notPath(array_keys($files))
+                ->sortByName();
 
-                $files = [...$files, ...$unknownFiles];
+            $files = [...$files, ...$unknownFiles];
 
-                uasort($files, static function (SplFileInfo|string $a, SplFileInfo|string $b) {
-                    $a = is_string($a) ? $a : $a->getPath();
-                    $b = is_string($b) ? $b : $b->getPath();
+            uasort($files, static function (SplFileInfo|string $a, SplFileInfo|string $b) {
+                $a = is_string($a) ? $a : $a->getPath();
+                $b = is_string($b) ? $b : $b->getPath();
 
-                    return strcmp($a, $b);
-                });
+                return strcmp($a, $b);
+            });
 
-                $this->phar->buildFromIterator(new ArrayIterator($files), $tmp);
-            } else {
-                $this->phar->buildFromDirectory($tmp);
-            }
+            $this->phar->buildFromIterator(new ArrayIterator($files), $tmp);
         } finally {
             FS::remove($tmp);
         }

src/Console/Command/CompileCommand.php

@@ -100,7 +100,6 @@ final class CompileCommand implements CommandAware
 
     private const DEBUG_OPTION = 'debug';
     private const NO_PARALLEL_PROCESSING_OPTION = 'no-parallel';
-    private const SORT_COMPILED_FILES = 'sort-compiled-files';
     private const NO_RESTART_OPTION = 'no-restart';
     private const DEV_OPTION = 'dev';
     private const NO_CONFIG_OPTION = 'no-config';
@@ -136,12 +135,6 @@ public function getConfiguration(): CommandConfiguration
                     InputOption::VALUE_NONE,
                     'Disable the parallel processing',
                 ),
-                new InputOption(
-                    self::SORT_COMPILED_FILES,
-                    null,
-                    InputOption::VALUE_NONE,
-                    'Sort compiled files',
-                ),
                 new InputOption(
                     self::NO_RESTART_OPTION,
                     null,
@@ -207,15 +200,6 @@ public function execute(IO $io): int
             );
         }
 
-        $sortCompiledFiles = $io->getTypedOption(self::SORT_COMPILED_FILES)->asBoolean();
-
-        if ($sortCompiledFiles) {
-            $io->writeln(
-                '<info>[debug] Enabled sorting compiled files</info>',
-                OutputInterface::VERBOSITY_DEBUG,
-            );
-        }
-
         ChangeWorkingDirOption::changeWorkingDirectory($io);
 
         $io->writeln($this->header);
@@ -240,7 +224,7 @@ public function execute(IO $io): int
         $restoreLimit = OpenFileDescriptorLimiter::bumpLimit(2048, $io);
 
         try {
-            $box = $this->createPhar($config, $logger, $io, !$disableParallelization, $sortCompiledFiles, $debug);
+            $box = $this->createPhar($config, $logger, $io, !$disableParallelization, $debug);
         } finally {
             $restoreLimit();
         }
@@ -261,11 +245,10 @@ private function createPhar(
         CompilerLogger $logger,
         IO $io,
         bool $enableParallelization,
-        bool $sortCompiledFiles,
         bool $debug,
     ): Box {
         $tmpOutputPath = $config->getTmpOutputPath();
-        $box = Box::create($tmpOutputPath, enableParallelization: $enableParallelization, sortCompiledFiles: $sortCompiledFiles);
+        $box = Box::create($tmpOutputPath, enableParallelization: $enableParallelization);
         $composerOrchestrator = new ComposerOrchestrator(
             ComposerProcessFactory::create(
                 $config->getComposerBin(),

tests/Benchmark/CompileBench.php

@@ -67,10 +67,9 @@ public function tearDown(): void
     public function bench(array $params): void
     {
         $enableParallelization = $params[1];
-        $sortCompiledFiles = $params[2];
 
         $exitCode = $this->runner->run(
-            self::createIO($enableParallelization, $sortCompiledFiles),
+            self::createIO($enableParallelization),
         );
 
         Assert::assertSame(ExitCode::SUCCESS, $exitCode);
@@ -112,21 +111,9 @@ public static function parameterProvider(): iterable
             true,
             false,
         ];
-
-        yield 'with compactors; no parallel processing; sort compiled files' => [
-            self::WITH_COMPACTORS_DIR,
-            false,
-            true,
-        ];
-
-        yield 'with compactors; parallel processing; sort compiled files' => [
-            self::WITH_COMPACTORS_DIR,
-            true,
-            true,
-        ];
     }
 
-    private static function createIO(bool $enableParallelization, bool $sortCompiledFiles): IO
+    private static function createIO(bool $enableParallelization): IO
     {
         $input = [
             'compile',
@@ -137,10 +124,6 @@ private static function createIO(bool $enableParallelization, bool $sortCompiled
             $input['--no-parallel'] = null;
         }
 
-        if ($sortCompiledFiles) {
-            $input['--sort-compiled-files'] = null;
-        }
-
         return new IO(
             new ArrayInput($input),
             new NullOutput(),