Skip to content

Commit

Permalink
Add PHP 8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
sypets committed Oct 27, 2024
1 parent 6fc0d3b commit 015db2f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
# rest matrix jobs be be executed anyway.
fail-fast: true
matrix:
php: [ '8.3' ]
php: [ '8.4' ]
minMax: [ 'composerInstallMax' ]
steps:
- name: "Checkout"
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
# rest matrix jobs be be executed anyway.
fail-fast: true
matrix:
php: [ '8.2', '8.3' ]
php: [ '8.2', '8.4' ]
minMax: [ 'composerInstallMax' ]
steps:
- name: "Checkout"
Expand Down
4 changes: 2 additions & 2 deletions Build/Scripts/runTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

# config
SUPPORTED_PHP_VERSIONS="8.1|8.2|8.3|8.4"
DEFAULT_PHP_VERSION="8.3"
DEFAULT_PHP_VERSION="8.4"
PHP_VERSION="${DEFAULT_PHP_VERSION}"
DEFAULT_PHP_PLATFORM_VERSION="8.3.0"
DEFAULT_PHP_PLATFORM_VERSION="8.4.0"


# Function to write a .env file in Build/testing-docker/local
Expand Down
10 changes: 2 additions & 8 deletions Build/testing-docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,7 @@ services:
if [ ${PHP_VERSION} == "8.0" ]; then
composer req --dev typo3/cms-core:"dev-main" \
typo3/cms-backend:"dev-main" \
typo3/cms-frontend:"dev-main" \
typo3/cms-extbase:"dev-main" \
typo3/cms-fluid:"dev-main" \
typo3/cms-recordlist:"dev-main"
typo3/cms-fluid:"dev-main"
fi
composer config --unset platform.php;
composer update --no-progress --no-interaction;
Expand All @@ -96,10 +93,7 @@ services:
if [ ${PHP_VERSION} == "8.0" ]; then
composer req --dev typo3/cms-core:"dev-main" \
typo3/cms-backend:"dev-main" \
typo3/cms-frontend:"dev-main" \
typo3/cms-extbase:"dev-main" \
typo3/cms-fluid:"dev-main" \
typo3/cms-recordlist:"dev-main"
typo3/cms-fluid:"dev-main"
fi
composer config platform.php ${PHP_VERSION}.0;
composer update --prefer-lowest --no-progress --no-interaction;
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "^8.1",
"typo3/cms-backend": "^12.4.1 || ^13.4",
"typo3/cms-core": "^12.4.1 || ^13.4",
"typo3/cms-fluid": "^12.4.1 || ^13.4"
Expand All @@ -43,9 +43,8 @@
"friendsofphp/php-cs-fixer": "^3.2",
"friendsoftypo3/phpstan-typo3": "^0.9.0",
"phpstan/phpstan": "^1.8.2",
"phpunit/phpunit": "^9.5.20",
"ssch/typo3-rector": "^1.2",
"typo3/testing-framework": "^7.0.2"
"typo3/testing-framework": "^8"
},
"suggest": {
"sypets/page-callouts": "^3.0.0"
Expand Down

0 comments on commit 015db2f

Please sign in to comment.