Merge pull request #2 from kernel243/dev

Dev

Author: merdielongo

src/Commands/BaseCommand.php

@@ -202,6 +202,24 @@ protected function isValidFilename(string $filename): bool
         return (bool) preg_match('#^[A-Za-z0-9_\\\\/\.-]+$#', $filename);
     }
 
+    /**
+     * Create folders if necessary for file paths.
+     *
+     * @param array $pathParts
+     * @param string $basePath
+     * @return void
+     */
+    protected function createFoldersIfNecessary(array $pathParts, string $basePath): void
+    {
+        $folder = $basePath;
+        for ($i = 0; $i < count($pathParts) - 1; $i++) {
+            $folder .= DIRECTORY_SEPARATOR . $pathParts[$i];
+            if (!is_dir($folder)) {
+                mkdir($folder, 0755, true);
+            }
+        }
+    }
+
     /**
      * Check if a repository file exists.
      *

src/Commands/ClassMakeCommand.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Kernel243\Artisan\Commands;
 
 use Illuminate\Support\Str;

src/Commands/Controller.php

@@ -2,7 +2,6 @@
 
 namespace Kernel243\Artisan\Commands;
 
-use Illuminate\Console\Command;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 

src/Commands/CrudMakeCommand.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Kernel243\Artisan\Commands;
 
 use Illuminate\Support\Str;

src/Commands/File.php

@@ -2,10 +2,9 @@
 
 namespace Kernel243\Artisan\Commands;
 
-use Illuminate\Console\Command;
 use Illuminate\Support\Str;
 
-class File extends Command
+class File extends BaseCommand
 {
     /**
      * The name and signature of the console command.
@@ -21,37 +20,27 @@ class File extends Command
      */
     protected $description = 'Create a new file';
 
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Execute the console command.
      *
-     * @return void
+     * @return int
      */
-    public function handle()
+    public function handle(): int
     {
         if ($this->isCorrectFilename($this->argument('filename'))) {
             $extension = $this->getExtension();
             $path = base_path(str_replace('.', '/', $this->argument('filename')).'.'.$extension);
 
-            if ($this->replaceExistingFile($path, 'There is already a file with this name do you want to replace it ? [y/n]')) {
+            if ($this->shouldReplaceFile($path, 'There is already a file with this name do you want to replace it ? [y/n]')) {
                 $filename = explode('.', $this->argument('filename'));
-
-                $this->createFoldersIfNecessary($filename);
-
+                $this->createFoldersIfNecessary($filename, base_path());
                 file_put_contents($path, '');
                 $this->info('File created successfully');
             }
-        } else
-            $this->error('The filename is not correct.');
+            return self::SUCCESS;
+        }
+        $this->error('The filename is not correct.');
+        return self::FAILURE;
     }
 
     /**
@@ -70,23 +59,6 @@ protected function getExtension()
         return 'php';
     }
 
-    /**
-     * Create a set of folders if necessary.
-     *
-     * @param $filename
-     * @return void
-     */
-    protected function createFoldersIfNecessary($filename)
-    {
-        $folder = base_path('');
-        for ($i = 0; $i < count($filename) - 1; $i++) {
-            if (!is_dir($folder . '/' . $filename[$i])) {
-                mkdir($folder . '/' . $filename[$i]);
-            }
-            $folder .= '/' . $filename[$i];
-        }
-    }
-
     /**
      * Check if the filename is correct.
      *
@@ -97,25 +69,4 @@ protected function isCorrectFilename($name)
     {
         return (bool) preg_match('#^[a-zA-Z][a-zA-Z0-9._\-]+$#', $name);
     }
-
-    /**
-     * Check if the filename exists and if it could be replaced.
-     *
-     * @param $filename
-     * @param $question
-     * @return bool
-     */
-    protected function replaceExistingFile($filename, $question)
-    {
-        $replaceExistingFile = true;
-        if (file_exists($filename)) {
-            do {
-                $input = $this->ask($question);
-            } while (strtolower($input) != 'y' && strtolower($input) != 'n');
-
-            if (strtolower($input) == 'n')
-                $replaceExistingFile = false;
-        }
-        return $replaceExistingFile;
-    }
 }

src/Commands/Lang.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Kernel243\Artisan\Commands;
 
 class Lang extends BaseCommand

src/Commands/Repository.php

@@ -2,7 +2,6 @@
 
 namespace Kernel243\Artisan\Commands;
 
-use Illuminate\Console\Command;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 

src/Commands/Resource.php

@@ -65,9 +65,9 @@ protected function replaceNamespace($namespace, $stub)
     /**
      * Rewrite actually the content in the file.
      *
-     * @param $filename
-     * @param null $content
-     * @param $module
+     * @param string $filename
+     * @param string $content
+     * @param string $module
      */
     protected function putInFile($filename, $content, $module = null)
     {

src/Commands/ResourceMakeCommand.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Kernel243\Artisan\Commands;
 
 use Illuminate\Support\Str;
@@ -248,6 +246,15 @@ protected function generateLayout(): void
         $this->writeFile($path, $stub);
     }
 
+    protected function generateTailwindConfig(): void
+    {
+        $path = base_path('tailwind.config.js');
+        if (file_exists($path)) return;
+        $stub = $this->getStubContent('tailwind.config');
+        if (!$this->shouldReplaceFile($path, 'Tailwind config exists. Replace it? [y/n]')) return;
+        $this->writeFile($path, $stub);
+    }
+
     protected function generateResourceFormFields(array $fields): string
     {
         if (empty($fields)) { return "            // Form::text('name', 'Name'),"; }

src/Commands/Service.php

@@ -54,9 +54,9 @@ protected function replaceClassName($name, $stub)
     /**
      * Rewrite actually the content in the file.
      *
-     * @param null $module
-     * @param $filename
-     * @param $content
+     * @param string $filename
+     * @param string $content
+     * @param string $module
      */
     protected function putInFile($filename, $content, $module = null)
     {