Fix looping issues in imports (#436)

* Fix looping issues in imports

* wrong method

* same

Author: ryanmitchell

src/Commands/ImportCollections.php

@@ -78,16 +78,19 @@ private function usingDefaultRepositories(Closure $callback): void
 
     private function importCollections(): void
     {
-        $this->withProgressBar(CollectionFacade::all(), function ($collection) {
-            if ($this->shouldImportCollections()) {
+        $importCollections = $this->shouldImportCollections();
+        $importCollectionTrees = $this->shouldImportCollectionTrees();
+
+        $this->withProgressBar(CollectionFacade::all(), function ($collection) use ($importCollections, $importCollectionTrees) {
+            if ($importCollections) {
                 $lastModified = $collection->fileLastModified();
 
                 EloquentCollection::makeModelFromContract($collection)
                     ->fill(['created_at' => $lastModified, 'updated_at' => $lastModified])
                     ->save();
             }
 
-            if ($this->shouldImportCollectionTrees() && $structure = $collection->structure()) {
+            if ($importCollectionTrees && $structure = $collection->structure()) {
                 $structure->trees()->each(function ($tree) {
                     $lastModified = $tree->fileLastModified();
 

src/Commands/ImportGlobals.php

@@ -60,16 +60,19 @@ private function useDefaultRepositories(): void
 
     private function importGlobals(): void
     {
-        $this->withProgressBar(GlobalSetFacade::all(), function ($set) {
-            if ($this->shouldImportGlobalSets()) {
+        $importGlobals = $this->shouldImportGlobalSets();
+        $importVariables = $this->shouldImportGlobalVariables();
+
+        $this->withProgressBar(GlobalSetFacade::all(), function ($set) use ($importGlobals, $importVariables) {
+            if ($importGlobals) {
                 $lastModified = $set->fileLastModified();
 
                 GlobalSet::makeModelFromContract($set)
                     ->fill(['created_at' => $lastModified, 'updated_at' => $lastModified])
                     ->save();
             }
 
-            if ($this->shouldImportGlobalVariables()) {
+            if ($importVariables) {
                 $set->localizations()->each(function ($locale) {
                     Variables::makeModelFromContract($locale)->save();
                 });

src/Commands/ImportNavs.php

@@ -61,16 +61,19 @@ private function useDefaultRepositories(): void
 
     private function importNavs(): void
     {
-        $this->withProgressBar(NavFacade::all(), function ($nav) {
-            if ($this->shouldImportNavigations()) {
+        $importNavs = $this->shouldImportNavigations();
+        $importTrees = $this->shouldImportNavigationTrees();
+
+        $this->withProgressBar(NavFacade::all(), function ($nav) use ($importNavs, $importTrees) {
+            if ($importNavs) {
                 $lastModified = $nav->fileLastModified();
 
                 EloquentNav::makeModelFromContract($nav)
                     ->fill(['created_at' => $lastModified, 'updated_at' => $lastModified])
                     ->save();
             }
 
-            if ($this->shouldImportNavigationTrees()) {
+            if ($importTrees) {
                 $nav->trees()->each(function ($tree) {
                     $lastModified = $tree->fileLastModified();