Move method up to where it’s called.

statamic · Aug 13, 2024 · 814de4c · 814de4c
1 parent b91fd06
commit 814de4c
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/src/StarterKits/Exporter.php b/src/StarterKits/Exporter.php
@@ -84,6 +84,24 @@ protected function instantiateModules(): self
         return $this;
     }
 
+    /**
+     * Instantiate module and check if nested modules should be recursively instantiated.
+     */
+    protected function instantiateModuleRecursively(array $config, string $key): ExportableModule|array
+    {
+        $instantiated = new ExportableModule($config, $key);
+
+        if ($modules = Arr::get($config, 'modules')) {
+            $instantiated = collect($modules)
+                ->map(fn ($config, $childKey) => $this->instantiateModule($config, $this->normalizeModuleKey($key, $childKey)))
+                ->prepend($instantiated, $key)
+                ->filter()
+                ->all();
+        }
+
+        return $instantiated;
+    }
+
     /**
      * Instantiate individual module.
      */
@@ -106,24 +124,6 @@ protected function instantiateSelectModule(array $config, string $key): Exportab
             ->all();
     }
 
-    /**
-     * Instantiate module and check if nested modules should be recursively instantiated.
-     */
-    protected function instantiateModuleRecursively(array $config, string $key): ExportableModule|array
-    {
-        $instantiated = new ExportableModule($config, $key);
-
-        if ($modules = Arr::get($config, 'modules')) {
-            $instantiated = collect($modules)
-                ->map(fn ($config, $childKey) => $this->instantiateModule($config, $this->normalizeModuleKey($key, $childKey)))
-                ->prepend($instantiated, $key)
-                ->filter()
-                ->all();
-        }
-
-        return $instantiated;
-    }
-
     /**
      * Normalize module key, as dotted array key for location in starter-kit.yaml.
      */

diff --git a/src/StarterKits/Installer.php b/src/StarterKits/Installer.php
@@ -299,6 +299,24 @@ protected function instantiateModules(): self
         return $this;
     }
 
+    /**
+     * Instantiate module and check if nested modules should be recursively instantiated.
+     */
+    protected function instantiateModuleRecursively(array $config, string $key): InstallableModule|array
+    {
+        $instantiated = (new InstallableModule($config, $key))->installer($this);
+
+        if ($modules = Arr::get($config, 'modules')) {
+            $instantiated = collect($modules)
+                ->map(fn ($config, $childKey) => $this->instantiateModule($config, $this->normalizeModuleKey($key, $childKey)))
+                ->prepend($instantiated, $key)
+                ->filter()
+                ->all();
+        }
+
+        return $instantiated;
+    }
+
     /**
      * Instantiate individual module.
      */
@@ -352,24 +370,6 @@ protected function instantiateSelectModule(array $config, string $key): Installa
         return $this->instantiateModuleRecursively($selectedModuleConfig, $selectedKey);
     }
 
-    /**
-     * Instantiate module and check if nested modules should be recursively instantiated.
-     */
-    protected function instantiateModuleRecursively(array $config, string $key): InstallableModule|array
-    {
-        $instantiated = (new InstallableModule($config, $key))->installer($this);
-
-        if ($modules = Arr::get($config, 'modules')) {
-            $instantiated = collect($modules)
-                ->map(fn ($config, $childKey) => $this->instantiateModule($config, $this->normalizeModuleKey($key, $childKey)))
-                ->prepend($instantiated, $key)
-                ->filter()
-                ->all();
-        }
-
-        return $instantiated;
-    }
-
     /**
      * Normalize module key.
      */