Merge pull request #143 from fleetbase/dev-v1.6.4

Cannot use facade before root facade set patch

Author: roncodes

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/core-api",
-    "version": "1.6.3",
+    "version": "1.6.4",
     "description": "Core Framework and Resources for Fleetbase API",
     "keywords": [
         "fleetbase",

config/database.connections.php

@@ -7,7 +7,8 @@
 $username = env('DB_USERNAME', 'fleetbase');
 $password = env('DB_PASSWORD', '');
 
-if ($databaseUrl = getenv('DATABASE_URL')) {
+$databaseUrl = getenv('DATABASE_URL');
+if (!empty($databaseUrl)) {
     $url = Utils::parseUrl($databaseUrl);
 
     $host = $url['host'];

src/Auth/GoogleVerifier.php

@@ -4,7 +4,6 @@
 
 use Google_Client as GoogleClient;
 use GuzzleHttp\Client as GuzzleClient;
-use Illuminate\Support\Facades\Log;
 
 class GoogleVerifier
 {
@@ -29,7 +28,7 @@ public static function verifyIdToken(string $idToken, string $clientId): ?array
 
             return null;
         } catch (\Exception $e) {
-            Log::error('Google ID Token verification failed: ' . $e->getMessage());
+            logger()->error('Google ID Token verification failed: ' . $e->getMessage());
 
             return null;
         }

src/Events/ResourceLifecycleEvent.php

@@ -14,7 +14,6 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 
 class ResourceLifecycleEvent implements ShouldBroadcastNow
@@ -150,7 +149,7 @@ public function broadcastOn()
     {
         $model              = $this->getModelRecord();
         if (!$model) {
-            Log::error('Unable to resolve a model to broadcast for', $this->getInternalEventData());
+            logger()->error('Unable to resolve a model to broadcast for', $this->getInternalEventData());
 
             return [];
         }
@@ -342,7 +341,7 @@ public function getEventData()
     {
         $model               = $this->getModelRecord();
         if (!$model) {
-            Log::error('Unable to resolve a model to get event data for', $this->getInternalEventData());
+            logger()->error('Unable to resolve a model to get event data for', $this->getInternalEventData());
 
             return [];
         }

src/Exceptions/Handler.php

@@ -5,7 +5,6 @@
 use Fleetbase\Support\Utils;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Illuminate\Support\Facades\Log;
 
 class Handler extends ExceptionHandler
 {
@@ -62,7 +61,7 @@ protected function unauthenticated($request, AuthenticationException $exception)
     public function report(\Throwable $exception)
     {
         // Log to CloudWatch
-        Log::error($this->getCloudwatchLoggableException($exception));
+        logger()->error($this->getCloudwatchLoggableException($exception));
 
         parent::report($exception);
     }

src/Listeners/SendResourceLifecycleWebhook.php

@@ -13,7 +13,6 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use Laravel\Sanctum\PersonalAccessToken;
 
@@ -65,7 +64,7 @@ public function handle($event)
             // log the api event
             $apiEvent = ApiEvent::create($eventData);
         } catch (\Exception|QueryException $e) {
-            Log::error($e->getMessage());
+            logger()->error($e->getMessage());
 
             return;
         }
@@ -110,7 +109,7 @@ public function handle($event)
                 $request  = $exception->getRequest();
 
                 // Log error
-                Log::error($exception->getMessage());
+                logger()->error($exception->getMessage());
 
                 // Prepare log data
                 $webhookRequestLogData = [

src/Support/NotificationRegistry.php

@@ -165,7 +165,7 @@ public static function getNotifiablesForCompany(string $companyId): array
             // If dynamic create a string representation
             if (Str::startsWith($notifiableClass, 'dynamic:')) {
                 $dynamicNotifiable = str_replace('dynamic:', '', $notifiableClass);
-                $notifiables[] = [
+                $notifiables[]     = [
                     'label'      => 'Dynamic: ' . Str::title($dynamicNotifiable),
                     'key'        => $dynamicNotifiable,
                     'primaryKey' => 'uuid',
@@ -344,7 +344,7 @@ public static function notifyUsingDefinitionName($notificationClass, $notificati
      *
      * @param array $notifiableObject an associative array containing the definition and primary key to resolve the notifiable object
      *
-     * @return \Illuminate\Database\Eloquent\Model|null the Eloquent model or null if it cannot be resolved
+     * @return Model|null the Eloquent model or null if it cannot be resolved
      */
     protected static function resolveNotifiable(array $notifiableObject, $subject): ?Model
     {
@@ -361,7 +361,7 @@ protected static function resolveNotifiable(array $notifiableObject, $subject):
                 } else {
                     $modelInstance = $subject->{$property};
                 }
-                
+
                 if ($modelInstance instanceof Model) {
                     return $modelInstance;
                 }

src/Support/Utils.php

@@ -2588,8 +2588,13 @@ public static function clearCacheByPattern(string $pattern): void
      * $result = arrayFrom($person);
      * // Result: ['name' => 'John', 'age' => 30]
      */
-    public static function arrayFrom(array|string|object $target): array
+    public static function arrayFrom(array|string|object|null $target): array
     {
+        // if target is null return empty array
+        if (is_null($target)) {
+            return [];
+        }
+
         if (is_array($target)) {
             // If the target is already an array, return it as is.
             return $target;