Merge remote-tracking branch 'origin/support/3.1' into develop

This commit is contained in:
Romain Quetiez
2023-10-27 19:41:01 +02:00
34 changed files with 483 additions and 256 deletions

View File

@@ -40,6 +40,11 @@ class Router
return static::$oSingleton;
}
/**
* @var bool $bUseCache
*/
protected $bUseCache = null;
/**********************/
/* Non-static methods */
/**********************/
@@ -54,6 +59,14 @@ class Router
// Don't do anything, we don't want to be initialized
}
/**
* @param bool|null $bUseCache Force cache usage for testing purposes, or leave it null for the default behavior
*/
public function SetUseCache(?bool $bUseCache): void
{
$this->bUseCache = $bUseCache;
}
/**
* Generate a complete URL for a specific route and optional parameters
*
@@ -137,7 +150,7 @@ class Router
public function GetRoutes(): array
{
$aRoutes = [];
$bUseCache = false === utils::IsDevelopmentEnvironment();
$bUseCache = is_null($this->bUseCache) ? (false === utils::IsDevelopmentEnvironment()) : $this->bUseCache;
$bMustWriteCache = false;
$sCacheFilePath = $this->GetCacheFileAbsPath();