Fix Builder

crocodic-studio · Mar 4, 2021 · 18983a3 · 18983a3
1 parent 0657de9
commit 18983a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/src/Helpers/BuilderMacro.php b/src/Helpers/BuilderMacro.php
@@ -1,25 +1,15 @@
 <?php
 
-
 namespace Crocodic\LaravelModel\Helpers;
 
-
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Str;
 
 class BuilderMacro
 {
-    private static function getFields(string $table)
-    {
-        $modelName = "\App\Models\\".Str::studly($table)."Model";
-        $modelClass = new $modelName();
-        return get_object_vars($modelClass);
-    }
-
     public static function registerMacro()
     {
         Builder::macro("addSelectTable", function($table) {
-            $fields = static::getFields($table);
+            $fields = Helper::getFields($table);
             foreach($fields as $field) {
                 $this->addSelect($table.".".$field." as ".$table."_".$field);
             }

diff --git a/src/Helpers/Helper.php b/src/Helpers/Helper.php
@@ -9,8 +9,8 @@ class Helper
 {
     public static function getFields(string $table)
     {
-        $modelName = Str::studly($table)."Model";
-        $modelClass = new ("\App\Models\\".$modelName)();
+        $modelName = "\App\Models\\".Str::studly($table)."Model";
+        $modelClass = new $modelName();
         return get_object_vars($modelClass);
     }