diff --git a/Classes/Component/Core/DemandResolver/Filesystem/Service/FalDriverService.php b/Classes/Component/Core/DemandResolver/Filesystem/Service/FalDriverService.php index d9d6dc043..daeec5234 100644 --- a/Classes/Component/Core/DemandResolver/Filesystem/Service/FalDriverService.php +++ b/Classes/Component/Core/DemandResolver/Filesystem/Service/FalDriverService.php @@ -56,10 +56,10 @@ protected function createFalDriver(array $storage): DriverInterface $driver->setStorageUid($storage['uid']); $capabilities = - ($storage['is_browsable'] ?? null ? ResourceStorageInterface::CAPABILITY_BROWSABLE : 0) - | ($storage['is_public'] ?? null ? ResourceStorageInterface::CAPABILITY_PUBLIC : 0) - | ($storage['is_writable'] ?? null ? ResourceStorageInterface::CAPABILITY_WRITABLE : 0) - | ResourceStorageInterface::CAPABILITY_HIERARCHICAL_IDENTIFIERS; + ($storage['is_browsable'] ?? null ? \TYPO3\CMS\Core\Resource\Capabilities::CAPABILITY_BROWSABLE : 0) + | ($storage['is_public'] ?? null ? \TYPO3\CMS\Core\Resource\Capabilities::CAPABILITY_PUBLIC : 0) + | ($storage['is_writable'] ?? null ? \TYPO3\CMS\Core\Resource\Capabilities::CAPABILITY_WRITABLE : 0) + | \TYPO3\CMS\Core\Resource\Capabilities::CAPABILITY_HIERARCHICAL_IDENTIFIERS; $driver->mergeConfigurationCapabilities($capabilities); $driver->processConfiguration(); $driver->initialize(); diff --git a/Classes/Features/RedirectsSupport/Backend/Button/BackButton.php b/Classes/Features/RedirectsSupport/Backend/Button/BackButton.php index ee0fd05fc..e65464cb2 100644 --- a/Classes/Features/RedirectsSupport/Backend/Button/BackButton.php +++ b/Classes/Features/RedirectsSupport/Backend/Button/BackButton.php @@ -13,7 +13,7 @@ class BackButton extends LinkButton { public function __construct(IconFactory $iconFactory, UriBuilder $uriBuilder) { - $this->icon = $iconFactory->getIcon('actions-close', Icon::SIZE_SMALL); + $this->icon = $iconFactory->getIcon('actions-close', \TYPO3\CMS\Core\Imaging\IconSize::SMALL); $this->href = $uriBuilder->reset()->uriFor('list'); $this->title = $GLOBALS['LANG']->sL('LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:back'); } diff --git a/Classes/Features/RedirectsSupport/Backend/Button/SaveAndPublishButton.php b/Classes/Features/RedirectsSupport/Backend/Button/SaveAndPublishButton.php index 2133bc63a..1aba465dd 100644 --- a/Classes/Features/RedirectsSupport/Backend/Button/SaveAndPublishButton.php +++ b/Classes/Features/RedirectsSupport/Backend/Button/SaveAndPublishButton.php @@ -63,7 +63,7 @@ public function __toString(): string public function render(): string { - $icon = $this->iconFactory->getIcon('actions-document-synchronize', Icon::SIZE_SMALL)->render(); + $icon = $this->iconFactory->getIcon('actions-document-synchronize', \TYPO3\CMS\Core\Imaging\IconSize::SMALL)->render(); $label = htmlspecialchars(LocalizationUtility::translate('save_and_publish', 'In2publishCore')); return <<$icon $label diff --git a/Classes/Features/RedirectsSupport/Domain/Dto/Filter.php b/Classes/Features/RedirectsSupport/Domain/Dto/Filter.php index 7bbb62bcd..0379c95ed 100644 --- a/Classes/Features/RedirectsSupport/Domain/Dto/Filter.php +++ b/Classes/Features/RedirectsSupport/Domain/Dto/Filter.php @@ -119,7 +119,7 @@ public function toAdditionWhere(): array $where[] = 'target LIKE ' . $database->quote('%' . $this->target . '%'); } if (null !== $this->code) { - $where[] = 'target_statuscode = ' . $database->quote($this->code); + $where[] = 'target_statuscode = ' . $database->quote((string) $this->code); } if (null !== $this->association) { if ('present' === $this->association) { diff --git a/Classes/ViewHelpers/File/IconViewHelper.php b/Classes/ViewHelpers/File/IconViewHelper.php index 14db6fddf..e064d8d3b 100644 --- a/Classes/ViewHelpers/File/IconViewHelper.php +++ b/Classes/ViewHelpers/File/IconViewHelper.php @@ -67,7 +67,7 @@ public function render(): string $iconIdentifier = $this->getIconIdentifier($record); - return $this->iconFactory->getIcon($iconIdentifier, Icon::SIZE_SMALL)->render(); + return $this->iconFactory->getIcon($iconIdentifier, \TYPO3\CMS\Core\Imaging\IconSize::SMALL)->render(); } protected function getIconIdentifier(Record $record): ?string diff --git a/Classes/ViewHelpers/Format/DiffViewHelper.php b/Classes/ViewHelpers/Format/DiffViewHelper.php index 9192ab930..795c1a43c 100644 --- a/Classes/ViewHelpers/Format/DiffViewHelper.php +++ b/Classes/ViewHelpers/Format/DiffViewHelper.php @@ -13,8 +13,6 @@ class DiffViewHelper extends AbstractViewHelper { - use CompileWithRenderStatic; - protected $escapeOutput = false; private const ARG_OLD = 'old'; private const ARG_NEW = 'new'; @@ -28,16 +26,13 @@ public function initializeArguments(): void /** * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public static function renderStatic( - array $arguments, - Closure $renderChildrenClosure, - RenderingContextInterface $renderingContext - ): string { + public function render(): string + { $diffUtility = GeneralUtility::makeInstance(DiffUtility::class); $diffUtility->stripTags = false; return $diffUtility->makeDiffDisplay( - (string)$arguments[self::ARG_OLD], - (string)$arguments[self::ARG_NEW], + (string)$this->arguments[self::ARG_OLD], + (string)$this->arguments[self::ARG_NEW], ); } } diff --git a/Classes/ViewHelpers/Record/LanguageFlagIconViewHelper.php b/Classes/ViewHelpers/Record/LanguageFlagIconViewHelper.php index e583c9f7a..ac8053bbf 100644 --- a/Classes/ViewHelpers/Record/LanguageFlagIconViewHelper.php +++ b/Classes/ViewHelpers/Record/LanguageFlagIconViewHelper.php @@ -75,7 +75,7 @@ public function render(): string $languageField = $GLOBALS['TCA'][$table]['ctrl']['languageField'] ?? null; if (null === $languageField) { - return $this->iconFactory->getIcon('actions-pencil', Icon::SIZE_SMALL)->render(); + return $this->iconFactory->getIcon('actions-pencil', \TYPO3\CMS\Core\Imaging\IconSize::SMALL)->render(); } $systemLanguages = array_filter( @@ -88,12 +88,12 @@ public function render(): string $systemLanguage = $systemLanguages[$language] ?? null; if (null === $systemLanguage) { - return $this->iconFactory->getIcon('flags-multiple', Icon::SIZE_SMALL, 'overlay-edit')->render(); + return $this->iconFactory->getIcon('flags-multiple', \TYPO3\CMS\Core\Imaging\IconSize::SMALL, 'overlay-edit')->render(); } return $this->iconFactory->getIcon( $systemLanguage['flagIcon'], - Icon::SIZE_SMALL, + \TYPO3\CMS\Core\Imaging\IconSize::SMALL, $overlay, )->render(); } diff --git a/Classes/ViewHelpers/Tca/TableRowLabelViewHelper.php b/Classes/ViewHelpers/Tca/TableRowLabelViewHelper.php index d5522bbf7..29cb630aa 100644 --- a/Classes/ViewHelpers/Tca/TableRowLabelViewHelper.php +++ b/Classes/ViewHelpers/Tca/TableRowLabelViewHelper.php @@ -13,8 +13,6 @@ class TableRowLabelViewHelper extends AbstractViewHelper { - use CompileWithRenderStatic; - public function initializeArguments(): void { $this->registerArgument('table', 'string', 'The row\'s table', true); @@ -24,16 +22,11 @@ public function initializeArguments(): void /** * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public static function renderStatic( - array $arguments, - Closure $renderChildrenClosure, - RenderingContextInterface $renderingContext - ) { + public function render() + { $tcaService = GeneralUtility::makeInstance(TcaService::class); - - $table = (string)$arguments['table']; - $row = (array)$arguments['row']; - + $table = (string)$this->arguments['table']; + $row = (array)$this->arguments['row']; return $tcaService->getRecordLabel($row, $table); } } diff --git a/ext_localconf.php b/ext_localconf.php index 235610bc6..236ee7018 100755 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -77,6 +77,7 @@ 'Pi1', [FrontendController::class => 'preview'], [FrontendController::class => 'preview'], + \TYPO3\CMS\Extbase\Utility\ExtensionUtility::PLUGIN_TYPE_CONTENT_ELEMENT, ); /******************************************** Configure Garbage Collector ****************************************/