mirror of
https://github.com/getgrav/grav.git
synced 2025-02-20 19:56:53 +01:00
more PHP 8.2 fixes
This commit is contained in:
parent
c56bb86b61
commit
81a911572c
|
|
@ -26,6 +26,7 @@ use Grav\Common\Page\Interfaces\PageInterface;
|
|||
use Grav\Common\Taxonomy;
|
||||
use Grav\Common\Uri;
|
||||
use Grav\Common\Utils;
|
||||
use Grav\Events\TypesEvent;
|
||||
use Grav\Framework\Flex\Flex;
|
||||
use Grav\Framework\Flex\FlexDirectory;
|
||||
use Grav\Framework\Flex\Interfaces\FlexTranslateInterface;
|
||||
|
|
@ -1289,7 +1290,7 @@ class Pages
|
|||
|
||||
$scanBlueprintsAndTemplates = static function (Types $types) use ($grav) {
|
||||
// Scan blueprints
|
||||
$event = new Event();
|
||||
$event = new TypesEvent();
|
||||
$event->types = $types;
|
||||
$grav->fireEvent('onGetPageBlueprints', $event);
|
||||
|
||||
|
|
@ -1303,7 +1304,7 @@ class Pages
|
|||
$types->scanBlueprints($lookup);
|
||||
|
||||
// Scan templates
|
||||
$event = new Event();
|
||||
$event = new TypesEvent();
|
||||
$event->types = $types;
|
||||
$grav->fireEvent('onGetPageTemplates', $event);
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
namespace Grav\Common\Processors;
|
||||
|
||||
use Grav\Common\Page\Interfaces\PageInterface;
|
||||
use Grav\Events\PageEvent;
|
||||
use Grav\Framework\RequestHandler\Exception\RequestException;
|
||||
use Grav\Plugin\Form\Forms;
|
||||
use RocketTheme\Toolbox\Event\Event;
|
||||
|
|
@ -66,7 +67,7 @@ class PagesProcessor extends ProcessorBase
|
|||
if (!$page->routable()) {
|
||||
$exception = new RequestException($request, 'Page Not Found', 404);
|
||||
// If no page found, fire event
|
||||
$event = new Event([
|
||||
$event = new PageEvent([
|
||||
'page' => $page,
|
||||
'code' => $exception->getCode(),
|
||||
'message' => $exception->getMessage(),
|
||||
|
|
|
|||
18
system/src/Grav/Events/PageEvent.php
Normal file
18
system/src/Grav/Events/PageEvent.php
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @package Grav\Events
|
||||
*
|
||||
* @copyright Copyright (c) 2015 - 2023 Trilby Media, LLC. All rights reserved.
|
||||
* @license MIT License; see LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace Grav\Events;
|
||||
|
||||
use Grav\Framework\Flex\Flex;
|
||||
use RocketTheme\Toolbox\Event\Event;
|
||||
|
||||
class PageEvent extends Event
|
||||
{
|
||||
public $page;
|
||||
}
|
||||
18
system/src/Grav/Events/TypesEvent.php
Normal file
18
system/src/Grav/Events/TypesEvent.php
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @package Grav\Events
|
||||
*
|
||||
* @copyright Copyright (c) 2015 - 2023 Trilby Media, LLC. All rights reserved.
|
||||
* @license MIT License; see LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace Grav\Events;
|
||||
|
||||
use Grav\Framework\Flex\Flex;
|
||||
use RocketTheme\Toolbox\Event\Event;
|
||||
|
||||
class TypesEvent extends Event
|
||||
{
|
||||
public $type;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user