From 2fe97c60ed6231377d6a66889f07f3ddc347b9e8 Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Fri, 28 Apr 2023 19:56:05 +0000 Subject: [PATCH] - Fixed a bad merge --- src/Extension/UrlExtension.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Extension/UrlExtension.php b/src/Extension/UrlExtension.php index 56afb45..5708236 100644 --- a/src/Extension/UrlExtension.php +++ b/src/Extension/UrlExtension.php @@ -252,13 +252,8 @@ PATTERN; if ($default ?? false) { $value = $default; } -<<<<<<< Updated upstream - elseif ($this->enforceExistingArguments && ! strpos($route, sprintf('[/{%s:', $variable)) ) { - throw new \RuntimeException(sprintf("Error while preparing route %s : could not match variable '%s' into given arguments ( %s )", $route, $variable, json_encode($arguments))); -======= elseif ($this->enforceExistingArguments) {dump($routeParam); throw new \RuntimeException(sprintf("Error while preparing route %s : could not match variable '%s' into given arguments ( %s ) from %s::%s", $route, $variable, json_encode($arguments), $routeParam['class'], $routeParam['classMethod'])); ->>>>>>> Stashed changes } }