chore: update for TYPO3 v12 - remove deprecations, fix some issues, a…

…djust tests, convert fixtures
AOEpeople · Jun 27, 2024 · a585493 · a585493
1 parent ef645be
commit a585493
Show file tree

Hide file tree

Showing 24 changed files with 88 additions and 176 deletions.
diff --git a/.code-quality/phpstan-baseline.neon b/.code-quality/phpstan-baseline.neon
@@ -1,6 +1,21 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Call to an undefined method TYPO3Fluid\\\\Fluid\\\\View\\\\ViewInterface\\:\\:setTemplate\\(\\)\\.$#"
+			message: "#^Parameter \\#2 \\$conf of method TYPO3\\\\CMS\\\\Frontend\\\\ContentObject\\\\ContentObjectRenderer\\:\\:parseFunc\\(\\) expects non\\-empty\\-array\\<string, mixed\\>\\|null, array given\\.$#"
+			count: 1
+			path: ../Classes/Service/RenderingService.php
+
+		-
+			message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Core\\\\View\\\\ViewInterface\\:\\:setTemplate\\(\\)\\.$#"
+			count: 1
+			path: ../Classes/Typo3/Hook/LinkWizzard.php
+
+		-
+			message: "#^Call to method displayRecordsForPage\\(\\) on an unknown class TYPO3\\\\CMS\\\\Recordlist\\\\Browser\\\\RecordBrowser\\.$#"
+			count: 1
+			path: ../Classes/Typo3/Hook/LinkWizzard.php
+
+		-
+			message: "#^Class TYPO3\\\\CMS\\\\Recordlist\\\\Browser\\\\RecordBrowser not found\\.$#"
 			count: 1
 			path: ../Classes/Typo3/Hook/LinkWizzard.php
diff --git a/.code-quality/rector.php b/.code-quality/rector.php
@@ -9,7 +9,6 @@
 use Rector\Set\ValueObject\SetList;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\YieldDataProviderRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
-use Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
 use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictSetUpRector;
 
@@ -34,7 +33,6 @@
         PHPUnitSetList::PHPUNIT_CODE_QUALITY
     ])
     ->withSkip([
-        FinalizeClassesWithoutChildrenRector::class,
         ChangeAndIfToEarlyReturnRector::class,
         TypedPropertyFromStrictSetUpRector::class,
         AddMethodCallBasedStrictParamTypeRector::class,

diff --git a/Classes/Domain/Repository/FootnoteRepository.php b/Classes/Domain/Repository/FootnoteRepository.php
@@ -71,7 +71,7 @@ public function getLowestFreeIndexNumber(): int
                 $queryBuilder->expr()
                     ->eq('deleted', $queryBuilder->createNamedParameter(0, PDO::PARAM_INT))
             )
-            ->execute()
+            ->executeQuery()
             ->fetchAllAssociative();
 
         $index = 1;
@@ -120,6 +120,7 @@ public function getFootnoteByUid($uid)
         $query = $this->createQuery();
         $query->setQuerySettings($this->defaultQuerySettings);
 
+        /** @var Footnote */
         return $query->matching($query->equals('uid', $uid))
             ->execute()
             ->getFirst();

diff --git a/Classes/Service/FCEFootnoteService.php b/Classes/Service/FCEFootnoteService.php
@@ -35,11 +35,9 @@ class FCEFootnoteService
 {
     public ?ContentObjectRenderer $cObj = null;
 
-    private RenderingService $renderingService;
-
-    public function __construct(RenderingService $renderingService)
-    {
-        $this->renderingService = $renderingService;
+    public function __construct(
+        private RenderingService $renderingService
+    ) {
     }
 
     /**

diff --git a/Classes/Service/FootnoteService.php b/Classes/Service/FootnoteService.php
@@ -31,11 +31,9 @@
 
 class FootnoteService
 {
-    private FootnoteRepository $footnoteRepository;
-
-    public function __construct(FootnoteRepository $footnoteRepository)
-    {
-        $this->footnoteRepository = $footnoteRepository;
+    public function __construct(
+        private FootnoteRepository $footnoteRepository
+    ) {
     }
 
     /**

diff --git a/Classes/Service/RenderingService.php b/Classes/Service/RenderingService.php
@@ -43,11 +43,9 @@ class RenderingService implements SingletonInterface
 
     private ?ContentObjectRenderer $contentObjectRenderer = null;
 
-    private FootnoteRepository $footnoteRepository;
-
-    public function __construct(FootnoteRepository $footnoteRepository)
-    {
-        $this->footnoteRepository = $footnoteRepository;
+    public function __construct(
+        private FootnoteRepository $footnoteRepository
+    ) {
     }
 
     /**
@@ -87,7 +85,7 @@ public function renderFootnotes(array $uids, array $conf = []): ?string
      *                      of the object path "lib.parseFunc" will be retrieved and MERGED with what is in $conf!
      * @return string
      */
-    public function renderRichText($richText, array $conf = [], $ref = '< lib.parseFunc_HappyFeet')
+    public function renderRichText($richText, array $conf = [], ?string $ref = '< lib.parseFunc_HappyFeet')
     {
         if ($richText === '') {
             return '';

diff --git a/Classes/Typo3/Hook/LinkWizzard.php b/Classes/Typo3/Hook/LinkWizzard.php
@@ -18,14 +18,14 @@
  */
 
 use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Backend\Controller\AbstractLinkBrowserController;
+use TYPO3\CMS\Backend\LinkHandler\AbstractLinkHandler;
+use TYPO3\CMS\Backend\LinkHandler\LinkHandlerInterface;
+use TYPO3\CMS\Backend\Tree\View\LinkParameterProviderInterface;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\LinkHandling\LinkService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Recordlist\Browser\RecordBrowser;
-use TYPO3\CMS\Recordlist\Controller\AbstractLinkBrowserController;
-use TYPO3\CMS\Recordlist\LinkHandler\AbstractLinkHandler;
-use TYPO3\CMS\Recordlist\LinkHandler\LinkHandlerInterface;
-use TYPO3\CMS\Recordlist\Tree\View\LinkParameterProviderInterface;
 
 /**
  * Link handler for arbitrary database records
@@ -48,10 +48,9 @@ final class LinkWizzard extends AbstractLinkHandler implements LinkHandlerInterf
     /**
      * Initializes the handler.
      *
-     * @param mixed $identifier
      * @param array $configuration Page TSconfig
      */
-    public function initialize(AbstractLinkBrowserController $linkBrowser, $identifier, array $configuration): void
+    public function initialize(AbstractLinkBrowserController $linkBrowser, mixed $identifier, array $configuration): void
     {
         parent::initialize($linkBrowser, $identifier, $configuration);
         $this->configuration = $configuration;

diff --git a/Classes/Typo3/Hook/Tcemain.php b/Classes/Typo3/Hook/Tcemain.php
@@ -27,11 +27,9 @@
  */
 class Tcemain
 {
-    private FootnoteRepository $footnoteRepository;
-
-    public function __construct(FootnoteRepository $footnoteRepository)
-    {
-        $this->footnoteRepository = $footnoteRepository;
+    public function __construct(
+        private FootnoteRepository $footnoteRepository
+    ) {
     }
 
     /**

diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
@@ -8,13 +8,9 @@ services:
         resource: '../Classes/*'
 
     AOE\HappyFeet\Typo3\Hook\LinkRenderer:
-        public: true
 
     AOE\HappyFeet\Typo3\Hook\Tcemain:
-        public: true
 
     AOE\HappyFeet\Service\RenderingService:
-        public: true
 
     AOE\HappyFeet\Domain\Repository\FootnoteRepository:
-        public: true
diff --git a/Configuration/TCA/tx_happyfeet_domain_model_footnote.php b/Configuration/TCA/tx_happyfeet_domain_model_footnote.php
@@ -24,8 +24,14 @@
                 'foreign_table'       => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items'               => [
-                    ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
-                    ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
+                    [
+                        'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
+                        'value' => -1,
+                    ],
+                    [
+                        'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value',
+                        'value' => 0,
+                    ],
                 ]
             ]
         ],
@@ -37,7 +43,10 @@
                 'type'        => 'select',
                 'renderType'  => 'selectSingle',
                 'items'       => [
-                    ['', 0],
+                    [
+                        'label' => '',
+                        'value' => 0,
+                    ],
                 ],
                 'foreign_table'       => 'tx_happyfeet_domain_model_footnote',
                 'foreign_table_where' => 'AND tx_happyfeet_domain_model_footnote.pid=###CURRENT_PID### AND tx_happyfeet_domain_model_footnote.sys_language_uid IN (-1,0)',
@@ -62,7 +71,7 @@
             'label'   => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config'  => [
                 'type'       => 'input',
-                'renderType' => 'inputDateTime',
+                'renderType' => 'datetime',
                 'size'       => '8',
                 'eval'       => 'date',
                 'default'    => '0',
@@ -74,7 +83,7 @@
             'label'   => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'config'  => [
                 'type'       => 'input',
-                'renderType' => 'inputDateTime',
+                'renderType' => 'datetime',
                 'size'       => '8',
                 'eval'       => 'date',
                 'checkbox'   => '0',
@@ -93,10 +102,11 @@
         'title' => [
             'exclude' => 0,
             'label'   => 'LLL:EXT:happy_feet/Resources/Private/Language/locallang_db.xlf:tx_happyfeet_domain_model_footnote.title',
+            'required' => true,
             'config'  => [
                 'type' => 'input',
                 'size' => 30,
-                'eval' => 'trim,required,unique'
+                'eval' => 'trim,unique'
             ]
         ],
         'header' => [
@@ -111,11 +121,11 @@
         'description' => [
             'exclude' => 0,
             'label'   => 'LLL:EXT:happy_feet/Resources/Private/Language/locallang_db.xlf:tx_happyfeet_domain_model_footnote.description',
+            'required' => true,
             'config'  => [
                 'type' => 'text',
                 'cols' => '30',
                 'rows' => '5',
-                'eval' => 'required',
                 'enableRichtext' => true
             ],
         ]

diff --git a/Tests/Functional/Domain/Repository/FootnoteRepositoryTest.php b/Tests/Functional/Domain/Repository/FootnoteRepositoryTest.php
@@ -63,43 +63,43 @@ public function testShouldGetDefaultIndexWhenNoRecordsAvailable(): void
 
     public function testShouldGetLowestIndex(): void
     {
-        $this->importDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote.xml');
+        $this->importCSVDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote.csv');
         $lowestIndex = $this->repository->getLowestFreeIndexNumber();
         $this->assertSame(1, $lowestIndex);
     }
 
     public function testShouldGetIndexWithGap(): void
     {
-        $this->importDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote_gap.xml');
+        $this->importCSVDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote_gap.csv');
         $lowestIndex = $this->repository->getLowestFreeIndexNumber();
         $this->assertSame(2, $lowestIndex);
     }
 
     public function testShouldGetNextIndexInRow(): void
     {
-        $this->importDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote_row.xml');
+        $this->importCSVDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote_row.csv');
         $lowestIndex = $this->repository->getLowestFreeIndexNumber();
         $this->assertSame(3, $lowestIndex);
     }
 
     public function testShouldGetFootnoteByUid(): void
     {
-        $this->importDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote.xml');
+        $this->importCSVDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote.csv');
         $footnote = $this->repository->getFootnoteByUid(1);
         $this->assertInstanceOf(Footnote::class, $footnote);
         $this->assertSame(1, $footnote->getUid());
     }
 
     public function testShouldReturnNullIfFootnoteNotFound(): void
     {
-        $this->importDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote.xml');
+        $this->importCSVDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote.csv');
         $footnote = $this->repository->getFootnoteByUid(99);
         $this->assertNull($footnote);
     }
 
     public function testShouldGetFootnotesByUids(): void
     {
-        $this->importDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote_collection.xml');
+        $this->importCSVDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote_collection.csv');
         $footnotes = $this->repository->getFootnotesByUids([2, 4]);
         $this->assertCount(2, $footnotes);
         $this->assertSame(2, $footnotes[0]->getUid());
@@ -108,7 +108,7 @@ public function testShouldGetFootnotesByUids(): void
 
     public function testShouldSortFootnotesByGivenOrderOfUids(): void
     {
-        $this->importDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote_collection.xml');
+        $this->importCSVDataSet(__DIR__ . '/fixtures/tx_happyfeet_domain_model_footnote_collection.csv');
         $footnotes = $this->repository->getFootnotesByUids([4, 1, 5, 3, 2]);
         $this->assertCount(5, $footnotes);
         $this->assertSame(4, $footnotes[0]->getUid());
@@ -134,7 +134,7 @@ public function testShouldAddObject(): void
         try {
             $footnote = new Footnote();
             $this->repository->add($footnote);
-        } catch (Throwable $throwable) {
+        } catch (Throwable) {
             $this->fail('assert that no exception is thrown.');
         }
 

diff --git a/Tests/Functional/Domain/Repository/fixtures/tx_happyfeet_domain_model_footnote.csv b/Tests/Functional/Domain/Repository/fixtures/tx_happyfeet_domain_model_footnote.csv
@@ -0,0 +1,3 @@
+tx_happyfeet_domain_model_footnote,,,,,,,,
+,uid,pid,l18n_diffsource,index_number,title,header,description,deleted
+,1,1,,2,0,test,,0
diff --git a/Tests/Functional/Domain/Repository/fixtures/tx_happyfeet_domain_model_footnote.xml b/Tests/Functional/Domain/Repository/fixtures/tx_happyfeet_domain_model_footnote.xml
diff --git a/...s/Functional/Domain/Repository/fixtures/tx_happyfeet_domain_model_footnote_collection.csv b/...s/Functional/Domain/Repository/fixtures/tx_happyfeet_domain_model_footnote_collection.csv
@@ -0,0 +1,8 @@
+tx_happyfeet_domain_model_footnote,,,,,,,,
+,uid,pid,l18n_diffsource,index_number,title,header,description,deleted
+,1,1,,1,0,,,0
+,2,1,,2,0,,,0
+,3,1,,2,0,,,0
+,4,1,,2,0,,,0
+,5,1,,2,0,,,0
+,6,1,,2,0,,,0