Skip to content

Commit 939a715

Browse files
committed
ContainerFactory - always check duplicate files
1 parent f17cf9e commit 939a715

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/Command/CommandHelper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public static function begin(
212212
$paths = array_map(static fn (string $path): string => $currentWorkingDirectoryFileHelper->normalizePath($currentWorkingDirectoryFileHelper->absolutizePath($path)), $paths);
213213

214214
$analysedPathsFromConfig = [];
215-
$containerFactory = new ContainerFactory($currentWorkingDirectory, true);
215+
$containerFactory = new ContainerFactory($currentWorkingDirectory);
216216
$projectConfig = null;
217217
if ($projectConfigFile !== null) {
218218
if (!is_file($projectConfigFile)) {

src/DependencyInjection/ContainerFactory.php

+1-5
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class ContainerFactory
7171
private static ?int $lastInitializedContainerId = null;
7272

7373
/** @api */
74-
public function __construct(private string $currentWorkingDirectory, private bool $checkDuplicateFiles = false)
74+
public function __construct(private string $currentWorkingDirectory)
7575
{
7676
$this->fileHelper = new FileHelper($currentWorkingDirectory);
7777

@@ -277,10 +277,6 @@ private function detectDuplicateIncludedFiles(
277277
return [$normalized, $configArray];
278278
}
279279

280-
if (!$this->checkDuplicateFiles) {
281-
return [$normalized, $configArray];
282-
}
283-
284280
$duplicateFiles = array_unique(array_diff_key($normalized, $deduplicated));
285281

286282
throw new DuplicateIncludedFilesException($duplicateFiles);

0 commit comments

Comments
 (0)