Merge pull request #55 from hexadog/develop

Develop

Author: gaetan-hexadog

src/Console/Commands/ListThemes.php

@@ -46,9 +46,9 @@ public function handle()
         }
 
         if (0 == count($this->themes)) {
-            return $this->error("Your application doesn't have any theme.");
+            $this->error("Your application doesn't have any theme.");
+        } else {
+            $this->table($this->headers, $this->themes);
         }
-
-        $this->table($this->headers, $this->themes);
     }
 }

src/Theme.php

@@ -49,7 +49,7 @@ class Theme
     /**
      * The Parent theme.
      */
-    protected string | Theme | null $parent;
+    protected string | Theme | null $parent = null;
 
     /**
      * The theme statud (enabled or not).
@@ -231,7 +231,7 @@ public function setParent(string | Theme | null $theme): self
      */
     public function getParent(): Theme | null
     {
-        if (is_string($this->parent) && !empty($this->parent)) {
+        if (is_string($this->parent)) {
             $this->parent = ThemesManager::findByName($this->parent);
         }
 
@@ -359,7 +359,7 @@ public function url(string $url, bool $absolute = true): string
     /**
      * List theme's available layouts.
      *
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      */
     public function listLayouts()
     {