Support TYPO3 v13

.github/workflows/ci.yml

@@ -15,22 +15,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        typo3: ['^11', '^12']
-        php: ['7.4', '8.0', '8.1', '8.2']
-        mysql: ['5.7', '8.0']
+        typo3: ['^12', '^13']
+        php: ['8.1', '8.2', '8.3']
+        mysql: ['5.7', '8.0', '8.4']
         exclude:
-          - typo3: '^11'
-            mysql: '8.0'
-          - typo3: '^12'
+          - typo3: '^13'
             mysql: '5.7'
-          - typo3: '^12'
-            php: '7.4'
-          - typo3: '^12'
-            php: '8.0'
+          - typo3: '^13'
+            php: '8.1'
     steps:
       - id: checkout
         name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - id: setup_mysql
         name: Set up MySQL ${{ matrix.mysql }}
@@ -54,7 +50,7 @@ jobs:
 
       - id: composer-cache-dependencies
         name: Cache Composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache-vars.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.typo3 }}-${{ steps.composer-cache-vars.outputs.timestamp }}

.php-cs-fixer.dist.php

@@ -54,7 +54,7 @@
         'no_blank_lines_after_phpdoc' => true,
         'array_syntax' => ['syntax' => 'short'],
         'whitespace_after_comma_in_array' => true,
-        'function_typehint_space' => true,
+        'type_declaration_spaces' => true,
         'single_line_comment_style' => true,
         'no_alias_functions' => true,
         'lowercase_cast' => true,

Build/phpstan-baseline.neon

@@ -1,36 +1,6 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Call to method addHeaderContent\\(\\) on an unknown class TYPO3\\\\CMS\\\\Backend\\\\Controller\\\\Event\\\\ModifyPageLayoutContentEvent\\.$#"
+			message: "#^Return type \\(TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryResultInterface\\) of method T3G\\\\AgencyPack\\\\Blog\\\\Domain\\\\Repository\\\\PostRepository\\:\\:findAll\\(\\) should be covariant with return type \\(iterable\\<object\\>\\) of method TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\RepositoryInterface\\<object\\>\\:\\:findAll\\(\\)$#"
 			count: 1
-			path: ../Classes/Listener/ModifyPageLayoutContent.php
-
-		-
-			message: "#^Call to method getRequest\\(\\) on an unknown class TYPO3\\\\CMS\\\\Backend\\\\Controller\\\\Event\\\\ModifyPageLayoutContentEvent\\.$#"
-			count: 1
-			path: ../Classes/Listener/ModifyPageLayoutContent.php
-
-		-
-			message: "#^Method T3G\\\\AgencyPack\\\\Blog\\\\Listener\\\\ModifyPageLayoutContent\\:\\:__invoke\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: ../Classes/Listener/ModifyPageLayoutContent.php
-
-		-
-			message: "#^Parameter \\$event of method T3G\\\\AgencyPack\\\\Blog\\\\Listener\\\\ModifyPageLayoutContent\\:\\:__invoke\\(\\) has invalid type TYPO3\\\\CMS\\\\Backend\\\\Controller\\\\Event\\\\ModifyPageLayoutContentEvent\\.$#"
-			count: 1
-			path: ../Classes/Listener/ModifyPageLayoutContent.php
-
-		-
-			message: "#^Call to method addContentAbove\\(\\) on an unknown class TYPO3\\\\CMS\\\\Backend\\\\Controller\\\\Event\\\\RenderAdditionalContentToRecordListEvent\\.$#"
-			count: 1
-			path: ../Classes/Listener/RenderAdditionalContentToRecordList.php
-
-		-
-			message: "#^Call to method getRequest\\(\\) on an unknown class TYPO3\\\\CMS\\\\Backend\\\\Controller\\\\Event\\\\RenderAdditionalContentToRecordListEvent\\.$#"
-			count: 1
-			path: ../Classes/Listener/RenderAdditionalContentToRecordList.php
-
-		-
-			message: "#^Parameter \\$event of method T3G\\\\AgencyPack\\\\Blog\\\\Listener\\\\RenderAdditionalContentToRecordList\\:\\:__invoke\\(\\) has invalid type TYPO3\\\\CMS\\\\Backend\\\\Controller\\\\Event\\\\RenderAdditionalContentToRecordListEvent\\.$#"
-			count: 1
-			path: ../Classes/Listener/RenderAdditionalContentToRecordList.php
+			path: ../Classes/Domain/Repository/PostRepository.php

Build/phpstan.neon

@@ -7,11 +7,13 @@ includes:
 
 parameters:
 	level: 8
-	checkMissingIterableValueType: false
 	reportUnmatchedIgnoredErrors: false
-	checkGenericClassInNonGenericObjectType: false
 
 	ignoreErrors:
+		-
+			identifier: missingType.iterableValue
+		-
+			identifier: missingType.generics
 		- "#Casting to string something that's already string.#"
 		- "#Casting to int something that's already int.#"
 		- "#Casting to bool something that's already bool.#"

Classes/Backend/View/BlogPostHeaderContentRenderer.php

@@ -42,7 +42,7 @@
             return '';
         }
 
-        $pageUid = (int)($request->getParsedBody()['id'] ?? $request->getQueryParams()['id'] ?? 0);
+        $pageUid = (int)($request->getQueryParams()['id'] ?? 0);
         $pageInfo = BackendUtility::readPageAccess($pageUid, $GLOBALS['BE_USER']->getPagePermsClause(Permission::PAGE_SHOW));
         if (($pageInfo['doktype'] ?? 0) !== Constants::DOKTYPE_BLOG_POST) {
             return '';
@@ -57,8 +57,9 @@
         $this->postRepository->setDefaultQuerySettings($querySettings);
         $post = $this->postRepository->findByUidRespectQuerySettings($pageUid);
 
         $view = GeneralUtility::makeInstance(StandaloneView::class);
-        $view->getRenderingContext()->getTemplatePaths()->fillDefaultsByPackageName('blog');
+        //$view->getRenderingContext()->getTemplatePaths()->fillDefaultsByPackageName('blog');
+        $view->getRenderingContext()->getTemplatePaths()->setTemplateRootPaths(['EXT:blog/Resources/Private/Templates']);
         $view->setTemplate('PageLayout/Header');
         $view->assignMultiple([
             'pageUid' => $pageUid,

Classes/Controller/BackendController.php

@@ -18,8 +18,8 @@
 use T3G\AgencyPack\Blog\Service\SetupService;
 use TYPO3\CMS\Backend\Template\ModuleTemplateFactory;
 use TYPO3\CMS\Core\Http\RedirectResponse;
-use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Page\PageRenderer;
+use TYPO3\CMS\Core\Type\ContextualFeedbackSeverity;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
 class BackendController extends ActionController
@@ -49,14 +49,13 @@ public function __construct(
 
     public function initializeAction(): void
     {
-        $this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Backend/Tooltip');
         $this->pageRenderer->addCssFile('EXT:blog/Resources/Public/Css/backend.min.css', 'stylesheet', 'all', '', false);
     }
 
     public function initializeSetupWizardAction(): void
     {
         $this->initializeDataTables();
-        $this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Blog/SetupWizard');
+        $this->pageRenderer->loadJavaScriptModule('@t3g/blog/setup-wizard.js');
     }
 
     public function initializePostsAction(): void
@@ -67,24 +66,23 @@ public function initializePostsAction(): void
     public function initializeCommentsAction(): void
     {
         $this->initializeDataTables();
-        $this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Blog/MassUpdate');
+        $this->pageRenderer->loadJavaScriptModule('@t3g/blog/mass-update.js');
     }
 
     protected function initializeDataTables(): void
     {
-        $this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Blog/Datatables');
-        $this->pageRenderer->addCssFile('EXT:blog/Resources/Public/Css/Datatables.min.css', 'stylesheet', 'all', '', false);
+        $this->pageRenderer->loadJavaScriptModule('@t3g/blog/datatables.js');
+        $this->pageRenderer->addCssFile('EXT:blog/Resources/Public/Css/datatables.min.css', 'stylesheet', 'all', '', false);
     }
 
     public function setupWizardAction(): ResponseInterface
     {
-        $this->view->assignMultiple([
+        $view = $this->moduleTemplateFactory->create($this->request);
+        $view->assignMultiple([
             'blogSetups' => $this->setupService->determineBlogSetups(),
         ]);
-        $moduleTemplate = $this->moduleTemplateFactory->create($this->request);
-        $moduleTemplate->setContent($this->view->render());
 
-        return $this->htmlResponse($moduleTemplate->renderContent());
+        return $view->renderResponse('Backend/SetupWizard');
     }
 
     public function postsAction(int $blogSetup = null): ResponseInterface
@@ -94,20 +92,20 @@ public function postsAction(int $blogSetup = null): ResponseInterface
         $querySettings->setIgnoreEnableFields(true);
         $this->postRepository->setDefaultQuerySettings($querySettings);
 
-        $this->view->assignMultiple([
+        $view = $this->moduleTemplateFactory->create($this->request);
+        $view->assignMultiple([
             'blogSetups' => $this->setupService->determineBlogSetups(),
             'activeBlogSetup' => $blogSetup,
             'posts' => $this->postRepository->findAllByPid($blogSetup),
         ]);
-        $moduleTemplate = $this->moduleTemplateFactory->create($this->request);
-        $moduleTemplate->setContent($this->view->render());
 
-        return $this->htmlResponse($moduleTemplate->renderContent());
+        return $view->renderResponse('Backend/Posts');
     }
 
     public function commentsAction(string $filter = null, int $blogSetup = null): ResponseInterface
     {
-        $this->view->assignMultiple([
+        $view = $this->moduleTemplateFactory->create($this->request);
+        $view->assignMultiple([
             'activeFilter' => $filter,
             'activeBlogSetup' => $blogSetup,
             'commentCounts' => [
@@ -120,10 +118,8 @@ public function commentsAction(string $filter = null, int $blogSetup = null): Re
             'blogSetups' => $this->setupService->determineBlogSetups(),
             'comments' => $this->commentRepository->findAllByFilter($filter, $blogSetup),
         ]);
-        $moduleTemplate = $this->moduleTemplateFactory->create($this->request);
-        $moduleTemplate->setContent($this->view->render());
 
-        return $this->htmlResponse($moduleTemplate->renderContent());
+        return $view->renderResponse('Backend/Comments');
     }
 
     public function updateCommentStatusAction(string $status, string $filter = null, int $blogSetup = null, array $comments = [], int $comment = null): ResponseInterface
@@ -164,7 +160,7 @@ public function createBlogAction(array $data = null): ResponseInterface
         if ($data !== null && $this->setupService->createBlogSetup($data)) {
             $this->addFlashMessage('Your blog setup has been created.', 'Congratulation');
         } else {
-            $this->addFlashMessage('Sorry, your blog setup could not be created.', 'An error occurred', FlashMessage::ERROR);
+            $this->addFlashMessage('Sorry, your blog setup could not be created.', 'An error occurred', ContextualFeedbackSeverity::ERROR);
         }
 
         return new RedirectResponse($this->uriBuilder->reset()->uriFor('setupWizard'));

Classes/Controller/PostController.php

@@ -59,7 +59,7 @@ public function __construct(
     }
 
     /**
-     * @param ViewInterface|\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view
+     * @param ViewInterface $view
      */
     protected function initializeView($view): void
     {
@@ -94,14 +94,14 @@ protected function initializeView($view): void
             $feedData = [
                 'title' => LocalizationUtility::translate('feed.title' . $action, 'blog', $arguments),
                 'description' => LocalizationUtility::translate('feed.description' . $action, 'blog', $arguments),
-                'language' => $this->getSiteLanguage()->getTwoLetterIsoCode(),
+                'language' => $this->getSiteLanguage()->getLocale()->getLanguageCode(),
                 'link' => $this->getRequestUrl(),
                 'date' => date('r'),
             ];
             $this->view->assign('feed', $feedData);
         }
 
-        $contentObject = $this->configurationManager->getContentObject();
+        $contentObject = $this->request->getAttribute('currentContentObject');
         $this->view->assign('data', $contentObject !== null ? $contentObject->data : null);
     }
 
@@ -185,7 +185,7 @@ public function listPostsByDateAction(?int $year = null, ?int $month = null, int
     public function listPostsByCategoryAction(?Category $category = null, int $currentPage = 1): ResponseInterface
     {
         if ($category === null) {
-            $contentObject = $this->configurationManager->getContentObject();
+            $contentObject = $this->request->getAttribute('currentContentObject');
             $referenceUid = $contentObject !== null ? (int) $contentObject->data['uid'] : null;
             if ($referenceUid !== null) {
                 $categories = $this->categoryRepository->getByReference('tt_content', $referenceUid);

Classes/Controller/WidgetController.php

@@ -17,7 +17,6 @@
 use T3G\AgencyPack\Blog\Domain\Repository\TagRepository;
 use T3G\AgencyPack\Blog\Service\CacheService;
 use T3G\AgencyPack\Blog\Utility\ArchiveUtility;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
 class WidgetController extends ActionController
@@ -44,7 +43,8 @@ public function __construct(
 
     public function categoriesAction(): ResponseInterface
     {
-        $requestParameters = GeneralUtility::_GP('tx_blog_category');
+        // @todo allow post?
+        $requestParameters = $this->request->getQueryParams()['tx_blog_category'] ?? [];
         $currentCategory = 0;
         if (($requestParameters['category'] ?? null) !== null) {
             $currentCategory = (int)$requestParameters['category'];
@@ -60,7 +60,8 @@ public function categoriesAction(): ResponseInterface
 
     public function tagsAction(): ResponseInterface
     {
-        $requestParameters = GeneralUtility::_GP('tx_blog_tag');
+        // @todo allow post?
+        $requestParameters = $this->request->getQueryParams()['tx_blog_tag'] ?? [];
         $currentTag = 0;
         if (($requestParameters['tag'] ?? null) !== null) {
             $currentTag = (int)$requestParameters['tag'];

Classes/Domain/Factory/CommentFormFactory.php

@@ -10,6 +10,7 @@
 
 namespace T3G\AgencyPack\Blog\Domain\Factory;
 
+use Psr\Http\Message\ServerRequestInterface;
 use T3G\AgencyPack\Blog\Domain\Finisher\CommentFormFinisher;
 use T3G\AgencyPack\Blog\Domain\Validator\GoogleCaptchaValidator;
 use TYPO3\CMS\Core\Information\Typo3Version;
@@ -35,7 +36,7 @@
      * This example build a FormDefinition manually,
      * so $configuration and $prototypeName are unused.
      */
-    public function build(array $configuration, string $prototypeName = null): FormDefinition
+    public function build(array $configuration, ?string $prototypeName = null, ?ServerRequestInterface $request = null): FormDefinition
     {
         $prototypeName = 'standard';
         $formConfigurationService = GeneralUtility::makeInstance(ConfigurationService::class);
@@ -118,7 +119,7 @@
         return $form;
     }
 
     protected function getTypoScriptFrontendController(): TypoScriptFrontendController
     {
         return $GLOBALS['TSFE'];
     }

Classes/Domain/Finisher/CommentFormFinisher.php

@@ -16,9 +16,9 @@
 use T3G\AgencyPack\Blog\Notification\NotificationManager;
 use T3G\AgencyPack\Blog\Service\CacheService;
 use T3G\AgencyPack\Blog\Service\CommentService;
-use TYPO3\CMS\Core\Messaging\AbstractMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
+use TYPO3\CMS\Core\Type\ContextualFeedbackSeverity;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Service\ExtensionService;
@@ -36,17 +36,17 @@ class CommentFormFinisher extends AbstractFinisher
         CommentService::STATE_ERROR => [
             'title' => 'message.addComment.error.title',
             'text' => 'message.addComment.error.text',
-            'severity' => AbstractMessage::ERROR,
+            'severity' => ContextualFeedbackSeverity::ERROR,
         ],
         CommentService::STATE_MODERATION => [
             'title' => 'message.addComment.moderation.title',
             'text' => 'message.addComment.moderation.text',
-            'severity' => AbstractMessage::INFO,
+            'severity' => ContextualFeedbackSeverity::INFO,
         ],
         CommentService::STATE_SUCCESS => [
             'title' => 'message.addComment.success.title',
             'text' => 'message.addComment.success.text',
-            'severity' => AbstractMessage::OK,
+            'severity' => ContextualFeedbackSeverity::OK,
         ],
     ];
 

Classes/Domain/Model/Author.php

@@ -54,8 +54,10 @@ public function initializeObject(): void
 
     public function getAvatarProvider(): AvatarProviderInterface
     {
-        $avatarProvider = trim($this->avatarProvider) !== ''
-            ? GeneralUtility::makeInstance($this->avatarProvider)
+        /** @var class-string<object>|'' $avatarProviderClassName */
+        $avatarProviderClassName = trim($this->avatarProvider);
+        $avatarProvider = $avatarProviderClassName !== ''
+            ? GeneralUtility::makeInstance($avatarProviderClassName)
             : GeneralUtility::makeInstance(GravatarProvider::class);
 
         if (!$avatarProvider instanceof AvatarProviderInterface) {

Classes/Domain/Repository/PostRepository.php

@@ -405,7 +405,11 @@
             if ($i === $limit) {
                 break;
             }
-            $posts->attach($this->findByUid($selectedPost));
+            $post = $this->findByUid($selectedPost);
+            if ($post === null) {
+                continue;
+            }
+            $posts->attach($post);
             $i++;
         }
 
@@ -447,7 +451,7 @@
         return $pids;
     }
 
     protected function getTypoScriptFrontendController(): ?TypoScriptFrontendController
     {
         return $GLOBALS['TSFE'] ?? null;
     }

Classes/Domain/Validator/GoogleCaptchaValidator.php

@@ -19,13 +19,16 @@ class GoogleCaptchaValidator extends AbstractValidator
 {
     protected $acceptsEmptyValues = false;
 
-    public function isValid($value): void
+    public function isValid(mixed $value): void
     {
         $action = 'form';
         $controller = 'Comment';
         $settings = GeneralUtility::makeInstance(ConfigurationManagerInterface::class)
             ->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS, 'blog');
-        $requestData = GeneralUtility::_GPmerged('tx_blog_commentform');
+        $request = $this->request ?? $GLOBALS['TYPO3_REQUEST'];
+        $queryArguments = $request->getQueryParams();
+        $bodyData = $request->getParsedBody();
+        $requestData = $queryArguments['tx_blog_commentform'] ?? [];
 
         if (
             // this validator is called multiple times, if the first success,
@@ -41,7 +44,7 @@ public function isValid($value): void
                 'headers' => ['Content-type' => 'application/x-www-form-urlencoded'],
                 'query' => [
                     'secret' => $settings['comments']['google_recaptcha']['secret_key'],
-                    'response' => GeneralUtility::_GP('g-recaptcha-response'),
+                    'response' => $bodyData['g-recaptcha-response'] ?? '',
                     'remoteip' => GeneralUtility::getIndpEnv('REMOTE_ADDR')
                 ]
             ];