geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-11 01:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source 
- Array arguments are now longer automaticially merged.
- Added domain-route parameter unit-test.
This commit is contained in:
Simon Sessingø
2016-11-17 03:50:33 +01:00
parent b5f8d9410f
commit 73ee4521bc
10 changed files with 303 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterRoute.php
+4 -4
View File
@@ -17,10 +17,10 @@ class RouterRoute extends LoadableRoute {
$url = rtrim($url, '/') . '/';
// Match on custom defined regular expression
if($this->getSetting('regexMatch') !== null) {
if($this->regex !== null) {
$parameters = array();
if(preg_match('/(' . $this->getSetting('regexMatch') . ')/is', $request->getHost() . $url, $parameters)) {
$this->settings['parameters'] = (!is_array($parameters[0]) ? array($parameters[0]) : $parameters[0]);
if(preg_match('/(' . $this->regex . ')/is', $request->getHost() . $url, $parameters)) {
$this->parameters = (!is_array($parameters[0]) ? array($parameters[0]) : $parameters[0]);
return true;
}
return null;
@@ -32,7 +32,7 @@ class RouterRoute extends LoadableRoute {
$parameters = $this->parseParameters($route, $url);
if($parameters !== null) {
$this->settings['parameters'] = array_merge($this->getSetting('parameters'), $parameters);
$this->parameters = array_merge($this->parameters, $parameters);
return true;
}