fix: Migration Generator - disabled timestamps fix (InfyOmLabs#1071)

billysmithers · billyskybettingandgaming · web-flow · commit 39b52bd49dcd · 2024-01-04T09:35:23.000+05:30
* fix: Migration Generator - null  or null  fix

* fix to dashedPlural in routes blade scaffold template

---------

Co-authored-by: Billy Smithers &lt;Billy.Smithers@skybettingandgaming.com&gt;
diff --git a/src/Generators/MigrationGenerator.php b/src/Generators/MigrationGenerator.php
@@ -60,7 +60,7 @@ protected function generateFields(): string
             }
         }
 
-        if ($createdAtField->name === 'created_at' and $updatedAtField->name === 'updated_at') {
+        if ($createdAtField->name ?? '' === 'created_at' and $updatedAtField->name ?? '' === 'updated_at') {
             $fields[] = '$table->timestamps();';
         } else {
             if ($createdAtField) {
diff --git a/views/scaffold/routes.blade.php b/views/scaffold/routes.blade.php
@@ -1,2 +1,2 @@
 Route::resource('{{ $config->prefixes->getRoutePrefixWith('/') }}{{ $config->modelNames->dashedPlural }}', {{ $config->namespaces->controller }}\{{ $config->modelNames->name }}Controller::class)@if(!$config->prefixes->route);@endif
-@if($config->prefixes->route){!! infy_nl_tab().'->names(['.infy_nl_tab(1, 2).implode(','.infy_nl_tab(1, 2), create_resource_route_names($config->prefixes->getRoutePrefixWith('.').$config->modelNames->camelPlural, true)).infy_nl_tab().']);' !!}@endif
+@if($config->prefixes->route){!! infy_nl_tab().'->names(['.infy_nl_tab(1, 2).implode(','.infy_nl_tab(1, 2), create_resource_route_names($config->prefixes->getRoutePrefixWith('.').$config->modelNames->dashedPlural, true)).infy_nl_tab().']);' !!}@endif

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ protected function generateFields(): string`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- if ($createdAtField->name === 'created_at' and $updatedAtField->name === 'updated_at') {`
	`63`	`+ if ($createdAtField->name ?? '' === 'created_at' and $updatedAtField->name ?? '' === 'updated_at') {`
`64`	`64`	`$fields[] = '$table->timestamps();';`
`65`	`65`	`} else {`
`66`	`66`	`if ($createdAtField) {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`Route::resource('{{ $config->prefixes->getRoutePrefixWith('/') }}{{ $config->modelNames->dashedPlural }}', {{ $config->namespaces->controller }}\{{ $config->modelNames->name }}Controller::class)@if(!$config->prefixes->route);@endif`
`2`		`-@if($config->prefixes->route){!! infy_nl_tab().'->names(['.infy_nl_tab(1, 2).implode(','.infy_nl_tab(1, 2), create_resource_route_names($config->prefixes->getRoutePrefixWith('.').$config->modelNames->camelPlural, true)).infy_nl_tab().']);' !!}@endif`
	`2`	`+@if($config->prefixes->route){!! infy_nl_tab().'->names(['.infy_nl_tab(1, 2).implode(','.infy_nl_tab(1, 2), create_resource_route_names($config->prefixes->getRoutePrefixWith('.').$config->modelNames->dashedPlural, true)).infy_nl_tab().']);' !!}@endif`