diff --git a/src/Symfony/Bridge/Twig/Extension/AssetExtension.php b/src/Symfony/Bridge/Twig/Extension/AssetExtension.php index 23701112f7..694821f7bf 100644 --- a/src/Symfony/Bridge/Twig/Extension/AssetExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/AssetExtension.php @@ -19,10 +19,8 @@ use Twig\TwigFunction; * Twig extension for the Symfony Asset component. * * @author Fabien Potencier - * - * @final */ -class AssetExtension extends AbstractExtension +final class AssetExtension extends AbstractExtension { private $packages; @@ -33,8 +31,6 @@ class AssetExtension extends AbstractExtension /** * {@inheritdoc} - * - * @return TwigFunction[] */ public function getFunctions(): array { @@ -49,31 +45,17 @@ class AssetExtension extends AbstractExtension * * If the package used to generate the path is an instance of * UrlPackage, you will always get a URL and not a path. - * - * @return string The public path of the asset */ - public function getAssetUrl(string $path, string $packageName = null) + public function getAssetUrl(string $path, string $packageName = null): string { return $this->packages->getUrl($path, $packageName); } /** * Returns the version of an asset. - * - * @return string The asset version */ - public function getAssetVersion(string $path, string $packageName = null) + public function getAssetVersion(string $path, string $packageName = null): string { return $this->packages->getVersion($path, $packageName); } - - /** - * Returns the name of the extension. - * - * @return string The extension name - */ - public function getName() - { - return 'asset'; - } } diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php index 1cf5b98dac..f35725af0d 100644 --- a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php @@ -19,10 +19,8 @@ use Twig\TwigFilter; * Twig extension relate to PHP code and used by the profiler and the default exception templates. * * @author Fabien Potencier - * - * @final */ -class CodeExtension extends AbstractExtension +final class CodeExtension extends AbstractExtension { private $fileLinkFormat; private $charset; @@ -30,8 +28,6 @@ class CodeExtension extends AbstractExtension /** * @param string|FileLinkFormatter $fileLinkFormat The format for links to source files - * @param string $projectDir The project directory - * @param string $charset The charset */ public function __construct($fileLinkFormat, string $projectDir, string $charset) { @@ -42,8 +38,6 @@ class CodeExtension extends AbstractExtension /** * {@inheritdoc} - * - * @return TwigFilter[] */ public function getFilters(): array { @@ -61,7 +55,7 @@ class CodeExtension extends AbstractExtension ]; } - public function abbrClass(string $class) + public function abbrClass(string $class): string { $parts = explode('\\', $class); $short = array_pop($parts); @@ -69,7 +63,7 @@ class CodeExtension extends AbstractExtension return sprintf('%s', $class, $short); } - public function abbrMethod(string $method) + public function abbrMethod(string $method): string { if (false !== strpos($method, '::')) { list($class, $method) = explode('::', $method, 2); @@ -85,10 +79,8 @@ class CodeExtension extends AbstractExtension /** * Formats an array as a string. - * - * @return string */ - public function formatArgs(array $args) + public function formatArgs(array $args): string { $result = []; foreach ($args as $key => $item) { @@ -116,20 +108,16 @@ class CodeExtension extends AbstractExtension /** * Formats an array as a string. - * - * @return string */ - public function formatArgsAsText(array $args) + public function formatArgsAsText(array $args): string { return strip_tags($this->formatArgs($args)); } /** * Returns an excerpt of a code file around the given line number. - * - * @return string An HTML string */ - public function fileExcerpt(string $file, int $line, int $srcContext = 3) + public function fileExcerpt(string $file, int $line, int $srcContext = 3): ?string { if (is_file($file) && is_readable($file)) { // highlight_file could throw warnings @@ -160,10 +148,8 @@ class CodeExtension extends AbstractExtension /** * Formats a file path. - * - * @return string */ - public function formatFile(string $file, int $line, string $text = null) + public function formatFile(string $file, int $line, string $text = null): string { $file = trim($file); @@ -211,7 +197,7 @@ class CodeExtension extends AbstractExtension return null; } - public function formatFileFromText(string $text) + public function formatFileFromText(string $text): string { return preg_replace_callback('/in ("|")?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', function ($match) { return 'in '.$this->formatFile($match[2], $match[3]); @@ -221,7 +207,7 @@ class CodeExtension extends AbstractExtension /** * @internal */ - public function formatLogMessage(string $message, array $context) + public function formatLogMessage(string $message, array $context): string { if ($context && false !== strpos($message, '{')) { $replacements = []; @@ -239,15 +225,7 @@ class CodeExtension extends AbstractExtension return htmlspecialchars($message, ENT_COMPAT | ENT_SUBSTITUTE, $this->charset); } - /** - * {@inheritdoc} - */ - public function getName() - { - return 'code'; - } - - protected static function fixCodeMarkup(string $line) + protected static function fixCodeMarkup(string $line): string { // ending tag from previous line $opening = strpos($line, ' * @author Titouan Galopin - * - * @final */ -class CsrfExtension extends AbstractExtension +final class CsrfExtension extends AbstractExtension { /** * {@inheritdoc} diff --git a/src/Symfony/Bridge/Twig/Extension/CsrfRuntime.php b/src/Symfony/Bridge/Twig/Extension/CsrfRuntime.php index c26ad5c903..c3d5da6470 100644 --- a/src/Symfony/Bridge/Twig/Extension/CsrfRuntime.php +++ b/src/Symfony/Bridge/Twig/Extension/CsrfRuntime.php @@ -16,10 +16,8 @@ use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface; /** * @author Christian Flothmann * @author Titouan Galopin - * - * @final */ -class CsrfRuntime +final class CsrfRuntime { private $csrfTokenManager; diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php index 791a2688b9..2187ed99bf 100644 --- a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php @@ -17,17 +17,14 @@ use Symfony\Component\VarDumper\Dumper\HtmlDumper; use Twig\Environment; use Twig\Extension\AbstractExtension; use Twig\Template; -use Twig\TokenParser\TokenParserInterface; use Twig\TwigFunction; /** * Provides integration of the dump() function with Twig. * * @author Nicolas Grekas - * - * @final */ -class DumpExtension extends AbstractExtension +final class DumpExtension extends AbstractExtension { private $cloner; private $dumper; @@ -39,7 +36,7 @@ class DumpExtension extends AbstractExtension } /** - * @return TwigFunction[] + * {@inheritdoc} */ public function getFunctions(): array { @@ -49,19 +46,14 @@ class DumpExtension extends AbstractExtension } /** - * @return TokenParserInterface[] + * {@inheritdoc} */ public function getTokenParsers(): array { return [new DumpTokenParser()]; } - public function getName() - { - return 'dump'; - } - - public function dump(Environment $env, array $context) + public function dump(Environment $env, array $context): ?string { if (!$env->isDebug()) { return null; diff --git a/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php b/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php index bde8fcd082..8d2a35c99f 100644 --- a/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php @@ -19,15 +19,11 @@ use Twig\TwigFunction; * ExpressionExtension gives a way to create Expressions from a template. * * @author Fabien Potencier - * - * @final */ -class ExpressionExtension extends AbstractExtension +final class ExpressionExtension extends AbstractExtension { /** * {@inheritdoc} - * - * @return TwigFunction[] */ public function getFunctions(): array { @@ -36,18 +32,8 @@ class ExpressionExtension extends AbstractExtension ]; } - public function createExpression(string $expression) + public function createExpression(string $expression): Expression { return new Expression($expression); } - - /** - * Returns the name of the extension. - * - * @return string The extension name - */ - public function getName() - { - return 'expression'; - } } diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php index 2eb0a6d6cb..0f4076db53 100644 --- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php @@ -15,7 +15,6 @@ use Symfony\Bridge\Twig\TokenParser\FormThemeTokenParser; use Symfony\Component\Form\ChoiceList\View\ChoiceView; use Symfony\Component\Form\FormView; use Twig\Extension\AbstractExtension; -use Twig\TokenParser\TokenParserInterface; use Twig\TwigFilter; use Twig\TwigFunction; use Twig\TwigTest; @@ -25,15 +24,11 @@ use Twig\TwigTest; * * @author Fabien Potencier * @author Bernhard Schussek - * - * @final */ -class FormExtension extends AbstractExtension +final class FormExtension extends AbstractExtension { /** * {@inheritdoc} - * - * @return TokenParserInterface[] */ public function getTokenParsers(): array { @@ -45,8 +40,6 @@ class FormExtension extends AbstractExtension /** * {@inheritdoc} - * - * @return TwigFunction[] */ public function getFunctions(): array { @@ -67,8 +60,6 @@ class FormExtension extends AbstractExtension /** * {@inheritdoc} - * - * @return TwigFilter[] */ public function getFilters(): array { @@ -80,8 +71,6 @@ class FormExtension extends AbstractExtension /** * {@inheritdoc} - * - * @return TwigTest[] */ public function getTests(): array { @@ -90,14 +79,6 @@ class FormExtension extends AbstractExtension new TwigTest('rootform', 'Symfony\Bridge\Twig\Extension\twig_is_root_form'), ]; } - - /** - * {@inheritdoc} - */ - public function getName() - { - return 'form'; - } } /** @@ -107,11 +88,9 @@ class FormExtension extends AbstractExtension * * @param string|array $selectedValue The selected value to compare * - * @return bool Whether the choice is selected - * * @see ChoiceView::isSelected() */ -function twig_is_selected_choice(ChoiceView $choice, $selectedValue) +function twig_is_selected_choice(ChoiceView $choice, $selectedValue): bool { if (\is_array($selectedValue)) { return \in_array($choice->value, $selectedValue, true); @@ -123,7 +102,7 @@ function twig_is_selected_choice(ChoiceView $choice, $selectedValue) /** * @internal */ -function twig_is_root_form(FormView $formView) +function twig_is_root_form(FormView $formView): bool { return null === $formView->parent; } diff --git a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php index 5b09d90fb1..a9ee05c4d0 100644 --- a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php @@ -20,10 +20,8 @@ use Twig\TwigFunction; * Twig extension for the Symfony HttpFoundation component. * * @author Fabien Potencier - * - * @final */ -class HttpFoundationExtension extends AbstractExtension +final class HttpFoundationExtension extends AbstractExtension { private $urlHelper; @@ -34,8 +32,6 @@ class HttpFoundationExtension extends AbstractExtension /** * {@inheritdoc} - * - * @return TwigFunction[] */ public function getFunctions(): array { @@ -50,11 +46,9 @@ class HttpFoundationExtension extends AbstractExtension * * This method returns the path unchanged if no request is available. * - * @return string The absolute URL - * * @see Request::getUriForPath() */ - public function generateAbsoluteUrl(string $path) + public function generateAbsoluteUrl(string $path): string { return $this->urlHelper->getAbsoluteUrl($path); } @@ -64,22 +58,10 @@ class HttpFoundationExtension extends AbstractExtension * * This method returns the path unchanged if no request is available. * - * @return string The relative path - * * @see Request::getRelativeUriForPath() */ - public function generateRelativePath(string $path) + public function generateRelativePath(string $path): string { return $this->urlHelper->getRelativePath($path); } - - /** - * Returns the name of the extension. - * - * @return string The extension name - */ - public function getName() - { - return 'request'; - } } diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php index fba4cb88c1..f4b3e4b669 100644 --- a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php @@ -19,13 +19,11 @@ use Twig\TwigFunction; * Provides integration with the HttpKernel component. * * @author Fabien Potencier - * - * @final */ -class HttpKernelExtension extends AbstractExtension +final class HttpKernelExtension extends AbstractExtension { /** - * @return TwigFunction[] + * {@inheritdoc} */ public function getFunctions(): array { @@ -36,16 +34,8 @@ class HttpKernelExtension extends AbstractExtension ]; } - public static function controller(string $controller, array $attributes = [], array $query = []) + public static function controller(string $controller, array $attributes = [], array $query = []): ControllerReference { return new ControllerReference($controller, $attributes, $query); } - - /** - * {@inheritdoc} - */ - public function getName() - { - return 'http_kernel'; - } } diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php index b9472a935e..6aab9566f9 100644 --- a/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php +++ b/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php @@ -18,10 +18,8 @@ use Symfony\Component\HttpKernel\Fragment\FragmentHandler; * Provides integration with the HttpKernel component. * * @author Fabien Potencier - * - * @final */ -class HttpKernelRuntime +final class HttpKernelRuntime { private $handler; @@ -35,11 +33,9 @@ class HttpKernelRuntime * * @param string|ControllerReference $uri A URI as a string or a ControllerReference instance * - * @return string The fragment content - * * @see FragmentHandler::render() */ - public function renderFragment($uri, array $options = []) + public function renderFragment($uri, array $options = []): string { $strategy = isset($options['strategy']) ? $options['strategy'] : 'inline'; unset($options['strategy']); @@ -52,11 +48,9 @@ class HttpKernelRuntime * * @param string|ControllerReference $uri A URI as a string or a ControllerReference instance * - * @return string The fragment content - * * @see FragmentHandler::render() */ - public function renderFragmentStrategy(string $strategy, $uri, array $options = []) + public function renderFragmentStrategy(string $strategy, $uri, array $options = []): string { return $this->handler->render($uri, $strategy, $options); } diff --git a/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php b/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php index 404276d8cb..071b9ff247 100644 --- a/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php @@ -19,10 +19,8 @@ use Twig\TwigFunction; * LogoutUrlHelper provides generator functions for the logout URL to Twig. * * @author Jeremy Mikola - * - * @final */ -class LogoutUrlExtension extends AbstractExtension +final class LogoutUrlExtension extends AbstractExtension { private $generator; @@ -33,8 +31,6 @@ class LogoutUrlExtension extends AbstractExtension /** * {@inheritdoc} - * - * @return TwigFunction[] */ public function getFunctions(): array { @@ -48,10 +44,8 @@ class LogoutUrlExtension extends AbstractExtension * Generates the relative logout URL for the firewall. * * @param string|null $key The firewall key or null to use the current firewall key - * - * @return string The relative logout URL */ - public function getLogoutPath(string $key = null) + public function getLogoutPath(string $key = null): string { return $this->generator->getLogoutPath($key); } @@ -60,19 +54,9 @@ class LogoutUrlExtension extends AbstractExtension * Generates the absolute logout URL for the firewall. * * @param string|null $key The firewall key or null to use the current firewall key - * - * @return string The absolute logout URL */ - public function getLogoutUrl(string $key = null) + public function getLogoutUrl(string $key = null): string { return $this->generator->getLogoutUrl($key); } - - /** - * {@inheritdoc} - */ - public function getName() - { - return 'logout_url'; - } } diff --git a/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php b/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php index 38b7c23891..fcc4396f1c 100644 --- a/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php @@ -17,10 +17,8 @@ use Twig\Profiler\Profile; /** * @author Fabien Potencier - * - * @final */ -class ProfilerExtension extends BaseProfilerExtension +final class ProfilerExtension extends BaseProfilerExtension { private $stopwatch; private $events; @@ -51,12 +49,4 @@ class ProfilerExtension extends BaseProfilerExtension unset($this->events[$profile]); } } - - /** - * {@inheritdoc} - */ - public function getName() - { - return 'native_profiler'; - } } diff --git a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php index 7807b7f6bf..800c22f6d4 100644 --- a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php @@ -22,10 +22,8 @@ use Twig\TwigFunction; * Provides integration of the Routing component with Twig. * * @author Fabien Potencier - * - * @final */ -class RoutingExtension extends AbstractExtension +final class RoutingExtension extends AbstractExtension { private $generator; @@ -36,8 +34,6 @@ class RoutingExtension extends AbstractExtension /** * {@inheritdoc} - * - * @return TwigFunction[] */ public function getFunctions(): array { @@ -47,18 +43,12 @@ class RoutingExtension extends AbstractExtension ]; } - /** - * @return string - */ - public function getPath(string $name, array $parameters = [], bool $relative = false) + public function getPath(string $name, array $parameters = [], bool $relative = false): string { return $this->generator->generate($name, $parameters, $relative ? UrlGeneratorInterface::RELATIVE_PATH : UrlGeneratorInterface::ABSOLUTE_PATH); } - /** - * @return string - */ - public function getUrl(string $name, array $parameters = [], bool $schemeRelative = false) + public function getUrl(string $name, array $parameters = [], bool $schemeRelative = false): string { return $this->generator->generate($name, $parameters, $schemeRelative ? UrlGeneratorInterface::NETWORK_PATH : UrlGeneratorInterface::ABSOLUTE_URL); } @@ -84,8 +74,6 @@ class RoutingExtension extends AbstractExtension * @param Node $argsNode The arguments of the path/url function * * @return array An array with the contexts the URL is safe - * - * @final */ public function isUrlGenerationSafe(Node $argsNode): array { @@ -102,12 +90,4 @@ class RoutingExtension extends AbstractExtension return []; } - - /** - * {@inheritdoc} - */ - public function getName() - { - return 'routing'; - } } diff --git a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php index 03a61f3b50..c70e0bb646 100644 --- a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php @@ -21,10 +21,8 @@ use Twig\TwigFunction; * SecurityExtension exposes security context features. * * @author Fabien Potencier - * - * @final */ -class SecurityExtension extends AbstractExtension +final class SecurityExtension extends AbstractExtension { private $securityChecker; @@ -33,7 +31,7 @@ class SecurityExtension extends AbstractExtension $this->securityChecker = $securityChecker; } - public function isGranted($role, object $object = null, string $field = null) + public function isGranted($role, object $object = null, string $field = null): bool { if (null === $this->securityChecker) { return false; @@ -52,8 +50,6 @@ class SecurityExtension extends AbstractExtension /** * {@inheritdoc} - * - * @return TwigFunction[] */ public function getFunctions(): array { @@ -61,12 +57,4 @@ class SecurityExtension extends AbstractExtension new TwigFunction('is_granted', [$this, 'isGranted']), ]; } - - /** - * {@inheritdoc} - */ - public function getName() - { - return 'security'; - } } diff --git a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php index 5dcb6c6704..80a25a949b 100644 --- a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php @@ -20,10 +20,8 @@ use Twig\TokenParser\TokenParserInterface; * Twig extension for the stopwatch helper. * * @author Wouter J - * - * @final */ -class StopwatchExtension extends AbstractExtension +final class StopwatchExtension extends AbstractExtension { private $stopwatch; private $enabled; @@ -34,7 +32,7 @@ class StopwatchExtension extends AbstractExtension $this->enabled = $enabled; } - public function getStopwatch() + public function getStopwatch(): Stopwatch { return $this->stopwatch; } @@ -53,9 +51,4 @@ class StopwatchExtension extends AbstractExtension new StopwatchTokenParser(null !== $this->stopwatch && $this->enabled), ]; } - - public function getName() - { - return 'stopwatch'; - } } diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php index dbdb177eef..aa5a2dde3d 100644 --- a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php @@ -19,17 +19,14 @@ use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorTrait; use Twig\Extension\AbstractExtension; use Twig\NodeVisitor\NodeVisitorInterface; -use Twig\TokenParser\AbstractTokenParser; use Twig\TwigFilter; /** * Provides integration of the Translation component with Twig. * * @author Fabien Potencier - * - * @final */ -class TranslationExtension extends AbstractExtension +final class TranslationExtension extends AbstractExtension { private $translator; private $translationNodeVisitor; @@ -40,7 +37,7 @@ class TranslationExtension extends AbstractExtension $this->translationNodeVisitor = $translationNodeVisitor; } - public function getTranslator(): ?TranslatorInterface + public function getTranslator(): TranslatorInterface { if (null === $this->translator) { if (!interface_exists(TranslatorInterface::class)) { @@ -57,8 +54,6 @@ class TranslationExtension extends AbstractExtension /** * {@inheritdoc} - * - * @return TwigFilter[] */ public function getFilters(): array { @@ -68,9 +63,7 @@ class TranslationExtension extends AbstractExtension } /** - * Returns the token parser instance to add to the existing list. - * - * @return AbstractTokenParser[] + * {@inheritdoc} */ public function getTokenParsers(): array { @@ -85,8 +78,6 @@ class TranslationExtension extends AbstractExtension /** * {@inheritdoc} - * - * @return NodeVisitorInterface[] */ public function getNodeVisitors(): array { @@ -106,12 +97,4 @@ class TranslationExtension extends AbstractExtension return $this->getTranslator()->trans($message, $arguments, $domain, $locale); } - - /** - * {@inheritdoc} - */ - public function getName(): string - { - return 'translator'; - } } diff --git a/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php b/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php index 1ca6eace85..4b8217d932 100644 --- a/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php @@ -21,10 +21,8 @@ use Twig\TwigFunction; * Twig extension for the Symfony WebLink component. * * @author Kévin Dunglas - * - * @final */ -class WebLinkExtension extends AbstractExtension +final class WebLinkExtension extends AbstractExtension { private $requestStack; @@ -35,8 +33,6 @@ class WebLinkExtension extends AbstractExtension /** * {@inheritdoc} - * - * @return TwigFunction[] */ public function getFunctions(): array { @@ -58,7 +54,7 @@ class WebLinkExtension extends AbstractExtension * * @return string The relation URI */ - public function link(string $uri, string $rel, array $attributes = []) + public function link(string $uri, string $rel, array $attributes = []): string { if (!$request = $this->requestStack->getMasterRequest()) { return $uri; @@ -82,7 +78,7 @@ class WebLinkExtension extends AbstractExtension * * @return string The path of the asset */ - public function preload(string $uri, array $attributes = []) + public function preload(string $uri, array $attributes = []): string { return $this->link($uri, 'preload', $attributes); } @@ -94,7 +90,7 @@ class WebLinkExtension extends AbstractExtension * * @return string The path of the asset */ - public function dnsPrefetch(string $uri, array $attributes = []) + public function dnsPrefetch(string $uri, array $attributes = []): string { return $this->link($uri, 'dns-prefetch', $attributes); } @@ -106,7 +102,7 @@ class WebLinkExtension extends AbstractExtension * * @return string The path of the asset */ - public function preconnect(string $uri, array $attributes = []) + public function preconnect(string $uri, array $attributes = []): string { return $this->link($uri, 'preconnect', $attributes); } @@ -118,7 +114,7 @@ class WebLinkExtension extends AbstractExtension * * @return string The path of the asset */ - public function prefetch(string $uri, array $attributes = []) + public function prefetch(string $uri, array $attributes = []): string { return $this->link($uri, 'prefetch', $attributes); } @@ -130,7 +126,7 @@ class WebLinkExtension extends AbstractExtension * * @return string The path of the asset */ - public function prerender(string $uri, array $attributes = []) + public function prerender(string $uri, array $attributes = []): string { return $this->link($uri, 'prerender', $attributes); } diff --git a/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php b/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php index a81ad61710..d385567b13 100644 --- a/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php @@ -21,10 +21,8 @@ use Twig\TwigFunction; * WorkflowExtension. * * @author Grégoire Pineau - * - * @final */ -class WorkflowExtension extends AbstractExtension +final class WorkflowExtension extends AbstractExtension { private $workflowRegistry; @@ -34,7 +32,7 @@ class WorkflowExtension extends AbstractExtension } /** - * @return TwigFunction[] + * {@inheritdoc} */ public function getFunctions(): array { @@ -50,10 +48,8 @@ class WorkflowExtension extends AbstractExtension /** * Returns true if the transition is enabled. - * - * @return bool true if the transition is enabled */ - public function canTransition(object $subject, string $transitionName, string $name = null) + public function canTransition(object $subject, string $transitionName, string $name = null): bool { return $this->workflowRegistry->get($subject, $name)->can($subject, $transitionName); } @@ -63,17 +59,15 @@ class WorkflowExtension extends AbstractExtension * * @return Transition[] All enabled transitions */ - public function getEnabledTransitions(object $subject, string $name = null) + public function getEnabledTransitions(object $subject, string $name = null): array { return $this->workflowRegistry->get($subject, $name)->getEnabledTransitions($subject); } /** * Returns true if the place is marked. - * - * @return bool true if the transition is enabled */ - public function hasMarkedPlace(object $subject, string $placeName, string $name = null) + public function hasMarkedPlace(object $subject, string $placeName, string $name = null): bool { return $this->workflowRegistry->get($subject, $name)->getMarking($subject)->has($placeName); } @@ -83,7 +77,7 @@ class WorkflowExtension extends AbstractExtension * * @return string[]|int[] */ - public function getMarkedPlaces(object $subject, bool $placesNameOnly = true, string $name = null) + public function getMarkedPlaces(object $subject, bool $placesNameOnly = true, string $name = null): array { $places = $this->workflowRegistry->get($subject, $name)->getMarking($subject)->getPlaces(); @@ -117,9 +111,4 @@ class WorkflowExtension extends AbstractExtension return $workflow->buildTransitionBlockerList($subject, $transitionName); } - - public function getName() - { - return 'workflow'; - } } diff --git a/src/Symfony/Bridge/Twig/Extension/YamlExtension.php b/src/Symfony/Bridge/Twig/Extension/YamlExtension.php index fcb53cb58e..63df133603 100644 --- a/src/Symfony/Bridge/Twig/Extension/YamlExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/YamlExtension.php @@ -12,7 +12,6 @@ namespace Symfony\Bridge\Twig\Extension; use Symfony\Component\Yaml\Dumper as YamlDumper; -use Symfony\Component\Yaml\Yaml; use Twig\Extension\AbstractExtension; use Twig\TwigFilter; @@ -20,15 +19,11 @@ use Twig\TwigFilter; * Provides integration of the Yaml component with Twig. * * @author Fabien Potencier - * - * @final */ -class YamlExtension extends AbstractExtension +final class YamlExtension extends AbstractExtension { /** * {@inheritdoc} - * - * @return TwigFilter[] */ public function getFilters(): array { @@ -38,7 +33,7 @@ class YamlExtension extends AbstractExtension ]; } - public function encode($input, int $inline = 0, int $dumpObjects = 0) + public function encode($input, int $inline = 0, int $dumpObjects = 0): string { static $dumper; @@ -53,7 +48,7 @@ class YamlExtension extends AbstractExtension return $dumper->dump($input, $inline, 0, false, $dumpObjects); } - public function dump($value, int $inline = 0, int $dumpObjects = 0) + public function dump($value, int $inline = 0, int $dumpObjects = 0): string { if (\is_resource($value)) { return '%Resource%'; @@ -65,12 +60,4 @@ class YamlExtension extends AbstractExtension return $this->encode($value, $inline, $dumpObjects); } - - /** - * {@inheritdoc} - */ - public function getName() - { - return 'yaml'; - } } diff --git a/src/Symfony/Bridge/Twig/Node/DumpNode.php b/src/Symfony/Bridge/Twig/Node/DumpNode.php index 9aad5d3260..205381c11d 100644 --- a/src/Symfony/Bridge/Twig/Node/DumpNode.php +++ b/src/Symfony/Bridge/Twig/Node/DumpNode.php @@ -16,14 +16,12 @@ use Twig\Node\Node; /** * @author Julien Galenski - * - * @final */ -class DumpNode extends Node +final class DumpNode extends Node { private $varPrefix; - public function __construct($varPrefix, Node $values = null, int $lineno, string $tag = null) + public function __construct($varPrefix, ?Node $values, int $lineno, string $tag = null) { $nodes = []; if (null !== $values) { diff --git a/src/Symfony/Bridge/Twig/Node/FormThemeNode.php b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php index f2e75cafd4..e37311267b 100644 --- a/src/Symfony/Bridge/Twig/Node/FormThemeNode.php +++ b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php @@ -17,10 +17,8 @@ use Twig\Node\Node; /** * @author Fabien Potencier - * - * @final */ -class FormThemeNode extends Node +final class FormThemeNode extends Node { public function __construct(Node $form, Node $resources, int $lineno, string $tag = null, bool $only = false) { diff --git a/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php b/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php index eee3cd5a3c..4d4cf61365 100644 --- a/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php +++ b/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php @@ -21,10 +21,8 @@ use Twig\Node\Expression\FunctionExpression; * is "foo", the block "foo" will be rendered. * * @author Bernhard Schussek - * - * @final */ -class RenderBlockNode extends FunctionExpression +final class RenderBlockNode extends FunctionExpression { public function compile(Compiler $compiler): void { diff --git a/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php b/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php index d7a3c40f5a..888171f138 100644 --- a/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php +++ b/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php @@ -18,10 +18,8 @@ use Twig\Node\Expression\FunctionExpression; /** * @author Bernhard Schussek - * - * @final */ -class SearchAndRenderBlockNode extends FunctionExpression +final class SearchAndRenderBlockNode extends FunctionExpression { public function compile(Compiler $compiler): void { diff --git a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php index a193028134..cfa4d8a197 100644 --- a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php +++ b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php @@ -19,10 +19,8 @@ use Twig\Node\Node; * Represents a stopwatch node. * * @author Wouter J - * - * @final */ -class StopwatchNode extends Node +final class StopwatchNode extends Node { public function __construct(Node $name, Node $body, AssignNameExpression $var, int $lineno = 0, string $tag = null) { diff --git a/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php b/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php index 5a053990aa..df29f0a199 100644 --- a/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php +++ b/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php @@ -17,10 +17,8 @@ use Twig\Node\Node; /** * @author Fabien Potencier - * - * @final */ -class TransDefaultDomainNode extends Node +final class TransDefaultDomainNode extends Node { public function __construct(AbstractExpression $expr, int $lineno = 0, string $tag = null) { diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php index 68ee49ae55..da2b85d1c2 100644 --- a/src/Symfony/Bridge/Twig/Node/TransNode.php +++ b/src/Symfony/Bridge/Twig/Node/TransNode.php @@ -19,15 +19,10 @@ use Twig\Node\Expression\NameExpression; use Twig\Node\Node; use Twig\Node\TextNode; -// BC/FC with namespaced Twig -class_exists('Twig\Node\Expression\ArrayExpression'); - /** * @author Fabien Potencier - * - * @final */ -class TransNode extends Node +final class TransNode extends Node { public function __construct(Node $body, Node $domain = null, AbstractExpression $count = null, AbstractExpression $vars = null, AbstractExpression $locale = null, int $lineno = 0, string $tag = null) { @@ -105,7 +100,7 @@ class TransNode extends Node $compiler->raw(");\n"); } - protected function compileString(Node $body, ArrayExpression $vars, bool $ignoreStrictCheck = false) + private function compileString(Node $body, ArrayExpression $vars, bool $ignoreStrictCheck = false): array { if ($body instanceof ConstantExpression) { $msg = $body->getAttribute('value'); diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php index db9f35e14e..55bc3ae9a8 100644 --- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php +++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php @@ -27,10 +27,8 @@ use Twig\NodeVisitor\AbstractNodeVisitor; /** * @author Fabien Potencier - * - * @final */ -class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor +final class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor { private $scope; @@ -126,7 +124,7 @@ class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor return false; } - private function getVarName() + private function getVarName(): string { return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false)); } diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php index a219986f1a..89a15cd622 100644 --- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php +++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php @@ -22,29 +22,27 @@ use Twig\NodeVisitor\AbstractNodeVisitor; * TranslationNodeVisitor extracts translation messages. * * @author Fabien Potencier - * - * @final */ -class TranslationNodeVisitor extends AbstractNodeVisitor +final class TranslationNodeVisitor extends AbstractNodeVisitor { const UNDEFINED_DOMAIN = '_undefined'; private $enabled = false; private $messages = []; - public function enable() + public function enable(): void { $this->enabled = true; $this->messages = []; } - public function disable() + public function disable(): void { $this->enabled = false; $this->messages = []; } - public function getMessages() + public function getMessages(): array { return $this->messages; } diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/CodeExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/CodeExtensionTest.php index 874faeeb99..33bb266cb6 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/CodeExtensionTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/CodeExtensionTest.php @@ -44,7 +44,7 @@ class CodeExtensionTest extends TestCase $this->assertEquals($this->getExtension()->abbrMethod($method), $abbr); } - public function getClassNameProvider() + public function getClassNameProvider(): array { return [ ['F\Q\N\Foo', 'Foo'], @@ -52,7 +52,7 @@ class CodeExtensionTest extends TestCase ]; } - public function getMethodNameProvider() + public function getMethodNameProvider(): array { return [ ['F\Q\N\Foo::Method', 'Foo::Method()'], @@ -62,12 +62,7 @@ class CodeExtensionTest extends TestCase ]; } - public function testGetName() - { - $this->assertEquals('code', $this->getExtension()->getName()); - } - - protected function getExtension() + protected function getExtension(): CodeExtension { return new CodeExtension(new FileLinkFormatter('proto://%f#&line=%l&'.substr(__FILE__, 0, 5).'>foobar'), \DIRECTORY_SEPARATOR.'project', 'UTF-8'); } diff --git a/src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php index 1721e2538b..341dc41855 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php @@ -26,10 +26,8 @@ use Twig\TokenParser\AbstractTokenParser; * {% dump foo, bar %} * * @author Julien Galenski - * - * @final */ -class DumpTokenParser extends AbstractTokenParser +final class DumpTokenParser extends AbstractTokenParser { /** * {@inheritdoc} diff --git a/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php index bf0ddfde86..ef5dacb59d 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php @@ -21,10 +21,8 @@ use Twig\TokenParser\AbstractTokenParser; * Token Parser for the 'form_theme' tag. * * @author Fabien Potencier - * - * @final */ -class FormThemeTokenParser extends AbstractTokenParser +final class FormThemeTokenParser extends AbstractTokenParser { /** * {@inheritdoc} diff --git a/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php index 59d994036f..a70e94b801 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php @@ -21,10 +21,8 @@ use Twig\TokenParser\AbstractTokenParser; * Token Parser for the stopwatch tag. * * @author Wouter J - * - * @final */ -class StopwatchTokenParser extends AbstractTokenParser +final class StopwatchTokenParser extends AbstractTokenParser { protected $stopwatchIsAvailable; @@ -54,7 +52,7 @@ class StopwatchTokenParser extends AbstractTokenParser return $body; } - public function decideStopwatchEnd(Token $token) + public function decideStopwatchEnd(Token $token): bool { return $token->test('endstopwatch'); } diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php index 9c1d155ce9..19b820497d 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php @@ -20,10 +20,8 @@ use Twig\TokenParser\AbstractTokenParser; * Token Parser for the 'trans_default_domain' tag. * * @author Fabien Potencier - * - * @final */ -class TransDefaultDomainTokenParser extends AbstractTokenParser +final class TransDefaultDomainTokenParser extends AbstractTokenParser { /** * {@inheritdoc} diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php index 940eb6c252..ffe8828590 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php @@ -24,10 +24,8 @@ use Twig\TokenParser\AbstractTokenParser; * Token Parser for the 'trans' tag. * * @author Fabien Potencier - * - * @final */ -class TransTokenParser extends AbstractTokenParser +final class TransTokenParser extends AbstractTokenParser { /** * {@inheritdoc} @@ -82,7 +80,7 @@ class TransTokenParser extends AbstractTokenParser return new TransNode($body, $domain, $count, $vars, $locale, $lineno, $this->getTag()); } - public function decideTransFork(Token $token) + public function decideTransFork(Token $token): bool { return $token->test(['endtrans']); }