From 7e5b9ea35f59d32c74f45115f2db4aba982a1b8a Mon Sep 17 00:00:00 2001
From: JNapolitanoIT <jnapolitanoit@gmail.com>
Date: Thu, 2 Mar 2023 21:59:59 -0800
Subject: [PATCH] ORM Corrections

Corrected return types in ORM modules
---
 src/ORM/HasAll.php   | 4 ++--
 src/ORM/HasFind.php  | 9 +++++----
 src/ORM/HasFirst.php | 7 ++++---
 src/ORM/HasJoin.php  | 9 +++++----
 src/ORM/HasLast.php  | 9 +++++----
 src/ORM/HasLike.php  | 4 ++--
 src/ORM/HasNot.php   | 9 +++++----
 src/ORM/HasWhere.php | 9 +++++----
 8 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/ORM/HasAll.php b/src/ORM/HasAll.php
index 075d15d..b7e3641 100644
--- a/src/ORM/HasAll.php
+++ b/src/ORM/HasAll.php
@@ -17,9 +17,9 @@
      */
     trait HasAll
     {
-        public static function all(string $columns = '*'): array
+        public static function all(string $columns = '*'): Builder
         {
-            return Facades\DB::table(static::table())->select($columns)->toArray();
+            return Facades\DB::table(static::table())->select($columns);
         }
     }
 }
diff --git a/src/ORM/HasFind.php b/src/ORM/HasFind.php
index fefa829..5d77034 100644
--- a/src/ORM/HasFind.php
+++ b/src/ORM/HasFind.php
@@ -1,8 +1,9 @@
 <?php
 
 namespace DatabaseFactory\ORM {
-
-    use DatabaseFactory\Facades\DB;
+	
+	use DatabaseFactory\Builder;
+	use DatabaseFactory\Facades\DB;
 
     /**
      * Allows an entity the ability to return one record
@@ -16,9 +17,9 @@
      */
     trait HasFind
     {
-        public static function find(int $id, string $columns = '*'): array
+        public static function find(int $id, string $columns = '*'): Builder
         {
-            return DB::table(static::table())->select($columns)->where('id', '=', $id)->toArray();
+            return DB::table(static::table())->select($columns)->where('id', '=', $id);
         }
     }
 }
diff --git a/src/ORM/HasFirst.php b/src/ORM/HasFirst.php
index c645143..8050abf 100644
--- a/src/ORM/HasFirst.php
+++ b/src/ORM/HasFirst.php
@@ -1,8 +1,9 @@
 <?php
 
 namespace DatabaseFactory\ORM {
-
-    use DatabaseFactory\Facades\DB;
+	
+	use DatabaseFactory\Builder;
+	use DatabaseFactory\Facades\DB;
 
 
     /**
@@ -18,7 +19,7 @@
      */
     trait HasFirst
     {
-        public static function first(string $columns = '*'): array
+        public static function first(string $columns = '*'): Builder
         {
             return DB::table(static::table())->select($columns)->orderBy('id', 'ASC')->limit(1);
         }
diff --git a/src/ORM/HasJoin.php b/src/ORM/HasJoin.php
index 5a8ddd7..d608e8e 100644
--- a/src/ORM/HasJoin.php
+++ b/src/ORM/HasJoin.php
@@ -1,8 +1,9 @@
 <?php
 
 namespace DatabaseFactory\ORM {
-
-    use DatabaseFactory\Facades\DB;
+	
+	use DatabaseFactory\Builder;
+	use DatabaseFactory\Facades\DB;
 
     /**
      * Allows an entity the ability to join tables
@@ -16,9 +17,9 @@
      */
     trait HasJoin
     {
-        public static function join(string $table, array $on, string $columns = '*'): array
+        public static function join(string $table, array $on, string $columns = '*'): Builder
         {
-            return DB::table(static::table())->join($table, $on, $columns)->toArray();
+            return DB::table(static::table())->join($table, $on, $columns);
         }
     }
 }
diff --git a/src/ORM/HasLast.php b/src/ORM/HasLast.php
index 9902b51..cff656c 100644
--- a/src/ORM/HasLast.php
+++ b/src/ORM/HasLast.php
@@ -1,8 +1,9 @@
 <?php
 
 namespace DatabaseFactory\ORM {
-
-    use DatabaseFactory\Facades\DB;
+	
+	use DatabaseFactory\Builder;
+	use DatabaseFactory\Facades\DB;
 
 
     /**
@@ -18,9 +19,9 @@
      */
     trait HasLast
     {
-        public static function last(string $columns = '*'): array
+        public static function last(string $columns = '*'): Builder
         {
-            return DB::table(static::table())->select($columns)->orderBy('id', 'DESC')->limit(1)->toArray();
+            return DB::table(static::table())->select($columns)->orderBy('id', 'DESC')->limit(1);
         }
     }
 }
diff --git a/src/ORM/HasLike.php b/src/ORM/HasLike.php
index 1d8ed46..4cfb124 100644
--- a/src/ORM/HasLike.php
+++ b/src/ORM/HasLike.php
@@ -18,9 +18,9 @@
      */
     trait HasLike
     {
-        public static function like(string $field, string $pattern, string $columns = '*'): array
+        public static function like(string $field, string $pattern, string $columns = '*'): Builder
         {
-            return DB::table(static::table())->select($columns)->like($field, $pattern)->toArray();
+            return DB::table(static::table())->select($columns)->like($field, $pattern);
         }
     }
 }
diff --git a/src/ORM/HasNot.php b/src/ORM/HasNot.php
index 883ad12..7342a15 100644
--- a/src/ORM/HasNot.php
+++ b/src/ORM/HasNot.php
@@ -1,8 +1,9 @@
 <?php
 
 namespace DatabaseFactory\ORM {
-
-    use DatabaseFactory\Facades\DB;
+	
+	use DatabaseFactory\Builder;
+	use DatabaseFactory\Facades\DB;
 
     /**
      * Allows an entity the ability to return records
@@ -17,9 +18,9 @@
      */
     trait HasNot
     {
-        public static function whereNot($key = null, $value = null, string $columns = '*'): array
+        public static function whereNot($key = null, $value = null, string $columns = '*'): Builder
         {
-            return DB::table(static::table())->select($columns)->whereNot($key, $value)->toArray();
+            return DB::table(static::table())->select($columns)->whereNot($key, $value);
         }
     }
 }
diff --git a/src/ORM/HasWhere.php b/src/ORM/HasWhere.php
index 02fa2c4..f5026e7 100644
--- a/src/ORM/HasWhere.php
+++ b/src/ORM/HasWhere.php
@@ -1,8 +1,9 @@
 <?php
 
 namespace DatabaseFactory\ORM {
-
-    use DatabaseFactory\Facades\DB;
+	
+	use DatabaseFactory\Builder;
+	use DatabaseFactory\Facades\DB;
 
 
     /**
@@ -18,9 +19,9 @@
      */
     trait HasWhere
     {
-        public static function where($key, $is = null, $value = null, string $columns = '*'): array
+        public static function where($key, $is = null, $value = null, string $columns = '*'): Builder
         {
-            return DB::table(static::table())->select($columns)->where($key, $is, $value)->toArray();
+            return DB::table(static::table())->select($columns)->where($key, $is, $value);
         }
     }
 }