From e6c57fb8850838cedb4d34cda5fd5cf43d672942 Mon Sep 17 00:00:00 2001
From: Matt Stauffer <matt@tighten.co>
Date: Wed, 8 Dec 2021 17:24:21 -0500
Subject: [PATCH 1/2] Update for PHP 8.1 support (#37)

---
 src/Locator/ConfigLocator.php |  4 ++++
 src/Model/TestCollection.php  | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Locator/ConfigLocator.php b/src/Locator/ConfigLocator.php
index bfc926b..cea8293 100644
--- a/src/Locator/ConfigLocator.php
+++ b/src/Locator/ConfigLocator.php
@@ -14,6 +14,10 @@ class ConfigLocator
      */
     public static function locate($configOption)
     {
+        if (is_null($configOption)) {
+            $configOption = '';
+        }
+
         $configurationFile = static::CONFIG_FILENAME;
         if (is_dir($configOption)) {
             $configurationFile = $configOption . DIRECTORY_SEPARATOR . $configurationFile;
diff --git a/src/Model/TestCollection.php b/src/Model/TestCollection.php
index 6e3a66b..592025d 100644
--- a/src/Model/TestCollection.php
+++ b/src/Model/TestCollection.php
@@ -42,22 +42,30 @@ public function __construct(ConfigurationHolder $configurationHolder)
         $this->iteratorIterator = new \RecursiveIteratorIterator($this->iterator);
     }
 
+    /**
+     * @return mixed
+     */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->iteratorIterator->current();
     }
 
+    /**
+     * @return mixed
+     */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->iteratorIterator->key();
     }
 
-    public function next()
+    public function next(): void
     {
         $this->iteratorIterator->next();
     }
 
-    public function rewind()
+    public function rewind(): void
     {
         $this->iteratorIterator->rewind();
     }

From 395c0b3dcee81ccc2f6975f78e3d612d871be70b Mon Sep 17 00:00:00 2001
From: Oliver Radwell <oliver.radwell@gmail.com>
Date: Sat, 11 Dec 2021 11:16:59 +0000
Subject: [PATCH 2/2] Keep PHP 7.0 support

---
 src/Model/TestCollection.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Model/TestCollection.php b/src/Model/TestCollection.php
index 592025d..dd2a4cb 100644
--- a/src/Model/TestCollection.php
+++ b/src/Model/TestCollection.php
@@ -42,30 +42,26 @@ public function __construct(ConfigurationHolder $configurationHolder)
         $this->iteratorIterator = new \RecursiveIteratorIterator($this->iterator);
     }
 
-    /**
-     * @return mixed
-     */
     #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->iteratorIterator->current();
     }
 
-    /**
-     * @return mixed
-     */
     #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->iteratorIterator->key();
     }
 
-    public function next(): void
+    #[\ReturnTypeWillChange]
+    public function next()
     {
         $this->iteratorIterator->next();
     }
 
-    public function rewind(): void
+    #[\ReturnTypeWillChange]
+    public function rewind()
     {
         $this->iteratorIterator->rewind();
     }