Skip to content

Commit

Permalink
Normalize filter paths to forward slashes.
Browse files Browse the repository at this point in the history
  • Loading branch information
JasperTey committed Apr 15, 2024
1 parent 932f656 commit 10fbd47
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions src/Support/DomainAutoloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function __construct()

public function autoload(): void
{
if (! config()->has('ddd.autoload')) {
if (!config()->has('ddd.autoload')) {
return;
}

Expand Down Expand Up @@ -99,10 +99,10 @@ protected function handlePolicies(): void
return Arr::wrap(Collection::times(count($classDirnameSegments), function ($index) use ($class, $classDirnameSegments) {
$classDirname = implode('\\', array_slice($classDirnameSegments, 0, $index));

return $classDirname.'\\Policies\\'.class_basename($class).'Policy';
return $classDirname . '\\Policies\\' . class_basename($class) . 'Policy';
})->reverse()->values()->first(function ($class) {
return class_exists($class);
}) ?: [$classDirname.'\\Policies\\'.class_basename($class).'Policy']);
}) ?: [$classDirname . '\\Policies\\' . class_basename($class) . 'Policy']);
});
}

Expand All @@ -115,18 +115,21 @@ protected function handleFactories(): void

$appNamespace = static::appNamespace();

$modelName = Str::startsWith($modelName, $appNamespace.'Models\\')
? Str::after($modelName, $appNamespace.'Models\\')
$modelName = Str::startsWith($modelName, $appNamespace . 'Models\\')
? Str::after($modelName, $appNamespace . 'Models\\')
: Str::after($modelName, $appNamespace);

return 'Database\\Factories\\'.$modelName.'Factory';
return 'Database\\Factories\\' . $modelName . 'Factory';
});
}

protected static function finder($paths)
{
$filter = app('ddd')->getAutoloadFilter() ?? function (SplFileInfo $file) {
$pathAfterDomain = str($file->getRelativePath())->after('/')->finish('/');
$pathAfterDomain = str($file->getRelativePath())
->replace('\\', '/')
->after('/')
->finish('/');

$ignoredFolders = collect(config('ddd.autoload.ignore', []))
->map(fn ($path) => Str::finish($path, '/'));
Expand Down

0 comments on commit 10fbd47

Please sign in to comment.