diff --git a/src/Commands/ImportAssets.php b/src/Commands/ImportAssets.php index bdbcdd59..29f2b235 100644 --- a/src/Commands/ImportAssets.php +++ b/src/Commands/ImportAssets.php @@ -76,7 +76,6 @@ private function importAssetContainers() return; } - if (! $this->option('only-asset-containers') && ! $this->option('force') && ! $this->confirm('Do you want to import asset containers?')) { return; } diff --git a/tests/Commands/ImportAssetsTest.php b/tests/Commands/ImportAssetsTest.php index 67f7f50d..27070f88 100644 --- a/tests/Commands/ImportAssetsTest.php +++ b/tests/Commands/ImportAssetsTest.php @@ -4,15 +4,12 @@ use Illuminate\Http\UploadedFile; use Illuminate\Support\Facades\Facade; -use Illuminate\Support\Facades\Storage; use Statamic\Contracts\Assets\Asset as AssetContract; use Statamic\Contracts\Assets\AssetContainer as AssetContainerContract; use Statamic\Contracts\Assets\AssetContainerRepository as AssetContainerRepositoryContract; use Statamic\Contracts\Assets\AssetRepository as AssetRepositoryContract; use Statamic\Eloquent\Assets\AssetContainerModel; use Statamic\Eloquent\Assets\AssetModel; -use Statamic\Eloquent\Forms\FormModel; -use Statamic\Eloquent\Forms\SubmissionModel; use Tests\PreventSavingStacheItemsToDisk; use Tests\TestCase; diff --git a/tests/Commands/ImportBlueprintsTest.php b/tests/Commands/ImportBlueprintsTest.php index d9aa456a..85a76c60 100644 --- a/tests/Commands/ImportBlueprintsTest.php +++ b/tests/Commands/ImportBlueprintsTest.php @@ -2,17 +2,9 @@ namespace Tests\Commands; -use Illuminate\Http\UploadedFile; use Illuminate\Support\Facades\Facade; -use Illuminate\Support\Facades\Storage; -use Statamic\Contracts\Assets\Asset as AssetContract; -use Statamic\Contracts\Assets\AssetContainer as AssetContainerContract; -use Statamic\Eloquent\Assets\AssetContainerModel; -use Statamic\Eloquent\Assets\AssetModel; use Statamic\Eloquent\Fields\BlueprintModel; use Statamic\Eloquent\Fields\FieldsetModel; -use Statamic\Eloquent\Forms\FormModel; -use Statamic\Eloquent\Forms\SubmissionModel; use Statamic\Facades\Blueprint as BlueprintFacade; use Statamic\Facades\Fieldset as FieldsetFacade; use Statamic\Fields\Blueprint; diff --git a/tests/Commands/ImportCollectionsTest.php b/tests/Commands/ImportCollectionsTest.php index 14bb9927..0d384c44 100644 --- a/tests/Commands/ImportCollectionsTest.php +++ b/tests/Commands/ImportCollectionsTest.php @@ -3,15 +3,14 @@ namespace Tests\Commands; use Illuminate\Support\Facades\Facade; -use Statamic\Contracts\Entries\CollectionRepository as CollectionRepositoryContract; use Statamic\Contracts\Entries\Collection as CollectionContract; +use Statamic\Contracts\Entries\CollectionRepository as CollectionRepositoryContract; +use Statamic\Contracts\Entries\Entry as EntryContract; use Statamic\Contracts\Entries\EntryRepository as EntryRepositoryContract; -use Statamic\Contracts\Structures\CollectionTreeRepository as CollectionTreeRepositoryContract; use Statamic\Contracts\Structures\CollectionTree as CollectionTreeContract; +use Statamic\Contracts\Structures\CollectionTreeRepository as CollectionTreeRepositoryContract; use Statamic\Eloquent\Collections\CollectionModel; use Statamic\Eloquent\Structures\TreeModel; -use Statamic\Facades\Collection as CollectionFacade; -use Statamic\Contracts\Entries\Entry as EntryContract; use Statamic\Facades\Entry; use Statamic\Structures\CollectionStructure; use Tests\PreventSavingStacheItemsToDisk; @@ -36,6 +35,7 @@ public function setUp(): void /** * @test + * * @dataProvider entriesDriverProvider */ public function it_imports_collections_and_collection_trees(string $repository, string $entry) @@ -76,7 +76,7 @@ public static function entriesDriverProvider(): array return [ 'stache-entries' => [ 'repository' => \Statamic\Stache\Repositories\EntryRepository::class, - 'entry' => \Statamic\Entries\Entry::class + 'entry' => \Statamic\Entries\Entry::class, ], 'eloquent-entries' => [ 'repository' => \Statamic\Eloquent\Entries\EntryRepository::class,