geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-17 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OPTIMISATION] Optimisations + bugfixes.

Browse Source 
- Fixed references to Pecee framework.
- Fixed variables not being initialised before usage.
- Cleaned up duplicate checks.
- Other small optimisations and bugfixes.
This commit is contained in:
Simon Sessingø
2015-12-11 18:06:52 +01:00
parent cede827a45
commit 0bec524606
8 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterGroup.php
+4 -4
View File
@@ -10,7 +10,7 @@ class RouterGroup extends RouterEntry {
parent::__construct();
}
protected function matchDomain() {
protected function matchDomain(Request $request) {
if($this->domain !== null) {
if(is_array($this->domain)) {
@@ -20,7 +20,7 @@ class RouterGroup extends RouterEntry {
for($i = 0; $i < $max; $i++) {
$domain = $this->domain[$i];
$parameters = $this->parseParameters($domain, request()->getHost(), '[^.]*');
$parameters = $this->parseParameters($domain, $request->getHost(), '[^.]*');
if($parameters !== null) {
$this->parameters = $parameters;
@@ -31,7 +31,7 @@ class RouterGroup extends RouterEntry {
return null;
}
$parameters = $this->parseParameters($this->domain, request()->getHost(), '[^.]*');
$parameters = $this->parseParameters($this->domain, $request->getHost(), '[^.]*');
if ($parameters !== null) {
$this->parameters = $parameters;
@@ -60,7 +60,7 @@ class RouterGroup extends RouterEntry {
throw new RouterException('Method not allowed');
}
if($this->matchDomain() === null) {
if($this->matchDomain($request) === null) {
return null;
}