Skip to content

[TASK] Add PHP 8.5 support #720

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

Merged
extcode merged 2 commits into from
Jan 20, 2026
Merged

[TASK] Add PHP 8.5 support #720

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
f913bcd
[TASK] Add PHP 8.5 support
extcode Nov 26, 2025
3adacb8
[TASK] Remove unit and functional testing with PHP 8.5
extcode Jan 20, 2026
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
10 changes: 10 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
php-version:
- 8.2
- 8.3
- 8.4
- 8.5
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -92,6 +94,8 @@ jobs:
typo3-version: '^13.4'
- php-version: '8.4'
typo3-version: '^13.4'
- php-version: '8.5'
typo3-version: '^13.4'
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -131,6 +135,9 @@ jobs:
- name: Run Unit Tests PHP8.4
run: nix-shell --arg phpVersion \"php84\" --pure --run project-test-unit

# - name: Run Unit Tests PHP8.5
# run: nix-shell --arg phpVersion \"php85\" --pure --run project-test-unit

- name: Run Functional Tests PHP8.2
run: nix-shell --arg phpVersion \"php82\" --pure --run project-test-functional

Expand All @@ -140,3 +147,6 @@ jobs:
- name: Run Functional Tests PHP8.4
run: nix-shell --arg phpVersion \"php84\" --pure --run project-test-functional

# - name: Run Functional Tests PHP8.5
# run: nix-shell --arg phpVersion \"php85\" --pure --run project-test-functional

3 changes: 2 additions & 1 deletion Classes/Service/TaxClassService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public function getTaxClasses(?string $countryCode = null): array
$taxClassSettings = $this->settings['taxClasses'];

if (
array_key_exists($countryCode, $taxClassSettings)
is_null($countryCode) === false
&& array_key_exists($countryCode, $taxClassSettings)
&& is_array($taxClassSettings[$countryCode])
) {
$taxClassSettings = $taxClassSettings[$countryCode];
Expand Down
4 changes: 2 additions & 2 deletions Documentation/guides.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
interlink-shortcode="extcode/cart"
/>
<project title="Cart"
release="11.5.0"
version="11.5"
release="11.6.0"
version="11.6"
copyright="2018 - 2025"
/>
<inventory id="t3tsref" url="https://docs.typo3.org/typo3cms/TyposcriptReference/"/>
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ Sometimes minor versions also result in minor adjustments to own templates or co

| Cart | TYPO3 | PHP | Support/Development |
|--------|------------|-----------|--------------------------------------|
| 11.x.x | 13.4 | 8.2 - 8.4 | Features, Bugfixes, Security Updates |
| 10.x.x | 12.4 | 8.1 - 8.4 | Bugfixes, Security Updates |
| 11.x.x | 13.4 | 8.2 - 8.5 | Features, Bugfixes, Security Updates |
| 10.x.x | 12.4 | 8.1 - 8.5 | Bugfixes, Security Updates |
| 9.x.x | 12.4 | 8.1 - 8.4 | Security Updates |
| 8.x.x | 10.4, 11.5 | 7.2+ | Security Updates |
| 7.x.x | 10.4 | 7.2 - 7.4 | |
Expand Down
2 changes: 1 addition & 1 deletion Tests/Unit/Validation/Validator/EmptyValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function emptyValidatorWorksForCountableObjects(): void
public function emptyValidatorWorksForEmptyCountableObjects(): void
{
$countableObject = new \SplObjectStorage();
$countableObject->attach(new \stdClass());
$countableObject->offsetSet(new \stdClass());
self::assertTrue($this->validator->validate($countableObject)->hasErrors());
}
}
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
}
},
"require": {
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
"ext-json": "*",
"ext-openssl": "*",
"typo3/cms-core": "^13.4",
Expand Down
4 changes: 2 additions & 2 deletions ext_emconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
'title' => 'Cart',
'description' => 'Shopping Cart(s) for TYPO3',
'category' => 'plugin',
'version' => '11.5.0',
'version' => '11.6.0',
'state' => 'stable',
'author' => 'Daniel Gohlke',
'author_email' => 'ext@extco.de',
'author_company' => 'extco.de UG (haftungsbeschränkt)',
'constraints' => [
'depends' => [
'php' => '8.2.0-8.4.99',
'php' => '8.2.0-8.5.99',
'typo3' => '13.4.0-13.4.99',
'extbase' => '13.4.0-13.4.99',
'fluid' => '13.4.0-13.4.99',
Expand Down
5 changes: 3 additions & 2 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
pkgs ? import <nixpkgs> { }
,phpPkgs ? import (fetchTarball "https://github.com/piotrkwiecinski/nixpkgs/archive/1c614d75004b9eb1ecda6ddeb959c4f544403de5.tar.gz") {}
,phpVersion ? "php82"
}:

let
php = pkgs.${phpVersion}.buildEnv {
php = phpPkgs.${phpVersion}.buildEnv {
extensions = { enabled, all }: enabled ++ (with all; [
xdebug
]);
Expand All @@ -14,7 +15,7 @@ let
memory_limit = 4G
'';
};
inherit(pkgs."${phpVersion}Packages") composer;
inherit(phpPkgs."${phpVersion}Packages") composer;

projectInstall = pkgs.writeShellApplication {
name = "project-install";
Expand Down