Skip to content

Commit ec5e34a

Browse files
committed
[#2388] Switched to PHP 8.4.
1 parent b33438f commit ec5e34a

30 files changed

Lines changed: 42 additions & 56 deletions

File tree

.docker/cli.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#
55
# hadolint global ignore=DL3018,SC2174
66
#
7-
# @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
7+
# @see https://hub.docker.com/r/uselagoon/php-8.4-cli-drupal/tags
88
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
99

10-
FROM uselagoon/php-8.3-cli-drupal:26.2.0
10+
FROM uselagoon/php-8.4-cli-drupal:26.2.0
1111

1212
# Add missing variables.
1313
# @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

.docker/php.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
#
66
# hadolint global ignore=DL3018
77
#
8-
# @see https://hub.docker.com/r/uselagoon/php-8.3-fpm/tags
8+
# @see https://hub.docker.com/r/uselagoon/php-8.4-fpm/tags
99
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm
1010

1111
ARG CLI_IMAGE
1212
# hadolint ignore=DL3006
1313
FROM ${CLI_IMAGE:-cli} AS cli
1414

15-
FROM uselagoon/php-8.3-fpm:26.2.0
15+
FROM uselagoon/php-8.4-fpm:26.2.0
1616

1717
RUN apk add --no-cache tzdata
1818

.vortex/installer/tests/Fixtures/handler_process/_baseline/.docker/cli.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#
55
# hadolint global ignore=DL3018,SC2174
66
#
7-
# @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
7+
# @see https://hub.docker.com/r/uselagoon/php-8.4-cli-drupal/tags
88
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
99

10-
FROM uselagoon/php-8.3-cli-drupal:__VERSION__
10+
FROM uselagoon/php-8.4-cli-drupal:__VERSION__
1111

1212
# Add missing variables.
1313
# @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

.vortex/installer/tests/Fixtures/handler_process/_baseline/.docker/php.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
#
66
# hadolint global ignore=DL3018
77
#
8-
# @see https://hub.docker.com/r/uselagoon/php-8.3-fpm/tags
8+
# @see https://hub.docker.com/r/uselagoon/php-8.4-fpm/tags
99
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm
1010

1111
ARG CLI_IMAGE
1212
# hadolint ignore=DL3006
1313
FROM ${CLI_IMAGE:-cli} AS cli
1414

15-
FROM uselagoon/php-8.3-fpm:__VERSION__
15+
FROM uselagoon/php-8.4-fpm:__VERSION__
1616

1717
RUN apk add --no-cache tzdata
1818

.vortex/installer/tests/Fixtures/handler_process/_baseline/phpcs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<arg name="parallel" value="10"/>
2828

2929
<!-- Lint code against platform version specified in composer.json key "config.platform.php". -->
30-
<config name="testVersion" value="8.3"/>
30+
<config name="testVersion" value="8.4"/>
3131

3232
<!-- Exclude theme assets. -->
3333
<exclude-pattern>web\/themes\/custom\/.*\/build\/.*</exclude-pattern>

.vortex/installer/tests/Fixtures/handler_process/_baseline/phpunit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
cacheDirectory=".phpunit.cache">
2929
<php>
3030
<!-- Set error reporting to E_ALL. -->
31-
<ini name="error_reporting" value="32767"/>
31+
<ini name="error_reporting" value="30719"/>
3232
<!-- Do not limit the amount of memory tests take to run. -->
3333
<ini name="memory_limit" value="-1"/>
3434
<env name="SIMPLETEST_BASE_URL" value="http://nginx:8080"/>

.vortex/installer/tests/Fixtures/handler_process/_baseline/rector.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
'*/vendor/*',
8080
'*/node_modules/*',
8181
])
82-
// PHP version upgrade sets - modernizes syntax to PHP 8.3.
83-
// Includes all rules from PHP 5.3 through 8.3.
84-
->withPhpSets(php83: TRUE)
82+
// PHP version upgrade sets - modernizes syntax to PHP 8.4.
83+
// Includes all rules from PHP 5.3 through 8.4.
84+
->withPhpSets(php84: TRUE)
8585
// Code quality improvement sets.
8686
->withPreparedSets(
8787
codeQuality: TRUE,

.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/SettingsTestCase.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,7 @@ protected function setEnvVars(array $vars): void {
176176
protected static function getRealEnvVarsFilteredNoValues(array $prefixes = []): array {
177177
$vars = getenv();
178178

179-
$vars = array_filter(array_keys($vars), static function (string $key) use ($prefixes): bool {
180-
foreach ($prefixes as $prefix) {
181-
if (str_starts_with($key, $prefix)) {
182-
return TRUE;
183-
}
184-
}
185-
186-
return FALSE;
187-
});
179+
$vars = array_filter(array_keys($vars), static fn(string $key): bool => array_any($prefixes, fn($prefix): bool => str_starts_with($key, (string) $prefix)));
188180

189181
return array_fill_keys($vars, NULL);
190182
}

.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/phpcs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<rule ref="Drupal"/>
1616
@@ -30,10 +30,10 @@
17-
<config name="testVersion" value="8.3"/>
17+
<config name="testVersion" value="8.4"/>
1818

1919
<!-- Exclude theme assets. -->
2020
- <exclude-pattern>web\/themes\/custom\/.*\/build\/.*</exclude-pattern>

.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/SettingsTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@@ -202,7 +202,7 @@
1+
@@ -194,7 +194,7 @@
22
* Require settings file.
33
*/
44
protected function requireSettingsFile(array $pre_settings = [], array $pre_config = []): void {

0 commit comments

Comments
 (0)