eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[CORE][Router] Remove duplicate service for URL generation, as that is actually the same object

Browse Source
This commit is contained in:
Hugo Sales
2021-11-10 13:59:02 +00:00
parent 420ebcda26
commit dea9aa4dcf
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/Router/Router.php
View File

@@ -63,13 +63,11 @@ abstract class Router
*/
public const NETWORK_PATH = UrlGeneratorInterface::NETWORK_PATH;
public static ?SymfonyRouter $router = null;
public static ?UrlGeneratorInterface $url_gen = null;
public static ?SymfonyRouter $router = null;
public static function setServices($rtr, $gen): void
public static function setRouter($rtr): void
{
self::$router = $rtr;
self::$url_gen = $gen;
self::$router = $rtr;
}
public static function isAbsolute(string $url)
@@ -84,7 +82,7 @@ abstract class Router
*/
public static function url(string $id, array $args = [], int $type = self::ABSOLUTE_PATH): string
{
return self::$url_gen->generate($id, $args, $type);
return self::$router->generate($id, $args, $type);
}
/**