Merge branch 'fix/add-arguments-to-import-commands' of github.com:sta…

…tamic/eloquent-driver into fix/add-arguments-to-import-commands

src/Commands/ImportAssets.php

@@ -7,7 +7,6 @@
 use Statamic\Assets\AssetContainerContents;
 use Statamic\Assets\AssetRepository;
 use Statamic\Console\RunsInPlease;
-use Statamic\Contracts\Assets\Asset;
 use Statamic\Contracts\Assets\AssetContainer as AssetContainerContract;
 use Statamic\Contracts\Assets\AssetContainerRepository as AssetContainerRepositoryContract;
 use Statamic\Contracts\Assets\AssetRepository as AssetRepositoryContract;
@@ -37,12 +36,10 @@ class ImportAssets extends Command
      *
      * @var string
      */
-    protected $description = "Imports file-based asset containers & asset metadata into the database.";
+    protected $description = 'Imports file-based asset containers & asset metadata into the database.';
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
     public function handle(): int
     {
@@ -76,7 +73,7 @@ private function importAssetContainers(): void
             AssetContainer::makeModelFromContract($container);
         });
 
-        $this->components->info("Assets containers imported sucessfully");
+        $this->components->info('Assets containers imported sucessfully');
     }
 
     private function importAssets(): void
@@ -89,7 +86,7 @@ private function importAssets(): void
             EloquentAsset::makeModelFromContract($asset);
         });
 
-        $this->components->info("Assets imported sucessfully");
+        $this->components->info('Assets imported sucessfully');
     }
 
     private function shouldImportAssetContainers(): bool

src/Commands/ImportBlueprints.php

@@ -33,8 +33,6 @@ class ImportBlueprints extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
     public function handle(): int
     {

src/Commands/ImportCollections.php

@@ -39,8 +39,6 @@ class ImportCollections extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
     public function handle(): int
     {

src/Commands/ImportEntries.php

@@ -34,8 +34,6 @@ class ImportEntries extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
     public function handle(): int
     {

src/Commands/ImportForms.php

@@ -37,8 +37,6 @@ class ImportForms extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
     public function handle(): int
     {

src/Commands/ImportGlobals.php

@@ -34,12 +34,10 @@ class ImportGlobals extends Command
      *
      * @var string
      */
-    protected $description = "Imports file-based global sets & variables into the database.";
+    protected $description = 'Imports file-based global sets & variables into the database.';
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
     public function handle(): int
     {

src/Commands/ImportNavs.php

@@ -34,12 +34,10 @@ class ImportNavs extends Command
      *
      * @var string
      */
-    protected $description = "Imports file-based navigations & nav trees into the database.";
+    protected $description = 'Imports file-based navigations & nav trees into the database.';
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
     public function handle(): int
     {

src/Commands/ImportRevisions.php

@@ -25,17 +25,16 @@ class ImportRevisions extends Command
      *
      * @var string
      */
-    protected $description = "Imports file-based revisions into the database.";
+    protected $description = 'Imports file-based revisions into the database.';
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
     public function handle(): int
     {
         if (! config('statamic.revisions.enabled')) {
-            $this->components->error("This import can only be run when revisions are enabled.");
+            $this->components->error('This import can only be run when revisions are enabled.');
+
             return 1;
         }
 

src/Commands/ImportTaxonomies.php

@@ -38,12 +38,10 @@ class ImportTaxonomies extends Command
      *
      * @var string
      */
-    protected $description = "Imports file-based taxonomies & terms into the database.";
+    protected $description = 'Imports file-based taxonomies & terms into the database.';
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
     public function handle(): int
     {

tests/Commands/ImportAssetsTest.php

@@ -10,15 +10,14 @@
 use Statamic\Contracts\Assets\AssetRepository as AssetRepositoryContract;
 use Statamic\Eloquent\Assets\AssetContainerModel;
 use Statamic\Eloquent\Assets\AssetModel;
+use Statamic\Facades\AssetContainer;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
-use Statamic\Facades\AssetContainer;
 
 class ImportAssetsTest extends TestCase
 {
     use PreventSavingStacheItemsToDisk;
 
-
     public function setUp(): void
     {
         parent::setUp();

tests/Commands/ImportCollectionsTest.php

@@ -11,8 +11,8 @@
 use Statamic\Contracts\Structures\CollectionTreeRepository as CollectionTreeRepositoryContract;
 use Statamic\Eloquent\Collections\CollectionModel;
 use Statamic\Eloquent\Structures\TreeModel;
-use Statamic\Facades\Entry;
 use Statamic\Facades\Collection;
+use Statamic\Facades\Entry;
 use Statamic\Structures\CollectionStructure;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;

tests/Commands/ImportEntriesTest.php

@@ -10,13 +10,10 @@
 use Statamic\Contracts\Entries\EntryRepository as EntryRepositoryContract;
 use Statamic\Contracts\Structures\CollectionTree as CollectionTreeContract;
 use Statamic\Contracts\Structures\CollectionTreeRepository as CollectionTreeRepositoryContract;
-use Statamic\Eloquent\Collections\CollectionModel;
 use Statamic\Eloquent\Entries\EntryModel;
-use Statamic\Eloquent\Structures\TreeModel;
-use Statamic\Facades\Entry;
 use Statamic\Facades\Collection;
+use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
-use Statamic\Structures\CollectionStructure;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 

tests/Commands/ImportFormsTest.php

@@ -9,9 +9,9 @@
 use Statamic\Contracts\Forms\SubmissionRepository as SubmissionRepositoryContract;
 use Statamic\Eloquent\Forms\FormModel;
 use Statamic\Eloquent\Forms\SubmissionModel;
+use Statamic\Facades\Form;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
-use Statamic\Facades\Form;
 
 class ImportFormsTest extends TestCase
 {

tests/Commands/ImportGlobalsTest.php

@@ -9,9 +9,9 @@
 use Statamic\Contracts\Globals\Variables as VariablesContract;
 use Statamic\Eloquent\Globals\GlobalSetModel;
 use Statamic\Eloquent\Globals\VariablesModel;
+use Statamic\Facades\GlobalSet;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
-use Statamic\Facades\GlobalSet;
 
 class ImportGlobalsTest extends TestCase
 {

tests/Commands/ImportRevisionsTest.php

@@ -21,7 +21,7 @@ public function setUp(): void
 
         config()->set('statamic.revisions', [
             'enabled' => true,
-            'path' => __DIR__ . '/tmp',
+            'path' => __DIR__.'/tmp',
         ]);
 
         mkdir(__DIR__.'/tmp');

tests/Commands/ImportTaxonomiesTest.php

@@ -5,19 +5,12 @@
 use Illuminate\Support\Facades\Facade;
 use Statamic\Contracts\Taxonomies\Taxonomy as TaxonomyContract;
 use Statamic\Contracts\Taxonomies\TaxonomyRepository as TaxonomyRepositoryContract;
-use Statamic\Contracts\Entries\EntryRepository as EntryRepositoryContract;
 use Statamic\Contracts\Taxonomies\Term as TermContract;
 use Statamic\Contracts\Taxonomies\TermRepository as TermRepositoryContract;
-use Statamic\Eloquent\Collections\CollectionModel;
-use Statamic\Eloquent\Entries\EntryModel;
-use Statamic\Eloquent\Structures\TreeModel;
 use Statamic\Eloquent\Taxonomies\TaxonomyModel;
 use Statamic\Eloquent\Taxonomies\TermModel;
-use Statamic\Facades\Entry;
-use Statamic\Facades\Site;
 use Statamic\Facades\Taxonomy;
 use Statamic\Facades\Term;
-use Statamic\Structures\CollectionStructure;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;