From e271f18ca6a76d91595e565de473fe93ece28ec2 Mon Sep 17 00:00:00 2001
From: Owen Voke <development@voke.dev>
Date: Sun, 29 Jan 2023 12:05:19 +0000
Subject: [PATCH 1/2] feat: drop support for PHP 8.0 and below

---
 .github/workflows/psalm.yml     | 2 +-
 .github/workflows/run-tests.yml | 2 +-
 composer.json                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index 8ef4ad5..f8cc47a 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -16,7 +16,7 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '7.4'
+                  php-version: '8.1'
                   extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
                   coverage: none
 
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 71017e5..d16ef93 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -9,7 +9,7 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ubuntu-latest]
-                php: [8.2, 8.1, 8.0, 7.4]
+                php: [8.2, 8.1]
                 dependency-version: [prefer-lowest, prefer-stable]
 
         name: P${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
diff --git a/composer.json b/composer.json
index c18a1ca..6bae762 100644
--- a/composer.json
+++ b/composer.json
@@ -18,13 +18,13 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.1",
         "guzzlehttp/guzzle": "^6.5.8|^7.5",
         "nesbot/carbon": "^2.65.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "psalm/plugin-laravel": "^1.6.2|^2.5",
+        "psalm/plugin-laravel": "^2.5",
         "vlucas/phpdotenv": "^5.5"
     },
     "autoload": {

From b833d8b26ddeab18e4b744823114ad2235d0e92d Mon Sep 17 00:00:00 2001
From: Owen Voke <development@voke.dev>
Date: Sun, 29 Jan 2023 12:09:26 +0000
Subject: [PATCH 2/2] feat: use union nullable types

---
 src/OhDear.php                      | 1 -
 src/Resources/ApiResource.php       | 2 +-
 src/Resources/BrokenLink.php        | 2 +-
 src/Resources/Check.php             | 2 +-
 src/Resources/CronCheck.php         | 6 +++---
 src/Resources/Downtime.php          | 3 +--
 src/Resources/MaintenancePeriod.php | 2 +-
 src/Resources/StatusPageUpdate.php  | 2 +-
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/OhDear.php b/src/OhDear.php
index a8489de..88bebd6 100644
--- a/src/OhDear.php
+++ b/src/OhDear.php
@@ -39,7 +39,6 @@ class OhDear
     use ManagesCronChecks;
     use ManagesDnsHistoryItems;
 
-    /** @var string */
     public string $apiToken;
 
     public Client $client;
diff --git a/src/Resources/ApiResource.php b/src/Resources/ApiResource.php
index 0267c22..048a17c 100644
--- a/src/Resources/ApiResource.php
+++ b/src/Resources/ApiResource.php
@@ -10,7 +10,7 @@ class ApiResource
 {
     public array $attributes = [];
 
-    protected ?OhDear $ohDear;
+    protected OhDear|null $ohDear;
 
     public function __construct(array $attributes, OhDear $ohDear = null)
     {
diff --git a/src/Resources/BrokenLink.php b/src/Resources/BrokenLink.php
index 7af8475..2ddeafb 100644
--- a/src/Resources/BrokenLink.php
+++ b/src/Resources/BrokenLink.php
@@ -7,7 +7,7 @@ class BrokenLink extends ApiResource
     /*
      * The status code the site responded with.
      */
-    public ?int $statusCode;
+    public int|null $statusCode;
 
     /*
      * The url that is broken.
diff --git a/src/Resources/Check.php b/src/Resources/Check.php
index 0489d3c..7b21477 100644
--- a/src/Resources/Check.php
+++ b/src/Resources/Check.php
@@ -9,7 +9,7 @@ class Check extends ApiResource
     public string $type;
 
     /*
-     * The human readable version of type.
+     * The human-readable version of type.
      */
     public string $label;
 
diff --git a/src/Resources/CronCheck.php b/src/Resources/CronCheck.php
index 84e0ab6..08411bd 100644
--- a/src/Resources/CronCheck.php
+++ b/src/Resources/CronCheck.php
@@ -14,15 +14,15 @@ class CronCheck extends ApiResource
 
     public int $checkId;
 
-    public ?int $frequencyInMinutes;
+    public int|null $frequencyInMinutes;
 
     public string $pingUrl;
 
     public int $graceTimeInMinutes = 0;
 
-    public ?string $cronExpression = '';
+    public string|null $cronExpression = '';
 
-    public ?string $description = '';
+    public string|null $description = '';
 
     public function __construct(array $attributes, $ohDear = null)
     {
diff --git a/src/Resources/Downtime.php b/src/Resources/Downtime.php
index d451871..bb46dd3 100644
--- a/src/Resources/Downtime.php
+++ b/src/Resources/Downtime.php
@@ -6,6 +6,5 @@ class Downtime extends ApiResource
 {
     public string $startedAt;
 
-    /** @var string */
-    public ?string $endedAt;
+    public string|null $endedAt;
 }
diff --git a/src/Resources/MaintenancePeriod.php b/src/Resources/MaintenancePeriod.php
index ef88462..a873c00 100644
--- a/src/Resources/MaintenancePeriod.php
+++ b/src/Resources/MaintenancePeriod.php
@@ -10,5 +10,5 @@ class MaintenancePeriod extends ApiResource
 
     public string $startsAt;
 
-    public ?string $endsAt;
+    public string|null $endsAt;
 }
diff --git a/src/Resources/StatusPageUpdate.php b/src/Resources/StatusPageUpdate.php
index 4fbc0c4..8383a04 100644
--- a/src/Resources/StatusPageUpdate.php
+++ b/src/Resources/StatusPageUpdate.php
@@ -8,7 +8,7 @@ class StatusPageUpdate extends ApiResource
 
     public string $title;
 
-    public ?string $text;
+    public string|null $text;
 
     public bool $pinned;