Skip to content

Commit

Permalink
sort files by default, as always true and to get reproducible builds
Browse files Browse the repository at this point in the history
  • Loading branch information
TomasVotruba committed Jun 29, 2024
1 parent 80aca73 commit 9f68305
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions src/FileSystem/FilesFinder.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function __construct(
* @param string[] $suffixes
* @return string[]
*/
public function findInDirectoriesAndFiles(array $source, array $suffixes = [], bool $sortByName = true): array
public function findInDirectoriesAndFiles(array $source, array $suffixes = []): array
{
$filesAndDirectories = $this->filesystemTweaker->resolveWithFnmatch($source);

Expand Down Expand Up @@ -69,7 +69,7 @@ function (string $file): bool {

// filtering files in directories collection
$directories = $this->fileAndDirectoryFilter->filterDirectories($filesAndDirectories);
$filteredFilePathsInDirectories = $this->findInDirectories($directories, $suffixes, $sortByName);
$filteredFilePathsInDirectories = $this->findInDirectories($directories, $suffixes);

$filePaths = [...$filteredFilePaths, ...$filteredFilePathsInDirectories];
return $this->unchangedFilesFilter->filterFilePaths($filePaths);
Expand Down Expand Up @@ -102,7 +102,7 @@ private function isStartWithShortPHPTag(string $fileContent): bool
* @param string[] $suffixes
* @return string[]
*/
private function findInDirectories(array $directories, array $suffixes, bool $sortByName = true): array
private function findInDirectories(array $directories, array $suffixes): array
{
if ($directories === []) {
return [];
Expand All @@ -112,11 +112,8 @@ private function findInDirectories(array $directories, array $suffixes, bool $so
->files()
// skip empty files
->size('> 0')
->in($directories);

if ($sortByName) {
$finder->sortByName();
}
->in($directories)
->sortByName();

if ($suffixes !== []) {
$suffixesPattern = $this->normalizeSuffixesToPattern($suffixes);
Expand Down

0 comments on commit 9f68305

Please sign in to comment.