[TASK] cleanup code for TYPO3 > 12

Author: achimfritz

Classes/Backend/ContextMenu/RecordContextMenuItemProvider.php

@@ -9,29 +9,28 @@
 
 class RecordContextMenuItemProvider extends \TYPO3\CMS\Backend\ContextMenu\ItemProviders\RecordProvider
 {
+    public function __construct(protected UriBuilder $uriBuilder)
+    {
+        parent::__construct();
+    }
+
     /**
      * Add tx_container_parent to newContentElementWizard Url if it is a tt_content record in a container
-     *
-     * @param string $itemName
-     *
-     * @return array
-     * @throws \TYPO3\CMS\Backend\Routing\Exception\RouteNotFoundException
      */
     protected function getAdditionalAttributes(string $itemName): array
     {
         $attributes = parent::getAdditionalAttributes($itemName);
         if ($itemName === 'newWizard' && $this->table === 'tt_content'
             && isset($this->record['tx_container_parent']) && $this->record['tx_container_parent'] > 0) {
-            $languageField = method_exists($this, 'getLanguageField') ? $this->getLanguageField() : $GLOBALS['TCA']['tt_content']['ctrl']['languageField'];
+            $languageField = $this->getLanguageField();
             $urlParameters = [
                 'id' => $this->record['pid'],
                 'sys_language_uid' => $this->record[$languageField] ?? null,
                 'colPos' => $this->record['colPos'],
                 'uid_pid' => -$this->record['uid'],
                 'tx_container_parent' => $this->record['tx_container_parent'],
             ];
-            $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
-            $url = (string)$uriBuilder->buildUriFromRoute('new_content_element_wizard', $urlParameters);
+            $url = (string)$this->uriBuilder->buildUriFromRoute('new_content_element_wizard', $urlParameters);
             if (isset($attributes['data-new-wizard-url'])) {
                 $attributes['data-new-wizard-url'] = $url;
             }

Tests/Unit/Tca/RegistryTest.php

@@ -13,32 +13,33 @@
  */
 
 use B13\Container\Tca\Registry;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\CMS\Core\EventDispatcher\NoopEventDispatcher;
+use TYPO3\CMS\Core\Imaging\IconRegistry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 class RegistryTest extends UnitTestCase
 {
     protected bool $resetSingletonInstances = true;
 
-    /**
-     * @test
-     */
+
+    #[Test]
     public function getAllAvailableColumnsReturnsEmptyArrayIfNoContainerConfigured(): void
     {
         $eventDispatcher = new NoopEventDispatcher();
-        $registry = GeneralUtility::makeInstance(Registry::class, $eventDispatcher);
+        $iconRegistry = $this->getMockBuilder(IconRegistry::class)->disableOriginalConstructor()->getMock();
+        $registry = GeneralUtility::makeInstance(Registry::class, $eventDispatcher, $iconRegistry);
         $columns = $registry->getAllAvailableColumns();
         self::assertSame([], $columns);
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function getPageTsStringReturnsEmptyStringIfNoContainerConfigured(): void
     {
         $eventDispatcher = new NoopEventDispatcher();
-        $registry = GeneralUtility::makeInstance(Registry::class, $eventDispatcher);
+        $iconRegistry = $this->getMockBuilder(IconRegistry::class)->disableOriginalConstructor()->getMock();
+        $registry = GeneralUtility::makeInstance(Registry::class, $eventDispatcher, $iconRegistry);
         $res = $registry->getPageTsString();
         self::assertSame('', $res, 'empty string should be returned');
     }