Merge remote-tracking branch 'origin/master' into 49-add-service-provider-tests

Author: pirs1337

composer.lock

@@ -0,0 +1,9 @@
+<?php
+
+namespace RonasIT\Support\Exceptions;
+
+use Exception;
+
+class IncorrectClassPathException extends Exception
+{
+}

src/Exceptions/IncorrectClassPathException.php

@@ -9,6 +9,7 @@
 use Illuminate\Support\Str;
 use RonasIT\Support\Events\WarningEvent;
 use RonasIT\Support\Exceptions\ClassNotExistsException;
+use RonasIT\Support\Exceptions\IncorrectClassPathException;
 use Throwable;
 use ReflectionMethod;
 use ReflectionClass;
@@ -23,6 +24,15 @@ abstract class EntityGenerator
         'boolean-required', 'boolean', 'timestamp-required', 'timestamp', 'json'
     ];
 
+    const LOVER_CASE_DIRECTORIES_MAP = [
+        'migrations' => 'database/migrations',
+        'factories' => 'database/factories',
+        'seeders' => 'database/seeders',
+        'database_seeder' => 'database/seeders',
+        'tests' => 'tests',
+        'routes' => 'routes',
+    ];
+
     protected $paths = [];
     protected $model;
     protected $fields;
@@ -84,15 +94,21 @@ public function __construct()
         $this->paths = config('entity-generator.paths');
     }
 
-    protected function getOrCreateNamespace(string $path): string
+    protected function getOrCreateNamespace(string $configPath): string
     {
-        $path = $this->paths[$path];
+        $path = $this->paths[$configPath];
         $pathParts = explode('/', $path);
 
         if (Str::endsWith(Arr::last($pathParts), '.php')) {
             array_pop($pathParts);
         }
 
+        foreach ($pathParts as $part) {
+            if (!$this->isFolderHasCorrectCase($part, $configPath)) {
+                throw new IncorrectClassPathException("Incorrect path to {$configPath}, {$part} folder must start with a capital letter, please specify the path according to the PSR.");
+            }
+        }
+
         $namespace = array_map(function (string $part) {
             return ucfirst($part);
         }, $pathParts);
@@ -106,6 +122,15 @@ protected function getOrCreateNamespace(string $path): string
         return implode('\\', $namespace);
     }
 
+    protected function isFolderHasCorrectCase(string $folder, string $configPath): bool
+    {
+        $directory = Arr::get(self::LOVER_CASE_DIRECTORIES_MAP, $configPath);
+
+        $firstFolderChar = substr($folder, 0, 1);
+
+        return $folder === 'app' || (ucfirst($firstFolderChar) === $firstFolderChar) || Str::contains($directory, $folder);
+    }
+
     abstract public function generate(): void;
 
     protected function classExists($path, $name): bool

src/Generators/EntityGenerator.php

@@ -4,8 +4,6 @@
 
 use Illuminate\Support\Arr;
 use RonasIT\Support\Events\SuccessCreateMessage;
-use RonasIT\Support\Events\WarningEvent;
-use RonasIT\Support\Exceptions\EntityCreateException;
 
 class SeederGenerator extends EntityGenerator
 {
@@ -64,7 +62,7 @@ protected function createEntitySeeder(): void
             'entity' => $this->model,
             'relations' => $this->relations,
             'namespace' => $this->getOrCreateNamespace('seeders'),
-            'modelsNamespace' => $this->getOrCreateNamespace('models'),
+            'factoryNamespace' => $this->getOrCreateNamespace('factories'),
         ]);
 
         $seederPath = "{$this->seedsPath}/{$this->model}Seeder.php";

src/Generators/SeederGenerator.php

@@ -1,44 +1,44 @@
 namespace {{$namespace}};
 
 use Illuminate\Database\Seeder;
-use {{$modelsNamespace}}\{{$entity}};
+use {{$factoryNamespace}}\{{$entity}}Factory;
 
 class {{$entity}}Seeder extends Seeder
 {
     public function run()
     {
 @if (empty($relations['belongsTo']))
 @if(empty(array_filter($relations)))
-        {{$entity}}::factory()->create();
+        {{$entity}}Factory::new()->create();
 @else
-        ${{strtolower($entity)}} = {{$entity}}::factory()->create();
+        ${{strtolower($entity)}} = {{$entity}}Factory::new()->create();
 @endif
 @else
 @if(empty(array_filter($relations)))
-        ${{strtolower($entity)}} = {{$entity}}::factory()->make([
+        ${{strtolower($entity)}} = {{$entity}}Factory::new()->make([
 @else
-        {{$entity}}::factory()->make([
+        {{$entity}}Factory::new()->make([
 @endif
 @foreach($relations['belongsTo'] as $relation)
-            '{{strtolower($relation)}}_id' => \{{$modelsNamespace}}\{{$relation}}::factory()->create()->id,
+            '{{strtolower($relation)}}_id' => \{{$factoryNamespace}}\{{$relation}}Factory::new()->create()->id,
 @endforeach
         ]);
 @endif
 
 @foreach($relations['hasOne'] as $relation)
-        \{{$modelsNamespace}}\{{$relation}}::factory()->make([
+        \{{$factoryNamespace}}\{{$relation}}Factory::new()->make([
             '{{strtolower($entity)}}_id' => ${{strtolower($entity)}}->id,
         ]);
 
 @endforeach
 @foreach($relations['hasMany'] as $relation)
-        \{{$modelsNamespace}}\{{$relation}}::factory()->count(10)->make([
+        \{{$factoryNamespace}}\{{$relation}}Factory::new()->count(10)->make([
             '{{strtolower($entity)}}_id' => ${{strtolower($entity)}}->id,
         ]);
 
 @endforeach
 @foreach($relations['belongsToMany'] as $relation)
-        $list = \{{$modelsNamespace}}\{{$relation}}::factory()->count(10)->create()->pluck('id');
+        $list = \{{$factoryNamespace}}\{{$relation}}Factory::new()->count(10)->create()->pluck('id');
         ${{strtolower($entity)}}->{{strtolower($relation)}}s()->sync($list);
 @endforeach
     }

stubs/seeder.blade.php

@@ -11,7 +11,7 @@ trait TranslationMockTrait
 
     public function mockFilesystem(): void
     {
-        $fileSystemMock = new FileSystemMock;
+        $fileSystemMock = new FileSystemMock();
 
         $fileSystemMock->translations = [];
 
@@ -22,7 +22,7 @@ public function mockFilesystemForAppend(): void
     {
         $validation = file_get_contents(getcwd() . '/tests/Support/Translation/validation_without_exceptions.php');
 
-        $fileSystemMock = new FileSystemMock;
+        $fileSystemMock = new FileSystemMock();
 
         $fileSystemMock->translations = ['validation.php' => $validation];