Merge pull request #854 from rubsilv/TYPO3_v14

[TASK] Upgrade to TYPO3 v14

Author: lochmueller

Classes/Controller/AbstractController.php

@@ -14,14 +14,14 @@
 use HDNET\Calendarize\Service\PluginConfigurationService;
 use HDNET\Calendarize\Utility\DateTimeUtility;
 use Psr\Http\Message\ResponseInterface;
+use TYPO3\CMS\Core\Crypto\HashService;
 use TYPO3\CMS\Core\Http\PropagateResponseException;
 use TYPO3\CMS\Core\Type\ContextualFeedbackSeverity;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\Controller\Arguments;
 use TYPO3\CMS\Extbase\Mvc\RequestInterface;
-use TYPO3\CMS\Extbase\Security\Cryptography\HashService;
 use TYPO3\CMS\Frontend\Controller\ErrorController;
 use TYPO3\CMS\Frontend\Page\PageAccessFailureReasons;
 
@@ -125,7 +125,7 @@ protected function callActionMethod(RequestInterface $request): ResponseInterfac
         if (isset($this->feedFormats[$request->getFormat()])) {
             if ($request->hasArgument('hmac')) {
                 $hmac = $request->getArgument('hmac');
-                if ($this->validatePluginHmac($hmac)) {
+                if ($this->validatePluginHmac($hmac, $this->request->getControllerActionName())) {
                     $this->setHeadersAndExit(
                         $response,
                         $this->feedFormats[$request->getFormat()],
@@ -194,7 +194,7 @@ protected function eventExtendedAssignMultiple(array $variables, string $classNa
     {
         // use this variable in your extension to add more custom variables
         $variables['extended'] = [];
-        $variables['extended']['pluginHmac'] = $this->calculatePluginHmac();
+        $variables['extended']['pluginHmac'] = $this->calculatePluginHmac($this->request->getControllerActionName());
         $variables['settings'] = $this->settings;
         $variables['contentObject'] = $this->request->getAttribute('currentContentObject')->data;
 
@@ -223,7 +223,7 @@ protected function eventExtendedRedirect(
                 'delay' => 0,
                 'statusCode' => 301,
             ];
-            $variables['extended']['pluginHmac'] = $this->calculatePluginHmac();
+            $variables['extended']['pluginHmac'] = $this->calculatePluginHmac($this->request->getControllerActionName());
             $variables['settings'] = $this->settings;
         }
 
@@ -260,26 +260,36 @@ protected function getStringForPluginHmac(): string
      *
      * @see HashService::generateHmac
      */
-    protected function calculatePluginHmac(): string
+    protected function calculatePluginHmac(string $context = 'default'): string
     {
+        /* Generate a secret that is unique per context */
+        $contentObject = $this->request->getAttribute('currentContentObject');
+        $uid = $contentObject ? (string)$contentObject->data['uid'] : '0';
+        $additionalSecret = $uid . $context;
+
         $string = $this->getStringForPluginHmac();
 
         $hashService = GeneralUtility::makeInstance(HashService::class);
 
-        return $hashService->generateHmac($string);
+        return $hashService->hmac($string, $additionalSecret);
     }
 
     /**
      * @see HashService::validateHmac
      */
-    protected function validatePluginHmac(string $hmac): bool
+    protected function validatePluginHmac(string $hmac, string $context = 'default'): bool
     {
+        /* Generate a secret that is unique per context */
+        $contentObject = $this->request->getAttribute('currentContentObject');
+        $uid = $contentObject ? (string)$contentObject->data['uid'] : '0';
+        $additionalSecret = $uid . $context;
+
         $string = $this->getStringForPluginHmac();
 
         /** @var HashService $hashService */
         $hashService = GeneralUtility::makeInstance(HashService::class);
 
-        return $hashService->validateHmac($string, $hmac);
+        return $hashService->validateHmac($string, $additionalSecret, $hmac);
     }
 
     /**

Classes/Controller/BackendController.php

@@ -7,7 +7,7 @@
 use HDNET\Calendarize\Domain\Model\Request\OptionRequest;
 use HDNET\Calendarize\Register;
 use Psr\Http\Message\ResponseInterface;
-use TYPO3\CMS\Backend\Attribute\Controller;
+use TYPO3\CMS\Backend\Attribute\AsController;
 use TYPO3\CMS\Backend\Template\ModuleTemplateFactory;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
@@ -21,7 +21,7 @@
 /**
  * BackendController.
  */
-#[Controller]
+#[AsController]
 class BackendController extends AbstractController
 {
     protected LanguageService $languageService;

Classes/Controller/BookingController.php

@@ -8,7 +8,7 @@
 use HDNET\Calendarize\Domain\Model\Request\AbstractBookingRequest;
 use HDNET\Calendarize\Validation\Validator\BookingRequestValidator;
 use Psr\Http\Message\ResponseInterface;
-use TYPO3\CMS\Extbase\Annotation as Extbase;
+use TYPO3\CMS\Extbase\Attribute as Extbase;
 
 /**
  * BookingController.

Classes/Controller/CalendarController.php

@@ -18,7 +18,7 @@
 use TYPO3\CMS\Core\Pagination\SlidingWindowPagination;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Extbase\Annotation as Extbase;
+use TYPO3\CMS\Extbase\Attribute as Extbase;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Http\ForwardResponse;
 use TYPO3\CMS\Extbase\Pagination\QueryResultPaginator;

Classes/Domain/Model/Configuration.php

@@ -4,7 +4,7 @@
 
 namespace HDNET\Calendarize\Domain\Model;
 
-use TYPO3\CMS\Extbase\Annotation as Extbase;
+use TYPO3\CMS\Extbase\Attribute as Extbase;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
 /**

Classes/Domain/Model/Event.php

@@ -8,7 +8,7 @@
 use HDNET\Calendarize\Features\KeSearchIndexInterface;
 use HDNET\Calendarize\Features\SpeakingUrlInterface;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Extbase\Annotation as Extbase;
+use TYPO3\CMS\Extbase\Attribute as Extbase;
 use TYPO3\CMS\Extbase\Domain\Model\Category;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;

Classes/Domain/Model/Request/DefaultBookingRequest.php

@@ -4,7 +4,7 @@
 
 namespace HDNET\Calendarize\Domain\Model\Request;
 
-use TYPO3\CMS\Extbase\Annotation as Extbase;
+use TYPO3\CMS\Extbase\Attribute as Extbase;
 use TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator;
 
 /**

Classes/EventListener/PreviewRenderingEventListener.php

@@ -9,11 +9,9 @@
 use HDNET\Calendarize\Utility\TranslateUtility;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Backend\View\Event\PageContentPreviewRenderingEvent;
-use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Domain\FlexFormFieldValues;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Imaging\IconSize;
-use TYPO3\CMS\Core\Information\Typo3Version;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Provides backend preview for calendarize plugins.
@@ -33,17 +31,19 @@ public function __invoke(PageContentPreviewRenderingEvent $event): void
             return;
         }
 
-        $this->flexFormService->load($record['pi_flexform'] ?? '');
-        if (!$this->flexFormService->isValid()) {
+        if (!isset($record['pi_flexform'])) {
             return;
         }
 
-        $iconSize = GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() <= 12 ? Icon::SIZE_SMALL : IconSize::SMALL;
+        /** @var FlexFormFieldValues $flexFormFieldValues */
+        $flexFormFieldValues = $record['pi_flexform'];
 
-        $extensionIconUsage = $this->iconFactory->getIcon('ext-calendarize-wizard-icon', $iconSize)->render();
+        $flexFormFieldValues->toArray();
+
+        $extensionIconUsage = $this->iconFactory->getIcon('ext-calendarize-wizard-icon', IconSize::SMALL)->render();
         $this->layoutService->setTitle($extensionIconUsage . ' Calendarize');
 
-        $listType = explode('_', $record['list_type'], 2)[1] ?? '';
+        $listType = explode('_', $record['CType'], 2)[1] ?? '';
         $this->layoutService->addRow(TranslateUtility::get('mode'), TranslateUtility::get('mode.' . $listType));
 
         $pluginConfiguration = (int)$this->flexFormService->get('settings.pluginConfiguration', 'main');

Classes/Service/TcaService.php

@@ -53,7 +53,7 @@ public function eventTitle(array &$params, ?object $_): void
         // base title
         $table = $params['table'];
         unset($GLOBALS['TCA'][$table]['ctrl']['label_userFunc']);
-        $params['title'] = BackendUtility::getRecordTitle($table, $params['row']);
+        $params['title'] = $params['row']['title'];
         $GLOBALS['TCA'][$table]['ctrl']['label_userFunc'] = self::class . '->eventTitle';
 
         // base record

Classes/Service/TimeTable/Secondary/ManipulationTimeTable.php

@@ -6,16 +6,16 @@
 use HDNET\Calendarize\Service\TimeTable\AbstractTimeTable;
 use HDNET\Calendarize\Service\TimeTable\TimeTableInterface;
 use HDNET\Calendarize\Utility\ConfigurationUtility;
-use TYPO3\CMS\Core\Service\FlexFormService;
+use TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools;
 use TYPO3\CMS\Core\Utility\MathUtility;
 
 class ManipulationTimeTable extends AbstractTimeTable implements TimeTableInterface
 {
-    public function __construct(protected FlexFormService $flexFormService) {}
+    public function __construct(protected FlexFormTools $flexFormTools) {}
 
     private function loadFlexForm($flexFormString): array
     {
-        return $this->flexFormService
+        return $this->flexFormTools
             ->convertFlexFormContentToArray($flexFormString);
     }
 
@@ -46,7 +46,7 @@ public function getFlexForm(): string
 
     public function handleConfiguration(array &$times, Configuration $configuration): void
     {
-        $settings = $this->flexFormService->convertFlexFormContentToArray($configuration->getFlexForm());
+        $settings = $this->flexFormTools->convertFlexFormContentToArray($configuration->getFlexForm());
         if (MathUtility::canBeInterpretedAsInteger($settings['settings']['fixedStartTime'] ?? null)) {
             foreach ($times as $key => $time) {
                 $times[$key]['start_time'] = (int)$settings['settings']['fixedStartTime'];