Merge branch 'main' into w3c-session-fix

longwave · web-flow · commit 84a2b403dd0d · 2024-07-04T10:15:09.000+01:00
diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
@@ -6,8 +6,6 @@ on:
   push:
     branches:
       - main
-  schedule:
-    - cron: '0 0 * * *'  # every day at midnight
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -19,17 +17,22 @@ jobs:
 
     strategy:
       matrix:
-        php: [ '7.4', '8.0', '8.1', '8.2' ]
+        php: [ '8.0', '8.3' ]
       fail-fast: false
 
     steps:
       - uses: actions/checkout@v3
 
       - uses: ddev/github-action-setup-ddev@v1
+        with:
+          autostart: false
 
       - name: Setup PHP Version
         run: ddev config --php-version ${{ matrix.php }}
 
+      - name: Start ddev
+        run: ddev start
+
       - name: Install dependencies
         run: ddev composer install
 
diff --git a/composer.json b/composer.json
@@ -11,7 +11,8 @@
     "homepage": "https://www.lullabot.com/",
     "license": "Apache-2.0",
     "require": {
-        "ext-curl": "*"
+        "ext-curl": "*",
+        "php": ">=8.0.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5 || ^9.5"
diff --git a/test/Test/WebDriver/ChromeDriverTest.php b/test/Test/WebDriver/ChromeDriverTest.php
@@ -38,6 +38,7 @@ class ChromeDriverTest extends WebDriverTestBase
     protected $testWebDriverRootUrl = 'http://localhost:9515';
     protected $testWebDriverName    = 'chromedriver';
     protected $w3c = true;
+    protected $status = null;
 
     protected function setUp(): void
     {
diff --git a/test/Test/WebDriver/GeckoDriverTest.php b/test/Test/WebDriver/GeckoDriverTest.php
@@ -37,6 +37,7 @@ class GeckoDriverTest extends WebDriverTestBase
 {
     protected $testWebDriverRootUrl = 'http://localhost:4444';
     protected $testWebDriverName    = 'geckodriver';
+    protected $status = null;
 
     protected function setUp(): void
     {

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ class ChromeDriverTest extends WebDriverTestBase`
`38`	`38`	`protected $testWebDriverRootUrl = 'http://localhost:9515';`
`39`	`39`	`protected $testWebDriverName = 'chromedriver';`
`40`	`40`	`protected $w3c = true;`
	`41`	`+ protected $status = null;`
`41`	`42`
`42`	`43`	`protected function setUp(): void`
`43`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ class GeckoDriverTest extends WebDriverTestBase`
`37`	`37`	`{`
`38`	`38`	`protected $testWebDriverRootUrl = 'http://localhost:4444';`
`39`	`39`	`protected $testWebDriverName = 'geckodriver';`
	`40`	`+ protected $status = null;`
`40`	`41`
`41`	`42`	`protected function setUp(): void`
`42`	`43`	`{`