Skip to content
GitLab
Commit 6450b0f5 authored by Benni Mack's avatar Benni Mack
Browse files

[TASK] Update various dependencies to support PHP8 

A few dependencies now have PHP8 support and PHP 7.2 support,
which we then update to the latest versions, also for v10.4.

Updated dev-dependencies:
* composer req "phpspec/prophecy:^1.12.2" --dev --with-all-dependencies
* composer req "friendsofphp/php-cs-fixer:^2.17.3" --dev --with-all-dependencies
* composer req "phpstan/phpstan:^0.12.64" --dev --with-all-dependencies
* composer req "phpunit/phpunit:^8.5.13" --dev --with-all-dependencies

Non-dev-dependency updates:
* composer req "nikic/php-parser:^4.10.4"

Also fix an undefined variable error that was introduced in #92497
and has now been discovered by the updated phpstan version.

Resolves: #93201
Releases: master, 10.4
Change-Id: Ic8839606ea05a0825a6e518dd644655ecc7c578e
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/67324


Tested-by: Benjamin Franzke's avatarBenjamin Franzke <bfr@qbus.de>
Tested-by: default avatarTYPO3com <noreply@typo3.com>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
Reviewed-by: Benjamin Franzke's avatarBenjamin Franzke <bfr@qbus.de>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
parent 3e1e688c
Expand all Hide whitespace changes
Inline Side-by-side
composer.lock
View file @ 6450b0f5
This diff is collapsed.
typo3/sysext/core/composer.json
View file @ 6450b0f5
......@@ -33,7 +33,7 @@
"doctrine/lexer": "^1.2.1",
"egulias/email-validator": "^2.1",
"guzzlehttp/guzzle": "^7.2",
"nikic/php-parser": "^4.3",
"nikic/php-parser": "^4.10.4",
"psr/container": "^1.0",
"psr/event-dispatcher": "^1.0",
"psr/http-client": "^1.0",
......@@ -69,10 +69,10 @@
"codeception/module-asserts": "^1.3.1",
"codeception/module-filesystem": "^1.0.3",
"codeception/module-webdriver": "^1.1.4",
"friendsofphp/php-cs-fixer": "^2.16.7",
"friendsofphp/php-cs-fixer": "^2.17.3",
"php-webdriver/webdriver": "^1.9.0",
"phpspec/prophecy": "^1.7.5",
"phpstan/phpstan": "^0.12.44",
"phpspec/prophecy": "^1.12.2",
"phpstan/phpstan": "^0.12.64",
"typo3/cms-styleguide": "~11.0.2",
"typo3/testing-framework": "^6.6.0"
},
......
typo3/sysext/install/composer.json
View file @ 6450b0f5
......@@ -20,7 +20,7 @@
},
"require": {
"doctrine/dbal": "^2.12",
"nikic/php-parser": "^4.3",
"nikic/php-parser": "^4.10.4",
"symfony/finder": "^5.2",
"typo3/cms-core": "11.1.*@dev",
"typo3/cms-extbase": "11.1.*@dev",
......
typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
View file @ 6450b0f5
......@@ -341,13 +341,13 @@ class DataHandlerHook
$versionedRecord = BackendUtility::getWorkspaceVersionOfRecord($dataHandler->BE_USER->workspace, $table, $uid, 'uid,t3ver_oid');
if ($tableSupportsVersioning) {
// Create version of record first, if it does not exist
if (empty($workspaceVersion['uid'])) {
if (empty($versionedRecord['uid'])) {
$dataHandler->versionizeRecord($table, $uid, 'MovePointer');
$versionedRecord = BackendUtility::getWorkspaceVersionOfRecord($dataHandler->BE_USER->workspace, $table, $uid, 'uid,t3ver_oid');
if ((int)$resolvedPid !== (int)$propArr['pid']) {
$this->moveRecord_processFields($dataHandler, $resolvedPid, $table, $uid);
}
} elseif ($dataHandler->isRecordCopied($table, $uid) && (int)$dataHandler->copyMappingArray[$table][$uid] === (int)$workspaceVersion['uid']) {
} elseif ($dataHandler->isRecordCopied($table, $uid) && (int)$dataHandler->copyMappingArray[$table][$uid] === (int)$versionedRecord['uid']) {
// If the record has been versioned before (e.g. cascaded parent-child structure), create only the move-placeholders
if ((int)$resolvedPid !== (int)$propArr['pid']) {
$this->moveRecord_processFields($dataHandler, $resolvedPid, $table, $uid);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment