refactor: add type-hints, remove un-used codes

config/twig.php

@@ -7,6 +7,7 @@
     |--------------------------------------------------------------------------
     |
     | Add supported view file extensions. E.g: *.twig, *.html.twig, *.css.twig...
+    |
     */
 
    'file_extensions' => [
@@ -19,6 +20,7 @@
     |--------------------------------------------------------------------------
     |
     | Enabled twig extensions.
+    |
     */
 
    'extensions' => [

src/Console/TwigViewClearCommand.php

@@ -3,45 +3,33 @@
 namespace DinhQuocHan\Twig\Console;
 
 use Illuminate\Console\Command;
-use Illuminate\Filesystem\Filesystem;
 use RuntimeException;
+use Symfony\Component\Console\Attribute\AsCommand;
 
+#[AsCommand('view:clear', 'Clear all compiled view files')]
 class TwigViewClearCommand extends Command
 {
-    /** @var string */
-    protected $name = 'view:clear';
-
-    /** @var string */
-    protected $description = 'Clear all compiled view files';
-
-    /** @var \Illuminate\Filesystem\Filesystem */
-    protected $files;
-
-    public function __construct(Filesystem $files)
-    {
-        parent::__construct();
-
-        $this->files = $files;
-    }
-
-    public function handle()
+    public function handle(): int
     {
+        $files = $this->laravel['files'];
         $path = $this->laravel['config']['view.compiled'];
 
         if (! $path) {
             throw new RuntimeException('View path not found.');
         }
 
-        foreach ($this->files->glob("{$path}/*") as $view) {
-            if ($this->files->isDirectory($view)) {
-                $this->files->deleteDirectory($view);
+        foreach ($files->glob("{$path}/*") as $view) {
+            if ($files->isDirectory($view)) {
+                $files->deleteDirectory($view);
                 continue;
             }
-            if ($this->files->isFile($view)) {
-                $this->files->delete($view);
+            if ($files->isFile($view)) {
+                $files->delete($view);
             }
         }
 
-        $this->info('Compiled twig views cleared!');
+        $this->components->info('Compiled blade & twig views cleared!');
+
+        return self::SUCCESS;
     }
 }

src/Extensions/Arr.php

@@ -4,16 +4,10 @@
 
 use Illuminate\Support\Str;
 use Twig\Extension\AbstractExtension;
-use Twig\Extension\ExtensionInterface;
 use Twig\TwigFunction;
 
-class Arr extends AbstractExtension implements ExtensionInterface
+class Arr extends AbstractExtension
 {
-    /**
-     * Get functions.
-     *
-     * @return \Twig\TwigFunction[]
-     */
     public function getFunctions()
     {
         return [

src/Extensions/Auth.php

@@ -4,32 +4,15 @@
 
 use Illuminate\Contracts\Auth\Factory;
 use Twig\Extension\AbstractExtension;
-use Twig\Extension\ExtensionInterface;
 use Twig\TwigFunction;
 
-class Auth extends AbstractExtension implements ExtensionInterface
+class Auth extends AbstractExtension
 {
-    /**
-     * @var \Illuminate\Contracts\Auth\Factory
-     */
-    protected $auth;
-
-    /**
-     * Create a new auth extension.
-     *
-     * @param \Illuminate\Contracts\Auth\Factory
-     */
-    public function __construct(Factory $auth)
+    public function __construct(protected Factory $auth)
     {
-        $this->auth = $auth;
     }
 
-    /**
-     * Get functions.
-     *
-     * @return \Twig\TwigFunction[]
-     */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('auth', [$this->auth, 'guard']),

src/Extensions/Config.php

@@ -4,31 +4,14 @@
 
 use Illuminate\Contracts\Config\Repository;
 use Twig\Extension\AbstractExtension;
-use Twig\Extension\ExtensionInterface;
 use Twig\TwigFunction;
 
-class Config extends AbstractExtension implements ExtensionInterface
+class Config extends AbstractExtension
 {
-    /**
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
-    /**
-     * Create a new config extension.
-     *
-     * @param \Illuminate\Contracts\Config\Repository
-     */
-    public function __construct(Repository $config)
+    public function __construct(protected Repository $config)
     {
-        $this->config = $config;
     }
 
-    /**
-     * Get functions.
-     *
-     * @return \Twig\TwigFunction[]
-     */
     public function getFunctions()
     {
         return [

src/Extensions/Dump.php

@@ -3,17 +3,11 @@
 namespace DinhQuocHan\Twig\Extensions;
 
 use Twig\Extension\AbstractExtension;
-use Twig\Extension\ExtensionInterface;
 use Twig\TwigFunction;
 
-class Dump extends AbstractExtension implements ExtensionInterface
+class Dump extends AbstractExtension
 {
-    /**
-     * Get functions.
-     *
-     * @return \Twig\TwigFunction[]
-     */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('dump', 'dump', ['is_safe' => ['html']]),

src/Extensions/Gate.php

@@ -4,32 +4,15 @@
 
 use Illuminate\Contracts\Auth\Access\Gate as GateContract;
 use Twig\Extension\AbstractExtension;
-use Twig\Extension\ExtensionInterface;
 use Twig\TwigFunction;
 
-class Gate extends AbstractExtension implements ExtensionInterface
+class Gate extends AbstractExtension
 {
-    /**
-     * @var \Illuminate\Contracts\Auth\Access\Gate
-     */
-    protected $gate;
-
-    /**
-     * Create a new gate extension.
-     *
-     * @param \Illuminate\Contracts\Auth\Access\Gate
-     */
-    public function __construct(GateContract $gate)
+    public function __construct(protected GateContract $gate)
     {
-        $this->gate = $gate;
     }
 
-    /**
-     * Get functions.
-     *
-     * @return \Twig\TwigFunction[]
-     */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('can', [$this->gate, 'check']),

src/Extensions/Path.php

@@ -3,17 +3,11 @@
 namespace DinhQuocHan\Twig\Extensions;
 
 use Twig\Extension\AbstractExtension;
-use Twig\Extension\ExtensionInterface;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
 
-class Path extends AbstractExtension implements ExtensionInterface
+class Path extends AbstractExtension
 {
-    /**
-     * Get functions.
-     *
-     * @return \Twig\TwigFilter[]
-     */
     public function getFilters()
     {
         return [

src/Extensions/Request.php

@@ -4,32 +4,15 @@
 
 use Illuminate\Http\Request as BaseRequest;
 use Twig\Extension\AbstractExtension;
-use Twig\Extension\ExtensionInterface;
 use Twig\TwigFunction;
 
-class Request extends AbstractExtension implements ExtensionInterface
+class Request extends AbstractExtension
 {
-    /**
-     * @var \Illuminate\Http\Request
-     */
-    protected $request;
-
-    /**
-     * Create a new request extension.
-     *
-     * @param \Illuminate\Http\Request
-     */
-    public function __construct(BaseRequest $request)
+    public function __construct(protected BaseRequest $request)
     {
-        $this->request = $request;
     }
 
-    /**
-     * Get functions.
-     *
-     * @return \Twig\TwigFunction[]
-     */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('request', [$this->request, 'input']),

src/Extensions/Session.php

@@ -4,32 +4,15 @@
 
 use Illuminate\Contracts\Session\Session as SessionContract;
 use Twig\Extension\AbstractExtension;
-use Twig\Extension\ExtensionInterface;
 use Twig\TwigFunction;
 
-class Session extends AbstractExtension implements ExtensionInterface
+class Session extends AbstractExtension
 {
-    /**
-     * @var \Illuminate\Contracts\Session\Session
-     */
-    protected $session;
-
-    /**
-     * Create a new session extension.
-     *
-     * @param \Illuminate\Contracts\Session\Session
-     */
-    public function __construct(SessionContract $session)
+    public function __construct(protected SessionContract $session)
     {
-        $this->session = $session;
     }
 
-    /**
-     * Get functions.
-     *
-     * @return \Twig\TwigFunction[]
-     */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('session', [$this->session, 'get']),

src/Extensions/Str.php

@@ -3,19 +3,13 @@
 namespace DinhQuocHan\Twig\Extensions;
 
 use Twig\Extension\AbstractExtension;
-use Twig\Extension\ExtensionInterface;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
 use Illuminate\Support\Str as IlluminateStr;
 
-class Str extends AbstractExtension implements ExtensionInterface
+class Str extends AbstractExtension
 {
-    /**
-     * Get functions.
-     *
-     * @return \Twig\TwigFilter[]
-     */
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             new TwigFilter('__', '__'),
@@ -31,12 +25,7 @@ public function getFilters()
         ];
     }
 
-    /**
-     * Get functions.
-     *
-     * @return \Twig\TwigFunction[]
-     */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('__', '__'),

src/Extensions/Translator.php

@@ -3,18 +3,12 @@
 namespace DinhQuocHan\Twig\Extensions;
 
 use Twig\Extension\AbstractExtension;
-use Twig\Extension\ExtensionInterface;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
 
-class Translator extends AbstractExtension implements ExtensionInterface
+class Translator extends AbstractExtension
 {
-    /**
-     * Get functions.
-     *
-     * @return \Twig\TwigFilter[]
-     */
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             new TwigFilter('__', '__', ['pre_escape' => 'html', 'is_safe' => ['html']]),
@@ -23,12 +17,7 @@ public function getFilters()
         ];
     }
 
-    /**
-     * Get functions.
-     *
-     * @return \Twig\TwigFunction[]
-     */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('__', '__', ['pre_escape' => 'html', 'is_safe' => ['html']]),