Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/eloquent-driver.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
'driver' => 'file',
'blueprint_model' => \Statamic\Eloquent\Fields\BlueprintModel::class,
'fieldset_model' => \Statamic\Eloquent\Fields\FieldsetModel::class,
'namespaces' => 'all',
],

'collections' => [
Expand Down
33 changes: 33 additions & 0 deletions src/Fields/BlueprintRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ public function find($blueprint): ?Blueprint
return null;
}

if (! $this->isEloquentDrivenNamespace($namespace)) {
return parent::find($blueprint);
}

$blueprintModel = ($namespace ? $this->filesIn($namespace) : app('statamic.eloquent.blueprints.blueprint_model')::whereNull('namespace'))
->where('handle', $handle)
->first();
Expand All @@ -43,13 +47,21 @@ public function save(Blueprint $blueprint)
{
$this->clearBlinkCaches();

if (! $this->isEloquentDrivenNamespace($blueprint->namespace())) {
return parent::save($blueprint);
}

$this->updateModel($blueprint);
}

public function delete(Blueprint $blueprint)
{
$this->clearBlinkCaches();

if (! $this->isEloquentDrivenNamespace($blueprint->namespace())) {
return parent::delete($blueprint);
}

$this->deleteModel($blueprint);
}

Expand All @@ -62,6 +74,10 @@ private function clearBlinkCaches()

public function in(string $namespace)
{
if (! $this->isEloquentDrivenNamespace($namespace)) {
return parent::in($namespace);
}

return $this
->filesIn($namespace)
->map(function ($file) {
Expand Down Expand Up @@ -202,4 +218,21 @@ private function updateOrderFromBlueprintSections($contents)

return $contents;
}

private function isEloquentDrivenNamespace(?string $namespace)
{
if (! $namespace) {
return true;
}

$eloquentNamespaces = config('statamic.eloquent-driver.blueprints.namespaces', 'all');

if ($eloquentNamespaces !== 'all') {
if (! in_array($namespace, Arr::wrap($eloquentNamespaces))) {
return false;
}
}

return true;
}
}
8 changes: 4 additions & 4 deletions src/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,10 @@ private function registerBlueprints()
return config('statamic.eloquent-driver.blueprints.fieldset_model');
});

$this->app->singleton(
'Statamic\Fields\BlueprintRepository',
'Statamic\Eloquent\Fields\BlueprintRepository'
);
$this->app->singleton(\Statamic\Fields\BlueprintRepository::class, function () {
return (new \Statamic\Eloquent\Fields\BlueprintRepository)
->setDirectory(resource_path('blueprints'));
});

$this->app->singleton(
'Statamic\Fields\FieldsetRepository',
Expand Down
25 changes: 21 additions & 4 deletions tests/Data/Fields/BlueprintTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Tests\Data\Fields;

use Illuminate\Foundation\Testing\RefreshDatabase;
use Statamic\Eloquent\Fields\BlueprintModel;
use Statamic\Facades\Blueprint;
use Tests\TestCase;

Expand All @@ -14,10 +15,10 @@ public function setUp(): void
{
parent::setUp();

$this->app->singleton(
'Statamic\Fields\BlueprintRepository',
'Statamic\Eloquent\Fields\BlueprintRepository'
);
$this->app->singleton(\Statamic\Fields\BlueprintRepository::class, function () {
return (new \Statamic\Eloquent\Fields\BlueprintRepository)
->setDirectory(resource_path('blueprints'));
});

$this->app->singleton(
'Statamic\Fields\FieldsetRepository',
Expand Down Expand Up @@ -70,4 +71,20 @@ public function it_deletes_the_model_when_the_blueprint_is_deleted()

$this->assertNull($model);
}

/** @test */
public function it_uses_file_based_namespaces()
{
config()->set('statamic.eloquent-driver.blueprints.namespaces', ['collections']);

$this->assertCount(1, BlueprintModel::all());

$blueprint = Blueprint::make()
->setNamespace('forms')
->setHandle('test')
->setHidden(true)
->save();

$this->assertCount(1, BlueprintModel::all()); // we check theres no new database entries, ie its been handled by files
}
}