ci: update PHP 8.1, 8.2, and 8.3 to latest patch release

.github/workflows/prof_asan.yml

@@ -7,7 +7,7 @@ jobs:
   prof-asan:
     runs-on: ubuntu-latest
     container:
-      image: datadog/dd-trace-ci:php-8.3_bookworm-2
+      image: datadog/dd-trace-ci:php-8.3_bookworm-3
       # https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
       options: --user root --privileged
 

docker-compose.yml

@@ -83,7 +83,7 @@ services:
   '8.3-buster': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.3_buster' }
   'php-master-buster': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-master_buster' }
   # --- Bookworm ---
-  '8.3-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.3_bookworm-2' }
+  '8.3-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.3_bookworm-3' }
   # --- CentOS 6 ---
   '7.0-centos7': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.0_centos-7' }
   '7.1-centos7': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.1_centos-7' }

dockerfiles/ci/alpine_compile_extension/docker-compose.yml

@@ -92,8 +92,8 @@ services:
       context: .
       x-bake: *bake
       args:
-        php_version: 8.1.26
-        php_sha: d954cecfc3d294c2fccbe2b1a6bef784ce0d6c5d44a9e28f8a527e092825f2cb
+        php_version: 8.1.29
+        php_sha: 8b2609bf1d3173aa38269a9af21532c65f730aadd3051f9aae011eea9e246de5
         php_api: 20210902
     volumes:
       - ../../:/app
@@ -104,8 +104,8 @@ services:
       context: .
       x-bake: *bake
       args:
-        php_version: 8.2.13
-        php_sha: 6a194038f5a9e46d8f70a9d59c072c3b08d6edbdd8e304096e24ccf2225bcf1b
+        php_version: 8.2.21
+        php_sha: 0c6323699309a4d2e71057f01bc071b199f240973c349287b667a3ab36a496c6
         php_api: 20220829
     volumes:
       - ../../:/app
@@ -116,9 +116,8 @@ services:
       context: .
       x-bake: *bake
       args:
-        php_version: 8.3.0
-        php_url: https://www.php.net/distributions/php-8.3.0.tar.gz
-        php_sha: "557ae14650f1d1984d3213e3fcd8d93a5f11418b3f8026d3a2d5022251163951"
+        php_version: 8.3.9
+        php_sha: f484dec6ee005c83f899af02fc021e1bc3b1d7b3f143ca062ef66b0fcee96566
         php_api: 20230831
     volumes:
       - ../../:/app

dockerfiles/ci/bookworm/.env

@@ -1,2 +1,2 @@
-BOOKWORM_CURRENT_VERSION=2
-BOOKWORM_NEXT_VERSION=3
+BOOKWORM_CURRENT_VERSION=3
+BOOKWORM_NEXT_VERSION=4

dockerfiles/ci/bookworm/docker-compose.yml

@@ -22,8 +22,8 @@ services:
       args:
         <<: *build-base
         phpVersion: "8.3"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.3.0.tar.gz
-        phpSha256Hash: "557ae14650f1d1984d3213e3fcd8d93a5f11418b3f8026d3a2d5022251163951"
+        phpTarGzUrl: https://www.php.net/distributions/php-8.3.9.tar.gz
+        phpSha256Hash: "f484dec6ee005c83f899af02fc021e1bc3b1d7b3f143ca062ef66b0fcee96566"
 
   php-8.2:
     image: datadog/dd-trace-ci:php-8.2_bookworm-$BOOKWORM_NEXT_VERSION
@@ -34,8 +34,8 @@ services:
       args:
         <<: *build-base
         phpVersion: "8.2"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.2.13.tar.gz
-        phpSha256Hash: "6a194038f5a9e46d8f70a9d59c072c3b08d6edbdd8e304096e24ccf2225bcf1b"
+        phpTarGzUrl: https://www.php.net/distributions/php-8.2.21.tar.gz
+        phpSha256Hash: "0c6323699309a4d2e71057f01bc071b199f240973c349287b667a3ab36a496c6"
 
   php-8.1:
     image: datadog/dd-trace-ci:php-8.1_bookworm-$BOOKWORM_NEXT_VERSION
@@ -46,8 +46,8 @@ services:
       args:
         <<: *build-base
         phpVersion: "8.1"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.1.26.tar.gz
-        phpSha256Hash: "d954cecfc3d294c2fccbe2b1a6bef784ce0d6c5d44a9e28f8a527e092825f2cb"
+        phpTarGzUrl: https://www.php.net/distributions/php-8.1.29.tar.gz
+        phpSha256Hash: "8b2609bf1d3173aa38269a9af21532c65f730aadd3051f9aae011eea9e246de5"
 
   php-8.0:
     image: datadog/dd-trace-ci:php-8.0_bookworm-$BOOKWORM_NEXT_VERSION

dockerfiles/ci/buster/docker-compose.yml

@@ -19,8 +19,8 @@ services:
       x-bake: *bake
       args:
         phpVersion: "8.3"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.3.0.tar.gz
-        phpSha256Hash: "557ae14650f1d1984d3213e3fcd8d93a5f11418b3f8026d3a2d5022251163951"
+        phpTarGzUrl: https://www.php.net/distributions/php-8.3.9.tar.gz
+        phpSha256Hash: "f484dec6ee005c83f899af02fc021e1bc3b1d7b3f143ca062ef66b0fcee96566"
 
   php-8.2:
     image: datadog/dd-trace-ci:php-8.2_buster
@@ -30,8 +30,8 @@ services:
       x-bake: *bake
       args:
         phpVersion: "8.2"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.2.17.tar.gz
-        phpSha256Hash: "1d8ab98e1c09518c672c5afcbef0e61f9003173c7638fc686461ae670d12742e"
+        phpTarGzUrl: https://www.php.net/distributions/php-8.2.21.tar.gz
+        phpSha256Hash: "0c6323699309a4d2e71057f01bc071b199f240973c349287b667a3ab36a496c6"
 
   php-8.1:
     image: datadog/dd-trace-ci:php-8.1_buster
@@ -41,8 +41,8 @@ services:
       x-bake: *bake
       args:
         phpVersion: "8.1"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.1.26.tar.gz
-        phpSha256Hash: "d954cecfc3d294c2fccbe2b1a6bef784ce0d6c5d44a9e28f8a527e092825f2cb"
+        phpTarGzUrl: https://www.php.net/distributions/php-8.1.29.tar.gz
+        phpSha256Hash: "8b2609bf1d3173aa38269a9af21532c65f730aadd3051f9aae011eea9e246de5"
 
   php-8.0:
     image: datadog/dd-trace-ci:php-8.0_buster

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

@@ -84,8 +84,8 @@ services:
       x-bake: *bake
       args:
         phpVersion: "8.1"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.1.26.tar.gz
-        phpSha256Hash: d954cecfc3d294c2fccbe2b1a6bef784ce0d6c5d44a9e28f8a527e092825f2cb
+        phpTarGzUrl: https://www.php.net/distributions/php-8.1.29.tar.gz
+        phpSha256Hash: "8b2609bf1d3173aa38269a9af21532c65f730aadd3051f9aae011eea9e246de5"
     image: 'datadog/dd-trace-ci:php-8.1_centos-7'
 
   php-8.2:
@@ -95,8 +95,8 @@ services:
       x-bake: *bake
       args:
         phpVersion: "8.2"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.2.13.tar.gz
-        phpSha256Hash: 6a194038f5a9e46d8f70a9d59c072c3b08d6edbdd8e304096e24ccf2225bcf1b
+        phpTarGzUrl: https://www.php.net/distributions/php-8.2.21.tar.gz
+        phpSha256Hash: "0c6323699309a4d2e71057f01bc071b199f240973c349287b667a3ab36a496c6"
     image: 'datadog/dd-trace-ci:php-8.2_centos-7'
 
   php-8.3:
@@ -106,6 +106,6 @@ services:
       x-bake: *bake
       args:
         phpVersion: "8.3"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.3.0.tar.gz
-        phpSha256Hash: 557ae14650f1d1984d3213e3fcd8d93a5f11418b3f8026d3a2d5022251163951
+        phpTarGzUrl: https://www.php.net/distributions/php-8.3.9.tar.gz
+        phpSha256Hash: "f484dec6ee005c83f899af02fc021e1bc3b1d7b3f143ca062ef66b0fcee96566"
     image: 'datadog/dd-trace-ci:php-8.3_centos-7'

dockerfiles/ci/windows/docker-compose.yml

@@ -52,30 +52,30 @@ services:
     build:
       context: .
       args:
-        phpVersion: "8.3.0"
+        phpVersion: "8.3.9"
         vsVersion: "vs16"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.3.0.tar.gz
-        phpSha256Hash: "557ae14650f1d1984d3213e3fcd8d93a5f11418b3f8026d3a2d5022251163951"
+        phpTarGzUrl: https://www.php.net/distributions/php-8.3.9.tar.gz
+        phpSha256Hash: "f484dec6ee005c83f899af02fc021e1bc3b1d7b3f143ca062ef66b0fcee96566"
 
   php-8.2:
     image: datadog/dd-trace-ci:php-8.2_windows
     build:
       context: .
       args:
-        phpVersion: "8.2.6"
+        phpVersion: "8.2.21"
         vsVersion: "vs16"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.2.6.tar.gz
-        phpSha256Hash: "1b8463df1f180ed39475cfcded1ff106242ccb823f99c9fc1a407c0b76afa2c8"
+        phpTarGzUrl: https://www.php.net/distributions/php-8.2.21.tar.gz
+        phpSha256Hash: "0c6323699309a4d2e71057f01bc071b199f240973c349287b667a3ab36a496c6"
 
   php-8.1:
     image: datadog/dd-trace-ci:php-8.1_windows
     build:
       context: .
       args:
-        phpVersion: "8.1.19"
+        phpVersion: "8.1.29"
         vsVersion: "vs16"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.1.19.tar.gz
-        phpSha256Hash: "0ebb6b0ecf5d8e355c2f1362807f9b73c6e803d496c5ad3e4fb00be989988372"
+        phpTarGzUrl: https://www.php.net/distributions/php-8.1.29.tar.gz
+        phpSha256Hash: "8b2609bf1d3173aa38269a9af21532c65f730aadd3051f9aae011eea9e246de5"
 
   php-8.0:
     image: datadog/dd-trace-ci:php-8.0_windows

dockerfiles/ci/xfail_tests/8.2.list

@@ -128,6 +128,7 @@ ext/standard/tests/array/array_reverse_variation4.phpt
 ext/standard/tests/array/array_unique_variation3.phpt
 ext/standard/tests/file/bug52820.phpt
 ext/standard/tests/file/disk_free_space_basic.phpt
+ext/standard/tests/file/file_get_contents_file_put_contents_5gb.phpt
 ext/standard/tests/file/lstat_stat_variation10.phpt
 ext/standard/tests/filters/bug54350.phpt
 ext/standard/tests/general_functions/bug73973.phpt

dockerfiles/ci/xfail_tests/8.3.list

@@ -130,6 +130,7 @@ ext/standard/tests/array/array_reverse_variation4.phpt
 ext/standard/tests/array/array_unique_variation3.phpt
 ext/standard/tests/file/bug52820.phpt
 ext/standard/tests/file/disk_free_space_basic.phpt
+ext/standard/tests/file/file_get_contents_file_put_contents_5gb.phpt
 ext/standard/tests/file/lstat_stat_variation10.phpt
 ext/standard/tests/filters/bug54350.phpt
 ext/standard/tests/general_functions/bug73973.phpt

dockerfiles/ci/xfail_tests/README.md

@@ -57,6 +57,14 @@ The following tests assert the output of `var_dump($obj)` and fail because we ad
 
 # Specific tests
 
+## `ext/standard/tests/file/file_get_contents_file_put_contents_5gb.phpt`
+
+Disabled on versions: `8.2`, `8.3`.
+
+Allocates > 5GB of Ram on a CircleCI medium instance (limit 4GB) but uses
+`/proc/meminfo` to check if enough memory is available in the `SKIP` section.
+See https://github.com/php/php-src/pull/14895 and https://github.com/DataDog/dd-trace-php/pull/2752#issuecomment-2219813169
+
 ## `sapi/cli/tests/bug80092.phpt`
 
 Temporarily disabled due to a too strict of a check for the precise php -v output.

ext/hook/uhook.c

@@ -448,6 +448,7 @@ static void dd_uhook_end(zend_ulong invocation, zend_execute_data *execute_data,
             zend_function *orig_func = *(zend_function**)(execute_data->func + 1);
             efree(execute_data->func);
             execute_data->func = orig_func;
+            execute_data->opline = orig_func->op_array.opcodes + orig_func->op_array.last - 1;
         } else {
             // TODO: not supported yet (JIT support appearing problematic)
         }