mcndave
/
picea
1
1
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' of https://git.mcnd.ca/mcndave/picea

This commit is contained in:
Dave M. 2023-04-20 18:16:29 +00:00
parent 7a2fa872fa 5182ba19bc
commit 3bcd5c9780
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Compiler/Context.php
View File

@ -24,10 +24,12 @@ abstract class Context {
public array $switchStack = []; public array $switchStack = [];
public array $iterateStack = []; public array $iterationStack = [];
public array $useStack = []; public array $useStack = [];
public array $sections = [];
public int $functions = 0; public int $functions = 0;
public array $functionStack = []; public array $functionStack = [];

5
src/Extension/UrlExtension.php
View File

@ -249,12 +249,13 @@ PATTERN;
if ($default ?? false) { if ($default ?? false) {
$value = $default; $value = $default;
} }
elseif ($this->enforceExistingArguments) { 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))); throw new \RuntimeException(sprintf("Error while preparing route %s : could not match variable '%s' into given arguments ( %s )", $route, $variable, json_encode($arguments)));
} }
} }
$search[ $item[0] ] = $value; $search[$item[0]] = $value ?? "";
} }
$route = str_replace(array_keys($search), array_values($search), $route); $route = str_replace(array_keys($search), array_values($search), $route);