feat: remove set and get functions

mbpcoder · mbpcoder · commit d839a795833e · 2024-11-02T18:03:23.000+03:30
diff --git a/src/Creators/BaseCreator.php b/src/Creators/BaseCreator.php
@@ -33,8 +33,13 @@ public function createClass(string $filenameWithPath, BaseCommand $command): str
         $attributesArray = $this->checkDiffrence($filenameWithPath, $attributesArray, $command, $specificPattern, $generalPattern);
 
         $attributes = trim(implode("\n\t", $attributesArray));
-        $functions = trim(implode("\n", $functionsArray));
-        $functions = (!empty($attributes)) ? "\n\n\t" . $functions : $functions;
+
+        $functions = '';
+        if (count($functionsArray) > 0) {
+            $functions = trim(implode("\n", $functionsArray));
+            $functions = (!empty($attributes)) ? "\n\n\t" . $functions : $functions;
+        }
+
         $uses = implode(PHP_EOL, $usesArray);
 
         $type = (isset($this->creator->enum)) ? self::ENUM_TYPE : self::CLASS_TYPE;
diff --git a/src/Creators/CreatorEntity.php b/src/Creators/CreatorEntity.php
@@ -97,54 +97,7 @@ public function createUses(): array
 
     public function createFunctions(): array
     {
-        $settersAndGetters = [];
-
-        foreach ($this->columns as $_column) {
-            $dataType = $this->getDataType($_column->COLUMN_TYPE, $_column->DATA_TYPE);
-
-            $settersAndGetters['get' . ucwords($_column->COLUMN_NAME)] =
-                $this->writeAccessors(
-                    $this->entityStubsPath,
-                    $_column->COLUMN_NAME,
-                    ($_column->IS_NULLABLE === 'YES' ? 'null|' : '') . $dataType,
-                    'getter'
-                );
-
-            $settersAndGetters['set' . ucwords($_column->COLUMN_NAME)] =
-                $this->writeAccessors(
-                    $this->entityStubsPath,
-                    $_column->COLUMN_NAME,
-                    ($_column->IS_NULLABLE === 'YES' ? 'null|' : '') . $dataType,
-                    'setter'
-                );
-
-        }
-
-        if ($this->detectForeignKeys) {
-            $foreignKeys = $this->extractForeignKeys($this->tableName);
-
-            // Create Additional Setters and Getters from Foreign keys
-            foreach ($foreignKeys as $_foreignKey) {
-
-                $settersAndGetters['get' . ucwords($_foreignKey->COLUMN_NAME)] =
-                    $this->writeAccessors(
-                        $this->entityStubsPath,
-                        $_foreignKey->VARIABLE_NAME,
-                        $_foreignKey->ENTITY_DATA_TYPE,
-                        'getter'
-                    );
-
-                $settersAndGetters['set' . ucwords($_foreignKey->COLUMN_NAME)] =
-                    $this->writeAccessors(
-                        $this->entityStubsPath,
-                        $_foreignKey->VARIABLE_NAME,
-                        $_foreignKey->ENTITY_DATA_TYPE,
-                        'setter'
-                    );
-            }
-        }
-
-        return $settersAndGetters;
+        return [];
     }
 
     private function writeAttribute(string $entityStubsPath, string $attributeName, string $attributeType): string
diff --git a/src/Creators/CreatorFactory.php b/src/Creators/CreatorFactory.php
@@ -28,23 +28,28 @@ public function getNameSpace(): string
 
     public function createAttributes(): array
     {
-        // TODO: Implement createAttributs() method.
-        return [];
-    }
-
-    public function createFunctions(): array
-    {
-        $setterStub = file_get_contents($this->factoryStubsPath . 'setter.stub');
-        $setterFunctions = '';
+        $setStub = file_get_contents($this->factoryStubsPath . 'set.stub');
+        $sets = '';
         foreach ($this->columns as $_column) {
-            $setterFunctions .= trim($this->writeSetter($setterStub, $_column->COLUMN_NAME)) . "\n\t\t";
+            $replacementTokens = [
+                '{{ AttributeName }}' => Str::camel($_column->COLUMN_NAME),
+                '{{ DatabaseAttributeName }}' => Str::snake($_column->COLUMN_NAME)
+            ];
+
+            $sets .= str_replace(array_keys($replacementTokens), array_values($replacementTokens), $setStub) . "\t\t";
         }
 
         return ['makeEntityFromStdClass' =>
-            str_replace(['{{ SetterFunctions }}', '{{ EntityName }}', '{{ EntityVariableName }}'],
-                [$setterFunctions, $this->entityName, $this->entityVariableName],
+            str_replace(['{{ Sets }}', '{{ EntityName }}', '{{ EntityVariableName }}'],
+                [$sets, $this->entityName, $this->entityVariableName],
                 $this->baseContent)
         ];
+        return [];
+    }
+
+    public function createFunctions(): array
+    {
+        return [];
     }
 
     public function createUses(): array
@@ -62,16 +67,6 @@ public function getExtendSection(): string
         return 'extends ' . self::PARENT_NAME;
     }
 
-    public function writeSetter(string $setterStub, string $columnName): string
-    {
-        $replacementTokens = [
-            '{{ SetterName }}' => ucfirst($columnName),
-            '{{ AttributeName }}' => Str::snake($columnName)
-        ];
-
-        return str_replace(array_keys($replacementTokens), array_values($replacementTokens), $setterStub);
-    }
-
     public function getClassName(): string
     {
         return $this->factoryName;
diff --git a/src/Creators/CreatorMySqlRepository.php b/src/Creators/CreatorMySqlRepository.php
@@ -153,21 +153,7 @@ private function writeGetAllFunction(string $getOneStub, string $columnName, str
             $getOneStub);
     }
 
-    private function writeGetterFunction(string $getterStub, string $columnName): string
-    {
-        return str_replace(['{{ ColumnName }}', '{{ GetterName }}'],
-            [$columnName, ucfirst(Str::camel($columnName))],
-            $getterStub);
-    }
-
-    private function writeSetterFunction(string $setterStub, string $columnName): string
-    {
-        return str_replace('{{ SetterName }}',
-            ucfirst(Str::camel($columnName)),
-            $setterStub);
-    }
-
-    private function getConstruct(string $tableName, string $factoryName, bool $hasSoftDelete, string $constructContent)
+     private function getConstruct(string $tableName, string $factoryName, bool $hasSoftDelete, string $constructContent)
     {
         return str_replace(
             ['{{ TableName }}', '{{ FactoryName }}', '{{ HasSoftDelete }}'],
@@ -186,11 +172,11 @@ public function makeCreateFunction(array &$stubContent, string &$getterFunctions
     {
         foreach ($this->columns as $_column) {
             if (!in_array($_column->COLUMN_NAME, ['id', 'deleted_at'])) {
-                $getterFunctions .= trim($this->writeGetterFunction($stubContent['getterStub'], $_column->COLUMN_NAME)) . "\n\t\t\t\t";
+                $getterFunctions .= trim(str_replace(['{{ ColumnName }}', '{{ AttributeName }}'], [$_column->COLUMN_NAME, Str::camel($_column->COLUMN_NAME)], $stubContent['getterStub'])) . "\n\t\t\t\t";
             }
 
             if (in_array($_column->COLUMN_NAME, ['created_at', 'updated_at'], true)) {
-                $setterFunctions .= trim($this->writeSetterFunction($stubContent['setterStub'], $_column->COLUMN_NAME)) . "\n\t\t";
+                $setterFunctions .= trim(str_replace('{{ AttributeName }}', Str::camel($_column->COLUMN_NAME), $stubContent['setterStub'])) . "\n\t\t";
             }
         }
 
@@ -216,11 +202,11 @@ public function makeUpdateFunction(array &$stubContent, string &$getterFunctions
         foreach ($this->columns as $_column) {
 
             if (!in_array($_column->COLUMN_NAME, ['id', 'created_at', 'deleted_at'])) {
-                $getterFunctions .= trim($this->writeGetterFunction($stubContent['getterStub'], $_column->COLUMN_NAME)) . "\n\t\t\t\t";
+                $getterFunctions .= trim(str_replace(['{{ ColumnName }}', '{{ AttributeName }}'], [$_column->COLUMN_NAME, Str::camel($_column->COLUMN_NAME)], $stubContent['getterStub'])) . "\n\t\t\t\t";;
             }
 
             if ($_column->COLUMN_NAME === 'updated_at') {
-                $setterFunctions .= trim($this->writeSetterFunction($stubContent['setterStub'], $_column->COLUMN_NAME)) . "\n\t\t";
+                $setterFunctions .= trim(str_replace('{{ AttributeName }}', Str::camel($_column->COLUMN_NAME), $stubContent['setterStub'])). "\n\t\t";;
             }
         }
 
diff --git a/src/Creators/CreatorResource.php b/src/Creators/CreatorResource.php
@@ -55,14 +55,14 @@ public function createAttributes(): array
 
     public function createFunctions(): array
     {
-        $getterStub = file_get_contents($this->resourceStubsPath . 'getter.default.stub');
+        $getsStub = file_get_contents($this->resourceStubsPath . 'getter.default.stub');
         $foreignGetterStub = file_get_contents($this->resourceStubsPath . 'getter.foreign.stub');
         $foreignFunStub = file_get_contents($this->resourceStubsPath . 'function.foreign.stub');
         $getterFunStub = file_get_contents($this->resourceStubsPath . 'function.getter.stub');
 
         $getters = '';
         foreach ($this->columns as $_column) {
-            $getters .= $this->writeGetter($getterStub, $_column->COLUMN_NAME, Str::camel($_column->COLUMN_NAME)) . "\t\t\t";
+            $getters .= $this->writeGet($getsStub, $_column->COLUMN_NAME, Str::camel($_column->COLUMN_NAME)) . "\t\t\t";
         }
 
         $foreignGetterFunctions = '';
@@ -82,11 +82,11 @@ public function createFunctions(): array
         return $functions;
     }
 
-    public function writeGetter(string $getterStub, string $columnName, string $attributeName): array|string
+    public function writeGet(string $getterStub, string $columnName, string $attributeName): array|string
     {
         $replaceMapping = [
             '{{ ColumnName }}' => $columnName,
-            '{{ GetterName }}' => ucfirst($attributeName),
+            '{{ AttributeName }}' => Str::camel($attributeName),
         ];
 
         return str_replace(array_keys($replaceMapping), array_values($replaceMapping), $getterStub);
diff --git a/src/Models/Entity/Entity.php b/src/Models/Entity/Entity.php
@@ -11,29 +11,11 @@ abstract class Entity implements JsonSerializable, Arrayable
     // contain originals value of attributes
     private $originals = [];
 
-    abstract public function getId(): int;
-
     public function __construct()
     {
 
     }
 
-    public function __set($name, $value)
-    {
-        if (property_exists($this, $name)) {
-            $function = Str::camel('set_' . Str::snake($name));
-            $this->$function($value);
-        }
-    }
-
-    public function __get($name)
-    {
-        if (property_exists($this, $name)) {
-            $function = Str::camel('get_' . Str::snake($name));
-            return $this->$function();
-        }
-    }
-
     public function __isset($name)
     {
         return property_exists($this, $name);
diff --git a/stubs/Entities/entity.attribute.stub b/stubs/Entities/entity.attribute.stub
@@ -1 +1 @@
-protected {{ AttributeType }} ${{ AttributeName }};
+public {{ AttributeType }} ${{ AttributeName }};
diff --git a/stubs/Entities/entity.getter.stub b/stubs/Entities/entity.getter.stub
diff --git a/stubs/Entities/entity.setter.stub b/stubs/Entities/entity.setter.stub
diff --git a/stubs/Factories/factory.class.stub b/stubs/Factories/factory.class.stub
@@ -2,6 +2,6 @@
     {
         ${{ EntityVariableName }} = new {{ EntityName }}();
 
-        {{ SetterFunctions }}
+        {{ Sets }}
         return ${{ EntityVariableName }};
     }
diff --git a/stubs/Factories/factory.set.stub b/stubs/Factories/factory.set.stub
@@ -0,0 +1 @@
+${{ EntityVariableName }}->{{ AttributeName }} = $entity->{{ DatabaseAttributeName }};
diff --git a/stubs/Factories/factory.setter.stub b/stubs/Factories/factory.setter.stub
diff --git a/stubs/Repositories/Mysql/mysql.create.stub b/stubs/Repositories/Mysql/mysql.create.stub
@@ -7,7 +7,7 @@
                 {{ GetterFunctions }}
             ]);
 
-        ${{ EntityVariableName }}->setId($id);
+        ${{ EntityVariableName }}->id = $id;
 
         return ${{ EntityVariableName }};
     }
diff --git a/stubs/Repositories/Mysql/mysql.getter.stub b/stubs/Repositories/Mysql/mysql.getter.stub
@@ -1 +1 @@
-	'{{ ColumnName }}' => ${{ EntityVariableName }}->get{{ GetterName }}(),
+	'{{ ColumnName }}' => ${{ EntityVariableName }}->{{ AttributeName }},
diff --git a/stubs/Repositories/Mysql/mysql.setter.stub b/stubs/Repositories/Mysql/mysql.setter.stub
@@ -1 +1 @@
-	${{ EntityVariableName }}->set{{ SetterName }}(date('Y-m-d H:i:s'));
+	${{ EntityVariableName }}->{{ AttributeName }} = date('Y-m-d H:i:s');
diff --git a/stubs/Resources/resource.getter.default.stub b/stubs/Resources/resource.getter.default.stub
@@ -1 +1 @@
-'{{ ColumnName }}' => ${{ EntityVariableName }}->get{{ GetterName }}(),
+'{{ ColumnName }}' => ${{ EntityVariableName }}->{{ AttributeName }},

Original file line number	Diff line number	Diff line change
`@@ -153,21 +153,7 @@ private function writeGetAllFunction(string $getOneStub, string $columnName, str`
`153`	`153`	`$getOneStub);`
`154`	`154`	`}`
`155`	`155`
`156`		`- private function writeGetterFunction(string $getterStub, string $columnName): string`
`157`		`- {`
`158`		`- return str_replace(['{{ ColumnName }}', '{{ GetterName }}'],`
`159`		`- [$columnName, ucfirst(Str::camel($columnName))],`
`160`		`- $getterStub);`
`161`		`- }`
`162`		`-`
`163`		`- private function writeSetterFunction(string $setterStub, string $columnName): string`
`164`		`- {`
`165`		`- return str_replace('{{ SetterName }}',`
`166`		`- ucfirst(Str::camel($columnName)),`
`167`		`- $setterStub);`
`168`		`- }`
`169`		`-`
`170`		`- private function getConstruct(string $tableName, string $factoryName, bool $hasSoftDelete, string $constructContent)`
	`156`	`+ private function getConstruct(string $tableName, string $factoryName, bool $hasSoftDelete, string $constructContent)`
`171`	`157`	`{`
`172`	`158`	`return str_replace(`
`173`	`159`	`['{{ TableName }}', '{{ FactoryName }}', '{{ HasSoftDelete }}'],`
`@@ -186,11 +172,11 @@ public function makeCreateFunction(array &$stubContent, string &$getterFunctions`
`186`	`172`	`{`
`187`	`173`	`foreach ($this->columns as $_column) {`
`188`	`174`	`if (!in_array($_column->COLUMN_NAME, ['id', 'deleted_at'])) {`
`189`		`- $getterFunctions .= trim($this->writeGetterFunction($stubContent['getterStub'], $_column->COLUMN_NAME)) . "\n\t\t\t\t";`
	`175`	`+ $getterFunctions .= trim(str_replace(['{{ ColumnName }}', '{{ AttributeName }}'], [$_column->COLUMN_NAME, Str::camel($_column->COLUMN_NAME)], $stubContent['getterStub'])) . "\n\t\t\t\t";`
`190`	`176`	`}`
`191`	`177`
`192`	`178`	`if (in_array($_column->COLUMN_NAME, ['created_at', 'updated_at'], true)) {`
`193`		`- $setterFunctions .= trim($this->writeSetterFunction($stubContent['setterStub'], $_column->COLUMN_NAME)) . "\n\t\t";`
	`179`	`+ $setterFunctions .= trim(str_replace('{{ AttributeName }}', Str::camel($_column->COLUMN_NAME), $stubContent['setterStub'])) . "\n\t\t";`
`194`	`180`	`}`
`195`	`181`	`}`
`196`	`182`
`@@ -216,11 +202,11 @@ public function makeUpdateFunction(array &$stubContent, string &$getterFunctions`
`216`	`202`	`foreach ($this->columns as $_column) {`
`217`	`203`
`218`	`204`	`if (!in_array($_column->COLUMN_NAME, ['id', 'created_at', 'deleted_at'])) {`
`219`		`- $getterFunctions .= trim($this->writeGetterFunction($stubContent['getterStub'], $_column->COLUMN_NAME)) . "\n\t\t\t\t";`
	`205`	`+ $getterFunctions .= trim(str_replace(['{{ ColumnName }}', '{{ AttributeName }}'], [$_column->COLUMN_NAME, Str::camel($_column->COLUMN_NAME)], $stubContent['getterStub'])) . "\n\t\t\t\t";;`
`220`	`206`	`}`
`221`	`207`
`222`	`208`	`if ($_column->COLUMN_NAME === 'updated_at') {`
`223`		`- $setterFunctions .= trim($this->writeSetterFunction($stubContent['setterStub'], $_column->COLUMN_NAME)) . "\n\t\t";`
	`209`	`+ $setterFunctions .= trim(str_replace('{{ AttributeName }}', Str::camel($_column->COLUMN_NAME), $stubContent['setterStub'])). "\n\t\t";;`
`224`	`210`	`}`
`225`	`211`	`}`
`226`	`212`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-protected {{ AttributeType }} ${{ AttributeName }};`
	`1`	`+public {{ AttributeType }} ${{ AttributeName }};`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`{`
`3`	`3`	`${{ EntityVariableName }} = new {{ EntityName }}();`
`4`	`4`
`5`		`- {{ SetterFunctions }}`
	`5`	`+ {{ Sets }}`
`6`	`6`	`return ${{ EntityVariableName }};`
`7`	`7`	`}`