Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-10-27 16:26:32 +01:00
Code Issues Packages Projects Releases Activity

PHP 8.4 fixes - Implicitly nullable parameter declarations deprecated

Browse Source
This commit is contained in:
Andy Miller
2024-10-25 20:12:25 +01:00
parent 1680968442
commit 841ec861bd
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/plugin/Admin.php
View File

@@ -904,7 +904,7 @@ class Admin
* @return object * @return object
* @throws \RuntimeException * @throws \RuntimeException
*/ */
public function getConfigurationData($type, array $post = null) public function getConfigurationData($type, ?array $post = null)
{ {
static $data = []; static $data = [];

4
classes/plugin/AdminController.php
View File

@@ -62,7 +62,7 @@ class AdminController extends AdminBaseController
* @param array|null $post * @param array|null $post
* @return void * @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->grav = $grav;
$this->admin = $this->grav['admin']; $this->admin = $this->grav['admin'];
@@ -2717,7 +2717,7 @@ class AdminController extends AdminBaseController
* @param PageInterface|null $page * @param PageInterface|null $page
* @return Media|null * @return Media|null
*/ */
public function getMedia(PageInterface $page = null) public function getMedia(?PageInterface $page = null)
{ {
$page = $page ?? $this->admin->page($this->route); $page = $page ?? $this->admin->page($this->route);
if (!$page) { if (!$page) {

8
classes/plugin/Controllers/AbstractController.php
View File

@@ -140,7 +140,7 @@ abstract class AbstractController implements RequestHandlerInterface
* @param mixed $default * @param mixed $default
* @return mixed * @return mixed
*/ */
public function getPost(string $name = null, $default = null) public function getPost(?string $name = null, $default = null)
{ {
$body = $this->request->getParsedBody(); $body = $this->request->getParsedBody();
@@ -167,7 +167,7 @@ abstract class AbstractController implements RequestHandlerInterface
* @param string|null $type * @param string|null $type
* @return FormInterface * @return FormInterface
*/ */
public function getForm(string $type = null): FormInterface public function getForm(?string $type = null): FormInterface
{ {
$object = $this->getObject(); $object = $this->getObject();
if (!$object) { if (!$object) {
@@ -227,7 +227,7 @@ abstract class AbstractController implements RequestHandlerInterface
* @param int $code * @param int $code
* @return Response * @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); return new Response($code ?: 200, [], $content);
} }
@@ -255,7 +255,7 @@ abstract class AbstractController implements RequestHandlerInterface
* @param int $code * @param int $code
* @return Response * @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) { if (null === $code || $code < 301 || $code > 307) {
$code = $this->grav['config']->get('system.pages.redirect_default_code', 302); $code = $this->grav['config']->get('system.pages.redirect_default_code', 302);

6
classes/plugin/Controllers/AdminController.php
View File

@@ -117,7 +117,7 @@ abstract class AdminController
* @param string|null $lang * @param string|null $lang
* @return string * @return string
*/ */
public function getAdminUrl(string $route, string $lang = null): string public function getAdminUrl(string $route, ?string $lang = null): string
{ {
/** @var Pages $pages */ /** @var Pages $pages */
$pages = $this->grav['pages']; $pages = $this->grav['pages'];
@@ -131,7 +131,7 @@ abstract class AdminController
* @param string|null $lang * @param string|null $lang
* @return string * @return string
*/ */
public function getAbsoluteAdminUrl(string $route, string $lang = null): string public function getAbsoluteAdminUrl(string $route, ?string $lang = null): string
{ {
/** @var Pages $pages */ /** @var Pages $pages */
$pages = $this->grav['pages']; $pages = $this->grav['pages'];
@@ -319,7 +319,7 @@ abstract class AdminController
* @param int|null $code * @param int|null $code
* @return ResponseInterface * @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(); $request = $this->getRequest();

4
classes/plugin/Controllers/Login/LoginController.php
View File

@@ -71,7 +71,7 @@ class LoginController extends AdminController
* @param string|null $token * @param string|null $token
* @return ResponseInterface * @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) { if ('' === (string)$username || '' === (string)$token) {
$this->setMessage($this->translate('PLUGIN_ADMIN.RESET_INVALID_LINK'), 'error'); $this->setMessage($this->translate('PLUGIN_ADMIN.RESET_INVALID_LINK'), 'error');
@@ -318,7 +318,7 @@ class LoginController extends AdminController
* @param string|null $token * @param string|null $token
* @return ResponseInterface * @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->page = $this->createPage('reset');
$this->form = $this->getForm('admin-login-reset'); $this->form = $this->getForm('admin-login-reset');

2
classes/plugin/Twig/AdminTwigExtension.php
View File

@@ -83,7 +83,7 @@ class AdminTwigExtension extends AbstractExtension
return clone $obj; return clone $obj;
} }
public function adminRouteFunc(string $route = '', string $languageCode = null) public function adminRouteFunc(string $route = '', ?string $languageCode = null)
{ {
/** @var Admin $admin */ /** @var Admin $admin */
$admin = Grav::instance()['admin']; $admin = Grav::instance()['admin'];