From c877e6aaa1f0fc693825b6a97832b6add3b4267b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Nitzsche?= Date: Fri, 11 Oct 2024 11:32:58 +0200 Subject: [PATCH] Fix php warning in tsfal --- CHANGELOG.md | 4 ++++ Classes/Utility/TSFAL.php | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 330de62d..dd1f9560 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ Changelog --------- +v1.19.1 (??.10.2024) + * Fix warning in TSFAL + * Possible BC: createConf() in TSFAL is now private + v1.19.0 (06.10.2024) * Use Doctrine and QueryBuilder for insert, update and delete statements * new delete()-method for PersistanceRepository diff --git a/Classes/Utility/TSFAL.php b/Classes/Utility/TSFAL.php index ec4f77de..0d7e881c 100644 --- a/Classes/Utility/TSFAL.php +++ b/Classes/Utility/TSFAL.php @@ -16,7 +16,6 @@ use Sys25\RnBase\Frontend\Marker\Templates; use tx_rnbase; use TYPO3\CMS\Core\Resource\FileReference; -use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer; /*************************************************************** @@ -287,7 +286,7 @@ protected static function convertRef2Media($pics) * * @return ConfigurationInterface */ - public function createConf($conf) + private function createConf($conf) { /** @var Processor $configurations */ $configurations = tx_rnbase::makeInstance(Processor::class); @@ -324,13 +323,13 @@ public function fetchFirstReference($content, $configuration) $contentObject = $this->cObj; if (isset($configuration['refUid']) || isset($configuration['refUid.'])) { - $uid = intval($contentObject->stdWrap($configuration['refUid'] ?? '', $configuration['refUid.'] ?? [])); + $uid = (int) $contentObject->stdWrap($configuration['refUid'] ?? '', $configuration['refUid.'] ?? []); } else { $uid = $contentObject->data['_LOCALIZED_UID'] ?? $contentObject->data['uid']; } $refTable = ($configuration['refTable'] && is_array($GLOBALS['TCA'][$configuration['refTable']])) ? $configuration['refTable'] : 'tt_content'; - $refField = trim($contentObject->stdWrap($configuration['refField'], $configuration['refField.'])); + $refField = trim($contentObject->stdWrap($configuration['refField'], $configuration['refField.'] ?? [])); if (isset($GLOBALS['BE_USER']->workspace) && 0 !== $GLOBALS['BE_USER']->workspace) { $workspaceRecord = BackendUtility::getWorkspaceVersionOfRecord( @@ -761,7 +760,7 @@ public static function getFirstReferenceFileInfo($refTable, $refUid, $refField) */ private static function getResourceFactory() { - return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\ResourceFactory::class); + return tx_rnbase::makeInstance(\TYPO3\CMS\Core\Resource\ResourceFactory::class); } /**