diff --git a/CHANGELOG.md b/CHANGELOG.md index 56fe0cb..2d64fae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to `laravel-ddd` will be documented in this file. ## [Unversioned] ### Added -- Ability to ignore folders during autoloading via config(`ddd.autoload.ignore`), or register a custom filter callback via `DDD::filterAutoloadPathsUsing(callable $filter)`. +- Ability to ignore folders during autoloading via config(`ddd.autoload_ignore`), or register a custom filter callback via `DDD::filterAutoloadPathsUsing(callable $filter)`. ### Changed - Internal: Domain cache is no longer quietly cleared on laravel's `cache:clearing` event, so that `ddd:cache` yields consistent results no matter what order runs in production (before or after `cache:clear` or `optimize:clear` commands). diff --git a/src/Support/DomainAutoloader.php b/src/Support/DomainAutoloader.php index 025f328..3174afa 100644 --- a/src/Support/DomainAutoloader.php +++ b/src/Support/DomainAutoloader.php @@ -28,7 +28,7 @@ public function __construct() public function autoload(): void { - if (! config()->has('ddd.autoload')) { + if (!config()->has('ddd.autoload')) { return; } @@ -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']); }); } @@ -115,11 +115,11 @@ 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'; }); } @@ -131,7 +131,7 @@ protected static function finder($paths) ->after('/') ->finish('/'); - $ignoredFolders = collect(config('ddd.autoload.ignore', [])) + $ignoredFolders = collect(config('ddd.autoload_ignore', [])) ->map(fn ($path) => Str::finish($path, '/')); if ($pathAfterDomain->startsWith($ignoredFolders)) { diff --git a/tests/Autoload/IgnoreTest.php b/tests/Autoload/IgnoreTest.php index 364d75b..0e94256 100644 --- a/tests/Autoload/IgnoreTest.php +++ b/tests/Autoload/IgnoreTest.php @@ -28,7 +28,7 @@ expect($cached)->toEqual($expected); - Config::set('ddd.autoload.ignore', ['Commands']); + Config::set('ddd.autoload_ignore', ['Commands']); Artisan::call('ddd:cache'); @@ -43,7 +43,7 @@ expect($cached)->toEqual($expected); - Config::set('ddd.autoload.ignore', ['Providers']); + Config::set('ddd.autoload_ignore', ['Providers']); Artisan::call('ddd:cache');