Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

php8.3 in the party #294

Merged
merged 2 commits into from
Dec 18, 2023
Merged

php8.3 in the party #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7972ef
add php8.3
connorhu Dec 15, 2023
39ff6bd
Fix(php-cs-fix) fix php-cs-fix single_space_around_construct warning
connorhu Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 .docker/php74_82/Dockerfile → .docker/php74_83/Dockerfile
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
- "8.0"
- "8.1"
- "8.2"
- "8.3"
memcached-version:
- "1.6"

Expand Down
17 changes: 13 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/functional/authTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

$app = 'frontend';
if (!include(__DIR__.'/../bootstrap/functional.php')) {
if (!include __DIR__.'/../bootstrap/functional.php') {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/autoloadTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

$app = 'frontend';
if (!include(__DIR__.'/../bootstrap/functional.php')) {
if (!include __DIR__.'/../bootstrap/functional.php') {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/cacheTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

$app = 'cache';
if (!include(__DIR__.'/../bootstrap/functional.php')) {
if (!include __DIR__.'/../bootstrap/functional.php') {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/escapingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

$app = 'frontend';
if (!include(__DIR__.'/../bootstrap/functional.php')) {
if (!include __DIR__.'/../bootstrap/functional.php') {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/filterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

$app = 'frontend';
if (!include(__DIR__.'/../bootstrap/functional.php')) {
if (!include __DIR__.'/../bootstrap/functional.php') {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/formatTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

$app = 'frontend';
if (!include(__DIR__.'/../bootstrap/functional.php')) {
if (!include __DIR__.'/../bootstrap/functional.php') {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/genericTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

$app = 'frontend';
if (!include(__DIR__.'/../bootstrap/functional.php')) {
if (!include __DIR__.'/../bootstrap/functional.php') {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/httpcacheTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

$app = 'cache';
if (!include(__DIR__.'/../bootstrap/functional.php')) {
if (!include __DIR__.'/../bootstrap/functional.php') {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/i18nFormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

$app = 'i18n';
if (!include(__DIR__.'/../bootstrap/functional.php')) {
if (!include __DIR__.'/../bootstrap/functional.php') {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/i18nTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

$app = 'i18n';
if (!include(__DIR__.'/../bootstrap/functional.php')) {
if (!include __DIR__.'/../bootstrap/functional.php') {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/prodTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

$app = 'frontend';
$debug = false;
if (!include(__DIR__.'/../bootstrap/functional.php')) {
if (!include __DIR__.'/../bootstrap/functional.php') {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/sfTestBrowserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

$app = 'frontend';
if (!include(__DIR__.'/../bootstrap/functional.php')) {
if (!include __DIR__.'/../bootstrap/functional.php') {
return;
}

Expand Down