From 841ec861bd2d3c8ef8927bcdd2a7524714f0079c Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 25 Oct 2024 20:12:25 +0100
Subject: [PATCH] PHP 8.4 fixes - Implicitly nullable parameter declarations
 deprecated

---
 classes/plugin/Admin.php                             | 2 +-
 classes/plugin/AdminController.php                   | 4 ++--
 classes/plugin/Controllers/AbstractController.php    | 8 ++++----
 classes/plugin/Controllers/AdminController.php       | 6 +++---
 classes/plugin/Controllers/Login/LoginController.php | 4 ++--
 classes/plugin/Twig/AdminTwigExtension.php           | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/classes/plugin/Admin.php b/classes/plugin/Admin.php
index 33d72f21..df1c7358 100644
--- a/classes/plugin/Admin.php
+++ b/classes/plugin/Admin.php
@@ -904,7 +904,7 @@ class Admin
      * @return object
      * @throws \RuntimeException
      */
-    public function getConfigurationData($type, array $post = null)
+    public function getConfigurationData($type, ?array $post = null)
     {
         static $data = [];
 
diff --git a/classes/plugin/AdminController.php b/classes/plugin/AdminController.php
index cd56d361..36b56c0e 100644
--- a/classes/plugin/AdminController.php
+++ b/classes/plugin/AdminController.php
@@ -62,7 +62,7 @@ class AdminController extends AdminBaseController
      * @param array|null $post
      * @return void
      */
-    public function initialize(Grav $grav = null, $view = null, $task = null, $route = null, $post = null)
+    public function initialize(?Grav $grav = null, $view = null, $task = null, $route = null, $post = null)
     {
         $this->grav = $grav;
         $this->admin = $this->grav['admin'];
@@ -2717,7 +2717,7 @@ class AdminController extends AdminBaseController
      * @param PageInterface|null $page
      * @return Media|null
      */
-    public function getMedia(PageInterface $page = null)
+    public function getMedia(?PageInterface $page = null)
     {
         $page = $page ?? $this->admin->page($this->route);
         if (!$page) {
diff --git a/classes/plugin/Controllers/AbstractController.php b/classes/plugin/Controllers/AbstractController.php
index 7b2324a6..b8118e99 100644
--- a/classes/plugin/Controllers/AbstractController.php
+++ b/classes/plugin/Controllers/AbstractController.php
@@ -140,7 +140,7 @@ abstract class AbstractController implements RequestHandlerInterface
      * @param mixed $default
      * @return mixed
      */
-    public function getPost(string $name = null, $default = null)
+    public function getPost(?string $name = null, $default = null)
     {
         $body = $this->request->getParsedBody();
 
@@ -167,7 +167,7 @@ abstract class AbstractController implements RequestHandlerInterface
      * @param string|null $type
      * @return FormInterface
      */
-    public function getForm(string $type = null): FormInterface
+    public function getForm(?string $type = null): FormInterface
     {
         $object = $this->getObject();
         if (!$object) {
@@ -227,7 +227,7 @@ abstract class AbstractController implements RequestHandlerInterface
      * @param int $code
      * @return Response
      */
-    public function createHtmlResponse(string $content, int $code = null): ResponseInterface
+    public function createHtmlResponse(string $content, ?int $code = null): ResponseInterface
     {
         return new Response($code ?: 200, [], $content);
     }
@@ -255,7 +255,7 @@ abstract class AbstractController implements RequestHandlerInterface
      * @param int $code
      * @return Response
      */
-    public function createRedirectResponse(string $url, int $code = null): ResponseInterface
+    public function createRedirectResponse(string $url, ?int $code = null): ResponseInterface
     {
         if (null === $code || $code < 301 || $code > 307) {
             $code = $this->grav['config']->get('system.pages.redirect_default_code', 302);
diff --git a/classes/plugin/Controllers/AdminController.php b/classes/plugin/Controllers/AdminController.php
index 9fd78abb..9a6a1d8d 100644
--- a/classes/plugin/Controllers/AdminController.php
+++ b/classes/plugin/Controllers/AdminController.php
@@ -117,7 +117,7 @@ abstract class AdminController
      * @param string|null $lang
      * @return string
      */
-    public function getAdminUrl(string $route, string $lang = null): string
+    public function getAdminUrl(string $route, ?string $lang = null): string
     {
         /** @var Pages $pages */
         $pages = $this->grav['pages'];
@@ -131,7 +131,7 @@ abstract class AdminController
      * @param string|null $lang
      * @return string
      */
-    public function getAbsoluteAdminUrl(string $route, string $lang = null): string
+    public function getAbsoluteAdminUrl(string $route, ?string $lang = null): string
     {
         /** @var Pages $pages */
         $pages = $this->grav['pages'];
@@ -319,7 +319,7 @@ abstract class AdminController
      * @param int|null $code
      * @return ResponseInterface
      */
-    protected function createRedirectResponse(string $url = null, int $code = null): ResponseInterface
+    protected function createRedirectResponse(?string $url = null, ?int $code = null): ResponseInterface
     {
         $request = $this->getRequest();
 
diff --git a/classes/plugin/Controllers/Login/LoginController.php b/classes/plugin/Controllers/Login/LoginController.php
index 871162f4..2c7bc2f4 100644
--- a/classes/plugin/Controllers/Login/LoginController.php
+++ b/classes/plugin/Controllers/Login/LoginController.php
@@ -71,7 +71,7 @@ class LoginController extends AdminController
      * @param string|null $token
      * @return ResponseInterface
      */
-    public function displayReset(string $username = null, string $token = null): ResponseInterface
+    public function displayReset(?string $username = null, ?string $token = null): ResponseInterface
     {
         if ('' === (string)$username || '' === (string)$token) {
             $this->setMessage($this->translate('PLUGIN_ADMIN.RESET_INVALID_LINK'), 'error');
@@ -318,7 +318,7 @@ class LoginController extends AdminController
      * @param string|null $token
      * @return ResponseInterface
      */
-    public function taskReset(string $username = null, string $token = null): ResponseInterface
+    public function taskReset(?string $username = null, ?string $token = null): ResponseInterface
     {
         $this->page = $this->createPage('reset');
         $this->form = $this->getForm('admin-login-reset');
diff --git a/classes/plugin/Twig/AdminTwigExtension.php b/classes/plugin/Twig/AdminTwigExtension.php
index 2dbfdefd..2b8ff954 100644
--- a/classes/plugin/Twig/AdminTwigExtension.php
+++ b/classes/plugin/Twig/AdminTwigExtension.php
@@ -83,7 +83,7 @@ class AdminTwigExtension extends AbstractExtension
         return clone $obj;
     }
 
-    public function adminRouteFunc(string $route = '', string $languageCode = null)
+    public function adminRouteFunc(string $route = '', ?string $languageCode = null)
     {
         /** @var Admin $admin */
         $admin = Grav::instance()['admin'];