mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Why are these static?

Browse Source 
...seriously, why are they static?
This commit is contained in:
Samuel Georges 2016-03-12 15:49:37 +11:00
parent 24a620e890
commit 864d38b77e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/cms/classes/Router.php
View File

@ -54,12 +54,12 @@ class Router
/**
* @var array Contains the URL map - the list of page file names and corresponding URL patterns.
*/
protected static $urlMap = [];
protected $urlMap = [];
/**
* October\Rain\Router\Router Router object with routes preloaded.
*/
protected static $routerObj;
protected $routerObj;
/**
* Creates the router instance.
@ -169,8 +169,8 @@ class Router
*/
protected function getRouterObject()
{
if (self::$routerObj !== null) {
return self::$routerObj;
if ($this->routerObj !== null) {
return $this->routerObj;
}
/*
@ -186,7 +186,7 @@ class Router
*/
$router->sortRules();
return self::$routerObj = $router;
return $this->routerObj = $router;
}
/**
@ -195,11 +195,11 @@ class Router
*/
protected function getUrlMap()
{
if (!count(self::$urlMap)) {
if (!count($this->urlMap)) {
$this->loadUrlMap();
}
return self::$urlMap;
return $this->urlMap;
}
/**
@ -235,7 +235,7 @@ class Router
$map[] = ['file' => $page->getFileName(), 'pattern' => $page->url];
}
self::$urlMap = $map;
$this->urlMap = $map;
if ($cacheable) {
Cache::put($key, serialize($map), Config::get('cms.urlCacheTtl', 1));
}
@ -243,7 +243,7 @@ class Router
return false;
}
self::$urlMap = $unserialized;
$this->urlMap = $unserialized;
return true;
}