Merge pull request #1420 from dev-lnk/publish_fix

fix: publish command fix
moonshine-software · Dec 24, 2024 · 9824b08 · 9824b08
2 parents 88f1af7 + 8caa485
commit 9824b08
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/Laravel/src/Commands/MoonShineCommand.php b/src/Laravel/src/Commands/MoonShineCommand.php
@@ -91,11 +91,16 @@ private static function addResourceOrPageTo(string $class, string $to, bool $isP
         file_put_contents($to, $content);
     }
 
-    protected function replaceInConfig(string $key, string $value): void
-    {
+    protected function replaceInConfig(
+        string $key,
+        string $value,
+        ?string $classReplace = null
+    ): void {
         $replace = "'$key' => $value,";
 
-        $pattern = "/['\"]" . $key . "['\"]\s*=>\s*[^'\"]+?,/";
+        $pattern = ! \is_null($classReplace) ?
+            "/['\"]" . $key . "['\"]\s*=>\s*" . $classReplace . "::class,/"
+            : "/['\"]" . $key . "['\"]\s*=>\s*[^'\"]+?,/";
 
         file_put_contents(
             config_path('moonshine.php'),

diff --git a/src/Laravel/src/Commands/PublishCommand.php b/src/Laravel/src/Commands/PublishCommand.php
@@ -157,7 +157,8 @@ private function publishSystemForm(string $className, string $configKey): void
 
         $this->replaceInConfig(
             $configKey,
-            moonshineConfig()->getNamespace('\Forms\\' . $className) . "::class"
+            moonshineConfig()->getNamespace('\Forms\\' . $className) . "::class",
+            $className
         );
     }
 
@@ -202,7 +203,8 @@ private function publishSystemPage(string $className, string $configKey): void
 
         $this->replaceInConfig(
             $configKey,
-            moonshineConfig()->getNamespace('\Pages\\' . $className) . "::class"
+            moonshineConfig()->getNamespace('\Pages\\' . $className) . "::class",
+            $className
         );
     }