Merge pull request #593 from brotkrueml/avoid-php84-deprecations

Avoid PHP 8.4 deprecations
Yoast · Jan 28, 2025 · bcf086b · bcf086b
2 parents 219be11 + 2ab9d22
commit bcf086b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Classes/Backend/PageLayoutHeader.php b/Classes/Backend/PageLayoutHeader.php
@@ -24,7 +24,7 @@ public function __construct(
     /**
      * @param array<string, string>|null $params
      */
-    public function render(array $params = null, PageLayoutController|ModuleTemplate|null $parentObj = null): string
+    public function render(?array $params = null, PageLayoutController|ModuleTemplate|null $parentObj = null): string
     {
         $languageId = $this->getLanguageId();
         $pageId = (int)$_GET['id'];

diff --git a/Classes/Controller/AbstractBackendController.php b/Classes/Controller/AbstractBackendController.php
@@ -22,7 +22,7 @@ abstract class AbstractBackendController extends ActionController
     /**
      * @param array<string, mixed> $data
      */
-    protected function returnResponse(string $template, array $data = [], ModuleTemplate $moduleTemplate = null): ResponseInterface
+    protected function returnResponse(string $template, array $data = [], ?ModuleTemplate $moduleTemplate = null): ResponseInterface
     {
         $data['layout'] = GeneralUtility::makeInstance(Typo3Version::class)
             ->getMajorVersion() < 13 ? 'Default' : 'Module';

diff --git a/Classes/EventListener/RecordCanonicalListener.php b/Classes/EventListener/RecordCanonicalListener.php
@@ -13,7 +13,7 @@ class RecordCanonicalListener
 {
     protected RecordService $recordService;
 
-    public function __construct(RecordService $recordService = null)
+    public function __construct(?RecordService $recordService = null)
     {
         if ($recordService === null) {
             $recordService = GeneralUtility::makeInstance(RecordService::class);

diff --git a/Classes/MetaTag/Generator/AbstractGenerator.php b/Classes/MetaTag/Generator/AbstractGenerator.php
@@ -16,7 +16,7 @@ abstract class AbstractGenerator implements GeneratorInterface
 {
     protected MetaTagManagerRegistry $managerRegistry;
 
-    public function __construct(MetaTagManagerRegistry $managerRegistry = null)
+    public function __construct(?MetaTagManagerRegistry $managerRegistry = null)
     {
         if ($managerRegistry === null) {
             $managerRegistry = GeneralUtility::makeInstance(MetaTagManagerRegistry::class);

diff --git a/Classes/PageTitle/RecordPageTitleProvider.php b/Classes/PageTitle/RecordPageTitleProvider.php
@@ -13,7 +13,7 @@ class RecordPageTitleProvider extends AbstractPageTitleProvider
 {
     protected RecordService $recordService;
 
-    public function __construct(RecordService $recordService = null)
+    public function __construct(?RecordService $recordService = null)
     {
         if ($recordService === null) {
             $recordService = GeneralUtility::makeInstance(RecordService::class);

diff --git a/Classes/Utility/JavascriptUtility.php b/Classes/Utility/JavascriptUtility.php
@@ -10,7 +10,7 @@
 
 class JavascriptUtility
 {
-    public static function loadJavascript(PageRenderer $pageRenderer = null): void
+    public static function loadJavascript(?PageRenderer $pageRenderer = null): void
     {
         if ($pageRenderer === null) {
             $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);