symfony · Tobion · Jul 28, 2019 · Jul 28, 2019
diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php
@@ -39,14 +39,14 @@ public function setRequestStack(RequestStack $requestStack)
        $this->requestStack = $requestStack;
    }

-    public function setEnvironment($environment)
+    public function setEnvironment(string $environment)
    {
        $this->environment = $environment;
    }

-    public function setDebug($debug)
+    public function setDebug(bool $debug)
    {
-        $this->debug = (bool) $debug;
+        $this->debug = $debug;
    }

    /**

diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
@@ -107,7 +107,7 @@ private function getFilesInfo(array $filenames)
        return $filesInfo;
    }

-    protected function findFiles($filename)
+    protected function findFiles(string $filename)
    {
        if (is_file($filename)) {
            return [$filename];

diff --git a/src/Symfony/Bridge/Twig/Extension/AssetExtension.php b/src/Symfony/Bridge/Twig/Extension/AssetExtension.php
@@ -46,25 +46,19 @@ public function getFunctions()
     * If the package used to generate the path is an instance of
     * UrlPackage, you will always get a URL and not a path.
     *
-     * @param string $path        A public path
-     * @param string $packageName The name of the asset package to use
-     *
     * @return string The public path of the asset
     */
-    public function getAssetUrl($path, $packageName = null)
+    public function getAssetUrl(string $path, string $packageName = null)
    {
        return $this->packages->getUrl($path, $packageName);
    }

    /**
     * Returns the version of an asset.
     *
-     * @param string $path        A public path
-     * @param string $packageName The name of the asset package to use
-     *
     * @return string The asset version
     */
-    public function getAssetVersion($path, $packageName = null)
+    public function getAssetVersion(string $path, string $packageName = null)
    {
        return $this->packages->getVersion($path, $packageName);
    }

diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
@@ -57,15 +57,15 @@ public function getFilters()
        ];
    }

-    public function abbrClass($class)
+    public function abbrClass(string $class)
    {
        $parts = explode('\\', $class);
        $short = array_pop($parts);

        return sprintf('<abbr title="%s">%s</abbr>', $class, $short);
    }

-    public function abbrMethod($method)
+    public function abbrMethod(string $method)
    {
        if (false !== strpos($method, '::')) {
            list($class, $method) = explode('::', $method, 2);
@@ -82,11 +82,9 @@ public function abbrMethod($method)
    /**
     * Formats an array as a string.
     *
-     * @param array $args The argument array
-     *
     * @return string
     */
-    public function formatArgs($args)
+    public function formatArgs(array $args)
    {
        $result = [];
        foreach ($args as $key => $item) {
@@ -115,25 +113,19 @@ public function formatArgs($args)
    /**
     * Formats an array as a string.
     *
-     * @param array $args The argument array
-     *
     * @return string
     */
-    public function formatArgsAsText($args)
+    public function formatArgsAsText(array $args)
    {
        return strip_tags($this->formatArgs($args));
    }

    /**
     * Returns an excerpt of a code file around the given line number.
     *
-     * @param string $file       A file path
-     * @param int    $line       The selected line number
-     * @param int    $srcContext The number of displayed lines around or -1 for the whole file
-     *
     * @return string An HTML string
     */
-    public function fileExcerpt($file, $line, $srcContext = 3)
+    public function fileExcerpt(string $file, int $line, int $srcContext = 3)
    {
        if (is_file($file) && is_readable($file)) {
            // highlight_file could throw warnings
@@ -165,13 +157,9 @@ public function fileExcerpt($file, $line, $srcContext = 3)
    /**
     * Formats a file path.
     *
-     * @param string $file An absolute file path
-     * @param int    $line The line number
-     * @param string $text Use this text for the link rather than the file path
-     *
     * @return string
     */
-    public function formatFile($file, $line, $text = null)
+    public function formatFile(string $file, int $line, string $text = null)
    {
        $file = trim($file);

@@ -197,12 +185,9 @@ public function formatFile($file, $line, $text = null)
    /**
     * Returns the link for a given file/line pair.
     *
-     * @param string $file An absolute file path
-     * @param int    $line The line number
-     *
     * @return string|false A link or false
     */
-    public function getFileLink($file, $line)
+    public function getFileLink(string $file, int $line)
    {
        if ($fmt = $this->fileLinkFormat) {
            return \is_string($fmt) ? strtr($fmt, ['%f' => $file, '%l' => $line]) : $fmt->format($file, $line);
@@ -222,7 +207,7 @@ public function getFileRelative(string $file): ?string
        return null;
    }

-    public function formatFileFromText($text)
+    public function formatFileFromText(string $text)
    {
        return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', function ($match) {
            return 'in '.$this->formatFile($match[2], $match[3]);
@@ -232,7 +217,7 @@ public function formatFileFromText($text)
    /**
     * @internal
     */
-    public function formatLogMessage($message, array $context)
+    public function formatLogMessage(string $message, array $context)
    {
        if ($context && false !== strpos($message, '{')) {
            $replacements = [];
@@ -258,7 +243,7 @@ public function getName()
        return 'code';
    }

-    protected static function fixCodeMarkup($line)
+    protected static function fixCodeMarkup(string $line)
    {
        // </span> ending tag from previous line
        $opening = strpos($line, '<span');

diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php
@@ -52,7 +52,7 @@ public function getName()
        return 'dump';
    }

-    public function dump(Environment $env, $context)
+    public function dump(Environment $env, array $context)
    {
        if (!$env->isDebug()) {
            return;

diff --git a/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php b/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php
@@ -32,7 +32,7 @@ public function getFunctions()
        ];
    }

-    public function createExpression($expression)
+    public function createExpression(string $expression)
    {
        return new Expression($expression);
    }

diff --git a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
@@ -46,13 +46,11 @@ public function getFunctions()
     *
     * This method returns the path unchanged if no request is available.
     *
-     * @param string $path The path
-     *
     * @return string The absolute URL
     *
     * @see Request::getUriForPath()
     */
-    public function generateAbsoluteUrl($path)
+    public function generateAbsoluteUrl(string $path)
    {
        return $this->urlHelper->getAbsoluteUrl($path);
    }
@@ -62,13 +60,11 @@ public function generateAbsoluteUrl($path)
     *
     * This method returns the path unchanged if no request is available.
     *
-     * @param string $path The path
-     *
     * @return string The relative path
     *
     * @see Request::getRelativeUriForPath()
     */
-    public function generateRelativePath($path)
+    public function generateRelativePath(string $path)
    {
        return $this->urlHelper->getRelativePath($path);
    }

diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
@@ -31,7 +31,7 @@ public function getFunctions()
        ];
    }

-    public static function controller($controller, $attributes = [], $query = [])
+    public static function controller(string $controller, array $attributes = [], array $query = [])
    {
        return new ControllerReference($controller, $attributes, $query);
    }

diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php
@@ -31,14 +31,13 @@ public function __construct(FragmentHandler $handler)
    /**
     * Renders a fragment.
     *
-     * @param string|ControllerReference $uri     A URI as a string or a ControllerReference instance
-     * @param array                      $options An array of options
+     * @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, $options = [])
+    public function renderFragment($uri, array $options = [])
    {
        $strategy = isset($options['strategy']) ? $options['strategy'] : 'inline';
        unset($options['strategy']);
@@ -49,15 +48,13 @@ public function renderFragment($uri, $options = [])
    /**
     * Renders a fragment.
     *
-     * @param string                     $strategy A strategy name
-     * @param string|ControllerReference $uri      A URI as a string or a ControllerReference instance
-     * @param array                      $options  An array of options
+     * @param string|ControllerReference $uri A URI as a string or a ControllerReference instance
     *
     * @return string The fragment content
     *
     * @see FragmentHandler::render()
     */
-    public function renderFragmentStrategy($strategy, $uri, $options = [])
+    public function renderFragmentStrategy(string $strategy, $uri, array $options = [])
    {
        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
@@ -47,7 +47,7 @@ public function getFunctions()
     *
     * @return string The relative logout URL
     */
-    public function getLogoutPath($key = null)
+    public function getLogoutPath(string $key = null)
    {
        return $this->generator->getLogoutPath($key);
    }
@@ -59,7 +59,7 @@ public function getLogoutPath($key = null)
     *
     * @return string The absolute logout URL
     */
-    public function getLogoutUrl($key = null)
+    public function getLogoutUrl(string $key = null)
    {
        return $this->generator->getLogoutUrl($key);
    }

diff --git a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
@@ -46,25 +46,17 @@ public function getFunctions()
    }

    /**
-     * @param string $name
-     * @param array  $parameters
-     * @param bool   $relative
-     *
     * @return string
     */
-    public function getPath($name, $parameters = [], $relative = false)
+    public function getPath(string $name, array $parameters = [], bool $relative = false)
    {
        return $this->generator->generate($name, $parameters, $relative ? UrlGeneratorInterface::RELATIVE_PATH : UrlGeneratorInterface::ABSOLUTE_PATH);
    }

    /**
-     * @param string $name
-     * @param array  $parameters
-     * @param bool   $schemeRelative
-     *
     * @return string
     */
-    public function getUrl($name, $parameters = [], $schemeRelative = false)
+    public function getUrl(string $name, array $parameters = [], bool $schemeRelative = false)
    {
        return $this->generator->generate($name, $parameters, $schemeRelative ? UrlGeneratorInterface::NETWORK_PATH : UrlGeneratorInterface::ABSOLUTE_URL);
    }

diff --git a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php
@@ -31,7 +31,7 @@ public function __construct(AuthorizationCheckerInterface $securityChecker = nul
        $this->securityChecker = $securityChecker;
    }

-    public function isGranted($role, $object = null, $field = null)
+    public function isGranted($role, object $object = null, string $field = null)
    {
        if (null === $this->securityChecker) {
            return false;

diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -94,7 +94,7 @@ public function getTranslationNodeVisitor(): TranslationNodeVisitor
        return $this->translationNodeVisitor ?: $this->translationNodeVisitor = new TranslationNodeVisitor();
    }

-    public function trans($message, array $arguments = [], $domain = null, $locale = null, $count = null): string
+    public function trans(string $message, array $arguments = [], string $domain = null, string $locale = null, int $count = null): string
    {
        if (null !== $count) {
            $arguments['%count%'] = $count;