From cef536caa5037b375c2e676a8a31f466b506a143 Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <info@mcnd.ca>
Date: Thu, 24 Nov 2022 20:01:49 +0000
Subject: [PATCH] - Fixed a bug within the merge

---
 src/Entity/User.php      | 22 +++++++++++-----------
 src/Lib/Authenticate.php |  4 +++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/Entity/User.php b/src/Entity/User.php
index 8725e35..c2dc25c 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -12,57 +12,57 @@ class User {
     public int $id;
 
     /**
-     * @Field("size" => 35, "name" => "first_name")
+     * @Field("length" => 35, "name" => "first_name")
      */
     public ? string $firstName;
 
     /**
-     * @Field("size" => 35, "name" => "last_name")
+     * @Field("length" => 35, "name" => "last_name")
      */
     public ? string $lastName;
 
     /**
-     * @Field("size" => 255)
+     * @Field("length" => 255)
      */
     public string $email;
 
     /**
-     * @Field("size" => 150)
+     * @Field("length" => 150)
      */
     public ? string $address;
 
     /**
-     * @Field("size" => 15, 'name' => "zip_code")
+     * @Field("length" => 15, 'name' => "zip_code")
      */
     public ? string $zipCode;
 
     /**
-     * @Field("size" => 45)
+     * @Field("length" => 45)
      */
     public ? string $province;
 
     /**
-     * @Field("size" => 3)
+     * @Field("length" => 3)
      */
     public ? string $country;
 
     /**
-     * @Field("size" => 15)
+     * @Field("length" => 15)
      */
     public ? string $phone;
 
     /**
-     * @Field("size" => 15)
+     * @Field("length" => 15)
      */
     public ? string $ext;
 
     /**
-     * @Field("size" => 15)
+     * @Field("length" => 15)
      */
     public ? string $mobile;
 
     /**
-     * @Field("size" => 255)
+     * @Field("length" => 255)
      */
     public ? string $username;
 
diff --git a/src/Lib/Authenticate.php b/src/Lib/Authenticate.php
index f38aaee..9d02681 100644
--- a/src/Lib/Authenticate.php
+++ b/src/Lib/Authenticate.php
@@ -123,7 +123,9 @@ class Authenticate {
             $this->cookie->delete('user.id');
         }
 
-        $this->user->logged = false;
+        if (isset($this->user)) {
+            $this->user->logged = false;
+        }
 
         return $this;
     }