[TASK] TYPO3 v12 compatibility

ref #21
cdaecke · Sep 20, 2023 · 178cf2d · 178cf2d
1 parent a54bc55
commit 178cf2d
Show file tree

Hide file tree

Showing 18 changed files with 66 additions and 200 deletions.
diff --git a/Classes/Controller/NewsAuthorController.php b/Classes/Controller/NewsAuthorController.php
@@ -31,6 +31,7 @@
 use GeorgRinger\NumberedPagination\NumberedPagination;
 use Mediadreams\MdNewsAuthor\Domain\Repository\NewsAuthorRepository;
 use Mediadreams\MdNewsAuthor\Domain\Repository\NewsRepository;
+use Psr\Http\Message\ResponseInterface;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Pagination\QueryResultPaginator;
 
@@ -73,9 +74,10 @@ public function __construct(
      *
      * @param string $selectedLetter
      * @param int $currentPage
-     * @return void
+     * @return ResponseInterface
+     * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
      */
-    public function listAction($selectedLetter = "", int $currentPage = 1)
+    public function listAction($selectedLetter = "", int $currentPage = 1): ResponseInterface
     {
         // get all authors
         // we need all authors all the time because the alphabetical filter needs them as well
@@ -109,16 +111,18 @@ public function listAction($selectedLetter = "", int $currentPage = 1)
             $this->settings['authorList']['paginate']['itemsPerPage'],
             $this->settings['authorList']['paginate']['maximumNumberOfLinks']
         );
+
+        return $this->htmlResponse();
     }
 
     /**
      * action show
      *
      * @param \Mediadreams\MdNewsAuthor\Domain\Model\NewsAuthor|null $newsAuthor
+     * @return ResponseInterface
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
-     * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      */
-    public function showAction(\Mediadreams\MdNewsAuthor\Domain\Model\NewsAuthor $newsAuthor = null)
+    public function showAction(\Mediadreams\MdNewsAuthor\Domain\Model\NewsAuthor $newsAuthor = null): ResponseInterface
     {
         if ($newsAuthor != null) {
             // write page title
@@ -143,6 +147,8 @@ public function showAction(\Mediadreams\MdNewsAuthor\Domain\Model\NewsAuthor $ne
                 $this->redirectToUri($uri, 0, 308);
             }
         }
+
+        return $this->htmlResponse();
     }
 
     /**

diff --git a/Classes/Domain/Repository/NewsAuthorRepository.php b/Classes/Domain/Repository/NewsAuthorRepository.php
@@ -81,21 +81,22 @@ public function getAuthorsByCategories($categories = '', $initial = '')
             $categories = \TYPO3\CMS\Core\Utility\GeneralUtility::intExplode(',', $categories, true);
         }
 
+        $categoryConstraints = [];
         foreach ($categories as $category) {
             $categoryConstraints[] = $query->contains('categories', $category);
         }
 
-        $constraint[] = $query->logicalOr($categoryConstraints);
+        if (count($categoryConstraints) > 0) {
+            $constraint[] = $query->logicalOr(...$categoryConstraints);
+        }
 
         if (!empty($initial)) {
-            $constraint[] = $query->logicalAnd(
-                $query->like('lastname', $initial . '%')
-            );
+            $constraint[] = $query->logicalAnd($query->like('lastname', $initial . '%'));
         }
 
         if (!empty($constraint)) {
             $query->matching(
-                $query->logicalAnd($constraint)
+                $query->logicalAnd(...$constraint)
             );
         }
 

diff --git a/Classes/Domain/Repository/NewsRepository.php b/Classes/Domain/Repository/NewsRepository.php
@@ -71,9 +71,12 @@ public function getNewsByAuthor(int $authorUid)
     {
         $query = $this->createQuery();
         $query->matching(
-            $query->logicalAnd([
-                $query->equals('newsAuthor.uid', (int)$authorUid),
-            ])
+            $query->logicalAnd(
+                ...
+                [
+                    $query->equals('newsAuthor.uid', (int)$authorUid),
+                ]
+            )
         );
 
         return $query->execute();

diff --git a/Configuration/TCA/Overrides/sys_category.php b/Configuration/TCA/Overrides/sys_category.php
diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php
@@ -1,5 +1,5 @@
 <?php
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
 
 /**
  * Add static template

diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -1,5 +1,5 @@
 <?php
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
 
 /**
  * Add new select group for list_type
@@ -25,7 +25,7 @@
  */
 foreach ($plugins as $plugin) {
     \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-        'Mediadreams.md_news_author',
+        'md_news_author',
         ucfirst($plugin),
         'LLL:EXT:md_news_author/Resources/Private/Language/locallang.xlf:plugin.' . $plugin . '.title',
         'EXT:md_news_author/Resources/Public/Icons/tx_mdnewsauthor_domain_model_newsauthor.svg',

diff --git a/Configuration/TCA/Overrides/tx_mdnewsauthor_domain_model_newsauthor.php b/Configuration/TCA/Overrides/tx_mdnewsauthor_domain_model_newsauthor.php
diff --git a/Configuration/TCA/Overrides/tx_news_domain_model_news.php b/Configuration/TCA/Overrides/tx_news_domain_model_news.php
@@ -1,5 +1,5 @@
 <?php
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
 
 
 $tmp_news_author_columns = [

diff --git a/Configuration/TCA/tx_mdnewsauthor_domain_model_newsauthor.php b/Configuration/TCA/tx_mdnewsauthor_domain_model_newsauthor.php
@@ -1,5 +1,7 @@
 <?php
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
+
+$versionInformation = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Information\Typo3Version::class);
 
 return [
     'ctrl' => [
@@ -10,7 +12,7 @@
         'default_sortby' => 'lastname',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
-        'cruser_id' => 'cruser_id',
+        'cruser_id' => 'cruser_id', // TODO: Remove as soon as TYPO3 v11 is not supported anymore
         'dividers2tabs' => TRUE,
         'versioningWS' => TRUE,
         'languageField' => 'sys_language_uid',
@@ -22,6 +24,9 @@
             'starttime' => 'starttime',
             'endtime' => 'endtime',
         ],
+        'security' => [
+            'ignorePageTypeRestriction' => true,
+        ],
         'searchFields' => 'title,firstname,lastname,bio,image,',
         'iconfile' => 'EXT:md_news_author/Resources/Public/Icons/tx_mdnewsauthor_domain_model_newsauthor.svg'
     ],
@@ -83,17 +88,7 @@
             'exclude' => true,
             'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
-                'type' => 'select',
-                'renderType' => 'selectSingle',
-                'special' => 'languages',
-                'items' => [
-                    [
-                        'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
-                        -1,
-                        'flags-multiple'
-                    ],
-                ],
-                'default' => 0,
+                'type' => 'language'
             ],
         ],
         'l10n_parent' => [
@@ -127,6 +122,16 @@
             'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
+                'renderType' => 'checkboxToggle',
+                'default' => 0,
+                'items' => $versionInformation->getMajorVersion() < 12 ? [
+                    [
+                        0 => '',
+                        1 => '',
+                    ],
+                ] : [
+                    ['label' => '', 'value' => ''],
+                ],
             ],
         ],
         'starttime' => [
@@ -136,7 +141,7 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'size' => 13,
-                'eval' => 'datetime',
+                'eval' => 'datetime,int',
                 'default' => 0,
                 'behaviour' => [
                     'allowLanguageSynchronization' => true
@@ -150,7 +155,7 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'size' => 13,
-                'eval' => 'datetime',
+                'eval' => 'datetime,int',
                 'default' => 0,
                 'range' => [
                     'upper' => mktime(0, 0, 0, 1, 1, 2038)
@@ -169,7 +174,7 @@
                 'renderType' => 'selectSingle',
                 'size' => 1,
                 'items' => [
-                    ['-', ''],
+                    ['label' => '-', 'value' => ''],
                     ['LLL:EXT:md_news_author/Resources/Private/Language/locallang_db.xlf:tx_mdnewsauthor_domain_model_newsauthor.gender.female', 'f'],
                     ['LLL:EXT:md_news_author/Resources/Private/Language/locallang_db.xlf:tx_mdnewsauthor_domain_model_newsauthor.gender.male', 'm'],
                 ]
@@ -251,9 +256,9 @@
             'exclude' => true,
             'label' => 'LLL:EXT:md_news_author/Resources/Private/Language/locallang_db.xlf:tx_mdnewsauthor_domain_model_newsauthor.email',
             'config' => [
-                'type' => 'input',
+                'type' => 'input', // TODO: change to `email` as soon, as TYPO3 v11 is not supported anymore
                 'size' => 30,
-                'eval' => 'trim,email'
+                'eval' => 'trim,email' // TODO: remove `email` as soon, as TYPO3 v11 is not supported anymore
             ],
         ],
         'www' => [
@@ -383,6 +388,11 @@
                 ],
             ],
         ],
-
+        'categories' => [
+            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.category',
+            'config' => [
+                'type' => 'category'
+            ]
+        ]
     ],
 ];
diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@ author which also shows the news records of the selected author.
 
 ## Requirements
 
-- TYPO3 >= 10.4
-- ext:news >= 7.0
-- ext:numbered_pagination >= 1.0
+- TYPO3 >= 11.5
+- ext:news >= 9.0
+- ext:numbered_pagination >= 1.0.1
 
 ### Installation
 

diff --git a/Resources/Private/Language/de.locallang_csh_tx_mdnewsauthor_domain_model_newsauthor.xlf b/Resources/Private/Language/de.locallang_csh_tx_mdnewsauthor_domain_model_newsauthor.xlf
diff --git a/Resources/Private/Language/de.locallang_csh_tx_news_domain_model_news.xlf b/Resources/Private/Language/de.locallang_csh_tx_news_domain_model_news.xlf
diff --git a/Resources/Private/Language/locallang_csh_tx_mdnewsauthor_domain_model_newsauthor.xlf b/Resources/Private/Language/locallang_csh_tx_mdnewsauthor_domain_model_newsauthor.xlf