Clear resolved facades on imports before changing them (#174)

Author: ryanmitchell

src/Commands/ImportAssets.php

@@ -3,6 +3,7 @@
 namespace Statamic\Eloquent\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Facade;
 use Statamic\Assets\AssetRepository;
 use Statamic\Console\RunsInPlease;
 use Statamic\Contracts\Assets\Asset as AssetContract;
@@ -52,6 +53,9 @@ public function handle()
 
     private function useDefaultRepositories()
     {
+        Facade::clearResolvedInstance(AssetContainerRepositoryContract::class);
+        Facade::clearResolvedInstance(AssetRepositoryContract::class);
+
         Statamic::repository(AssetContainerRepositoryContract::class, AssetContainerRepository::class);
         Statamic::repository(AssetRepositoryContract::class, AssetRepository::class);
 

src/Commands/ImportBlueprints.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Facade;
 use Statamic\Console\RunsInPlease;
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\Fieldset;
@@ -47,6 +48,9 @@ public function handle()
 
     private function useDefaultRepositories()
     {
+        Facade::clearResolvedInstance(\Statamic\Fields\BlueprintRepository::class);
+        Facade::clearResolvedInstance(\Statamic\Fields\FieldsetRepository::class);
+
         app()->singleton(
             'Statamic\Fields\BlueprintRepository',
             'Statamic\Fields\BlueprintRepository'

src/Commands/ImportCollections.php

@@ -59,6 +59,9 @@ private function usingDefaultRepositories(Closure $callback)
         $originalTreeRepo = get_class(app()->make(CollectionTreeRepositoryContract::class));
         $originalCollection = get_class(app()->make(CollectionContract::class));
 
+        Facade::clearResolvedInstance(CollectionRepositoryContract::class);
+        Facade::clearResolvedInstance(CollectionTreeRepositoryContract::class);
+
         Statamic::repository(CollectionRepositoryContract::class, CollectionRepository::class);
         Statamic::repository(CollectionTreeRepositoryContract::class, CollectionTreeRepository::class);
         app()->bind(CollectionContract::class, StacheCollection::class);
@@ -68,7 +71,9 @@ private function usingDefaultRepositories(Closure $callback)
         Statamic::repository(CollectionRepositoryContract::class, $originalRepo);
         Statamic::repository(CollectionTreeRepositoryContract::class, $originalTreeRepo);
         app()->bind(CollectionContract::class, $originalCollection);
+
         Facade::clearResolvedInstance(CollectionRepositoryContract::class);
+        Facade::clearResolvedInstance(CollectionTreeRepositoryContract::class);
     }
 
     private function importCollections()

src/Commands/ImportEntries.php

@@ -3,6 +3,7 @@
 namespace Statamic\Eloquent\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Facade;
 use Statamic\Console\RunsInPlease;
 use Statamic\Contracts\Entries\CollectionRepository as CollectionRepositoryContract;
 use Statamic\Contracts\Entries\Entry as EntryContract;
@@ -47,6 +48,9 @@ public function handle()
 
     private function useDefaultRepositories()
     {
+        Facade::clearResolvedInstance(EntryRepositoryContract::class);
+        Facade::clearResolvedInstance(CollectionRepositoryContract::class);
+
         Statamic::repository(EntryRepositoryContract::class, EntryRepository::class);
         Statamic::repository(CollectionRepositoryContract::class, CollectionRepository::class);
 

src/Commands/ImportForms.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Facade;
 use Statamic\Console\RunsInPlease;
 use Statamic\Contracts\Forms\Form as FormContract;
 use Statamic\Contracts\Forms\Submission as SubmissionContract;
@@ -47,6 +48,9 @@ public function handle()
 
     private function useDefaultRepositories()
     {
+        Facade::clearResolvedInstance(FormContract::class);
+        Facade::clearResolvedInstance(SubmissionContract::class);
+
         app()->bind(FormContract::class, StacheForm::class);
         app()->bind(SubmissionContract::class, StacheSubmission::class);
     }

src/Commands/ImportGlobals.php

@@ -3,6 +3,7 @@
 namespace Statamic\Eloquent\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Facade;
 use Statamic\Console\RunsInPlease;
 use Statamic\Contracts\Globals\GlobalRepository as GlobalRepositoryContract;
 use Statamic\Contracts\Globals\GlobalSet as GlobalSetContract;
@@ -45,6 +46,8 @@ public function handle()
 
     private function useDefaultRepositories()
     {
+        Facade::clearResolvedInstance(GlobalRepositoryContract::class);
+
         Statamic::repository(GlobalRepositoryContract::class, GlobalRepository::class);
 
         app()->bind(GlobalSetContract::class, GlobalSet::class);

src/Commands/ImportNavs.php

@@ -3,6 +3,7 @@
 namespace Statamic\Eloquent\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Facade;
 use Statamic\Console\RunsInPlease;
 use Statamic\Contracts\Structures\Nav as NavContract;
 use Statamic\Contracts\Structures\NavigationRepository as NavigationRepositoryContract;
@@ -50,6 +51,9 @@ public function handle()
 
     private function useDefaultRepositories()
     {
+        Facade::clearResolvedInstance(NavigationRepositoryContract::class);
+        Facade::clearResolvedInstance(NavTreeRepositoryContract::class);
+
         Statamic::repository(NavigationRepositoryContract::class, NavigationRepository::class);
         Statamic::repository(NavTreeRepositoryContract::class, NavTreeRepository::class);
 

src/Commands/ImportTaxonomies.php

@@ -3,6 +3,7 @@
 namespace Statamic\Eloquent\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Facade;
 use Statamic\Console\RunsInPlease;
 use Statamic\Contracts\Taxonomies\Taxonomy as TaxonomyContract;
 use Statamic\Contracts\Taxonomies\TaxonomyRepository as TaxonomyRepositoryContract;
@@ -53,6 +54,9 @@ public function handle()
 
     private function useDefaultRepositories()
     {
+        Facade::clearResolvedInstance(TaxonomyRepositoryContract::class);
+        Facade::clearResolvedInstance(TermRepositoryContract::class);
+
         Statamic::repository(TaxonomyRepositoryContract::class, TaxonomyRepository::class);
         Statamic::repository(TermRepositoryContract::class, TermRepository::class);