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

[TASK] Support PHP 8.4 #2576

Merged
merged 7 commits into from
Nov 25, 2024
Merged

[TASK] Support PHP 8.4 #2576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e4fc41
[TASK] Support PHP 8.4
georgringer Nov 25, 2024
4791839
[TASK] Csfixer not with 8.4
georgringer Nov 25, 2024
749ca58
[TASK] Csfixer not with 8.4
georgringer Nov 25, 2024
30475aa
[TASK] Csfixer not with 8.4
georgringer Nov 25, 2024
5206c21
Revert "[TASK] Csfixer not with 8.4"
georgringer Nov 25, 2024
f804f56
[TASK] Provide default arguments for str_getcsv
georgringer Nov 25, 2024
2bba47d
[TASK] Csfixer only in 8.3
georgringer Nov 25, 2024
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
5 changes: 3 additions & 2 deletions .github/workflows/core12.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
# rest matrix jobs be executed anyway.
fail-fast: false
matrix:
php: [ '8.1', '8.2', '8.3' ]
php: [ '8.1', '8.2', '8.3', '8.4' ]
composerInstall: [ 'composerInstallLowest', 'composerInstallHighest' ]
steps:
- name: Checkout
Expand All @@ -23,7 +23,8 @@ jobs:
- name: Lint PHP
run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s lint

- name: Validate code against CGL
- if: matrix.php == '8.3'
name: Validate code against CGL
run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s cgl -n

- name: Unit Tests
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/core13.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
# rest matrix jobs be executed anyway.
fail-fast: false
matrix:
php: [ '8.2', '8.3' ]
php: [ '8.2', '8.3', '8.4' ]
composerInstall: [ 'composerInstallLowest', 'composerInstallHighest' ]
steps:
- name: Checkout
Expand All @@ -23,7 +23,8 @@ jobs:
- name: Lint PHP
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s lint

- name: Validate code against CGL
- if: matrix.php == '8.3'
name: Validate code against CGL
run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s cgl -n

- name: Unit Tests
Expand Down
5 changes: 3 additions & 2 deletions Build/Scripts/runTests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,13 @@ Options:
- 12: use TYPO3 v12 (default)
- 13: use TYPO3 v13

-p <8.0|8.1|8.2|8.3>
-p <8.0|8.1|8.2|8.3|8.4>
Specifies the PHP minor version to be used
- 8.0: use PHP 8.0 (default)
- 8.1: use PHP 8.1
- 8.2: use PHP 8.2
- 8.3: use PHP 8.3
- 8.4: use PHP 8.4

-e "<phpunit options>"
Only with -s docsGenerate|functional|unit
Expand Down Expand Up @@ -356,7 +357,7 @@ while getopts "a:b:s:d:i:p:e:t:xy:nhu" OPT; do
;;
p)
PHP_VERSION=${OPTARG}
if ! [[ ${PHP_VERSION} =~ ^(8.1|8.2|8.3)$ ]]; then
if ! [[ ${PHP_VERSION} =~ ^(8.1|8.2|8.3|8.4)$ ]]; then
INVALID_OPTIONS+=("-p ${OPTARG}")
fi
;;
Expand Down
2 changes: 1 addition & 1 deletion Classes/Backend/RecordList/RecordListConstraint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function extendQuery(array &$parameters, array $arguments): void
$fieldParts = [];
foreach ($fields as $field) {
$likeParts = [];
$nameParts = str_getcsv($arguments['searchWord'], ' ');
$nameParts = str_getcsv($arguments['searchWord'], ' ', '"', '\\');
foreach ($nameParts as $part) {
$part = trim($part);
if ($part !== '') {
Expand Down
2 changes: 1 addition & 1 deletion Classes/Domain/Repository/NewsRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ protected function getSearchConstraints(QueryInterface $query, DemandInterface $
if (count($searchFields) === 0) {
throw new \UnexpectedValueException('No search fields defined', 1318497755);
}
$searchSubjectSplitted = str_getcsv($searchSubject, ' ');
$searchSubjectSplitted = str_getcsv($searchSubject, ' ', '"', '\\');
if ($searchObject->isSplitSubjectWords()) {
foreach ($searchFields as $field) {
$subConstraints = [];
Expand Down
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 @@ -25,7 +25,7 @@
"GPL-2.0-or-later"
],
"require": {
"php": ">= 8.1 < 8.4",
"php": ">= 8.1 < 8.5",
"symfony/console": "^5.4 || ^6.4 || ^7.0",
"typo3/cms-backend": "^12.4.2 || ^13.1",
"typo3/cms-core": "^12.4.2 || ^13.1",
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'version' => '12.2.0',
'constraints' => [
'depends' => [
'php' => '8.1.0-8.3.99',
'php' => '8.1.0-8.4.99',
'typo3' => '12.4.2-13.9.99',
'backend' => '12.4.2-13.9.99',
'extbase' => '12.4.2-13.9.99',
Expand Down
Loading