CI: Complements PHP 8.3 test suites (#2419)

* ci: Add PHP 8.3 Web/Integrations Tests * Add 8.3 buster to docker-compose.yml * Drupal 10.1 Doesn't support PHP 8.3 * Use php:8.3-fpm-alpine instead of RC2 * Uncomment skipped tests
DataDog · Dec 12, 2023 · e33deef · e33deef
1 parent e872674
commit e33deef
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 4 deletions.
diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
@@ -1327,7 +1327,7 @@ jobs:
           name: Generate coverage
           command: |
             cd appsec
-            llvm-profdata-17 merge -sparse *.profraw -o default.profdata 
+            llvm-profdata-17 merge -sparse *.profraw -o default.profdata
             llvm-cov-17 show build/tests/fuzzer/ddappsec_helper_fuzzer -instr-profile=default.profdata -ignore-filename-regex="(tests|third_party|build)" -format=html > fuzzer-coverage.html
             llvm-cov-17 report -instr-profile default.profdata build/tests/fuzzer/ddappsec_helper_fuzzer -ignore-filename-regex="(tests|third_party|build)" -show-region-summary=false
       - store_artifacts:
@@ -3812,7 +3812,7 @@ workflows:
                 - php:8.0-fpm-alpine
                 - php:8.1-fpm-alpine
                 - php:8.2-fpm-alpine
-                - php:8.3.0RC2-fpm-alpine
+                - php:8.3-fpm-alpine
       - verify_centos:
           requires: [ "package extension" ]
           matrix:
@@ -3831,7 +3831,7 @@ workflows:
                 - PHP_MAJOR=8 PHP_MINOR=0
                 - PHP_MAJOR=8 PHP_MINOR=1
                 - PHP_MAJOR=8 PHP_MINOR=2
-                # - PHP_MAJOR=8 PHP_MINOR=3
+                - PHP_MAJOR=8 PHP_MINOR=3
       - verify_debian:
           requires: [ "package extension" ]
           matrix:
@@ -3853,7 +3853,7 @@ workflows:
                 - PHP_VERSION=8.0
                 - PHP_VERSION=8.1
                 - PHP_VERSION=8.2
-                # - PHP_VERSION=8.3
+                - PHP_VERSION=8.3
 
       - verify_tar_gz:
           requires: [ "package extension" ]

diff --git a/Makefile b/Makefile
@@ -885,6 +885,51 @@ TEST_WEB_82 := \
 	test_web_zend_1_21
 #	test_web_yii_2 \
 
+TEST_INTEGRATIONS_83 := \
+	test_integrations_amqp2 \
+	test_integrations_amqp35 \
+	test_integrations_curl \
+	test_integrations_deferred_loading \
+	test_integrations_laminaslog2 \
+	test_integrations_memcache \
+	test_integrations_memcached \
+	test_integrations_mongodb1 \
+	test_integrations_monolog1 \
+	test_integrations_monolog2 \
+	test_integrations_monolog3 \
+	test_integrations_mysqli \
+	test_opentelemetry_1 \
+	test_integrations_guzzle7 \
+	test_integrations_pcntl \
+	test_integrations_pdo \
+	test_integrations_elasticsearch7 \
+	test_integrations_elasticsearch8 \
+	test_integrations_predis1 \
+	test_integrations_roadrunner \
+	test_integrations_sqlsrv \
+	test_opentracing_10
+
+TEST_WEB_83 := \
+	test_metrics \
+	test_web_codeigniter_22 \
+	test_web_drupal_95 \
+	test_web_laravel_8x \
+	test_web_laravel_9x \
+	test_web_laravel_10x \
+	test_web_lumen_81 \
+	test_web_lumen_90 \
+	test_web_lumen_100 \
+	test_web_nette_24 \
+	test_web_nette_30 \
+	test_web_slim_312 \
+	test_web_slim_4 \
+	test_web_symfony_52 \
+	test_web_symfony_62 \
+	test_web_wordpress_59 \
+	test_web_wordpress_61 \
+	test_web_custom \
+	test_web_zend_1_21
+
 FILTER := .
 
 define run_tests

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -64,6 +64,7 @@ services:
   '8.0-buster-shared-ext': { <<: *base_php_service, image: 'datadog/dd-trace-ci:php-8.0-shared-ext' }
   '8.1-buster': { <<: *base_php_service, image: 'datadog/dd-trace-ci:php-8.1_buster' }
   '8.2-buster': { <<: *base_php_service, image: 'datadog/dd-trace-ci:php-8.2_buster' }
+  '8.3-buster': { <<: *base_php_service, image: 'datadog/dd-trace-ci:php-8.3_buster' }
   'php-master-buster': { <<: *base_php_service, image: 'datadog/dd-trace-ci:php-master_buster' }
   # --- CentOS 6 ---
   '7.0-centos7': { <<: *base_php_service, image: 'datadog/dd-trace-ci:php-7.0_centos-7' }