Fix code for TYPO3 12

subugoe · Feb 27, 2025 · a36b01a · a36b01a
1 parent 6d36af5
commit a36b01a
Show file tree

Hide file tree

Showing 77 changed files with 814 additions and 1,688 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,9 +11,8 @@ jobs:
       fail-fast: false
       matrix:
         env:
-          - { php: 8.0 }
-          - { php: 8.1 }
           - { php: 8.2 }
+          - { php: 8.3 }
 
     env: ${{ matrix.env }}
 
@@ -42,7 +41,6 @@ jobs:
 
       - name: Check coding style
         run: composer lint
-        if: ${{ matrix.env.php == '8.1' }}
 
       - name: Run Unit Tests
         run: |

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -1,13 +1,13 @@
 <?php
+use TYPO3\CodingStandards\CsFixerConfig;
 
 $finder = PhpCsFixer\Finder::create()
     ->exclude('vendor')
     ->exclude('node_modules')
     ->in(__DIR__);
 
-return (new PhpCsFixer\Config)
-    ->setRules([
-        '@Symfony' => true,
-        'array_syntax' => ['syntax' => 'short'],
-    ])
+
+$config = CsFixerConfig::create();
+
+return $config
     ->setFinder($finder);
diff --git a/.php-version b/.php-version
@@ -1 +1 @@
-8.1
+8.2
diff --git a/Classes/Controller/SearchController.php b/Classes/Controller/SearchController.php
@@ -48,12 +48,9 @@ class SearchController extends ActionController
 
     protected ?object $searchProvider = null;
 
-    private LoggerInterface $logger;
+    private readonly LoggerInterface $logger;
 
-    public function __construct(LogManagerInterface $logManager)
-    {
-        $this->logger = $logManager->getLogger('find');
-    }
+    public function __construct(private readonly LogManagerInterface $logManager, private readonly AssetCollector $assetCollector) {}
 
     /**
      * @throws NoSuchArgumentException
@@ -68,12 +65,11 @@ public function detailAction(string $id): ResponseInterface
             $underlyingQueryScriptTagContent = FrontendUtility::addQueryInformationAsJavaScript(
                 $underlyingQueryInfo['q'],
                 $this->settings,
-                (int) $underlyingQueryInfo['position'],
+                (int)$underlyingQueryInfo['position'],
                 $arguments
             );
 
-            GeneralUtility::makeInstance(AssetCollector::class)
-                ->addInlineJavaScript('underlyingQueryVar', $underlyingQueryScriptTagContent, ['type' => 'text/javascript'], ['priority' => true]);
+            $this - \ASSETCOLLECTOR->addInlineJavaScript('underlyingQueryVar', $underlyingQueryScriptTagContent, ['type' => 'text/javascript'], ['priority' => true]);
         }
 
         $this->addStandardAssignments();
@@ -87,9 +83,6 @@ public function detailAction(string $id): ResponseInterface
         return $this->htmlResponse();
     }
 
-    /**
-     * Index Action.
-     */
     public function indexAction(): ResponseInterface
     {
         if (array_key_exists('id', $this->requestArguments)) {
@@ -158,7 +151,7 @@ protected function addStandardAssignments(): void
         $this->searchProvider->setConfigurationValue('extendedSearch', $this->searchProvider->isExtendedSearch());
         $this->searchProvider->setConfigurationValue(
             'uid',
-            $this->configurationManager->getContentObject()->data['uid']
+            $this->request->getAttribute('currentContentObject')->data['uid']
         );
         $this->searchProvider->setConfigurationValue('prefixID', 'tx_find_find');
         $this->searchProvider->setConfigurationValue('pageTitle', $GLOBALS['TSFE']->page['title']);
@@ -172,8 +165,11 @@ protected function initializeConnection($activeConnection): void
         $connectionConfiguration = $this->settings['connections'][$activeConnection];
 
         /* @var ServiceProviderInterface $searchProvider */
-        $this->searchProvider = GeneralUtility::makeInstance($connectionConfiguration['provider'], $activeConnection,
-            $this->settings);
+        $this->searchProvider = GeneralUtility::makeInstance(
+            $connectionConfiguration['provider'],
+            $activeConnection,
+            $this->settings
+        );
         $this->searchProvider->connect();
     }
 }
diff --git a/Classes/Hooks/RealUrl.php b/Classes/Hooks/RealUrl.php
diff --git a/Classes/Service/AbstractServiceProvider.php b/Classes/Service/AbstractServiceProvider.php
@@ -28,10 +28,7 @@ public function getRequestArguments()
         return $this->requestArguments;
     }
 
-    /**
-     * @param array $requestArguments
-     */
-    public function setRequestArguments($requestArguments)
+    public function setRequestArguments(array $requestArguments)
     {
         $this->requestArguments = $requestArguments;
     }

diff --git a/Classes/Service/ServiceProviderInterface.php b/Classes/Service/ServiceProviderInterface.php
@@ -46,44 +46,17 @@ public function getRequestArguments();
 
     public function isExtendedSearch();
 
-    /**
-     * @param $query
-     *
-     * @return mixed
-     */
     public function search($query);
 
-    /**
-     * @param string $actionName
-     */
-    public function setAction($actionName);
-
-    /**
-     * @param $key
-     * @param $value
-     *
-     * @return mixed
-     */
+    public function setAction(string $actionName);
+
     public function setConfigurationValue($key, $value);
 
-    /**
-     * @param string $key
-     */
-    public function setControllerExtensionKey($key);
+    public function setControllerExtensionKey(string $key);
 
     public function setCounter();
 
-    /**
-     * @param array $requestArguments
-     *
-     * @return mixed
-     */
-    public function setRequestArguments($requestArguments);
-
-    /**
-     * @param $settings
-     *
-     * @return mixed
-     */
+    public function setRequestArguments(array $requestArguments);
+
     public function suggestQuery($settings);
 }