Merge branch 'master' of https://github.com/spatie/laravel-uptime-monitor

Author: freekmurze

config/laravel-uptime-monitor.php

@@ -44,7 +44,7 @@
          */
         'notifiable' => \Spatie\UptimeMonitor\Notifications\Notifiable::class,
 
-        /**
+        /*
          * The date format used in notifications.
          */
         'date_format' => 'd/m/Y',

src/Exceptions/CannotSaveMonitor.php

@@ -10,6 +10,6 @@ class CannotSaveMonitor extends Exception
     public static function alreadyExists(Monitor $monitor)
     {
         return new static("Could not save a monitor for url `{$monitor->url}` because there already exists another monitor with the same url. ".
-            "Try saving a monitor with a different url.");
+            'Try saving a monitor with a different url.');
     }
 }

src/Helpers/Period.php

@@ -36,10 +36,10 @@ public function toText(): string
         $configuredDateFormat = config('laravel-uptime-monitor.notifications.date_format');
 
         return
-            $this->startDateTime->format('H:i') . " "
-            . ($this->startDateTime->isToday() ? "" : "on {$this->startDateTime->format($configuredDateFormat)} ")
-            . Emoji::rightwardsArrow() . " "
-            . $this->endDateTime->format('H:i')
-            . ($this->endDateTime->isToday() ? '' : " on {$this->endDateTime->format($configuredDateFormat)}");
+            $this->startDateTime->format('H:i').' '
+            .($this->startDateTime->isToday() ? '' : "on {$this->startDateTime->format($configuredDateFormat)} ")
+            .Emoji::rightwardsArrow().' '
+            .$this->endDateTime->format('H:i')
+            .($this->endDateTime->isToday() ? '' : " on {$this->endDateTime->format($configuredDateFormat)}");
     }
-}
+}

src/Helpers/UptimeResponseCheckers/LookForStringChecker.php

@@ -13,11 +13,11 @@ public function isValidResponse(ResponseInterface $response, Monitor $monitor):
             return true;
         }
 
-        return str_contains((string)$response->getBody(), $monitor->look_for_string);
+        return str_contains((string) $response->getBody(), $monitor->look_for_string);
     }
 
     public function getFailureReason(ResponseInterface $response, Monitor $monitor): string
     {
         return "String `{$monitor->look_for_string}` was not found on the response.";
     }
-}
+}

src/Helpers/UptimeResponseCheckers/UptimeResponseChecker.php

@@ -10,4 +10,4 @@ interface UptimeResponseChecker
     public function isValidResponse(ResponseInterface $response, Monitor $monitor) : bool;
 
     public function getFailureReason(ResponseInterface $response, Monitor $monitor) : string;
-}
+}

src/Models/Monitor.php

@@ -44,7 +44,7 @@ public function scopeEnabled($query)
     public function getUrlAttribute()
     {
         if (! isset($this->attributes['url'])) {
-            return null;
+            return;
         }
 
         return Url::fromString($this->attributes['url']);

src/Models/Traits/SupportsUptimeCheck.php

@@ -8,7 +8,6 @@
 use Spatie\UptimeMonitor\Events\UptimeCheckRecovered;
 use Spatie\UptimeMonitor\Events\UptimeCheckSucceeded;
 use Spatie\UptimeMonitor\Helpers\Period;
-use Spatie\UptimeMonitor\Helpers\UptimeResponseCheckers\LookForStringChecker;
 use Spatie\UptimeMonitor\Helpers\UptimeResponseCheckers\UptimeResponseChecker;
 use Spatie\UptimeMonitor\Models\Monitor;
 use Spatie\UptimeMonitor\Models\Enums\UptimeStatus;

src/Notifications/BaseNotification.php

@@ -15,7 +15,7 @@ abstract class BaseNotification extends Notification
      */
     public function via($notifiable)
     {
-        return config('laravel-uptime-monitor.notifications.notifications.' . static::class);
+        return config('laravel-uptime-monitor.notifications.notifications.'.static::class);
     }
 
     public function getMonitorProperties($extraProperties = []): array
@@ -25,7 +25,6 @@ public function getMonitorProperties($extraProperties = []): array
         $properties = array_merge([], $extraProperties);
 
         if ($monitor->certificate_check_enabled && $monitor->certificate_status === CertificateStatus::VALID) {
-
             $certificateTitle = "Certificate expires in {$monitor->formattedCertificateExpirationDate('forHumans')}";
             $certificateIssuer = $monitor->certificate_issuer;
 

src/Notifications/Notifications/CertificateCheckFailed.php

@@ -61,5 +61,4 @@ public function getMessageText(): string
     {
         return "{$this->event->monitor->url} hasn't got a valid certificate{$this->getLocationDescription()}.";
     }
-
 }

src/Notifications/Notifications/UptimeCheckFailed.php

@@ -51,7 +51,7 @@ public function getMonitorProperties($extraProperties = []): array
 
         $extraProperties = [
             $since => $date,
-            "Failure reason" => $this->event->monitor->uptime_check_failure_reason,
+            'Failure reason' => $this->event->monitor->uptime_check_failure_reason,
         ];
 
         return parent::getMonitorProperties($extraProperties);