upgrade to PHP8.3

composer.json

@@ -33,7 +33,7 @@
         "typo3/cms-opendocs": "^11.5",
         "typo3/cms-recordlist": "^11.5",
         "fluidtypo3/flux": "^9.7",
-        "fluidtypo3/vhs": "dev-development",
+        "fluidtypo3/vhs": "^7.0",
         "georgringer/news": "^9",
         "helhum/typo3-console": "^7.1",
         "causal/image_autoresize": "^2.2",

ot_connect/Configuration/Services.yaml

@@ -0,0 +1,8 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  Opentalent\OtConnect\:
+    resource: '../Classes/*'

ot_core/Classes/ViewHelpers/OtAbstractViewHelper.php

@@ -3,10 +3,7 @@
 namespace Opentalent\OtCore\ViewHelpers;
 
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
-use Opentalent\OtCore\Logging\OtLogger;
 use Opentalent\OtCore\Website\OtPageRepository;
-use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerAwareTrait;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;

ot_optimizer/Classes/Middleware/Frontend/OtPageResolver.php

@@ -20,7 +20,7 @@ class OtPageResolver extends \TYPO3\CMS\Frontend\Middleware\PageResolver
      * @param OtWebsiteRepository $otWebsiteRepository
      * @return void
      */
-    public function injectOtWebsiteRepository(OtWebsiteRepository $otWebsiteRepository)
+    public function injectOtWebsiteRepository(OtWebsiteRepository $otWebsiteRepository): void
     {
         $this->otWebsiteRepository = $otWebsiteRepository;
     }
@@ -37,9 +37,9 @@ class OtPageResolver extends \TYPO3\CMS\Frontend\Middleware\PageResolver
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        // Shall fallback on non-optimized mode if a cookie 'optimize' exists and is different from 1, or if
+        // Shall fall back on non-optimized mode if a cookie 'optimize' exists and is different from 1, or if
         // a server global variable TYPO3_OPTIMIZE is set and is different from 1
-        $shallFallback = ($_COOKIE['optimize'] != 1 && $_SERVER['TYPO3_OPTIMIZE'] != 1);
+        $shallFallback = (isset($_COOKIE['optimize']) && $_COOKIE['optimize'] !== 1 && $_SERVER['TYPO3_OPTIMIZE'] !== 1);
         if ($shallFallback) {
             return parent::process($request, $handler);
         }
@@ -69,7 +69,7 @@ class OtPageResolver extends \TYPO3\CMS\Frontend\Middleware\PageResolver
         // a backend user shall be authenticated for this
         $requestedFromBE = (
                 preg_match("/.+\/typo3\/index.php\?route=.*(Viewpage)|(FrontendEditing).*/", $_SERVER['HTTP_REFERER']) ||
-                $request->getQueryParams()['frontend_editing'] === 'true'
+                ($request->getQueryParams()['frontend_editing'] ?? null) === 'true'
             )
             && $GLOBALS['BE_USER'];
 

ot_optimizer/Configuration/Services.yaml

@@ -0,0 +1,8 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  Opentalent\OtOptimizer\:
+    resource: '../Classes/*'

ot_stats/Configuration/Services.yaml

@@ -0,0 +1,8 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  Opentalent\OtStats\:
+    resource: '../Classes/*'

ot_templating/Classes/ViewHelpers/Carousel/ImagesViewHelper.php

@@ -78,6 +78,10 @@ class ImagesViewHelper extends OtAbstractViewHelper {
         $falViewhelper = GeneralUtility::makeInstance(FalViewHelper::class);
         $pageUid = $GLOBALS['TSFE']->page;
         $falViewhelper->arguments['slide'] = -1;
+        $falViewhelper->arguments['limit'] = false;
+        $falViewhelper->arguments['slideCollectReverse'] = false;
+        $falViewhelper->arguments['slideCollect'] = 0;
+        $falViewhelper->arguments['asObjects'] = false;
         $resources = $falViewhelper->getResources($pageUid);
 
         $images = [];

ot_templating/Classes/ViewHelpers/EventsPage/GetIdViewHelper.php

@@ -2,14 +2,10 @@
 
 namespace Opentalent\OtTemplating\ViewHelpers\EventsPage;
 
-use Closure;
 use Opentalent\OtCore\Website\OtPageRepository;
 use Opentalent\OtCore\ViewHelpers\OtAbstractViewHelper;
 use Opentalent\OtCore\Website\OtWebsiteRepository;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-
+use Opentalent\OtTemplating\ViewHelpers\RootPage\GetIdViewHelper as RootPageGetIdViewHelper;
 /**
  * Retrieves and returns the uid of the events' page of the current site
  * The events page is the first page found with the template 'OpenTalent.OtTemplating->events'
@@ -27,6 +23,7 @@ class GetIdViewHelper extends OtAbstractViewHelper
 {
     public function __construct(
         private readonly OtPageRepository $otPageRepository,
+        private readonly OtWebsiteRepository $otWebsiteRepository,
     ) {}
 
     /**
@@ -52,11 +49,7 @@ class GetIdViewHelper extends OtAbstractViewHelper
      */
     public function render(): ?int
     {
-        $rootId = \Opentalent\OtTemplating\ViewHelpers\RootPage\GetIdViewHelper::renderStatic(
-            $this->arguments,
-            $this->renderChildrenClosure,
-            $this->renderingContext
-        );
+        $rootId = $this->otWebsiteRepository->getCurrentRootpageUidFromFEGlobals();
 
         $subpages = $this->otPageRepository->getAllSubpagesForPage($rootId);
 

ot_templating/Classes/ViewHelpers/NewsPage/GetIdViewHelper.php

@@ -5,6 +5,7 @@ namespace Opentalent\OtTemplating\ViewHelpers\NewsPage;
 use Closure;
 use Opentalent\OtCore\Website\OtPageRepository;
 use Opentalent\OtCore\ViewHelpers\OtAbstractViewHelper;
+use Opentalent\OtCore\Website\OtWebsiteRepository;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
@@ -26,6 +27,7 @@ class GetIdViewHelper extends OtAbstractViewHelper
 {
     public function __construct(
         private readonly OtPageRepository $otPageRepository,
+        private readonly OtWebsiteRepository $otWebsiteRepository,
     ) {}
 
     /**
@@ -36,11 +38,8 @@ class GetIdViewHelper extends OtAbstractViewHelper
      */
     public function render(): ?int
     {
-        $rootId = \Opentalent\OtTemplating\ViewHelpers\RootPage\GetIdViewHelper::renderStatic(
-            $this->arguments,
-            $this->renderChildrenClosure,
-            $this->renderingContext
-        );
+        $rootId = $this->otWebsiteRepository->getCurrentRootpageUidFromFEGlobals();
+
         $subpages = $this->otPageRepository->getAllSubpagesForPage($rootId);
 
         foreach ($subpages as $page) {

ot_templating/Classes/ViewHelpers/Page/GetFirstWithTemplateViewHelper.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Opentalent\OtTemplating\ViewHelpers;
+namespace Opentalent\OtTemplating\ViewHelpers\Page;
 
 
 use Closure;
@@ -21,7 +21,7 @@ use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
  *
  * @package Opentalent\OtTemplating\ViewHelpers
  */
-class FirstWithTemplateViewHelper extends OtAbstractViewHelper
+class GetFirstWithTemplateViewHelper extends OtAbstractViewHelper
 {
     public function __construct(
         private readonly OtPageRepository $otPageRepository,
@@ -31,7 +31,7 @@ class FirstWithTemplateViewHelper extends OtAbstractViewHelper
      * -- This method is expected by Fluid --
      * Declares the viewhelper's parameters
      */
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         $this->registerArgument(
             'template',
@@ -47,14 +47,15 @@ class FirstWithTemplateViewHelper extends OtAbstractViewHelper
      *
      * @return int|null
      */
-    public function render() {
+    public function render(): ?int
+    {
         $rootId = GetIdViewHelper::renderStatic(
             $this->arguments,
             $this->renderChildrenClosure,
             $this->renderingContext
         );
 
-        $subpages = $this->pageRepository->getAllSubpagesForPage($rootId);
+        $subpages = $this->otPageRepository->getAllSubpagesForPage($rootId);
 
         $templateName = 'OpenTalent.OtTemplating->' . $this->arguments['template'];
 

ot_templating/Classes/ViewHelpers/Social/MetadataViewHelper.php

@@ -113,9 +113,9 @@ class MetadataViewHelper extends OtAbstractViewHelper
 
         // Forced values registered with https://viewhelpers.fluidtypo3.org/fluidtypo3/vhs/5.0.1/Variable/Register/Set.html
         $registered = $GLOBALS["TSFE"]->register;
-        $forcedTitle = $registered['forceSocialTitle'];
-        $forcedDescription = $registered['forceSocialDescription'];
-        $forcedImageUrl = $registered['forceSocialImageUrl'];
+        $forcedTitle = ($registered['forceSocialTitle'] ?? null);
+        $forcedDescription = ($registered['forceSocialDescription'] ?? null);
+        $forcedImageUrl = ($registered['forceSocialImageUrl'] ?? '');
 
         $data = [
             'pageUrl' => (string)$uri,

ot_templating/Classes/ViewHelpers/Template/CurrentViewHelper.php

@@ -32,10 +32,10 @@ class CurrentViewHelper extends OtAbstractViewHelper
      * -- This method is expected by Fluid --
      * Renders the content as html
      *
-     * @return int|null
+     * @return string
      * @throws NoSuchWebsiteException
      */
-    public function render(): ?int
+    public function render(): string
     {
         $website = $this->otWebsiteRepository->getCurrentWebsiteFromFEGlobals();
 

ot_templating/Classes/ViewHelpers/Template/GetPreferenceViewHelper.php

@@ -46,10 +46,10 @@ class GetPreferenceViewHelper extends OtAbstractViewHelper
      * -- This method is expected by Fluid --
      * Renders the content as html
      *
-     * @return array
+     * @return string
      * @throws NoSuchWebsiteException
      */
-    public function render(): array
+    public function render(): string
     {
         $website = $this->otWebsiteRepository->getCurrentWebsiteFromFEGlobals();
         $preferences = $this->templateRepository->getTemplatePreferences($website);

ot_templating/Configuration/Services.yaml

@@ -0,0 +1,8 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  Opentalent\OtTemplating\:
+    resource: '../Classes/*'