Skip to content

Commit a16a2ba

Browse files
authored
Merge pull request php-webdriver#1074 from php-webdriver/feature/update-php-build
Update PHP versions in test builds, run tests primarily on PHP 8
2 parents 7b00cc1 + ce82460 commit a16a2ba

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.github/workflows/sauce-labs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Setup PHP
3535
uses: shivammathur/setup-php@v2
3636
with:
37-
php-version: '7.4'
37+
php-version: '8.2'
3838
extensions: mbstring, intl, zip
3939
coverage: none
4040

.github/workflows/tests.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup PHP
2020
uses: shivammathur/setup-php@v2
2121
with:
22-
php-version: '7.4'
22+
php-version: '8.2'
2323
extensions: mbstring, intl, zip
2424

2525
- name: Install PHP dependencies
@@ -46,11 +46,10 @@ jobs:
4646

4747
strategy:
4848
matrix:
49-
php-version: ['7.3', '7.4', '8.0']
49+
php-version: ['7.3', '7.4', '8.0', '8.1', '8.2']
5050
dependencies: ['']
5151
include:
5252
- { php-version: '7.3', dependencies: '--prefer-lowest' }
53-
- { php-version: '8.1', dependencies: '--ignore-platform-req=php' }
5453

5554
steps:
5655
- uses: actions/checkout@v3
@@ -105,7 +104,7 @@ jobs:
105104
- name: Setup PHP
106105
uses: shivammathur/setup-php@v2
107106
with:
108-
php-version: 7.4
107+
php-version: 8.2
109108
extensions: mbstring, intl, zip
110109
coverage: xdebug
111110

tests/functional/RemoteWebElementTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,11 @@ public function testShouldTakeAndSaveElementScreenshot(): void
515515

516516
// Assert string output
517517
$imageFromString = imagecreatefromstring($outputPngString);
518-
$this->assertNotFalse($imageFromString);
519-
$this->assertTrue(is_resource($imageFromString));
518+
if (version_compare(phpversion(), '8.0.0', '>=')) {
519+
$this->assertInstanceOf(\GdImage::class, $imageFromString);
520+
} else {
521+
$this->assertTrue(is_resource($imageFromString));
522+
}
520523

521524
if ($isSafari && !$isCi) {
522525
$this->assertEquals(10, imagesx($imageFromString));

0 commit comments

Comments
 (0)