Skip to content

Commit

Permalink
[FEATURE] Add support for PHP 8.4 (#4012)
Browse files Browse the repository at this point in the history
Fixes #3989
  • Loading branch information
oliverklee authored Dec 28, 2024
1 parent 141bd84 commit eb96e11
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 6 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
code-quality:
name: "Code quality checks"
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -164,6 +165,12 @@ jobs:
- typo3-version: "^11.5"
php-version: "8.3"
composer-dependencies: highest
# - typo3-version: "^11.5"
# php-version: "8.4"
# composer-dependencies: lowest
- typo3-version: "^11.5"
php-version: "8.4"
composer-dependencies: highest
functional-tests:
name: "Functional tests"
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -259,6 +266,12 @@ jobs:
- typo3-version: "^11.5"
php-version: "8.3"
composer-dependencies: highest
- typo3-version: "^11.5"
php-version: "8.4"
composer-dependencies: lowest
- typo3-version: "^11.5"
php-version: "8.4"
composer-dependencies: highest
legacy-functional-tests:
name: "Legacy functional tests"
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -354,6 +367,12 @@ jobs:
- typo3-version: "^11.5"
php-version: "8.3"
composer-dependencies: highest
- typo3-version: "^11.5"
php-version: "8.4"
composer-dependencies: lowest
- typo3-version: "^11.5"
php-version: "8.4"
composer-dependencies: highest
shellcheck:
name: Check shell scripts
runs-on: ubuntu-24.04
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).

### Added

- Add support for PHP 8.4 (#4012)
- Add a new Extbase-/Fluid based single view (#3986)
- Add `Organizer.emailFooter` to the Extbase model (#3977)
- Add a new plugin for the event outlook (#3969)
Expand Down
6 changes: 3 additions & 3 deletions Classes/Templating/TemplateHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ abstract class TemplateHelper
*
* @param null $_ unused,
*/
public function __construct($_ = null, TypoScriptFrontendController $frontendController = null)
public function __construct($_ = null, ?TypoScriptFrontendController $frontendController = null)
{
if ($frontendController instanceof TypoScriptFrontendController) {
$this->frontendController = $frontendController;
Expand Down Expand Up @@ -250,9 +250,9 @@ public function setContentObjectRenderer(ContentObjectRenderer $contentObjectRen
* If the parameter is omitted, the configuration for `plugin.tx_[extkey]` is
* used instead, e.g., `plugin.tx_seminars`.
*
* @param array<string, mixed> $configuration TypoScript configuration for the plugin
* @param array<string, mixed>|null $configuration TypoScript configuration for the plugin
*/
public function init(array $configuration = null): void
public function init(?array $configuration = null): void
{
if ($this->isInitialized) {
return;
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"source": "https://github.com/oliverklee/ext-seminars"
},
"require": {
"php": "^7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "^7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"ext-json": "*",
"doctrine/dbal": "^2.13.8 || ^3.9",
"oliverklee/feuserextrafields": "^6.4.0",
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
'category' => 'plugin',
'constraints' => [
'depends' => [
'php' => '7.4.0-8.3.99',
'php' => '7.4.0-8.4.99',
'typo3' => '11.5.41-11.5.99',
'extbase' => '11.5.41-11.5.99',
'feuserextrafields' => '6.4.0-6.99.99',
Expand Down
2 changes: 1 addition & 1 deletion rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
])
->withImportNames(true, true, false)
->withConfiguredRule(ExtEmConfRector::class, [
ExtEmConfRector::PHP_VERSION_CONSTRAINT => '7.4.0-8.3.99',
ExtEmConfRector::PHP_VERSION_CONSTRAINT => '7.4.0-8.4.99',
ExtEmConfRector::TYPO3_VERSION_CONSTRAINT => '11.5.41-11.5.99',
ExtEmConfRector::ADDITIONAL_VALUES_TO_BE_REMOVED => [],
])
Expand Down

0 comments on commit eb96e11

Please sign in to comment.