Skip to content

Commit 02b4b4c

Browse files
authored
Tidy up entries import (#480)
* Tidy up entries import * Depending on our config settings we might not have a bound entry * pint doesnt like the use
1 parent b1c6382 commit 02b4b4c

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

src/Commands/ImportEntries.php

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,8 @@
55
use Illuminate\Console\Command;
66
use Illuminate\Support\Facades\Facade;
77
use Statamic\Console\RunsInPlease;
8-
use Statamic\Contracts\Entries\CollectionRepository as CollectionRepositoryContract;
9-
use Statamic\Contracts\Entries\Entry as EntryContract;
108
use Statamic\Contracts\Entries\EntryRepository as EntryRepositoryContract;
11-
use Statamic\Eloquent\Entries\Entry as EloquentEntry;
129
use Statamic\Facades\Entry;
13-
use Statamic\Stache\Repositories\CollectionRepository;
1410
use Statamic\Stache\Repositories\EntryRepository;
1511
use Statamic\Statamic;
1612

@@ -47,12 +43,8 @@ public function handle(): int
4743
private function useDefaultRepositories(): void
4844
{
4945
Facade::clearResolvedInstance(EntryRepositoryContract::class);
50-
Facade::clearResolvedInstance(CollectionRepositoryContract::class);
5146

5247
Statamic::repository(EntryRepositoryContract::class, EntryRepository::class);
53-
Statamic::repository(CollectionRepositoryContract::class, CollectionRepository::class);
54-
55-
app()->bind(EntryContract::class, app('statamic.eloquent.entries.entry'));
5648
}
5749

5850
private function importEntries(): void
@@ -71,7 +63,7 @@ private function importEntries(): void
7163
$this->withProgressBar($entriesWithoutOrigin, function ($entry) {
7264
$lastModified = $entry->fileLastModified();
7365

74-
$entry = EloquentEntry::makeModelFromContract($entry)
66+
(app()->has('statamic.eloquent.entries.entry') ? app('statamic.eloquent.entries.entry') : \Statamic\Eloquent\Entries\Entry)::makeModelFromContract($entry)
7567
->fill(['created_at' => $lastModified, 'updated_at' => $lastModified])
7668
->save();
7769
});
@@ -82,7 +74,7 @@ private function importEntries(): void
8274
$this->withProgressBar($entriesWithOrigin, function ($entry) {
8375
$lastModified = $entry->fileLastModified();
8476

85-
EloquentEntry::makeModelFromContract($entry)
77+
(app()->has('statamic.eloquent.entries.entry') ? app('statamic.eloquent.entries.entry') : \Statamic\Eloquent\Entries\Entry)::makeModelFromContract($entry)
8678
->fill(['created_at' => $lastModified, 'updated_at' => $lastModified])
8779
->save();
8880
});

0 commit comments

Comments
 (0)