fix:

jbidad · jbidad · commit 435252a1148c · 2022-12-29T15:40:03.000+03:30
- add POINT datatype as string
- remove laravel/helpers package
diff --git a/composer.json b/composer.json
@@ -13,7 +13,6 @@
         "php": "^8.0",
         "ext-pdo": "*",
         "ext-json": "*",
-        "laravel/helpers": "^1.5",
         "illuminate/console": "^6.0|^7.0|^8.0|^9.0",
         "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
         "illuminate/cache": "^6.0|^7.0|^8.0|^9.0",
diff --git a/src/Commands/MakeEntity.php b/src/Commands/MakeEntity.php
@@ -2,6 +2,7 @@
 
 namespace Nanvaie\DatabaseRepository\Commands;
 
+use Illuminate\Support\Str;
 use Nanvaie\DatabaseRepository\CustomMySqlQueries;
 use Illuminate\Console\Command;
 
@@ -63,7 +64,7 @@ public function handle(): int
     {
         $tableName = $this->argument('table_name');
         $detectForeignKeys = $this->option('foreign-keys');
-        $entityName = str_singular(ucfirst(camel_case($tableName)));
+        $entityName = Str::singular(ucfirst(Str::camel($tableName)));
         $entityNamespace = config('repository.path.namespace.entities');
         $relativeEntitiesPath = config('repository.path.relative.entities');
         $entityStubsPath = __DIR__ . '/../../' . config('repository.path.stub.entities');
@@ -93,7 +94,7 @@ public function handle(): int
         }
 
         foreach ($columns as $_column) {
-            $_column->COLUMN_NAME = camel_case($_column->COLUMN_NAME);
+            $_column->COLUMN_NAME = Str::camel($_column->COLUMN_NAME);
         }
 
         $baseContent = file_get_contents($entityStubsPath.'class.stub');
diff --git a/src/Commands/MakeEnum.php b/src/Commands/MakeEnum.php
@@ -2,6 +2,7 @@
 
 namespace Nanvaie\DatabaseRepository\Commands;
 
+use Illuminate\Support\Str;
 use Nanvaie\DatabaseRepository\CustomMySqlQueries;
 use Illuminate\Console\Command;
 
@@ -62,7 +63,7 @@ public function handle(): int
         $enums = [];
         foreach ($columns as $_column) {
             if ($_column->DATA_TYPE == 'enum') {
-                $enumClassName = studly_case(str_singular(ucfirst(camel_case($_column->TABLE_NAME))) . '_' . $_column->COLUMN_NAME);
+                $enumClassName = Str::studly(Str::singular(ucfirst(Str::camel($_column->TABLE_NAME))) . '_' . $_column->COLUMN_NAME);
                 $enums[$enumClassName] = explode(',', str_replace(['enum(', '\'', ')'], ['', '', ''], $_column->COLUMN_TYPE));
 
                 $filenameWithPath = $relativeEntitiesPath . $enumClassName.'.php';
diff --git a/src/Commands/MakeFactory.php b/src/Commands/MakeFactory.php
@@ -2,6 +2,7 @@
 
 namespace Nanvaie\DatabaseRepository\Commands;
 
+use Illuminate\Support\Str;
 use Nanvaie\DatabaseRepository\CustomMySqlQueries;
 use Illuminate\Console\Command;
 
@@ -29,7 +30,7 @@ class MakeFactory extends Command
     public function writeSetter(string $setterStub, string $columnName): string
     {
         return str_replace(['{{ SetterName }}', '{{ AttributeName }}'],
-            [ucfirst($columnName), snake_case($columnName)],
+            [ucfirst($columnName), Str::snake($columnName)],
             $setterStub);
     }
 
@@ -41,8 +42,8 @@ public function writeSetter(string $setterStub, string $columnName): string
     public function handle(): int
     {
         $tableName = $this->argument('table_name');
-        $entityName = str_singular(ucfirst(camel_case($tableName)));
-        $entityVariableName = camel_case($entityName);
+        $entityName = Str::singular(ucfirst(Str::camel($tableName)));
+        $entityVariableName = Str::camel($entityName);
         $factoryName = $entityName.'Factory';
         $entityNamespace = config('repository.path.namespace.entities');
         $factoryNamespace = config('repository.path.namespace.factories');
@@ -74,7 +75,7 @@ public function handle(): int
         }
 
         foreach ($columns as $_column) {
-            $_column->COLUMN_NAME = camel_case($_column->COLUMN_NAME);
+            $_column->COLUMN_NAME = Str::camel($_column->COLUMN_NAME);
         }
 
         $baseContent = file_get_contents($factoryStubsPath.'class.stub');
diff --git a/src/Commands/MakeInterfaceRepository.php b/src/Commands/MakeInterfaceRepository.php
@@ -2,6 +2,7 @@
 
 namespace Nanvaie\DatabaseRepository\Commands;
 
+use Illuminate\Support\Str;
 use Nanvaie\DatabaseRepository\CustomMySqlQueries;
 use Illuminate\Console\Command;
 
@@ -30,14 +31,14 @@ class MakeInterfaceRepository extends Command
     private function writeGetOneFunction(string $getOneStub, string $columnName, string $attributeType): string
     {
         return str_replace(['{{ FunctionName }}', '{{ ColumnName }}', '{{ AttributeType }}', '{{ AttributeName }}'],
-            [ucfirst(camel_case($columnName)), $columnName, $attributeType, camel_case($columnName)],
+            [ucfirst(Str::camel($columnName)), $columnName, $attributeType, Str::camel($columnName)],
             $getOneStub);
     }
 
     private function writeGetAllFunction(string $getOneStub, string $columnName, string $attributeType): string
     {
         return str_replace(['{{ FunctionNamePlural }}', '{{ AttributeType }}', '{{ AttributeNamePlural }}'],
-            [ucfirst(str_plural(camel_case($columnName))), $attributeType, str_plural(camel_case($columnName))],
+            [ucfirst(Str::plural(Str::camel($columnName))), $attributeType, Str::plural(Str::camel($columnName))],
             $getOneStub);
     }
 
@@ -50,8 +51,8 @@ public function handle(): int
     {
         $tableName = $this->argument('table_name');
         $detectForeignKeys = $this->option('foreign-keys');
-        $entityName = str_singular(ucfirst(camel_case($tableName)));
-        $entityVariableName = camel_case($entityName);
+        $entityName = Str::singular(ucfirst(Str::camel($tableName)));
+        $entityVariableName = Str::camel($entityName);
         $interfaceName = "I$entityName"."Repository";
         $entityNamespace = config('repository.path.namespace.entities');
         $repositoryNamespace = config('repository.path.namespace.repositories');
diff --git a/src/Commands/MakeMySqlRepository.php b/src/Commands/MakeMySqlRepository.php
@@ -2,6 +2,7 @@
 
 namespace Nanvaie\DatabaseRepository\Commands;
 
+use Illuminate\Support\Str;
 use Nanvaie\DatabaseRepository\CustomMySqlQueries;
 use Illuminate\Console\Command;
 
@@ -30,28 +31,28 @@ class MakeMySqlRepository extends Command
     private function writeGetOneFunction(string $getOneStub, string $columnName, string $attributeType): string
     {
         return str_replace(['{{ FunctionName }}', '{{ ColumnName }}', '{{ AttributeType }}', '{{ AttributeName }}'],
-            [ucfirst(camel_case($columnName)), $columnName, $attributeType, camel_case($columnName)],
+            [ucfirst(Str::camel($columnName)), $columnName, $attributeType, Str::camel($columnName)],
             $getOneStub);
     }
 
     private function writeGetAllFunction(string $getOneStub, string $columnName, string $attributeType): string
     {
         return str_replace(['{{ FunctionNamePlural }}', '{{ ColumnName }}', '{{ AttributeType }}', '{{ AttributeNamePlural }}'],
-            [ucfirst(str_plural(camel_case($columnName))), $columnName, $attributeType, str_plural(camel_case($columnName))],
+            [ucfirst(Str::plural(Str::camel($columnName))), $columnName, $attributeType, Str::plural(Str::camel($columnName))],
             $getOneStub);
     }
 
     private function writeGetterFunction(string $getterStub, string $columnName): string
     {
         return str_replace(['{{ ColumnName }}', '{{ GetterName }}'],
-            [$columnName, ucfirst(camel_case($columnName))],
+            [$columnName, ucfirst(Str::camel($columnName))],
             $getterStub);
     }
 
     private function writeSetterFunction(string $setterStub, string $columnName): string
     {
         return str_replace('{{ SetterName }}',
-            ucfirst(camel_case($columnName)),
+            ucfirst(Str::camel($columnName)),
             $setterStub);
     }
 
@@ -64,8 +65,8 @@ public function handle(): int
     {
         $tableName = $this->argument('table_name');
         $detectForeignKeys = $this->option('foreign-keys');
-        $entityName = str_singular(ucfirst(camel_case($tableName)));
-        $entityVariableName = camel_case($entityName);
+        $entityName = Str::singular(ucfirst(Str::camel($tableName)));
+        $entityVariableName = Str::camel($entityName);
         $factoryName = $entityName.'Factory';
         $interfaceName = 'I'.$entityName.'Repository';
         $mysqlRepositoryName = 'MySql'.$entityName.'Repository';
diff --git a/src/Commands/MakeRedisRepository.php b/src/Commands/MakeRedisRepository.php
@@ -2,6 +2,7 @@
 
 namespace Nanvaie\DatabaseRepository\Commands;
 
+use Illuminate\Support\Str;
 use Nanvaie\DatabaseRepository\CustomMySqlQueries;
 use Illuminate\Console\Command;
 
@@ -36,7 +37,7 @@ public function handle(): int
     {
         $tableName = $this->argument('table_name');
         $detectForeignKeys = $this->option('foreign-keys');
-        $entityName = str_singular(ucfirst(camel_case($tableName)));
+        $entityName = Str::singular(ucfirst(Str::camel($tableName)));
         $redisRepositoryName = "Redis$entityName"."Repository";
         $redisRepositoryNamespace = config('repository.path.namespace.repositories');
         $relativeRedisRepositoryPath = config('repository.path.relative.repositories') . "$entityName" . DIRECTORY_SEPARATOR;
diff --git a/src/Commands/MakeRepository.php b/src/Commands/MakeRepository.php
@@ -3,6 +3,7 @@
 namespace Nanvaie\DatabaseRepository\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Str;
 use Nanvaie\DatabaseRepository\CustomMySqlQueries;
 
 class MakeRepository extends Command
@@ -31,20 +32,20 @@ private function writeFunction(string $functionStub, string $functionName, strin
     {
         if ($functionName === 'getOneBy') {
             $functionReturnType = '?{{ EntityName }}';
-            $functionName .= ucfirst(camel_case($columnName));
-            $columnName = camel_case($columnName);
+            $functionName .= ucfirst(Str::camel($columnName));
+            $columnName = Str::camel($columnName);
         } elseif ($functionName === 'getAllBy') {
             $functionReturnType = 'Collection';
-            $functionName .= ucfirst(str_plural(camel_case($columnName)));
-            $columnName = str_plural(camel_case($columnName));
+            $functionName .= ucfirst(Str::plural(Str::camel($columnName)));
+            $columnName = Str::plural(Str::camel($columnName));
         } elseif ($functionName === 'create') {
             $functionReturnType = $attributeType;
         } elseif (in_array($functionName, ['update', 'remove', 'restore'])) {
             $functionReturnType = 'int';
         }
 
         return str_replace(['{{ FunctionName }}', '{{ AttributeType }}', '{{ AttributeName }}', '{{ FunctionReturnType }}'],
-            [$functionName, $attributeType, camel_case($columnName), $functionReturnType],
+            [$functionName, $attributeType, Str::camel($columnName), $functionReturnType],
             $functionStub);
     }
 
@@ -64,8 +65,8 @@ public function handle(): int
     {
         $tableName = $this->argument('table_name');
         $detectForeignKeys = $this->option('foreign-keys');
-        $entityName = str_singular(ucfirst(camel_case($tableName)));
-        $entityVariableName = camel_case($entityName);
+        $entityName = Str::singular(ucfirst(Str::camel($tableName)));
+        $entityVariableName = Str::camel($entityName);
         $factoryName = $entityName.'Factory';
         $interfaceName = 'I'.$entityName.'Repository';
         $repositoryName = $entityName.'Repository';
diff --git a/src/Commands/MakeResource.php b/src/Commands/MakeResource.php
@@ -3,6 +3,7 @@
 namespace Nanvaie\DatabaseRepository\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Str;
 use Nanvaie\DatabaseRepository\CustomMySqlQueries;
 
 class MakeResource extends Command
@@ -37,7 +38,7 @@ public function writeGetter(string $getterStub, string $columnName, string $attr
     public function writeForeignGetter(string $foreignGetterStub, string $columnName, string $attributeName)
     {
         return str_replace(['{{ AttributeName }}', '{{ GetterName }}', '{{ AttributeType }}'],
-            [snake_case($columnName), ucfirst($columnName), ucfirst($attributeName)],
+            [Str::snake($columnName), ucfirst($columnName), ucfirst($attributeName)],
             $foreignGetterStub);
     }
 
@@ -50,8 +51,8 @@ public function handle(): int
     {
         $tableName = $this->argument('table_name');
         $detectForeignKeys = $this->option('foreign-keys');
-        $entityName = str_singular(ucfirst(camel_case($tableName)));
-        $entityVariableName = camel_case($entityName);
+        $entityName = Str::singular(ucfirst(Str::camel($tableName)));
+        $entityVariableName = Str::camel($entityName);
         $entityNamespace = config('repository.path.namespace.entities');
         $resourceName = $entityName."Resource";
         $resourceNamespace = config('repository.path.namespace.resources');
@@ -92,7 +93,7 @@ public function handle(): int
 
         $getterFunctions = '';
         foreach ($columns as $_column) {
-            $getterFunctions .= $this->writeGetter($getterStub, $_column->COLUMN_NAME, camel_case($_column->COLUMN_NAME));
+            $getterFunctions .= $this->writeGetter($getterStub, $_column->COLUMN_NAME, Str::camel($_column->COLUMN_NAME));
         }
 
         $foreignGetterFunctions = '';
diff --git a/src/CustomMySqlQueries.php b/src/CustomMySqlQueries.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 
 trait CustomMySqlQueries
 {
@@ -37,6 +38,7 @@ trait CustomMySqlQueries
         'time' => 'string',
         'datetime' => 'string',
         'timestamp' => 'string',
+        'point' => 'string',
     ];
 
     /**
@@ -81,8 +83,8 @@ public function extractForeignKeys(string $tableName): Collection
             ->get();
 
         $foreignKeys->each(function ($foreignKey) {
-            $foreignKey->VARIABLE_NAME = camel_case(str_replace('_id', '', $foreignKey->COLUMN_NAME));
-            $foreignKey->ENTITY_DATA_TYPE = ucfirst(camel_case(str_singular($foreignKey->REFERENCED_TABLE_NAME)));
+            $foreignKey->VARIABLE_NAME = Str::camel(str_replace('_id', '', $foreignKey->COLUMN_NAME));
+            $foreignKey->ENTITY_DATA_TYPE = ucfirst(Str::camel(Str::singular($foreignKey->REFERENCED_TABLE_NAME)));
         });
 
         return $foreignKeys;
diff --git a/src/Models/Entity/Entity.php b/src/Models/Entity/Entity.php
@@ -3,6 +3,7 @@
 namespace Nanvaie\DatabaseRepository\Models\Entity;
 
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Str;
 use JsonSerializable;
 
 abstract class Entity implements JsonSerializable, Arrayable
@@ -23,15 +24,15 @@ public function __construct()
     public function __set($name, $value)
     {
         if (property_exists($this, $name)) {
-            $function = camel_case('set_' . snake_case($name));
+            $function = Str::camel('set_' . Str::snake($name));
             $this->$function($value);
         }
     }
 
     public function __get($name)
     {
         if (property_exists($this, $name)) {
-            $function = camel_case('get_' . snake_case($name));
+            $function = Str::camel('get_' . Str::snake($name));
             return $this->$function();
         }
     }
diff --git a/src/Models/Repositories/MySqlRepository.php b/src/Models/Repositories/MySqlRepository.php
@@ -207,7 +207,7 @@ protected function processOrder(Builder $query, array $orders): Builder
     protected function processFilter(Builder $query, array $filters): Builder
     {
         foreach ($filters as $filter) {
-            switch (strtolower(snake_case($filter->operator))) {
+            switch (strtolower(Str::snake($filter->operator))) {
                 case GriewFilterOperator::IS_NULL:
                     $query->whereNull($filter->name);
                     break;

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Nanvaie\DatabaseRepository\Commands;`
`4`	`4`
	`5`	`+use Illuminate\Support\Str;`
`5`	`6`	`use Nanvaie\DatabaseRepository\CustomMySqlQueries;`
`6`	`7`	`use Illuminate\Console\Command;`
`7`	`8`
`@@ -63,7 +64,7 @@ public function handle(): int`
`63`	`64`	`{`
`64`	`65`	`$tableName = $this->argument('table_name');`
`65`	`66`	`$detectForeignKeys = $this->option('foreign-keys');`
`66`		`- $entityName = str_singular(ucfirst(camel_case($tableName)));`
	`67`	`+ $entityName = Str::singular(ucfirst(Str::camel($tableName)));`
`67`	`68`	`$entityNamespace = config('repository.path.namespace.entities');`
`68`	`69`	`$relativeEntitiesPath = config('repository.path.relative.entities');`
`69`	`70`	`$entityStubsPath = __DIR__ . '/../../' . config('repository.path.stub.entities');`
`@@ -93,7 +94,7 @@ public function handle(): int`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`foreach ($columns as $_column) {`
`96`		`- $_column->COLUMN_NAME = camel_case($_column->COLUMN_NAME);`
	`97`	`+ $_column->COLUMN_NAME = Str::camel($_column->COLUMN_NAME);`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`$baseContent = file_get_contents($entityStubsPath.'class.stub');`