From ed8710e7908743ffc68d50413f1cfb3015bb5191 Mon Sep 17 00:00:00 2001
From: Dave Redfern <dave-redfern@users.noreply.github.com>
Date: Sat, 2 Mar 2024 13:38:28 -0500
Subject: [PATCH] Update dependencies

---
 .github/workflows/tests.yml                  | 48 +++++++++++++-------
 .gitignore                                   |  1 +
 CHANGELOG.md                                 |  6 +++
 composer.json                                |  8 ++--
 phpunit.xml.dist                             | 25 +++++-----
 tests/Behaviours/MagicMethodTest.php         |  2 +-
 tests/Behaviours/Query/ArrayAccessorTest.php |  2 +-
 tests/MutableSetTest.php                     |  2 +-
 8 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0a98a43..bec5406 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,24 +1,40 @@
 name: tests
 
 on:
-  push:
-    
-  create:
-    tags:
-      - '*'  
-
+    push:
+        branches: [ master ]
+    pull_request:
+        branches: [ master ]
+    workflow_dispatch:
+    create:
+        tags:
+            - '*'
 jobs:
-  build:
-    runs-on: ubuntu-latest
+    testsuite:
+        name: Unittests
+        runs-on: ubuntu-22.04
+        strategy:
+            fail-fast: false
+            matrix:
+                php-version: ['8.1', '8.2', '8.3']
+
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 1
 
-    steps:
-    - uses: actions/checkout@v2
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php-version }}
+                  extensions: json
+                  tools: pecl
 
-    - name: Validate composer.json and composer.lock
-      run: composer validate
+            - name: Validate composer.json
+              run: composer validate
 
-    - name: Install dependencies
-      run: composer install --prefer-dist --no-progress --no-suggest
+            - name: Composer install
+              run: composer install --prefer-dist --no-progress
 
-    - name: Run test suite
-      run: vendor/bin/phpunit
+            - name: Run PHPUnit
+              run: vendor/bin/phpunit --exclude-group=amqp
diff --git a/.gitignore b/.gitignore
index c1ec1ca..82dd009 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,4 @@ Network Trash Folder
 Temporary Items
 .apdisk
 /.phpunit.result.cache
+/.phpunit.cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13090e8..f040643 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+2024-02-24 - 5.4.0
+------------------
+
+ * Bump minimum PHP to 8.1
+ * Remove all unnecessary docblock comments
+
 2022-05-27 - 5.3.0
 ------------------
 
diff --git a/composer.json b/composer.json
index b9e4db5..b0172cd 100644
--- a/composer.json
+++ b/composer.json
@@ -15,13 +15,13 @@
         }
     ],
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~9.5",
-        "symfony/phpunit-bridge": "~6.0",
-        "symfony/var-dumper": "~6.0",
+        "phpunit/phpunit": "^10.5",
+        "symfony/phpunit-bridge": "^6.4",
+        "symfony/var-dumper": "^6.4",
         "victorjonsson/markdowndocs": "^1.3"
     },
     "autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4e14fe9..a2be8f8 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,28 +1,25 @@
 <?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="https://schema.phpunit.de/9.5/phpunit.xsd"
-         backupGlobals="false" colors="true">
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-        <exclude>
-            <directory>bin</directory>
-            <directory>tests</directory>
-        </exclude>
-    </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         backupGlobals="false" colors="true" cacheDirectory=".phpunit.cache">
     <php>
         <ini name="error_reporting" value="-1"/>
         <ini name="memory_limit" value="256M"/>
         <env name="SHELL_VERBOSITY" value="-1"/>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
     </php>
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
     <testsuites>
         <testsuite name="Project Test Suite">
             <directory>tests/</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+        <exclude>
+            <directory>bin</directory>
+            <directory>tests</directory>
+        </exclude>
+    </source>
 </phpunit>
diff --git a/tests/Behaviours/MagicMethodTest.php b/tests/Behaviours/MagicMethodTest.php
index d70fcc5..01bebbd 100644
--- a/tests/Behaviours/MagicMethodTest.php
+++ b/tests/Behaviours/MagicMethodTest.php
@@ -55,6 +55,6 @@ public function testMagicUnset()
 
         $this->assertEquals('bar', $col->foo);
         unset($col->foo);
-        $this->assertObjectNotHasAttribute('foo', $col);
+        $this->assertObjectNotHasProperty('foo', $col);
     }
 }
diff --git a/tests/Behaviours/Query/ArrayAccessorTest.php b/tests/Behaviours/Query/ArrayAccessorTest.php
index 81980f6..6bc40df 100644
--- a/tests/Behaviours/Query/ArrayAccessorTest.php
+++ b/tests/Behaviours/Query/ArrayAccessorTest.php
@@ -71,6 +71,6 @@ public function testOffsetUnset()
         $col['bar'] = 'too';
         unset($col['bar']);
 
-        $this->assertObjectNotHasAttribute('bar', $col);
+        $this->assertObjectNotHasProperty('bar', $col);
     }
 }
diff --git a/tests/MutableSetTest.php b/tests/MutableSetTest.php
index 12a01d3..2fa884d 100644
--- a/tests/MutableSetTest.php
+++ b/tests/MutableSetTest.php
@@ -98,7 +98,7 @@ public function testMutatingMethodsReturnCollectionInstance(string $method, ...$
         $this->assertInstanceOf($col->getCollectionClass(), $ret);
     }
 
-    public function methods(): array
+    public static function methods(): array
     {
         return [
             ['keys',],