diff --git a/composer.json b/composer.json index 85b3f42..00aacd6 100644 --- a/composer.json +++ b/composer.json @@ -22,9 +22,9 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "composer/installers": "~1.0", - "laravel/framework": "7.0.*" + "laravel/framework": "~7.0" }, "autoload": { "files": [ diff --git a/src/LaraPress/Routing/Matching/ConditionalValidator.php b/src/LaraPress/Routing/Matching/ConditionalValidator.php index 22fac8e..42b796e 100644 --- a/src/LaraPress/Routing/Matching/ConditionalValidator.php +++ b/src/LaraPress/Routing/Matching/ConditionalValidator.php @@ -18,6 +18,10 @@ class ConditionalValidator implements ValidatorInterface { */ public function matches(Route $route, Request $request) { + if (function_exists('is_admin') && is_admin()) { + return false; + } + /** @var \LaraPress\Routing\Route $route */ return $route->wordpressConditional() == null || call_user_func($route->wordpressConditional(), $route->uri()); } diff --git a/src/LaraPress/Routing/Router.php b/src/LaraPress/Routing/Router.php index 57bf0da..93aaab2 100644 --- a/src/LaraPress/Routing/Router.php +++ b/src/LaraPress/Routing/Router.php @@ -194,7 +194,7 @@ protected function addAdminMenuPage($uri, Route $route) * @param mixed $action * @return Route */ - protected function newRoute($methods, $uri, $action) + public function newRoute($methods, $uri, $action) { return (new Route($methods, $uri, $action)) ->setRouter($this)