fix(theme): Create same theme name in another vendor

fix #17

Author: gaetan-hexadog

src/Console/Generators/MakeTheme.php

@@ -122,7 +122,7 @@ protected function validateName()
             }
         }
 
-        if (ThemesManager::has($this->theme['name'])) {
+        if (ThemesManager::has("{$this->theme['vendor']}/{$this->theme['name']}")) {
             $this->error("Theme with name {$this->theme['vendor']}/{$this->theme['name']} already exists!");
 
             return false;
@@ -173,7 +173,7 @@ private function generateTheme()
      * Replace placeholders in generated file.
      *
      * @param \Symfony\Component\Finder\SplFileInfo $file
-     *
+     * 
      * @return string
      */
     protected function replacePlaceholders($file)
@@ -233,15 +233,9 @@ protected function askDescription()
      */
     protected function askName()
     {
-        while (empty(Arr::get($this->theme, 'name', null))) {
+        do {
             $this->theme['name'] = $this->ask('Theme Name');
-            
-            if (ThemesManager::has($this->theme['name'])) {
-                $this->error("Theme with name {$this->theme['name']} already exists!");
-                
-                unset($this->theme['name']);
-            }
-        }
+        } while(!strlen($this->theme['name']));
     }
 
     /**
@@ -264,7 +258,9 @@ protected function askParent()
      */
     protected function askVendor()
     {
-        $this->theme['vendor'] = mb_strtolower($this->config->get('themes-manager.composer.vendor') ?? $this->ask('Vendor name'));
+        do {
+            $this->theme['vendor'] = mb_strtolower($this->config->get('themes-manager.composer.vendor') ?? $this->ask('Vendor name'));
+        } while(!strlen($this->theme['vendor']));
     }
 
     /**
@@ -273,5 +269,9 @@ protected function askVendor()
     protected function askVersion()
     {
         $this->theme['version'] = $this->ask('Version number');
+
+        if (!strlen($this->theme['version'])) {
+            $this->theme['version'] = null;
+        }
     }
 }

src/ThemesManager.php

@@ -101,22 +101,13 @@ public function clearCache(): bool
      * Check if theme with given name exists.
      *
      * @param string $name
+     * @param string $vendor
      *
      * @return boolean
      */
     public function has(string $name = null)
     {
-        return !is_null($this->themes->first(function ($theme) use ($name) {
-            // normalize module name
-            $name = str_replace(['-theme', 'theme-'], '', $name);
-            // Check if $name contains vendor
-            if (strpos($name, '/') !== false) {
-                return Str::lower($theme->getName()) === Str::lower(substr($name, $pos + 1, strlen($name)));
-                ;
-            } else {
-                return $theme->getLowerName() === Str::lower($name);
-            }
-        }));
+        return !is_null($this->findByName($name));
     }
 
     /**
@@ -131,17 +122,7 @@ public function get(string $name = null)
         if (is_null($name)) {
             return $this->themes;
         } else {
-            return $this->themes->first(function ($theme) use ($name) {
-                // normalize module name
-                $name = str_replace(['-theme', 'theme-'], '', $name);
-                // Check if $name contains vendor
-                if (strpos($name, '/') !== false) {
-                    return Str::lower($theme->getName()) === Str::lower(substr($name, $pos + 1, strlen($name)));
-                    ;
-                } else {
-                    return $theme->getLowerName() === Str::lower($name);
-                }
-            });
+            return $this->findByName($name);
         }
     }
 
@@ -373,6 +354,40 @@ private function htmlAttributes($attributes): string
         }, array_keys($attributes)));
     }
 
+    /**
+     * Find a theme by given name and vendor (optional)
+     * name can include vendor prefix (ie: hexadog/default)
+     * If no vendor provided and name not prefixed by vendor
+     * the first theme with given name is returned
+     *
+     * @param string $name
+     * @return void
+     */
+    protected function findByName(string $name = null, string $vendor = null)
+    {
+        if (is_null($name)) {
+            return null;
+        }
+
+        return $this->themes->first(function ($theme) use ($name, $vendor) {
+            // normalize module name
+            $name = str_replace(['-theme', 'theme-'], '', $name);
+            // Check if $name contains vendor
+            if (($pos = strpos($name, '/')) !== false) {
+                $vendor = substr($name, 0, $pos);
+                $name = substr($name, $pos + 1, strlen($name));
+
+                return Str::lower($theme->getName()) === Str::lower($name)  && $theme->getLowerVendor() === Str::lower($vendor);
+            } else {
+                if (is_null($vendor)) {
+                    return $theme->getLowerName() === Str::lower($name);
+                } else {
+                    return $theme->getLowerName() === Str::lower($name) && $theme->getLowerVendor() === Str::lower($vendor);
+                }
+            }
+        });
+    }
+
     /**
      * Find all available themes.
      *