Skip to content

Commit 59bfe87

Browse files
DenTrayDenTray
authored
Merge pull request #191 from RonasIT/187_Standardize-variable-usage-in-Stub-templates
feat: Standardize variable usage in Stub templates
2 parents 8922601 + 408ae5f commit 59bfe87

20 files changed

+186
-186
lines changed

‎stubs/collection_resource.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
namespace {{$namespace}}\{{$singular_name}};
1+
namespace {{ $namespace }}\{{ $singular_name }};
22

33
use Illuminate\Http\Resources\Json\ResourceCollection;
44

5-
class {{$plural_name}}CollectionResource extends ResourceCollection
5+
class {{ $plural_name }}CollectionResource extends ResourceCollection
66
{
7-
public $collects = {{$singular_name}}Resource::class;
7+
public $collects = {{ $singular_name }}Resource::class;
88
}

‎stubs/controller.blade.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
namespace {{$namespace}};
22

33
@inject('str', 'Illuminate\Support\Str')
4-
use {{$resourcesNamespace}}\{{$entity}}\{{$str::plural($entity)}}CollectionResource;
4+
use {{ $resourcesNamespace }}\{{ $entity }}\{{ $str::plural($entity) }}CollectionResource;
55
@if (in_array('C', $options))
6-
use {{$requestsNamespace}}\{{$requestsFolder}}\Create{{$entity}}Request;
6+
use {{ $requestsNamespace }}\{{ $requestsFolder }}\Create{{ $entity }}Request;
77
@endif
88
@if (in_array('D', $options))
9-
use {{$requestsNamespace}}\{{$requestsFolder}}\Delete{{$entity}}Request;
9+
use {{ $requestsNamespace }}\{{ $requestsFolder }}\Delete{{ $entity }}Request;
1010
@endif
11-
use {{$requestsNamespace}}\{{$requestsFolder}}\Get{{$entity}}Request;
11+
use {{ $requestsNamespace }}\{{ $requestsFolder}}\Get{{ $entity }}Request;
1212
@if (in_array('R', $options))
13-
use {{$requestsNamespace}}\{{$requestsFolder}}\Search{{$str::plural($entity)}}Request;
13+
use {{ $requestsNamespace }}\{{ $requestsFolder }}\Search{{ $str::plural($entity) }}Request;
1414
@endif
1515
@if (in_array('U', $options))
16-
use {{$requestsNamespace}}\{{$requestsFolder}}\Update{{$entity}}Request;
16+
use {{ $requestsNamespace }}\{{ $requestsFolder }}\Update{{ $entity }}Request;
1717
@endif
18-
use {{$resourcesNamespace}}\{{$entity}}\{{$entity}}Resource;
19-
use {{$servicesNamespace}}\{{$entity}}Service;
18+
use {{ $resourcesNamespace }}\{{ $entity }}\{{ $entity }}Resource;
19+
use {{ $servicesNamespace }}\{{ $entity }}Service;
2020
@if (in_array('D', $options) || in_array('U', $options))
2121
use Symfony\Component\HttpFoundation\Response;
2222
@endif
2323

24-
class {{$entity}}Controller extends Controller
24+
class {{ $entity }}Controller extends Controller
2525
{
2626
@if (in_array('C', $options))
27-
public function create(Create{{$entity}}Request $request, {{$entity}}Service $service): {{$entity}}Resource
27+
public function create(Create{{ $entity }}Request $request, {{ $entity }}Service $service): {{ $entity }}Resource
2828
{
2929
$data = $request->onlyValidated();
3030

@@ -35,26 +35,26 @@ public function create(Create{{$entity}}Request $request, {{$entity}}Service $se
3535

3636
@endif
3737
@if (in_array('R', $options))
38-
public function get(Get{{$entity}}Request $request, {{$entity}}Service $service, $id): {{$entity}}Resource
38+
public function get(Get{{ $entity }}Request $request, {{ $entity }}Service $service, $id): {{ $entity }}Resource
3939
{
4040
$result = $service
4141
->with($request->input('with', []))
4242
->withCount($request->input('with_count', []))
4343
->find($id);
4444

45-
return {{$entity}}Resource::make($result);
45+
return {{ $entity }}Resource::make($result);
4646
}
4747

48-
public function search(Search{{$str::plural($entity)}}Request $request, {{$entity}}Service $service): {{$str::plural($entity)}}CollectionResource
48+
public function search(Search{{ $str::plural($entity) }}Request $request, {{ $entity }}Service $service): {{ $str::plural($entity) }}CollectionResource
4949
{
5050
$result = $service->search($request->onlyValidated());
5151

52-
return {{$str::plural($entity)}}CollectionResource::make($result);
52+
return {{ $str::plural($entity) }}CollectionResource::make($result);
5353
}
5454

5555
@endif
5656
@if (in_array('U', $options))
57-
public function update(Update{{$entity}}Request $request, {{$entity}}Service $service, $id): Response
57+
public function update(Update{{ $entity }}Request $request, {{ $entity }}Service $service, $id): Response
5858
{
5959
$service->update($id, $request->onlyValidated());
6060

@@ -63,7 +63,7 @@ public function update(Update{{$entity}}Request $request, {{$entity}}Service $se
6363

6464
@endif
6565
@if (in_array('D', $options))
66-
public function delete(Delete{{$entity}}Request $request, {{$entity}}Service $service, $id): Response
66+
public function delete(Delete{{ $entity }}Request $request, {{ $entity }}Service $service, $id): Response
6767
{
6868
$service->delete($id);
6969

‎stubs/database_empty_seeder.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@if((version_compare(app()->version(), '8', '>=')))
2-
namespace {{$namespace}};
2+
namespace {{ $namespace }};
33
@else
4-
namespace {{$namespace}};
4+
namespace {{ $namespace }};
55
@endif
66

77
use Illuminate\Database\Seeder;

‎stubs/dumps/mysql.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@foreach($inserts as $entities)
22
@foreach($entities['items'] as $entity)
3-
INSERT INTO "{{$entities['name']}}"({!! implode(', ', $entity['fields']) !!}, created_at, updated_at) VALUES
3+
INSERT INTO "{{ $entities['name'] }}"({!! implode(', ', $entity['fields']) !!}, created_at, updated_at) VALUES
44
({!! implode(', ', $entity['values']) !!}, '2016-10-20 11:05:00', '2016-10-20 11:05:00');
55
@endforeach
66

‎stubs/dumps/pgsql.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@foreach($inserts as $entities)
22
@foreach($entities['items'] as $entity)
3-
INSERT INTO "{{$entities['name']}}"({!! implode(', ', $entity['fields']) !!}, created_at, updated_at) VALUES
3+
INSERT INTO "{{ $entities['name'] }}"({!! implode(', ', $entity['fields']) !!}, created_at, updated_at) VALUES
44
({!! implode(', ', $entity['values']) !!}, '2016-10-20 11:05:00', '2016-10-20 11:05:00');
55
@endforeach
66

‎stubs/factory.blade.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
namespace {{$namespace}};
1+
namespace {{ $namespace }};
22

33
@if (!empty($fields))
44
use Faker\Generator as Faker;
55
@endif
66
use Illuminate\Database\Eloquent\Factories\Factory;
7-
use {{$modelNamespace}}\{{$entity}};
7+
use {{ $modelNamespace }}\{{ $entity }};
88

9-
class {{$entity}}Factory extends Factory
9+
class {{ $entity }}Factory extends Factory
1010
{
11-
protected $model = {{$entity}}::class;
11+
protected $model = {{ $entity }}::class;
1212

1313
public function definition(): array
1414
{
@@ -18,7 +18,7 @@ public function definition(): array
1818
@endif
1919
return [
2020
@foreach($fields as $field)
21-
'{{$field['name']}}' => {!! \RonasIT\Support\Generators\FactoryGenerator::getFactoryFieldsContent($field) !!},
21+
'{{ $field['name'] }}' => {!! \RonasIT\Support\Generators\FactoryGenerator::getFactoryFieldsContent($field) !!},
2222
@endforeach
2323
];
2424
}

‎stubs/migration.blade.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public function up(): void
1212
@if(!empty($relations['belongsToMany']) || !empty($relations['belongsTo']) || !empty($relations['hasOne']) || !empty($relations['hasMany']))
1313
$this->createTable();
1414
@else
15-
Schema::create('{{\Illuminate\Support\Str::plural(\Illuminate\Support\Str::snake($entity))}}', function (Blueprint $table) {
15+
Schema::create('{{ \Illuminate\Support\Str::plural(\Illuminate\Support\Str::snake($entity)) }}', function (Blueprint $table) {
1616
$table->increments('id');
1717
@foreach ($table as $row )
1818
{!!$row!!}
@@ -22,43 +22,43 @@ public function up(): void
2222
@endif
2323
@foreach($relations['belongsToMany'] as $relation)
2424

25-
$this->createBridgeTable('{{$entity}}', '{{$relation}}');
25+
$this->createBridgeTable('{{ $entity }}', '{{ $relation }}');
2626
@endforeach
2727
@foreach($relations['belongsTo'] as $relation)
2828

29-
$this->addForeignKey('{{$entity}}', '{{$relation}}');
29+
$this->addForeignKey('{{ $entity }}', '{{ $relation }}');
3030
@endforeach
3131
@foreach($relations['hasOne'] as $relation)
3232

33-
$this->addForeignKey('{{$relation}}', '{{$entity}}', true);
33+
$this->addForeignKey('{{ $relation }}', '{{ $entity }}', true);
3434
@endforeach
3535
@foreach($relations['hasMany'] as $relation)
3636

37-
$this->addForeignKey('{{$relation}}', '{{$entity}}', true);
37+
$this->addForeignKey('{{ $relation }}', '{{ $entity }}', true);
3838
@endforeach
3939
}
4040

4141
public function down(): void
4242
{
4343
@foreach($relations['hasOne'] as $relation)
44-
$this->dropForeignKey('{{$relation}}', '{{$entity}}', true);
44+
$this->dropForeignKey('{{ $relation }}', '{{ $entity }}', true);
4545

4646
@endforeach
4747
@foreach($relations['hasMany'] as $relation)
48-
$this->dropForeignKey('{{$relation}}', '{{$entity}}', true);
48+
$this->dropForeignKey('{{ $relation }}', '{{ $entity }}', true);
4949

5050
@endforeach
5151
@foreach($relations['belongsToMany'] as $relation)
52-
$this->dropBridgeTable('{{$entity}}', '{{$relation}}');
52+
$this->dropBridgeTable('{{ $entity }}', '{{ $relation }}');
5353

5454
@endforeach
55-
Schema::dropIfExists('{{\Illuminate\Support\Str::plural(\Illuminate\Support\Str::snake($entity))}}');
55+
Schema::dropIfExists('{{ \Illuminate\Support\Str::plural(\Illuminate\Support\Str::snake($entity)) }}');
5656
}
5757
@if(!empty($relations['belongsToMany']) || !empty($relations['belongsTo']) || !empty($relations['hasOne']) || !empty($relations['hasMany']))
5858

5959
public function createTable(): void
6060
{
61-
Schema::create('{{\Illuminate\Support\Str::plural(\Illuminate\Support\Str::snake($entity))}}', function (Blueprint $table) {
61+
Schema::create('{{ \Illuminate\Support\Str::plural(\Illuminate\Support\Str::snake($entity)) }}', function (Blueprint $table) {
6262
$table->increments('id');
6363
@foreach ($table as $row )
6464
{!!$row!!}

‎stubs/model.blade.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
namespace {{$namespace}};
1+
namespace {{ $namespace }};
22

33
use Illuminate\Database\Eloquent\Model;
44
use RonasIT\Support\Traits\ModelTrait;
55
@foreach($importRelations as $value)
6-
use {{$value}};
6+
use {{ $value }};
77
@endforeach
88
@if($hasCarbonField)
99
use Carbon\Carbon;
@@ -12,21 +12,21 @@
1212
@if(!empty($anotationProperties))
1313
/**
1414
@foreach($anotationProperties as $key => $value)
15-
* @property {{$value}} ${{$key}}
15+
* @property {{ $value }} ${{ $key }}
1616
@endforeach
1717
*/
1818
@else
1919
//TODO: add @property annotation for each model's field
2020
/**
2121
*/
2222
@endif
23-
class {{$entity}} extends Model
23+
class {{ $entity }} extends Model
2424
{
2525
use ModelTrait;
2626

2727
protected $fillable = [
2828
@foreach($fields as $field)
29-
'{{$field}}',
29+
'{{ $field }}',
3030
@endforeach
3131
];
3232

@@ -35,7 +35,7 @@ class {{$entity}} extends Model
3535

3636
protected $casts = [
3737
@foreach($casts as $fieldName => $cast)
38-
'{{$fieldName}}' => '{{$cast}}',
38+
'{{ $fieldName }}' => '{{ $cast }}',
3939
@endforeach
4040
];
4141
@endif

‎stubs/nova_resource.blade.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
namespace {{$namespace}};
1+
namespace {{ $namespace }};
22

33
@inject('str', 'Illuminate\Support\Str')
4-
use {{$modelNamespace}}\{{$model}};
4+
use {{ $modelNamespace }}\{{ $model }};
55
use Illuminate\Http\Request;
66
@foreach($types as $fieldType)
7-
use Laravel\Nova\Fields\{{$fieldType}};
7+
use Laravel\Nova\Fields\{{ $fieldType }};
88
@endforeach
99

10-
class {{$model}}Resource extends Resource
10+
class {{ $model }}Resource extends Resource
1111
{
12-
public static $model = {{$model}}::class;
12+
public static $model = {{ $model }}::class;
1313

1414
//TODO change field for the title if it required
1515
public static $title = 'name';
@@ -19,15 +19,15 @@ class {{$model}}Resource extends Resource
1919

2020
public static function label(): string
2121
{
22-
return '{{Str::plural($model)}}';
22+
return '{{ Str::plural($model) }}';
2323
}
2424

2525
public function fields(Request $request): array
2626
{
2727
return [
2828
@foreach($fields as $fieldName => $fieldOptions)
2929
@php($name = ctype_upper($fieldName) ? $fieldName : Str::headline($fieldName))
30-
{{$fieldOptions['type']}}::make('{{$name}}')
30+
{{ $fieldOptions['type'] }}::make('{{ $name }}')
3131
@if($fieldOptions['is_required'])
3232
->required()
3333
@endif

0 commit comments

Comments
 (0)