Fix console export now that repositories are split (#196)

Author: ryanmitchell

src/Commands/ExportGlobals.php

@@ -8,10 +8,15 @@
 use Statamic\Console\RunsInPlease;
 use Statamic\Contracts\Globals\GlobalRepository as GlobalRepositoryContract;
 use Statamic\Contracts\Globals\GlobalSet as GlobalSetContract;
+use Statamic\Contracts\Globals\GlobalVariablesRepository as GlobalVariablesRepositoryContract;
+use Statamic\Contracts\Globals\Variables as VariablesContract;
 use Statamic\Eloquent\Globals\GlobalSetModel;
+use Statamic\Eloquent\Globals\VariablesModel;
 use Statamic\Facades\GlobalSet as GlobalSetFacade;
 use Statamic\Globals\GlobalSet;
+use Statamic\Globals\Variables;
 use Statamic\Stache\Repositories\GlobalRepository;
+use Statamic\Stache\Repositories\GlobalVariablesRepository;
 use Statamic\Statamic;
 
 class ExportGlobals extends Command
@@ -49,25 +54,29 @@ public function handle()
     private function usingDefaultRepositories(Closure $callback)
     {
         Facade::clearResolvedInstance(GlobalRepositoryContract::class);
+        Facade::clearResolvedInstance(GlobalVariablesRepositoryContract::class);
 
         Statamic::repository(GlobalRepositoryContract::class, GlobalRepository::class);
+        Statamic::repository(GlobalVariablesRepositoryContract::class, GlobalVariablesRepository::class);
 
         app()->bind(GlobalSetContract::class, GlobalSet::class);
+        app()->bind(VariablesContract::class, Variables::class);
 
         $callback();
     }
 
     private function exportGlobals()
     {
         $sets = GlobalSetModel::all();
+        $variables = VariablesModel::all();
 
-        $this->withProgressBar($sets, function ($model) {
+        $this->withProgressBar($sets, function ($model) use ($variables) {
             $global = GlobalSetFacade::make()
                 ->handle($model->handle)
                 ->title($model->title)
                 ->save();
 
-            foreach ($model->localizations as $localization) {
+            foreach ($variables->where('handle', $model->handle) as $localization) {
                 $global->makeLocalization($localization->locale)
                     ->data($localization->data)
                     ->origin($localization->origin ?? null)

src/Commands/ExportNavs.php

@@ -91,7 +91,7 @@ private function exportNavs()
 
     private function exportNavTrees()
     {
-        if (! $this->confirm('Do you want to export navs?')) {
+        if (! $this->confirm('Do you want to export nav trees?')) {
             return;
         }