From 328b971bec748e10b4b202ac46a930b6f964a618 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Tue, 3 Mar 2020 10:02:24 +0100
Subject: [PATCH 1/2] [TASK] Update to codeception v4 and allow phpunit v9

---
 .../Acceptance/Extension/InstallPostgresqlCoreEnvironment.php | 1 -
 composer.json                                                 | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Classes/Core/Acceptance/Extension/InstallPostgresqlCoreEnvironment.php b/Classes/Core/Acceptance/Extension/InstallPostgresqlCoreEnvironment.php
index f9ff1e42..8548657a 100644
--- a/Classes/Core/Acceptance/Extension/InstallPostgresqlCoreEnvironment.php
+++ b/Classes/Core/Acceptance/Extension/InstallPostgresqlCoreEnvironment.php
@@ -15,7 +15,6 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-use Codeception\Event\SuiteEvent;
 use Codeception\Event\TestEvent;
 use Codeception\Events;
 use Codeception\Extension;
diff --git a/composer.json b/composer.json
index e0e52227..3802315c 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
     "issues": "https://github.com/TYPO3/testing-framework/issues"
   },
   "require": {
-    "phpunit/phpunit": "^8.4",
+    "phpunit/phpunit": "^8.4 || ^9.0",
     "mikey179/vfsstream": "~1.6.8",
     "typo3fluid/fluid": "^2.5",
     "typo3/cms-core": "10.*.*@dev",
@@ -36,7 +36,7 @@
     "typo3/cms-recordlist": "10.*.*@dev"
   },
   "suggest": {
-    "codeception/codeception": "^3",
+    "codeception/codeception": "^4.0",
     "typo3/cms-styleguide": "^9.0"
   },
   "config": {

From 417227d88ad779948346194433042732a45f0539 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Tue, 3 Mar 2020 12:52:40 +0100
Subject: [PATCH 2/2] [BUGFIX] Use correct namespace for WebDriver

---
 Classes/Core/Acceptance/Helper/AbstractPageTree.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Classes/Core/Acceptance/Helper/AbstractPageTree.php b/Classes/Core/Acceptance/Helper/AbstractPageTree.php
index caee65f8..dd1a05e9 100644
--- a/Classes/Core/Acceptance/Helper/AbstractPageTree.php
+++ b/Classes/Core/Acceptance/Helper/AbstractPageTree.php
@@ -52,7 +52,7 @@ public function openPath(array $path)
         foreach ($path as $pageName) {
             $context = $this->ensureTreeNodeIsOpen($pageName, $context);
         }
-        $context->findElement(\WebDriverBy::cssSelector(self::$treeItemAnchorSelector))->click();
+        $context->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector(self::$treeItemAnchorSelector))->click();
     }
 
     /**
@@ -65,7 +65,7 @@ public function getPageTreeElement()
         $I = $this->tester;
         $I->switchToIFrame();
         return $I->executeInSelenium(function (\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
-            return $webdriver->findElement(\WebDriverBy::cssSelector(self::$pageTreeSelector));
+            return $webdriver->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector(self::$pageTreeSelector));
         });
     }
 
@@ -84,11 +84,11 @@ protected function ensureTreeNodeIsOpen(string $nodeText, RemoteWebElement $cont
         /** @var RemoteWebElement $context */
         $context = $I->executeInSelenium(function () use ($nodeText, $context
         ) {
-            return $context->findElement(\WebDriverBy::xpath('//*[text()=\'' . $nodeText . '\']/..'));
+            return $context->findElement(\Facebook\WebDriver\WebDriverBy::xpath('//*[text()=\'' . $nodeText . '\']/..'));
         });
 
         try {
-            $context->findElement(\WebDriverBy::cssSelector('.chevron.collapsed'))->click();
+            $context->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('.chevron.collapsed'))->click();
         } catch (\Facebook\WebDriver\Exception\NoSuchElementException $e) {
             // element not found so it may be already opened...
         } catch (\Facebook\WebDriver\Exception\ElementNotVisibleException $e) {