From f7972ef33adc7febee6d41406802f32d0fbd356a Mon Sep 17 00:00:00 2001 From: Karoly Gossler Date: Fri, 15 Dec 2023 07:58:05 +0100 Subject: [PATCH 1/2] add php8.3 --- .docker/{php74_82 => php74_83}/Dockerfile | 0 .github/workflows/continuous-integration.yml | 1 + docker-compose.yml | 17 +++++++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) rename .docker/{php74_82 => php74_83}/Dockerfile (100%) diff --git a/.docker/php74_82/Dockerfile b/.docker/php74_83/Dockerfile similarity index 100% rename from .docker/php74_82/Dockerfile rename to .docker/php74_83/Dockerfile diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 08fc2566c..561845967 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -21,6 +21,7 @@ jobs: - "8.0" - "8.1" - "8.2" + - "8.3" memcached-version: - "1.6" diff --git a/docker-compose.yml b/docker-compose.yml index 373560b09..1814cef2a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -129,7 +129,7 @@ services: php74: <<: *services_php54 build: - context: .docker/php74_82 + context: .docker/php74_83 args: PHP_VERSION: '7.4' MEMCACHE_VERSION: '4.0.5.2' @@ -139,7 +139,7 @@ services: php80: <<: *services_php54 build: - context: .docker/php74_82 + context: .docker/php74_83 args: PHP_VERSION: '8.0' MEMCACHE_VERSION: '8.0' @@ -149,7 +149,7 @@ services: php81: <<: *services_php54 build: - context: .docker/php74_82 + context: .docker/php74_83 args: PHP_VERSION: '8.1' MEMCACHE_VERSION: '8.0' @@ -158,12 +158,21 @@ services: php82: <<: *services_php54 build: - context: .docker/php74_82 + context: .docker/php74_83 args: PHP_VERSION: '8.2' MEMCACHE_VERSION: '8.0' APCU_VERSION: '' + php83: + <<: *services_php54 + build: + context: .docker/php74_83 + args: + PHP_VERSION: '8.3' + MEMCACHE_VERSION: '8.0' + APCU_VERSION: '' + db: image: mysql:5.5.62 From 39ff6bd77ef1d9925f7134ade543e155db413ac9 Mon Sep 17 00:00:00 2001 From: Karoly Gossler Date: Sat, 16 Dec 2023 08:07:18 +0100 Subject: [PATCH 2/2] Fix(php-cs-fix) fix php-cs-fix single_space_around_construct warning --- test/functional/authTest.php | 2 +- test/functional/autoloadTest.php | 2 +- test/functional/cacheTest.php | 2 +- test/functional/escapingTest.php | 2 +- test/functional/filterTest.php | 2 +- test/functional/formatTest.php | 2 +- test/functional/genericTest.php | 2 +- test/functional/httpcacheTest.php | 2 +- test/functional/i18nFormTest.php | 2 +- test/functional/i18nTest.php | 2 +- test/functional/prodTest.php | 2 +- test/functional/sfTestBrowserTest.php | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/functional/authTest.php b/test/functional/authTest.php index 2c771d0f8..3a68aa5a5 100644 --- a/test/functional/authTest.php +++ b/test/functional/authTest.php @@ -9,7 +9,7 @@ */ $app = 'frontend'; -if (!include(__DIR__.'/../bootstrap/functional.php')) { +if (!include __DIR__.'/../bootstrap/functional.php') { return; } diff --git a/test/functional/autoloadTest.php b/test/functional/autoloadTest.php index 1391b678e..9a40574ef 100755 --- a/test/functional/autoloadTest.php +++ b/test/functional/autoloadTest.php @@ -9,7 +9,7 @@ */ $app = 'frontend'; -if (!include(__DIR__.'/../bootstrap/functional.php')) { +if (!include __DIR__.'/../bootstrap/functional.php') { return; } diff --git a/test/functional/cacheTest.php b/test/functional/cacheTest.php index 878eef54c..f0e7a232f 100644 --- a/test/functional/cacheTest.php +++ b/test/functional/cacheTest.php @@ -9,7 +9,7 @@ */ $app = 'cache'; -if (!include(__DIR__.'/../bootstrap/functional.php')) { +if (!include __DIR__.'/../bootstrap/functional.php') { return; } diff --git a/test/functional/escapingTest.php b/test/functional/escapingTest.php index f8c3ca28f..fc2a0fab4 100644 --- a/test/functional/escapingTest.php +++ b/test/functional/escapingTest.php @@ -9,7 +9,7 @@ */ $app = 'frontend'; -if (!include(__DIR__.'/../bootstrap/functional.php')) { +if (!include __DIR__.'/../bootstrap/functional.php') { return; } diff --git a/test/functional/filterTest.php b/test/functional/filterTest.php index e1bd3c462..4d8f5f6ff 100644 --- a/test/functional/filterTest.php +++ b/test/functional/filterTest.php @@ -9,7 +9,7 @@ */ $app = 'frontend'; -if (!include(__DIR__.'/../bootstrap/functional.php')) { +if (!include __DIR__.'/../bootstrap/functional.php') { return; } diff --git a/test/functional/formatTest.php b/test/functional/formatTest.php index 47f058f96..7050f8659 100644 --- a/test/functional/formatTest.php +++ b/test/functional/formatTest.php @@ -9,7 +9,7 @@ */ $app = 'frontend'; -if (!include(__DIR__.'/../bootstrap/functional.php')) { +if (!include __DIR__.'/../bootstrap/functional.php') { return; } diff --git a/test/functional/genericTest.php b/test/functional/genericTest.php index 964820cc1..d6d3e7ba9 100644 --- a/test/functional/genericTest.php +++ b/test/functional/genericTest.php @@ -9,7 +9,7 @@ */ $app = 'frontend'; -if (!include(__DIR__.'/../bootstrap/functional.php')) { +if (!include __DIR__.'/../bootstrap/functional.php') { return; } diff --git a/test/functional/httpcacheTest.php b/test/functional/httpcacheTest.php index a26b6e161..07b00a639 100644 --- a/test/functional/httpcacheTest.php +++ b/test/functional/httpcacheTest.php @@ -9,7 +9,7 @@ */ $app = 'cache'; -if (!include(__DIR__.'/../bootstrap/functional.php')) { +if (!include __DIR__.'/../bootstrap/functional.php') { return; } diff --git a/test/functional/i18nFormTest.php b/test/functional/i18nFormTest.php index 4f5d30ff1..97cf10d16 100644 --- a/test/functional/i18nFormTest.php +++ b/test/functional/i18nFormTest.php @@ -9,7 +9,7 @@ */ $app = 'i18n'; -if (!include(__DIR__.'/../bootstrap/functional.php')) { +if (!include __DIR__.'/../bootstrap/functional.php') { return; } diff --git a/test/functional/i18nTest.php b/test/functional/i18nTest.php index 615745a86..540232ad3 100644 --- a/test/functional/i18nTest.php +++ b/test/functional/i18nTest.php @@ -9,7 +9,7 @@ */ $app = 'i18n'; -if (!include(__DIR__.'/../bootstrap/functional.php')) { +if (!include __DIR__.'/../bootstrap/functional.php') { return; } diff --git a/test/functional/prodTest.php b/test/functional/prodTest.php index 7a5757db5..e5db92dd3 100644 --- a/test/functional/prodTest.php +++ b/test/functional/prodTest.php @@ -10,7 +10,7 @@ $app = 'frontend'; $debug = false; -if (!include(__DIR__.'/../bootstrap/functional.php')) { +if (!include __DIR__.'/../bootstrap/functional.php') { return; } diff --git a/test/functional/sfTestBrowserTest.php b/test/functional/sfTestBrowserTest.php index 5aea35569..2faebebf8 100644 --- a/test/functional/sfTestBrowserTest.php +++ b/test/functional/sfTestBrowserTest.php @@ -9,7 +9,7 @@ */ $app = 'frontend'; -if (!include(__DIR__.'/../bootstrap/functional.php')) { +if (!include __DIR__.'/../bootstrap/functional.php') { return; }