From ef8f48880d1f9c88371d348a47e94a30cf865450 Mon Sep 17 00:00:00 2001
From: Christopher Georg <christopher.georg@sr-travel.de>
Date: Fri, 4 Oct 2024 15:25:00 +0200
Subject: [PATCH] feat: fix PHP 8.4 deprecations for implicit nullable

---
 PHPUnit/Extensions/Selenium2TestCase.php                        | 2 +-
 PHPUnit/Extensions/Selenium2TestCase/SessionStrategy.php        | 2 +-
 .../Extensions/Selenium2TestCase/SessionStrategy/Isolated.php   | 2 +-
 PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Shared.php | 2 +-
 Tests/Selenium2TestCase/Coverage/CookieTest.php                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/PHPUnit/Extensions/Selenium2TestCase.php b/PHPUnit/Extensions/Selenium2TestCase.php
index 95c35181..95279b19 100644
--- a/PHPUnit/Extensions/Selenium2TestCase.php
+++ b/PHPUnit/Extensions/Selenium2TestCase.php
@@ -346,7 +346,7 @@ public function prepareSession()
         return $this->session;
     }
 
-    public function run(TestResult $result = NULL): TestResult
+    public function run(?TestResult $result = NULL): TestResult
     {
         $this->testId = get_class($this) . '__' . $this->getName();
 
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy.php b/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy.php
index 00a0a520..a7a73015 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy.php
@@ -68,5 +68,5 @@ public function session(array $parameters);
 
     public function notSuccessfulTest();
 
-    public function endOfTest(Session $session = NULL);
+    public function endOfTest(?Session $session = NULL);
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Isolated.php b/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Isolated.php
index fffab02b..3aa3633d 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Isolated.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Isolated.php
@@ -78,7 +78,7 @@ public function notSuccessfulTest()
     {
     }
 
-    public function endOfTest(Session $session = NULL)
+    public function endOfTest(?Session $session = NULL)
     {
         if ($session !== NULL) {
             $session->stop();
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Shared.php b/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Shared.php
index 59d9e1e2..4f79ccd7 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Shared.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Shared.php
@@ -95,7 +95,7 @@ public function notSuccessfulTest()
         $this->lastTestWasNotSuccessful = TRUE;
     }
 
-    public function endOfTest(Session $session = NULL)
+    public function endOfTest(?Session $session = NULL)
     {
     }
 }
diff --git a/Tests/Selenium2TestCase/Coverage/CookieTest.php b/Tests/Selenium2TestCase/Coverage/CookieTest.php
index 3423b446..3653b34c 100644
--- a/Tests/Selenium2TestCase/Coverage/CookieTest.php
+++ b/Tests/Selenium2TestCase/Coverage/CookieTest.php
@@ -10,7 +10,7 @@ class CookieTest extends BaseTestCase
     // this is a dummy URL (returns down coverage data in HTML), but Firefox still sets domain cookie, which is what's needed
     protected $coverageScriptUrl = PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_TESTS_URL .'/coverage/dummy.html';
 
-    public function run(TestResult $result = NULL): TestResult
+    public function run(?TestResult $result = NULL): TestResult
     {
         // make sure code coverage collection is enabled
         if ($result === NULL) {