Merge pull request #59 from hexadog/gaetan-hexadog-patch-1

Update php-cs-fixer.yml

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/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

src/Http/Middleware/ThemeLoader.php

@@ -2,7 +2,6 @@
 
 namespace Hexadog\ThemesManager\Http\Middleware;
 
-use Closure;
 use Hexadog\ThemesManager\Facades\ThemesManager;
 use Illuminate\Http\Request;
 
@@ -16,7 +15,7 @@ class ThemeLoader
      *
      * @return mixed
      */
-    public function handle(Request $request, Closure $next, $theme = null)
+    public function handle(Request $request, \Closure $next, $theme = null)
     {
         // Do not load theme if API request or App is running in console
         if ($request->expectsJson() || app()->runningInConsole()) {

src/Providers/PackageServiceProvider.php

@@ -15,7 +15,6 @@
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
-use ReflectionClass;
 
 class PackageServiceProvider extends ServiceProvider
 {
@@ -83,7 +82,7 @@ public function provides()
     protected function getPath($path = '')
     {
         // We get the child class
-        $rc = new ReflectionClass(get_class($this));
+        $rc = new \ReflectionClass(get_class($this));
 
         return dirname($rc->getFileName()) . '/../../' . $path;
     }

src/Theme.php

@@ -49,7 +49,7 @@ class Theme
     /**
      * The Parent theme.
      */
-    protected string | Theme | null $parent = null;
+    protected string|Theme|null $parent = null;
 
     /**
      * The theme statud (enabled or not).
@@ -219,7 +219,7 @@ public function hasParent(): bool
     /**
      * Set parent Theme.
      */
-    public function setParent(string | Theme | null $theme): self
+    public function setParent(string|Theme|null $theme): self
     {
         $this->parent = empty($theme) ? null : $theme;
 
@@ -229,7 +229,7 @@ public function setParent(string | Theme | null $theme): self
     /**
      * Get parent Theme.
      */
-    public function getParent(): Theme | null
+    public function getParent(): Theme|null
     {
         if (is_string($this->parent)) {
             $this->parent = ThemesManager::findByName($this->parent);

src/ThemesManager.php

@@ -79,7 +79,8 @@ public function current(): ?Theme
         return $this->themes
             ->filter(function ($theme) {
                 return $theme->enabled();
-            })->first();
+            })->first()
+        ;
     }
 
     /**