Fix an issue where the caching command would crash if an issue did no…

…t exist
spatie · Oct 23, 2024 · 1486dd4 · 1486dd4
1 parent 0ff1fab
commit 1486dd4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/Support/Caching/DataClassFinder.php b/src/Support/Caching/DataClassFinder.php
@@ -10,7 +10,7 @@ class DataClassFinder
  public static function fromConfig(array $config): self
  {
  return new self(
- directories: $config['directories'],
+ directories:  array_filter($config['directories'], 'is_dir'),
  useReflection: $config['reflection_discovery']['enabled'],
  reflectionBasePath: $config['reflection_discovery']['base_path'],
  reflectionRootNamespace: $config['reflection_discovery']['root_namespace'],

diff --git a/tests/Commands/DataStructuresCacheCommandTest.php b/tests/Commands/DataStructuresCacheCommandTest.php
@@ -37,3 +37,27 @@ function () {
  expect(invade($config)->transformers)->toHaveCount(count(config('data.transformers')));
  expect(invade($config)->casts)->toHaveCount(count(config('data.casts')));
 });
+
+it('will ignore non existing directories', function () {
+ // Ensure we cache
+ App::forgetInstance(DataConfig::class);
+
+ app()->singleton(
+ DataConfig::class,
+ function () {
+ return app()->make(DataStructureCache::class)->getConfig() ?? DataConfig::createFromConfig(config('data'));
+ }
+ );
+
+ config()->set('data.structure_caching.directories', [
+ __DIR__.'/../Fakes',
+ __DIR__.'/../NonExisting',
+ ]);
+
+ config()->set('data.structure_caching.reflection_discovery.base_path', __DIR__.'/../Fakes');
+ config()->set('data.structure_caching.reflection_discovery.root_namespace', 'Spatie\LaravelData\Tests\Fakes');
+
+ $this->artisan('data:cache-structures')->assertExitCode(0);
+
+ expect(cache()->has('laravel-data.data-class.'. SimpleData::class))->toBeTrue();
+});