Fix MakeResource Command to Properly Add Getters Functions

Author: MR-Sharifi

src/Commands/MakeResource.php

@@ -90,22 +90,20 @@ public function handle(): int
         $getterStub = file_get_contents($resourceStubsPath.'getter.default.stub');
         $foreignGetterStub = file_get_contents($resourceStubsPath.'getter.foreign.stub');
 
+        $getterFunctions = '';
         foreach ($columns as $_column) {
-            $baseContent = substr_replace($baseContent,
-                $this->writeGetter($getterStub, $_column->COLUMN_NAME, camel_case($_column->COLUMN_NAME)),
-                -293, 0);
+            $getterFunctions .= $this->writeGetter($getterStub, $_column->COLUMN_NAME, camel_case($_column->COLUMN_NAME));
         }
 
+        $foreignGetterFunctions = '';
         if ($detectForeignKeys) {
             foreach ($foreignKeys as $_foreignKey) {
-                $baseContent = substr_replace($baseContent,
-                    $this->writeForeignGetter($foreignGetterStub, $_foreignKey->VARIABLE_NAME, $_foreignKey->ENTITY_DATA_TYPE),
-                    -20, 0);
+                $foreignGetterFunctions .= $this->writeForeignGetter($foreignGetterStub, $_foreignKey->VARIABLE_NAME, $_foreignKey->ENTITY_DATA_TYPE);
             }
         }
 
-        $baseContent = str_replace(['{{ EntityName }}', '{{ EntityNamespace }}', '{{ EntityVariableName }}', '{{ ResourceName }}', '{{ ResourceNamespace }}'],
-            [$entityName, $entityNamespace, $entityVariableName, $resourceName, $resourceNamespace],
+        $baseContent = str_replace(['{{ GetterFunctions }}', '{{ ForeignGetterFunctions }}', '{{ EntityName }}', '{{ EntityNamespace }}', '{{ EntityVariableName }}', '{{ ResourceName }}', '{{ ResourceNamespace }}'],
+            [substr($getterFunctions, 0, -1), substr($foreignGetterFunctions, 0, -1), $entityName, $entityNamespace, $entityVariableName, $resourceName, $resourceNamespace],
             $baseContent);
 
         file_put_contents($filenameWithPath, $baseContent);

stubs/PHP7.4/repository.resource.class.stub

@@ -14,6 +14,7 @@ class {{ ResourceName }} extends Resource
     public function toArray(${{ EntityVariableName }}): array
     {
         return [
+{{ GetterFunctions }}
         ];
     }
 
@@ -24,6 +25,7 @@ class {{ ResourceName }} extends Resource
     public function toArrayWithForeignKeys(${{ EntityVariableName }}): array
     {
         return $this->toArray(${{ EntityVariableName }}) + [
+{{ ForeignGetterFunctions }}
         ];
     }
 }

stubs/PHP8.0/repository.resource.class.stub

@@ -14,6 +14,7 @@ class {{ ResourceName }} extends Resource
     public function toArray(${{ EntityVariableName }}): array
     {
         return [
+{{ GetterFunctions }}
         ];
     }
 
@@ -24,6 +25,7 @@ class {{ ResourceName }} extends Resource
     public function toArrayWithForeignKeys(${{ EntityVariableName }}): array
     {
         return $this->toArray(${{ EntityVariableName }}) + [
+{{ ForeignGetterFunctions }}
         ];
     }
 }