♻️ deal with null and false returns (#995)

* ♻️ deal with null and false returns Co-authored-by: erikn69 <[email protected]> * Fix --------- Co-authored-by: erikn69 <[email protected]>
owen-it · Jan 23, 2025 · f7cbe09 · f7cbe09
1 parent 2a5b584
commit f7cbe09
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/Audit.php b/src/Audit.php
@@ -169,7 +169,13 @@ private function castDatetimeUTC($model, $value)
         }
 
         if (preg_match('/^(\d{4})-(\d{1,2})-(\d{1,2})$/', $value)) {
-            return Date::instance(Carbon::createFromFormat('Y-m-d', $value, Date::now('UTC')->getTimezone())->startOfDay());
+            $date = Carbon::createFromFormat('Y-m-d', $value, Date::now('UTC')->getTimezone());
+
+            if (! $date) {
+                return $value;
+            }
+
+            return Date::instance($date->startOfDay());
         }
 
         if (preg_match('/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/', $value)) {
@@ -259,7 +265,11 @@ public function getMetadata(bool $json = false, int $options = 0, int $depth = 5
             }
         }
 
-        return $json ? json_encode($metadata, $options, $depth) : $metadata;
+        if (! $json) {
+            return $metadata;
+        }
+
+        return json_encode($metadata, $options, $depth) ?: '{}';
     }
 
     /**
@@ -285,7 +295,12 @@ public function getModified(bool $json = false, int $options = 0, int $depth = 5
             }
         }
 
-        return $json ? json_encode($modified, $options, $depth) : $modified;
+
+        if (! $json) {
+            return $modified;
+        }
+
+        return json_encode($modified, $options, $depth) ?: '{}';
     }
 
     /**

diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -44,7 +44,7 @@ protected function registerAuditingServiceProvider()
 
         $appConfig = file_get_contents(config_path('app.php'));
 
-        if (Str::contains($appConfig, 'OwenIt\\Auditing\\AuditingServiceProvider::class')) {
+        if (! $appConfig || Str::contains($appConfig, 'OwenIt\\Auditing\\AuditingServiceProvider::class')) {
             return;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ protected function registerAuditingServiceProvider() @@
             $appConfig = file_get_contents(config_path('app.php'));
-            if (Str::contains($appConfig, 'OwenIt\\Auditing\\AuditingServiceProvider::class')) {
+            if (! $appConfig || Str::contains($appConfig, 'OwenIt\\Auditing\\AuditingServiceProvider::class')) {
                 return;
             }
@@ Expand Down @@