Merge branch 'master' into develop

Author: gaetan-hexadog

.github/workflows/php-cs-fixer.yml

@@ -15,7 +15,7 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: Run php-cs-fixer
-        uses: docker://oskarstark/php-cs-fixer-ga:3.0.0
+        uses: docker://oskarstark/php-cs-fixer-ga
         with:
           args: --config=.php-cs-fixer.dist.php --allow-risky=yes
 

src/Console/Commands/AbstractCommand.php

@@ -24,7 +24,7 @@ protected function validateName()
         if (!$this->theme) {
             $this->error("Theme with name {$name} does not exists!");
 
-            exit();
+            exit;
         }
     }
 }

src/Console/Commands/ListThemes.php

@@ -40,7 +40,7 @@ public function handle()
                 'vendor' => $theme->getVendor(),
                 'version' => $theme->getVersion(),
                 'description' => $theme->getDescription(),
-                'extends' => $theme->getParent() ? $theme->getParent() : '',
+                'extends' => $theme->getParent() ? $theme->getParent()->getName() : '',
                 'default' => $theme->getName() === config('themes-manager.fallback_theme') ? 'X' : '',
             ];
         }

src/Console/Generators/MakeTheme.php

@@ -2,7 +2,6 @@
 
 namespace Hexadog\ThemesManager\Console\Generators;
 
-use Exception;
 use Hexadog\ThemesManager\Console\Commands\Traits\BlockMessage;
 use Hexadog\ThemesManager\Console\Commands\Traits\SectionMessage;
 use Hexadog\ThemesManager\Facades\ThemesManager;
@@ -86,7 +85,7 @@ public function handle()
                 $this->generateTheme();
 
                 $this->sectionMessage('Themes Manager', 'Theme successfully created');
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $this->error($e->getMessage());
             }
         }
@@ -240,7 +239,7 @@ private function generateTheme()
 
         // Make directory
         if ($this->files->isDirectory($directory)) {
-            throw new Exception("Theme {$this->theme['name']} already exists");
+            throw new \Exception("Theme {$this->theme['name']} already exists");
         }
         $this->files->makeDirectory($directory, 0755, true);
 

src/Events/ThemeDisabled.php

@@ -9,9 +9,6 @@ class ThemeDisabled
      */
     public $theme;
 
-    /**
-     * @param $theme
-     */
     public function __construct($theme)
     {
         $this->theme = $theme;

src/Events/ThemeDisabling.php

@@ -9,9 +9,6 @@ class ThemeDisabling
      */
     public $theme;
 
-    /**
-     * @param $theme
-     */
     public function __construct($theme)
     {
         $this->theme = $theme;

src/Events/ThemeEnabled.php

@@ -9,9 +9,6 @@ class ThemeEnabled
      */
     public $theme;
 
-    /**
-     * @param $theme
-     */
     public function __construct($theme)
     {
         $this->theme = $theme;

src/Events/ThemeEnabling.php

@@ -9,9 +9,6 @@ class ThemeEnabling
      */
     public $theme;
 
-    /**
-     * @param $theme
-     */
     public function __construct($theme)
     {
         $this->theme = $theme;

src/Exceptions/ThemeLoaderException.php

@@ -2,9 +2,7 @@
 
 namespace Hexadog\ThemesManager\Exceptions;
 
-use RuntimeException;
-
-class ThemeLoaderException extends RuntimeException
+class ThemeLoaderException extends \RuntimeException
 {
     /**
      * @return \Hexadog\ThemesManager\Exceptions\ThemeLoaderException

src/Helpers/Json.php

@@ -201,7 +201,6 @@ public function save(): bool
     /**
      * Get the specified attribute from json file.
      *
-     * @param $key
      * @param null $default
      *
      * @return mixed