diff options
Diffstat (limited to 'src/Renderer/Twig/Extensions')
-rw-r--r-- | src/Renderer/Twig/Extensions/Assets.php | 10 | ||||
-rw-r--r-- | src/Renderer/Twig/Extensions/Authentication.php | 10 | ||||
-rw-r--r-- | src/Renderer/Twig/Extensions/Config.php | 6 | ||||
-rw-r--r-- | src/Renderer/Twig/Extensions/Csrf.php | 10 | ||||
-rw-r--r-- | src/Renderer/Twig/Extensions/Globals.php | 6 | ||||
-rw-r--r-- | src/Renderer/Twig/Extensions/Legacy.php | 8 | ||||
-rw-r--r-- | src/Renderer/Twig/Extensions/Markdown.php | 6 | ||||
-rw-r--r-- | src/Renderer/Twig/Extensions/Session.php | 6 | ||||
-rw-r--r-- | src/Renderer/Twig/Extensions/Translation.php | 29 | ||||
-rw-r--r-- | src/Renderer/Twig/Extensions/Url.php | 10 |
10 files changed, 43 insertions, 58 deletions
diff --git a/src/Renderer/Twig/Extensions/Assets.php b/src/Renderer/Twig/Extensions/Assets.php index 2cdfb0fd..04d6c9c8 100644 --- a/src/Renderer/Twig/Extensions/Assets.php +++ b/src/Renderer/Twig/Extensions/Assets.php @@ -3,8 +3,8 @@ namespace Engelsystem\Renderer\Twig\Extensions; use Engelsystem\Http\UrlGenerator; -use Twig_Extension as TwigExtension; -use Twig_Function as TwigFunction; +use Twig\Extension\AbstractExtension as TwigExtension; +use Twig\TwigFunction; class Assets extends TwigExtension { @@ -22,7 +22,7 @@ class Assets extends TwigExtension /** * @return TwigFunction[] */ - public function getFunctions() + public function getFunctions(): array { return [ new TwigFunction('asset', [$this, 'getAsset']), @@ -31,9 +31,9 @@ class Assets extends TwigExtension /** * @param string $path - * @return UrlGenerator|string + * @return string */ - public function getAsset($path) + public function getAsset(string $path): string { $path = ltrim($path, '/'); diff --git a/src/Renderer/Twig/Extensions/Authentication.php b/src/Renderer/Twig/Extensions/Authentication.php index 538526da..061a9018 100644 --- a/src/Renderer/Twig/Extensions/Authentication.php +++ b/src/Renderer/Twig/Extensions/Authentication.php @@ -3,8 +3,8 @@ namespace Engelsystem\Renderer\Twig\Extensions; use Engelsystem\Helpers\Authenticator; -use Twig_Extension as TwigExtension; -use Twig_Function as TwigFunction; +use Twig\Extension\AbstractExtension as TwigExtension; +use Twig\TwigFunction; class Authentication extends TwigExtension { @@ -22,7 +22,7 @@ class Authentication extends TwigExtension /** * @return TwigFunction[] */ - public function getFunctions() + public function getFunctions(): array { return [ new TwigFunction('is_user', [$this, 'isAuthenticated']), @@ -34,7 +34,7 @@ class Authentication extends TwigExtension /** * @return bool */ - public function isAuthenticated() + public function isAuthenticated(): bool { return (bool)$this->auth->user(); } @@ -42,7 +42,7 @@ class Authentication extends TwigExtension /** * @return bool */ - public function isGuest() + public function isGuest(): bool { return !$this->isAuthenticated(); } diff --git a/src/Renderer/Twig/Extensions/Config.php b/src/Renderer/Twig/Extensions/Config.php index dbbe93e7..da106957 100644 --- a/src/Renderer/Twig/Extensions/Config.php +++ b/src/Renderer/Twig/Extensions/Config.php @@ -3,8 +3,8 @@ namespace Engelsystem\Renderer\Twig\Extensions; use Engelsystem\Config\Config as EngelsystemConfig; -use Twig_Extension as TwigExtension; -use Twig_Function as TwigFunction; +use Twig\Extension\AbstractExtension as TwigExtension; +use Twig\TwigFunction; class Config extends TwigExtension { @@ -22,7 +22,7 @@ class Config extends TwigExtension /** * @return TwigFunction[] */ - public function getFunctions() + public function getFunctions(): array { return [ new TwigFunction('config', [$this->config, 'get']), diff --git a/src/Renderer/Twig/Extensions/Csrf.php b/src/Renderer/Twig/Extensions/Csrf.php index 9f77df80..fee1c1f9 100644 --- a/src/Renderer/Twig/Extensions/Csrf.php +++ b/src/Renderer/Twig/Extensions/Csrf.php @@ -3,8 +3,8 @@ namespace Engelsystem\Renderer\Twig\Extensions; use Symfony\Component\HttpFoundation\Session\SessionInterface; -use Twig_Extension as TwigExtension; -use Twig_Function as TwigFunction; +use Twig\Extension\AbstractExtension as TwigExtension; +use Twig\TwigFunction; class Csrf extends TwigExtension { @@ -22,7 +22,7 @@ class Csrf extends TwigExtension /** * @return TwigFunction[] */ - public function getFunctions() + public function getFunctions(): array { return [ new TwigFunction('csrf', [$this, 'getCsrfField'], ['is_safe' => ['html']]), @@ -33,7 +33,7 @@ class Csrf extends TwigExtension /** * @return string */ - public function getCsrfField() + public function getCsrfField(): string { return sprintf('<input type="hidden" name="_token" value="%s">', $this->getCsrfToken()); } @@ -41,7 +41,7 @@ class Csrf extends TwigExtension /** * @return string */ - public function getCsrfToken() + public function getCsrfToken(): string { return $this->session->get('_token'); } diff --git a/src/Renderer/Twig/Extensions/Globals.php b/src/Renderer/Twig/Extensions/Globals.php index ef29a819..a809682c 100644 --- a/src/Renderer/Twig/Extensions/Globals.php +++ b/src/Renderer/Twig/Extensions/Globals.php @@ -3,8 +3,8 @@ namespace Engelsystem\Renderer\Twig\Extensions; use Engelsystem\Helpers\Authenticator; -use Twig_Extension as TwigExtension; -use Twig_Extension_GlobalsInterface as GlobalsInterface; +use Twig\Extension\AbstractExtension as TwigExtension; +use Twig\Extension\GlobalsInterface as GlobalsInterface; class Globals extends TwigExtension implements GlobalsInterface { @@ -24,7 +24,7 @@ class Globals extends TwigExtension implements GlobalsInterface * * @return array An array of global variables */ - public function getGlobals() + public function getGlobals(): array { $user = $this->auth->user(); diff --git a/src/Renderer/Twig/Extensions/Legacy.php b/src/Renderer/Twig/Extensions/Legacy.php index 55c095fc..dc0c4775 100644 --- a/src/Renderer/Twig/Extensions/Legacy.php +++ b/src/Renderer/Twig/Extensions/Legacy.php @@ -3,8 +3,8 @@ namespace Engelsystem\Renderer\Twig\Extensions; use Engelsystem\Http\Request; -use Twig_Extension as TwigExtension; -use Twig_Function as TwigFunction; +use Twig\Extension\AbstractExtension as TwigExtension; +use Twig\TwigFunction; class Legacy extends TwigExtension { @@ -22,7 +22,7 @@ class Legacy extends TwigExtension /** * @return TwigFunction[] */ - public function getFunctions() + public function getFunctions(): array { $isSafeHtml = ['is_safe' => ['html']]; return [ @@ -39,7 +39,7 @@ class Legacy extends TwigExtension /** * @return string */ - public function getPage() + public function getPage(): string { if ($this->request->has('p')) { return $this->request->get('p'); diff --git a/src/Renderer/Twig/Extensions/Markdown.php b/src/Renderer/Twig/Extensions/Markdown.php index 293efe91..c23a0031 100644 --- a/src/Renderer/Twig/Extensions/Markdown.php +++ b/src/Renderer/Twig/Extensions/Markdown.php @@ -3,8 +3,8 @@ namespace Engelsystem\Renderer\Twig\Extensions; use Parsedown; -use Twig_Extension as TwigExtension; -use Twig_Filter as TwigFilter; +use Twig\Extension\AbstractExtension as TwigExtension; +use Twig\TwigFilter; class Markdown extends TwigExtension { @@ -36,7 +36,7 @@ class Markdown extends TwigExtension * @param string $text * @return string */ - public function render($text): string + public function render(string $text): string { return $this->renderer->text(htmlspecialchars($text)); } diff --git a/src/Renderer/Twig/Extensions/Session.php b/src/Renderer/Twig/Extensions/Session.php index 4690f701..77b5b55a 100644 --- a/src/Renderer/Twig/Extensions/Session.php +++ b/src/Renderer/Twig/Extensions/Session.php @@ -3,8 +3,8 @@ namespace Engelsystem\Renderer\Twig\Extensions; use Symfony\Component\HttpFoundation\Session\Session as SymfonySession; -use Twig_Extension as TwigExtension; -use Twig_Function as TwigFunction; +use Twig\Extension\AbstractExtension as TwigExtension; +use Twig\TwigFunction; class Session extends TwigExtension { @@ -22,7 +22,7 @@ class Session extends TwigExtension /** * @return TwigFunction[] */ - public function getFunctions() + public function getFunctions(): array { return [ new TwigFunction('session_get', [$this->session, 'get']), diff --git a/src/Renderer/Twig/Extensions/Translation.php b/src/Renderer/Twig/Extensions/Translation.php index 3e6f30b4..fff3bfa9 100644 --- a/src/Renderer/Twig/Extensions/Translation.php +++ b/src/Renderer/Twig/Extensions/Translation.php @@ -3,34 +3,27 @@ namespace Engelsystem\Renderer\Twig\Extensions; use Engelsystem\Helpers\Translation\Translator; -use Twig_Extension as TwigExtension; -use Twig_Extensions_TokenParser_Trans as TranslationTokenParser; -use Twig_Filter as TwigFilter; -use Twig_Function as TwigFunction; -use Twig_TokenParserInterface as TwigTokenParser; +use Twig\Extension\AbstractExtension as TwigExtension; +use Twig\TwigFilter; +use Twig\TwigFunction; class Translation extends TwigExtension { /** @var Translator */ protected $translator; - /** @var TranslationTokenParser */ - protected $tokenParser; - /** - * @param Translator $translator - * @param TranslationTokenParser $tokenParser + * @param Translator $translator */ - public function __construct(Translator $translator, TranslationTokenParser $tokenParser) + public function __construct(Translator $translator) { $this->translator = $translator; - $this->tokenParser = $tokenParser; } /** * @return array */ - public function getFilters() + public function getFilters(): array { return [ new TwigFilter('trans', [$this->translator, 'translate']), @@ -40,19 +33,11 @@ class Translation extends TwigExtension /** * @return TwigFunction[] */ - public function getFunctions() + public function getFunctions(): array { return [ new TwigFunction('__', [$this->translator, 'translate']), new TwigFunction('_e', [$this->translator, 'translatePlural']), ]; } - - /** - * @return TwigTokenParser[] - */ - public function getTokenParsers() - { - return [$this->tokenParser]; - } } diff --git a/src/Renderer/Twig/Extensions/Url.php b/src/Renderer/Twig/Extensions/Url.php index 62e59782..17fd6ff0 100644 --- a/src/Renderer/Twig/Extensions/Url.php +++ b/src/Renderer/Twig/Extensions/Url.php @@ -3,8 +3,8 @@ namespace Engelsystem\Renderer\Twig\Extensions; use Engelsystem\Http\UrlGenerator; -use Twig_Extension as TwigExtension; -use Twig_Function as TwigFunction; +use Twig\Extension\AbstractExtension as TwigExtension; +use Twig\TwigFunction; class Url extends TwigExtension { @@ -22,7 +22,7 @@ class Url extends TwigExtension /** * @return TwigFunction[] */ - public function getFunctions() + public function getFunctions(): array { return [ new TwigFunction('url', [$this, 'getUrl']), @@ -32,9 +32,9 @@ class Url extends TwigExtension /** * @param string $path * @param array $parameters - * @return UrlGenerator|string + * @return string */ - public function getUrl($path, $parameters = []) + public function getUrl(string $path, array $parameters = []): string { $path = str_replace('_', '-', $path); |