Skip to content

Commit 41be886

Browse files
LeiyksLeiyks
committed
feat: update to 0RC3
Signed-off-by: Alexandre Rulleau <[email protected]>
1 parent 8687221 commit 41be886

File tree

13 files changed

+46
-34
lines changed

13 files changed

+46
-34
lines changed

‎appsec/tests/integration/gradle/tag_mappings.gradle‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,16 @@ ext.tag_mappings = [
125125
'apache2-mod-php-8.4-release': 'sha256:79c2d7dd843b18ce2c5f929e6300e9a1f64a5e00a7edbaeb9f75d8a60b2be3d2',
126126
'php-7.0-release': 'sha256:627c4f460fa1c11f3f5da44d9361eba5de9f38134189ca05b3bfdb9979011e44',
127127
'php-7.1-release-zts': 'sha256:d997b9f99c28967872bd0949f8572b089daaadb6ceaa1e856ccc76e07e2ba6b7',
128-
'php-8.5-release': 'sha256:85006ca959faac9762c71d2c04456da7b3e668f9433760074170ade846465c2a',
129-
'php-8.5-release-zts': 'sha256:e93dad03fde7f3771bd2390cd34fc2aadd6f2ad2065ec458c06710713a24ff90',
130-
'php-8.5-debug': 'sha256:fff058d6ed5a2de5f06f3c8d1c157879a4926294e17190ff8bcfe54cdfaf025f',
131-
'apache2-fpm-php-8.5-release-zts': 'sha256:45d4416f0ccb887074b4a4c6406c71533a84049312b454c28fc33d18c1fe00fb',
132-
'apache2-fpm-php-8.5-release': 'sha256:1b9b9fb033e20ac867a684adb9084a6ceefa1812baa39308cca47013ce2cf705',
133-
'apache2-fpm-php-8.5-debug': 'sha256:9e82028aac75eb916455938f59d68e412307fcfcad1d4eb37e6d4a75e7a61269',
134-
'apache2-mod-php-8.5-release-zts': 'sha256:f3e8741683433b0fd43ee0eb8dd197b91d6b3e56122963f20df46858c78462d7',
135-
'apache2-mod-php-8.5-release': 'sha256:12ffe23c006de6d74279b0e53390f023bb1f3d132e4d0cbff3a4fd684a9761d2',
136-
'apache2-mod-php-8.5-debug': 'sha256:d16455deab5f5a68b5b3d0ac18e3904d51ff6c30a0107148944b7a6467517edc',
137-
'nginx-fpm-php-8.5-release-zts': 'sha256:a2ecb6bdb630debd9ea61be9b32acd975361f1d13fe2ad325a0dff4b9ef1ea2c',
138-
'nginx-fpm-php-8.5-release': 'sha256:a6a4ff845b68a3e2a35399bedab758e9b47a48ad669e3c9f2f4f3a9367c3ad10',
139-
'nginx-fpm-php-8.5-debug': 'sha256:a62ce17ddb04879e1d3c383ccaf53eb1cbe8e6711679383045dd3de81aed1b47'
128+
'php-8.5-release': 'sha256:8728b0dd4fe83b1b0ea6e8d129d685dbd46e93d97782421bfdd549b9ecc57e9f',
129+
'php-8.5-release-zts': 'sha256:7521a31e22c9363ac681b71cd058046ade967ff35210a15083fbb1cc342b4188',
130+
'php-8.5-debug': 'sha256:badd675d5b86c52ea0100784adca65d728e8731ceae9693869763171f5b363bd',
131+
'apache2-fpm-php-8.5-release-zts': 'sha256:73f65188ffdd1a8fa0d14c8209f8a741fdb20b98db41f2a839fd49d6f567af45',
132+
'apache2-fpm-php-8.5-release': 'sha256:0897c1b7f60aa2424c4c893d89fffff6258c8cd798056f8f5efdd6b4b0e65ab3',
133+
'apache2-fpm-php-8.5-debug': 'sha256:229af7b98d64bb48438ca2ddaf3451da0e344649e01e0bdd15f9d03edda97e63',
134+
'apache2-mod-php-8.5-release-zts': 'sha256:c251da953a25e265551659a91798911948f882a959e9c926581824ca24618539',
135+
'apache2-mod-php-8.5-release': 'sha256:7be04bc4f4858dbfae4367c201e3e171ce085b14049bc00b5032fd32784de7da',
136+
'apache2-mod-php-8.5-debug': 'sha256:546eda07534d0c0221fc6636ff54ac102db36d6201a59621651a4f059611e1ff',
137+
'nginx-fpm-php-8.5-release-zts': 'sha256:0fdcee4b7c84f764789e825796115687843b72f667e73ddbb629a212a34333bd',
138+
'nginx-fpm-php-8.5-release': 'sha256:07573dae4a904c764ee8de036a62199a9f9dc106664b8e9bdb477c1391c74ca1',
139+
'nginx-fpm-php-8.5-debug': 'sha256:35ab8b5b90fcc43418a621a5f335fd724d41953cfca876aff4cce0c2cca02413'
140140
]

‎appsec/tests/integration/src/docker/php/build_dev_php.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function download_php {
3737
if [[ $version_id -lt 50400 ]]; then
3838
download_url="http://museum.php.net/php5/php-${version}.tar.gz"
3939
elif [[ $version_id -ge 80500 ]]; then
40-
download_url="https://downloads.php.net/~daniels/php-8.5.0RC1.tar.gz"
40+
download_url="https://downloads.php.net/~daniels/php-8.5.0RC3.tar.gz"
4141
else
4242
download_url="https://www.php.net/distributions/php-${version}.tar.gz"
4343
fi

‎datadog-setup.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2430,7 +2430,7 @@ function get_ini_settings($sourcesDir, $appsecHelperPath, $appsecRulesPath)
24302430
*/
24312431
function get_supported_php_versions()
24322432
{
2433-
return ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'];
2433+
return ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'];
24342434
}
24352435

24362436
main();

‎dockerfiles/ci/alpine_compile_extension/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ services:
141141
x-bake: *bake
142142
args:
143143
phpVersion: 8.5.0
144-
phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC1.tar.gz
145-
phpSha256Hash: "0ea5059a387117fe6ed9a72cdc20945dbff6acc072df936e97d35a9cb26420e0"
144+
phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC3.tar.gz
145+
phpSha256Hash: "937e544d72ee1eb28d2190cadaadf8e5e8d7d8c365b5c1f6a99b4f979a1f3a1b"
146146
phpApi: 20250925
147147
volumes:
148148
- ../../:/app

‎dockerfiles/ci/bookworm/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ services:
2222
args:
2323
<<: *build-base
2424
phpVersion: "8.5"
25-
phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC1.tar.gz
26-
phpSha256Hash: "0ea5059a387117fe6ed9a72cdc20945dbff6acc072df936e97d35a9cb26420e0"
25+
phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC3.tar.gz
26+
phpSha256Hash: "937e544d72ee1eb28d2190cadaadf8e5e8d7d8c365b5c1f6a99b4f979a1f3a1b"
2727

2828
php-8.4:
2929
image: datadog/dd-trace-ci:php-8.4_bookworm-$BOOKWORM_NEXT_VERSION

‎dockerfiles/ci/buster/build-php.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ ${PHP_SRC_DIR}/configure \
4949
--enable-ftp \
5050
$(if [[ ${PHP_VERSION_ID} -ge 71 ]]; then echo --enable-intl; fi) \
5151
--enable-mbstring \
52-
--enable-opcache \
52+
$(if [[ ${PHP_VERSION_ID} -le 84 ]]; then echo --enable-opcache; fi) \
5353
$(if [[ ${PHP_VERSION_ID} -ge 80 ]]; then echo --enable-zend-test=shared; fi) \
5454
--enable-pcntl \
5555
--enable-soap \

‎dockerfiles/ci/buster/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ services:
1717
x-bake: *bake
1818
args:
1919
phpVersion: "8.5"
20-
phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC1.tar.gz
21-
phpSha256Hash: "0ea5059a387117fe6ed9a72cdc20945dbff6acc072df936e97d35a9cb26420e0"
20+
phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC3.tar.gz
21+
phpSha256Hash: "937e544d72ee1eb28d2190cadaadf8e5e8d7d8c365b5c1f6a99b4f979a1f3a1b"
2222

2323
php-8.4:
2424
image: datadog/dd-trace-ci:php-8.4_buster

‎dockerfiles/ci/centos/7/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,6 @@ services:
128128
x-bake: *bake
129129
args:
130130
phpVersion: "8.5"
131-
phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC1.tar.gz
132-
phpSha256Hash: "0ea5059a387117fe6ed9a72cdc20945dbff6acc072df936e97d35a9cb26420e0"
131+
phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC3.tar.gz
132+
phpSha256Hash: "937e544d72ee1eb28d2190cadaadf8e5e8d7d8c365b5c1f6a99b4f979a1f3a1b"
133133
image: 'datadog/dd-trace-ci:php-8.5_centos-7'

‎dockerfiles/ci/windows/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ services:
8787
args:
8888
phpVersion: "8.5.0"
8989
vsVersion: "vs17"
90-
phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC1.tar.gz
91-
phpSha256Hash: "0ea5059a387117fe6ed9a72cdc20945dbff6acc072df936e97d35a9cb26420e0"
90+
phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC3.tar.gz
91+
phpSha256Hash: "937e544d72ee1eb28d2190cadaadf8e5e8d7d8c365b5c1f6a99b4f979a1f3a1b"
9292

9393
php-8.4:
9494
image: datadog/dd-trace-ci:php-8.4_windows

‎dockerfiles/verify_packages/debian/install.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@ elif [ "${INSTALL_MODE}" = "sury" ]; then
3030
php${PHP_VERSION}-cli \
3131
php${PHP_VERSION}-curl \
3232
php${PHP_VERSION}-fpm \
33-
php${PHP_VERSION}-opcache \
3433
libapache2-mod-php${PHP_VERSION}
3534
WWW_CONF=/etc/php/${PHP_VERSION}/fpm/pool.d/www.conf
3635
PHP_FPM_BIN=php-fpm${PHP_VERSION}
36+
if [ "${PHP_VERSION}" != "8.5" ]; then
37+
apt install -y \
38+
php${PHP_VERSION}-opcache
39+
fi
3740
else
3841
echo "Unknown installation mode: ${INSTALL_MODE}"
3942
exit 1

0 commit comments

Comments
 (0)