From 947e27902e661dedd5140d0fa2ecf054db705645 Mon Sep 17 00:00:00 2001
From: Malachi Soord <inverse.chi@gmail.com>
Date: Mon, 27 Nov 2023 21:43:59 +0100
Subject: [PATCH 1/3] Bump dependencies

---
 composer.json    | 12 ++++++------
 phpunit.xml.dist | 35 +++++++++++++++--------------------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/composer.json b/composer.json
index bd95acb..29566cc 100644
--- a/composer.json
+++ b/composer.json
@@ -11,11 +11,11 @@
         "monolog/monolog": "^2.1.1",
         "pimple/pimple": "^3.2",
         "psr/log": "^1.1.4",
-        "symfony/browser-kit": "^5.4",
-        "symfony/css-selector": "^5.4",
-        "symfony/dom-crawler": "^5.4",
-        "symfony/http-client": "^5.4",
-        "symfony/yaml": "^5.3",
+        "symfony/browser-kit": "^6.3",
+        "symfony/css-selector": "^6.3",
+        "symfony/dom-crawler": "^6.3",
+        "symfony/http-client": "^6.3",
+        "symfony/yaml": "^6.3",
         "telegram-bot/api": "^2.3",
         "verifiedjoseph/ntfy-php-library": "^4"
     },
@@ -25,7 +25,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.3.8"
+        "phpunit/phpunit": "^10.4"
     },
     "autoload-dev": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 221ad9c..9d997b4 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,23 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-    <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
-    </coverage>
-    <testsuites>
-        <testsuite name="Project Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <php>
+    <ini name="error_reporting" value="-1"/>
+  </php>
+  <coverage/>
+  <testsuites>
+    <testsuite name="Project Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>

From d31bea28525c528fb70f6aae0b9cb8bf49cbe7c3 Mon Sep 17 00:00:00 2001
From: Malachi Soord <inverse.chi@gmail.com>
Date: Mon, 27 Nov 2023 21:48:11 +0100
Subject: [PATCH 2/3] Fix up

---
 tests/Config/Rules/AfterDateRuleTest.php  | 2 +-
 tests/Config/Rules/AfterRuleTest.php      | 2 +-
 tests/Config/Rules/BeforeDateRuleTest.php | 2 +-
 tests/Config/Rules/BeforeRuleTest.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Config/Rules/AfterDateRuleTest.php b/tests/Config/Rules/AfterDateRuleTest.php
index c69279d..3a2408f 100644
--- a/tests/Config/Rules/AfterDateRuleTest.php
+++ b/tests/Config/Rules/AfterDateRuleTest.php
@@ -14,7 +14,7 @@ public function testInvalidInput(): void
     {
         self::expectException(\InvalidArgumentException::class);
         new AfterDateRule('HelloWorld');
-        self::assertStringStartsWith('Failed to parse before', self::getExpectedExceptionMessage());
+        self::expectExceptionMessage('Failed to parse before');
     }
 
     public function testPassesValid(): void
diff --git a/tests/Config/Rules/AfterRuleTest.php b/tests/Config/Rules/AfterRuleTest.php
index 4afb985..213c02c 100644
--- a/tests/Config/Rules/AfterRuleTest.php
+++ b/tests/Config/Rules/AfterRuleTest.php
@@ -14,7 +14,7 @@ public function testInvalidInput(): void
     {
         self::expectException(\InvalidArgumentException::class);
         new AfterRule('HelloWorld');
-        self::assertStringStartsWith('Failed to parse after', self::getExpectedExceptionMessage());
+        self::expectExceptionMessage('Failed to parse after');
     }
 
     public function testPassesValid(): void
diff --git a/tests/Config/Rules/BeforeDateRuleTest.php b/tests/Config/Rules/BeforeDateRuleTest.php
index f303ab4..b129521 100644
--- a/tests/Config/Rules/BeforeDateRuleTest.php
+++ b/tests/Config/Rules/BeforeDateRuleTest.php
@@ -14,7 +14,7 @@ public function testInvalidInput(): void
     {
         self::expectException(\InvalidArgumentException::class);
         new BeforeDateRule('HelloWorld');
-        self::assertStringStartsWith('Failed to parse before', self::getExpectedExceptionMessage());
+        self::expectExceptionMessage('Failed to parse before');
     }
 
     public function testPassesValid(): void
diff --git a/tests/Config/Rules/BeforeRuleTest.php b/tests/Config/Rules/BeforeRuleTest.php
index 2bafece..2714b07 100644
--- a/tests/Config/Rules/BeforeRuleTest.php
+++ b/tests/Config/Rules/BeforeRuleTest.php
@@ -14,7 +14,7 @@ public function testInvalidInput(): void
     {
         self::expectException(\InvalidArgumentException::class);
         new BeforeRule('HelloWorld');
-        self::assertStringStartsWith('Failed to parse before', self::getExpectedExceptionMessage());
+        self::expectExceptionMessage('Failed to parse before');
     }
 
     public function testPassesValid(): void

From 394e52cc45f094cd82ab7e7f9bb3279ae1a7f57f Mon Sep 17 00:00:00 2001
From: Malachi Soord <inverse.chi@gmail.com>
Date: Mon, 27 Nov 2023 21:48:40 +0100
Subject: [PATCH 3/3] Fix up

---
 .github/workflows/push.yml | 2 +-
 Dockerfile                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index bafec72..38a3d9e 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.3', '8.2', '8.1', '8.0']
+        php-version: ['8.3', '8.2', '8.1']
     steps:
     - uses: actions/checkout@v4
     - name: Install PHP
diff --git a/Dockerfile b/Dockerfile
index e823b8c..e5737a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ COPY composer.json /app
 
 RUN composer install --no-dev --optimize-autoloader
 
-FROM php:8.3-alpine
+FROM php:8.2-alpine
 
 COPY . /app