Merge branch 'main' into feature/recordTitleProvider

Author: linawolf

Build/Scripts/runTests.sh

@@ -139,7 +139,6 @@ Options:
             - composer: "composer" with all remaining arguments dispatched.
             - composerNormalize: "composer normalize"
             - composerUpdate: "composer update", handy if host has no PHP
-            - composerUpdateRector: "composer update", for rector subdirectory
             - composerValidate: "composer validate"
             - functional: PHP functional tests
             - lint: PHP linting
@@ -454,18 +453,6 @@ case ${TEST_SUITE} in
         cp ${ROOT_DIR}/composer.json ${ROOT_DIR}/composer.json.testing
         mv ${ROOT_DIR}/composer.json.orig ${ROOT_DIR}/composer.json
         ;;
-    composerUpdateRector)
-        rm -rf Build/rector/.Build/bin/ Build/rector/.Build/vendor Build/rector/composer.lock
-        cp ${ROOT_DIR}/Build/rector/composer.json ${ROOT_DIR}/Build/rector/composer.json.orig
-        if [ -f "${ROOT_DIR}/Build/rector/composer.json.testing" ]; then
-            cp ${ROOT_DIR}/Build/rector/composer.json ${ROOT_DIR}/Build/rector/composer.json.orig
-        fi
-        COMMAND=(composer require --working-dir=${ROOT_DIR}/Build/rector --no-ansi --no-interaction --no-progress)
-        ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-install-${SUFFIX} -e COMPOSER_CACHE_DIR=.Build/.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} "${COMMAND[@]}"
-        SUITE_EXIT_CODE=$?
-        cp ${ROOT_DIR}/Build/rector/composer.json ${ROOT_DIR}/Build/rector/composer.json.testing
-        mv ${ROOT_DIR}/Build/rector/composer.json.orig ${ROOT_DIR}/Build/rector/composer.json
-        ;;
     composerValidate)
         COMMAND=(composer validate "$@")
         ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-command-${SUFFIX} -e COMPOSER_CACHE_DIR=.Build/.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} "${COMMAND[@]}"
@@ -524,9 +511,9 @@ case ${TEST_SUITE} in
         ;;
     rector)
         if [ "${CGLCHECK_DRY_RUN}" -eq 1 ]; then
-            COMMAND=(php -dxdebug.mode=off Build/rector/.Build/bin/rector -n --config=Build/rector/rector.php --clear-cache "$@")
+            COMMAND=(php -dxdebug.mode=off .Build/bin/rector -n --config=Build/rector/rector.php --clear-cache "$@")
         else
-            COMMAND=(php -dxdebug.mode=off Build/rector/.Build/bin/rector --config=Build/rector/rector.php --clear-cache "$@")
+            COMMAND=(php -dxdebug.mode=off .Build/bin/rector --config=Build/rector/rector.php --clear-cache "$@")
         fi
         ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name rector-${SUFFIX} -e COMPOSER_CACHE_DIR=.Build/.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} "${COMMAND[@]}"
         SUITE_EXIT_CODE=$?

Build/rector/composer.json

@@ -64,7 +64,7 @@ public function __construct(
 
     public function addPopulateButton(ButtonBar $buttonBar): void
     {
-        $populateButton = $buttonBar->makeLinkButton()
+        $populateButton = $this->componentFactory->createLinkButton()
             ->setHref($this->uriBuilder->reset()->uriFor('populate'))
             ->setTitle('Create example data')
             ->setShowLabelText(true)
@@ -235,13 +235,13 @@ private function modifyDocHeaderComponent(ModuleTemplate $view, string &$context
 
         $metaInformation = $this->getMetaInformation();
         if (is_array($metaInformation)) {
-            $view->getDocHeaderComponent()->setMetaInformation($metaInformation);
+            $view->getDocHeaderComponent()->setPageBreadcrumb($metaInformation);
         }
     }
 
     private function addReloadButton(ButtonBar $buttonBar): void
     {
-        $reloadButton = $buttonBar->makeLinkButton()
+        $reloadButton = $this->componentFactory->createLinkButton()
             ->setHref($this->request->getAttribute('normalizedParams')->getRequestUri())
             ->setTitle($this->getLanguageService()->sL('core.core:labels.reload'))
             ->setIcon($this->iconFactory->getIcon('actions-refresh', IconSize::SMALL));
@@ -250,7 +250,7 @@ private function addReloadButton(ButtonBar $buttonBar): void
 
     private function addShortCutButton(ButtonBar $buttonBar): void
     {
-        $shortcutButton = $buttonBar->makeShortcutButton()
+        $shortcutButton = $this->componentFactory->createShortcutButton()
             ->setRouteIdentifier('blog_example')
             ->setDisplayName($this->getLanguageService()->sL('blog_example.messages:administration.menu.index'));
         $buttonBar->addButton($shortcutButton, ButtonBar::BUTTON_POSITION_RIGHT);
@@ -280,12 +280,12 @@ private function buildMenu(ModuleTemplate $view, string &$context): Menu
         //$menu = $this->componentFactory->createMenu();
         //$menu->setIdentifier('viewSelector')->setLabel('View');
 
-        $menu = $view->getDocHeaderComponent()->getMenuRegistry()->makeMenu();
+        $menu = $this->componentFactory->createMenu();
         $menu->setIdentifier('BlogExampleModuleMenu')->setLabel('View');
 
         foreach ($menuItems as $menuItemConfig) {
             $isActive = $this->request->getControllerActionName() === $menuItemConfig['action'];
-            $menuItem = $menu->makeMenuItem()
+            $menuItem = $this->componentFactory->createMenuItem()
                 ->setTitle($menuItemConfig['label'])
                 ->setHref($this->uriBuilder->reset()->uriFor(
                     $menuItemConfig['action'],

Classes/Controller/AbstractController.php

@@ -27,12 +27,14 @@
 use TYPO3\CMS\Core\Type\ContextualFeedbackSeverity;
 use TYPO3\CMS\Extbase\Attribute\IgnoreValidation;
 use TYPO3\CMS\Extbase\Attribute\Validate;
+use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Pagination\QueryResultPaginator;
+use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
 /**
  * The blog controller for the BlogExample extension
  */
-class BlogController extends AbstractController
+class BlogController extends ActionController
 {
     /**
      * BlogController constructor.
@@ -77,9 +79,10 @@ public function helloWorldAction(): ResponseInterface
     /**
      * Displays a form for creating a new blog
      */
-    #[IgnoreValidation(['value' => 'newBlog'])]
-    public function newAction(?Blog $newBlog = null): ResponseInterface
-    {
+    public function newAction(
+        #[IgnoreValidation]
+        ?Blog $newBlog = null,
+    ): ResponseInterface {
         $this->view->assignMultiple([
             'newBlog' => $newBlog,
             'administrators' => $this->administratorRepository->findAll(),
@@ -93,9 +96,10 @@ public function newAction(?Blog $newBlog = null): ResponseInterface
      * $blog is a fresh Blog object which has not yet been added to the
      * repository
      */
-    #[Validate(['param' => 'newBlog', 'validator' => BlogValidator::class])]
-    public function createAction(Blog $newBlog): ResponseInterface
-    {
+    public function createAction(
+        #[Validate(validator: BlogValidator::class)]
+        Blog $newBlog,
+    ): ResponseInterface {
         $this->checkBlogAdminAccess();
         $this->blogRepository->add($newBlog);
         $this->addFlashMessage('created');
@@ -109,9 +113,10 @@ public function createAction(Blog $newBlog): ResponseInterface
      * modifications if the edit form has been submitted, contained errors and
      * therefore ended up in this action again.
      */
-    #[IgnoreValidation(['value' => 'blog'])]
-    public function editAction(Blog $blog): ResponseInterface
-    {
+    public function editAction(
+        #[IgnoreValidation]
+        Blog $blog,
+    ): ResponseInterface {
         $this->view->assignMultiple([
             'blog' => $blog,
             'administrators' => $this->administratorRepository->findAll(),
@@ -127,9 +132,10 @@ public function editAction(Blog $blog): ResponseInterface
      *
      * @throws NoBlogAdminAccessException
      */
-    #[Validate(['param' => 'blog', 'validator' => BlogValidator::class])]
-    public function updateAction(Blog $blog): ResponseInterface
-    {
+    public function updateAction(
+        #[Validate(validator: BlogValidator::class)]
+        Blog $blog,
+    ): ResponseInterface {
         $this->checkBlogAdminAccess();
         $this->blogRepository->update($blog);
         $this->addFlashMessage('updated');
@@ -180,4 +186,34 @@ public function showBlogAjaxAction(Blog $blog): ResponseInterface
         $jsonOutput = json_encode($blog);
         return $this->jsonResponse($jsonOutput);
     }
+    /**
+     * Override getErrorFlashMessage to present
+     * nice flash error messages.
+     */
+    protected function getErrorFlashMessage(): string
+    {
+        $defaultFlashMessage = parent::getErrorFlashMessage();
+        $locallangKey = sprintf(
+            'error.%s.%s',
+            $this->request->getControllerName(),
+            $this->actionMethodName,
+        );
+        return LocalizationUtility::translate($locallangKey, 'BlogExample') ?? $defaultFlashMessage;
+    }
+
+    protected function hasBlogAdminAccess(): bool
+    {
+        // TODO access protection
+        return true;
+    }
+
+    /**
+     * @throws NoBlogAdminAccessException
+     */
+    protected function checkBlogAdminAccess(): void
+    {
+        if (!$this->hasBlogAdminAccess()) {
+            throw new NoBlogAdminAccessException();
+        }
+    }
 }

Classes/Controller/BackendController.php

@@ -12,7 +12,9 @@
 use T3docs\BlogExample\Exception\NoBlogAdminAccessException;
 use T3docs\BlogExample\Property\TypeConverters\HiddenCommentConverter;
 use TYPO3\CMS\Core\Type\ContextualFeedbackSeverity;
+use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException;
+use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -30,7 +32,7 @@
 /**
  * The comment controller for the BlogExample extension
  */
-class CommentController extends AbstractController
+class CommentController extends ActionController
 {
     /**
      * CommentController constructor.
@@ -109,4 +111,34 @@ public function deleteAllAction(Post $post): ResponseInterface
             ['post' => $post, 'blog' => $post->getBlog()],
         );
     }
+    /**
+     * Override getErrorFlashMessage to present
+     * nice flash error messages.
+     */
+    protected function getErrorFlashMessage(): string
+    {
+        $defaultFlashMessage = parent::getErrorFlashMessage();
+        $locallangKey = sprintf(
+            'error.%s.%s',
+            $this->request->getControllerName(),
+            $this->actionMethodName,
+        );
+        return LocalizationUtility::translate($locallangKey, 'BlogExample') ?? $defaultFlashMessage;
+    }
+
+    protected function hasBlogAdminAccess(): bool
+    {
+        // TODO access protection
+        return true;
+    }
+
+    /**
+     * @throws NoBlogAdminAccessException
+     */
+    protected function checkBlogAdminAccess(): void
+    {
+        if (!$this->hasBlogAdminAccess()) {
+            throw new NoBlogAdminAccessException();
+        }
+    }
 }