some fixes

Author: HichemTab-tech

src/Console/Commands/GenerateEnvExample.php renamed to src/Console/Commands/LaravelProjectAssist/GenerateEnvExample.php

@@ -1,13 +1,8 @@
 <?php
 
-namespace HichemtabTech\LaravelProjectAssist\Console\Commands;
+namespace App\Console\Commands\LaravelProjectAssist;
 
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Str;
-use function App\Console\Commands\app_path;
-use function App\Console\Commands\class_basename;
-use function App\Console\Commands\lang_path;
 
 class GenerateEnvExample extends Command
 {

src/Console/Commands/MakeDataClass.php renamed to src/Console/Commands/LaravelProjectAssist/MakeDataClass.php

@@ -1,6 +1,6 @@
 <?php /** @noinspection ALL */
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\LaravelProjectAssist;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
@@ -87,7 +87,7 @@ protected function collectFields(): array
 
     protected function generateDataClass(string $className, string $subdirectory, array $fields, bool $serialize, array $hidden): void
     {
-        $template = File::get(app_path('Console/Commands/stubs/dataClass.stub'));
+        $template = File::get(app_path('Console/Commands/LaravelProjectAssist/stubs/dataClass.stub'));
         $constructor = $this->generateConstructorBuilder($fields);
         $uses = [];
         if ($serialize) {
@@ -195,7 +195,7 @@ protected function generateConstructorBuilder(array $fields): array
 
     protected function generateDataClassBuilder(string $className, string $subdirectory, array $fields): void
     {
-        $template = File::get(app_path('Console/Commands/stubs/dataClassBuilder.stub'));
+        $template = File::get(app_path('Console/Commands/LaravelProjectAssist/stubs/dataClassBuilder.stub'));
         $replacements = [
             '{{class}}' => $className,
             '{{builderFields}}' => $this->generateBuilderFields($fields),

src/Console/Commands/MakeLangFile.php renamed to src/Console/Commands/LaravelProjectAssist/MakeLangFile.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\LaravelProjectAssist;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
@@ -48,7 +48,7 @@ public function handle(): void
             $replacements = [
                 '{{CONTENT}}' => $contents[$dir],
             ];
-            $template = File::get(app_path('Console/Commands/stubs/lang.stub'));
+            $template = File::get(app_path('Console/Commands/LaravelProjectAssist/stubs/lang.stub'));
             $generatedClass = str_replace(array_keys($replacements), array_values($replacements), $template);
 
             $classPath = lang_path($dir.'/'.$subdirectory.'/'.$scriptName . '.php');

src/Console/Commands/MakeRepository.php renamed to src/Console/Commands/LaravelProjectAssist/MakeRepository.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\LaravelProjectAssist;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
-use Str;
+use Illuminate\Support\Str;
 use Symfony\Component\Console\Command\Command as CommandAlias;
 
 class MakeRepository extends Command
@@ -35,7 +35,7 @@ public function handle(): int
         $repositoryClassName = str_replace("RepositoryRepository", "Repository", $repositoryClassName);
         $repositorySubdirectory = rtrim(dirname($name), '/\\');
 
-        $repositoryStub = File::get(app_path('Console/Commands/stubs/repository.stub'));
+        $repositoryStub = File::get(app_path('Console/Commands/LaravelProjectAssist/stubs/repository.stub'));
 
 
 

src/Console/Commands/MakeTrait.php renamed to src/Console/Commands/LaravelProjectAssist/MakeTrait.php

@@ -1,12 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\LaravelProjectAssist;
 
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Filesystem\FileNotFoundException;
-use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\File;
-use Str;
+use Illuminate\Support\Str;
 use Symfony\Component\Console\Command\Command as CommandAlias;
 
 /**
@@ -40,7 +38,7 @@ public function handle(): int
         $traitName = str_replace("TraitTrait", "Trait", $traitName);
         $traitSubdirectory = rtrim(dirname($name), '/\\');
 
-        $traitStub = File::get(app_path('Console/Commands/stubs/trait.stub'));
+        $traitStub = File::get(app_path('Console/Commands/LaravelProjectAssist/stubs/trait.stub'));
 
         $traitStub = str_replace('{{className}}', $traitName, $traitStub);
         $traitStub = str_replace('\{{subdirectory}}', ($traitSubdirectory != "." ? "\\".$traitSubdirectory : ""), $traitStub);