Skip to content

Commit ccbeef1

Browse files
MR-SharifiMR-Sharifi
committed
Minor Change in Paths, Fix Some Stubs
1 parent 92b24f3 commit ccbeef1

11 files changed

+25
-25
lines changed

‎config/repository.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@
88
'namespace' => [
99
'entities' => 'App\Models\Entities',
1010
'factories' => 'App\Models\Factories',
11-
'resource' => 'App\Http\Resources\Admin',
12-
'repository' => 'App\Models\Repositories',
11+
'resources' => 'App\Http\Resources\Admin',
12+
'repositories' => 'App\Models\Repositories',
1313
],
1414

15-
'stubs' => [
16-
'entity' => 'stubs/PHP'.config('repository.php_version').'/repository.entity.',
17-
'factory' => 'stubs/PHP'.config('repository.php_version').'/repository.factory.',
18-
'resource' => 'stubs/PHP'.config('repository.php_version').'/repository.resource.',
19-
'repository' => 'stubs/PHP'.config('repository.php_version').'/repository.repository.',
15+
'stub' => [
16+
'entities' => 'stubs/repository.entity.',
17+
'factories' => 'stubs/repository.factory.',
18+
'resources' => 'stubs/repository.resource.',
19+
'repositories' => 'stubs/repository.repository.',
2020
],
2121

2222
'relative' => [
2323
'entities' => 'app/Models/Entities/',
2424
'factories' => 'app/Models/Factories/',
25-
'resource' => 'app/Http/Resources/Admin/',
26-
'repository' => 'app/Models/Repositories/',
25+
'resources' => 'app/Http/Resources/Admin/',
26+
'repositories' => 'app/Models/Repositories/',
2727
],
2828

2929
]

‎src/Commands/MakeEntity.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function handle(): int
6666
$entityName = str_singular(ucfirst(camel_case($tableName)));
6767
$entityNamespace = config('repository.path.namespace.entities');
6868
$relativeEntitiesPath = config('repository.path.relative.entities');
69-
$entityStubsPath = config('repository.path.stubs.entity');
69+
$entityStubsPath = config('repository.path.stub.entities');
7070
$filenameWithPath = $relativeEntitiesPath.$entityName.'.php';
7171

7272
if ($this->option('delete')) {

‎src/Commands/MakeFactory.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ public function handle(): int
3737
$entityName = str_singular(ucfirst(camel_case($tableName)));
3838
$entityVariableName = camel_case($entityName);
3939
$factoryName = $entityName . "Factory";
40+
$entityNamespace = config('repository.path.namespace.entities');
4041
$factoryNamespace = config('repository.path.namespace.factories');
4142
$relativeFactoriesPath = config('repository.path.relative.factories');
43+
$factoryStubsPath = config('repository.path.stub.factories');
4244

4345
if ($this->option('delete')) {
4446
unlink("$relativeFactoriesPath/$factoryName.php");

‎src/Commands/MakeInterfaceRepository.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public function handle(): int
3939
$entityName = str_singular(ucfirst(camel_case($tableName)));
4040
$entityVariableName = camel_case($entityName);
4141
$interfaceName = "I$entityName" . "Repository";
42-
$interfaceNamespace = config('repository.path.namespace.repository');
43-
$relativeInterfacePath = config('repository.path.relative.repository') . "\\$entityName";
42+
$interfaceNamespace = config('repository.path.namespace.repositories');
43+
$relativeInterfacePath = config('repository.path.relative.repositories') . "\\$entityName";
4444

4545
if ($this->option('delete')) {
4646
unlink("$relativeInterfacePath/$interfaceName.php");

‎src/Commands/MakeMySqlRepository.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public function handle(): int
7777
$factoryName = $entityName . "Factory";
7878
$interfaceName = "I$entityName" . "Repository";
7979
$mysqlRepositoryName = "MySql$entityName" . "Repository";
80-
$mysqlRepositoryNamespace = config('repository.path.namespace.repository');
81-
$relativeMysqlRepositoryPath = config('repository.path.relative.repository') . "\\$entityName";
80+
$mysqlRepositoryNamespace = config('repository.path.namespace.repositories');
81+
$relativeMysqlRepositoryPath = config('repository.path.relative.repositories') . "\\$entityName";
8282

8383
if ($this->option('delete')) {
8484
unlink("$relativeMysqlRepositoryPath/$mysqlRepositoryName.php");

‎src/Commands/MakeRedisRepository.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public function handle(): int
4141
$factoryName = $entityName . "Factory";
4242
$interfaceName = "I$entityName" . "Repository";
4343
$redisRepositoryName = "Redis$entityName" . "Repository";
44-
$redisRepositoryNamespace = config('repository.path.namespace.repository');
45-
$relativeRedisRepositoryPath = config('repository.path.relative.repository') . "\\$entityName";
44+
$redisRepositoryNamespace = config('repository.path.namespace.repositories');
45+
$relativeRedisRepositoryPath = config('repository.path.relative.repositories') . "\\$entityName";
4646

4747
if ($this->option('delete')) {
4848
unlink("$relativeRedisRepositoryPath/$redisRepositoryName.php");

‎src/Commands/MakeRepository.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public function handle(): int
3434
$entityName = str_singular(ucfirst(camel_case($tableName)));
3535
$mysqlRepositoryName = "MySql$entityName" . "Repository";
3636
$repository = $entityName . "Repository";
37-
$repositoryNamespace = config('repository.path.namespace.repository');
38-
$relativeRepositoryPath = config('repository.path.relative.repository') . "\\$entityName";
37+
$repositoryNamespace = config('repository.path.namespace.repositories');
38+
$relativeRepositoryPath = config('repository.path.relative.repositories') . "\\$entityName";
3939

4040
if ($this->option('delete')) {
4141
unlink("$relativeRepositoryPath/$repository.php");

‎src/Commands/MakeResource.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public function handle(): int
3939
$entityName = str_singular(ucfirst(camel_case($tableName)));
4040
$entityVariableName = camel_case($entityName);
4141
$resourceName = $entityName . "Resource";
42-
$resourceNamespace = config('repository.path.namespace.resource');
43-
$relativeResourcesPath = config('repository.path.relative.resource');
42+
$resourceNamespace = config('repository.path.namespace.resources');
43+
$relativeResourcesPath = config('repository.path.relative.resources');
4444

4545
if ($this->option('delete')) {
4646
unlink("$relativeResourcesPath/$resourceName.php");

‎src/stubs/PHP7.0/repository.entity.attribute.stub‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
protected ${{ AttributeName }};
1+
protected ${{ AttributeName }};

‎src/stubs/PHP7.0/repository.factory.setter.stub‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
2-
${{ EntityVariableName }}->set{{ SetterName }}($entity->{{ AttributeName }} ?? null);
1+
${{ EntityVariableName }}->set{{ SetterName }}($entity->{{ AttributeName }} ?? null);

0 commit comments

Comments
 (0)