From c64f270db985d57e95d1c8152d075d2ba6e32c8a Mon Sep 17 00:00:00 2001 From: Brian Detweiler Date: Fri, 19 Aug 2022 10:56:19 -0600 Subject: [PATCH 1/5] updated composer.json php requirement to use 8.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 85b3f42..1277047 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "composer/installers": "~1.0", "laravel/framework": "7.0.*" }, From c8f32e6dd5b5ab6df1c4d598eb76946734719c61 Mon Sep 17 00:00:00 2001 From: Brian Detweiler Date: Fri, 19 Aug 2022 10:59:51 -0600 Subject: [PATCH 2/5] update composer.json laravel/framework version to ~7.* --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1277047..dcf29e2 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "require": { "php": "^7.2.5|^8.0", "composer/installers": "~1.0", - "laravel/framework": "7.0.*" + "laravel/framework": "~7.*" }, "autoload": { "files": [ From 8c79fae3e1dcb4318e6d6a0e66cfe8cf3ca77455 Mon Sep 17 00:00:00 2001 From: Brian Detweiler Date: Fri, 19 Aug 2022 11:01:06 -0600 Subject: [PATCH 3/5] update composer.json laravel/framework version to ~7.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index dcf29e2..00aacd6 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "require": { "php": "^7.2.5|^8.0", "composer/installers": "~1.0", - "laravel/framework": "~7.*" + "laravel/framework": "~7.0" }, "autoload": { "files": [ From 8b71ed853b82f38065ff9972142761fce7af96eb Mon Sep 17 00:00:00 2001 From: Brian Detweiler Date: Fri, 19 Aug 2022 11:30:36 -0600 Subject: [PATCH 4/5] updated Router.php newRoute to be public --- src/LaraPress/Routing/Router.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From e91e0746e127bf7f730a8781939e03674527450c Mon Sep 17 00:00:00 2001 From: Brian Detweiler Date: Sat, 28 Feb 2026 12:49:33 -0700 Subject: [PATCH 5/5] Add admin check in matches method fix(routing): return false in ConditionalValidator if is_admin, LaraPress was rendering blade in wp-admin --- src/LaraPress/Routing/Matching/ConditionalValidator.php | 4 ++++ 1 file changed, 4 insertions(+) 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()); }