symfony · andreia · Jul 2, 2019
diff --git a/src/Symfony/Component/Security/Http/AccessMap.php b/src/Symfony/Component/Security/Http/AccessMap.php
@@ -28,7 +28,7 @@ class AccessMap implements AccessMapInterface
      * @param array       $attributes An array of attributes to pass to the access decision manager (like roles)
      * @param string|null $channel    The channel to enforce (http, https, or null)
      */
-    public function add(RequestMatcherInterface $requestMatcher, array $attributes = [], $channel = null)
+    public function add(RequestMatcherInterface $requestMatcher, array $attributes = [], string $channel = null)
     {
         $this->map[] = [$requestMatcher, $attributes, $channel];
     }

diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php
@@ -31,11 +31,9 @@ public function __construct(RequestStack $requestStack)
     }
 
     /**
-     * @param bool $clearSession
-     *
      * @return AuthenticationException|null
      */
-    public function getLastAuthenticationError($clearSession = true)
+    public function getLastAuthenticationError(bool $clearSession = true)
     {
         $request = $this->getRequest();
         $authenticationException = null;

diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
@@ -82,12 +82,7 @@ public function getProviderKey()
         return $this->providerKey;
     }
 
-    /**
-     * Set the provider key.
-     *
-     * @param string $providerKey
-     */
-    public function setProviderKey($providerKey)
+    public function setProviderKey(string $providerKey)
     {
         $this->providerKey = $providerKey;
     }

diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php
@@ -58,7 +58,7 @@ public function __construct(UrlGeneratorInterface $urlGenerator = null, $urlMatc
      *
      * @return RedirectResponse A RedirectResponse instance
      */
-    public function createRedirectResponse(Request $request, $path, $status = 302)
+    public function createRedirectResponse(Request $request, string $path, int $status = 302)
     {
         if (null !== $this->secureDomainRegexp && 'https' === $this->urlMatcher->getContext()->getScheme() && preg_match('#^https?:[/\\\\]{2,}+[^/]++#i', $path, $host) && !preg_match(sprintf($this->secureDomainRegexp, preg_quote($request->getHttpHost())), $host[0])) {
             $path = '/';
@@ -78,7 +78,7 @@ public function createRedirectResponse(Request $request, $path, $status = 302)
      *
      * @return Request A Request instance
      */
-    public function createRequest(Request $request, $path)
+    public function createRequest(Request $request, string $path)
     {
         $newRequest = Request::create($this->generateUri($request, $path), 'get', [], $request->cookies->all(), [], $request->server->all());
 
@@ -116,7 +116,7 @@ public function createRequest(Request $request, $path)
      *
      * @return bool true if the path is the same as the one from the Request, false otherwise
      */
-    public function checkRequestPath(Request $request, $path)
+    public function checkRequestPath(Request $request, string $path)
     {
         if ('/' !== $path[0]) {
             try {
@@ -147,7 +147,7 @@ public function checkRequestPath(Request $request, $path)
      *
      * @throws \LogicException
      */
-    public function generateUri(Request $request, $path)
+    public function generateUri(Request $request, string $path)
     {
         if (0 === strpos($path, 'http') || !$path) {
             return $path;

diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
@@ -56,32 +56,24 @@ public function registerListener($key, $logoutPath, $csrfTokenId, $csrfParameter
     /**
      * Generates the absolute logout path for the firewall.
      *
-     * @param string|null $key The firewall key or null to use the current firewall key
-     *
      * @return string The logout path
      */
-    public function getLogoutPath($key = null)
+    public function getLogoutPath(string $key = null)
     {
         return $this->generateLogoutUrl($key, UrlGeneratorInterface::ABSOLUTE_PATH);
     }
 
     /**
      * 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 logout URL
      */
-    public function getLogoutUrl($key = null)
+    public function getLogoutUrl(string $key = null)
     {
         return $this->generateLogoutUrl($key, UrlGeneratorInterface::ABSOLUTE_URL);
     }
 
-    /**
-     * @param string|null $key     The current firewall key
-     * @param string|null $context The current firewall context
-     */
-    public function setCurrentFirewall($key, $context = null)
+    public function setCurrentFirewall(?string $key, string $context = null)
     {
         $this->currentFirewall = [$key, $context];
     }

diff --git a/src/Symfony/Component/Security/Http/ParameterBagUtils.php b/src/Symfony/Component/Security/Http/ParameterBagUtils.php
@@ -29,14 +29,11 @@ final class ParameterBagUtils
      *
      * Paths like foo[bar] will be evaluated to find deeper items in nested data structures.
      *
-     * @param ParameterBag $parameters The parameter bag
-     * @param string       $path       The key
-     *
      * @return mixed
      *
      * @throws InvalidArgumentException when the given path is malformed
      */
-    public static function getParameterBagValue(ParameterBag $parameters, $path)
+    public static function getParameterBagValue(ParameterBag $parameters, string $path)
     {
         if (false === $pos = strpos($path, '[')) {
             return $parameters->get($path);
@@ -64,14 +61,11 @@ public static function getParameterBagValue(ParameterBag $parameters, $path)
      *
      * Paths like foo[bar] will be evaluated to find deeper items in nested data structures.
      *
-     * @param Request $request The request
-     * @param string  $path    The key
-     *
      * @return mixed
      *
      * @throws InvalidArgumentException when the given path is malformed
      */
-    public static function getRequestParameterValue(Request $request, $path)
+    public static function getRequestParameterValue(Request $request, string $path)
     {
         if (false === $pos = strpos($path, '[')) {
             return $request->get($path);

diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
@@ -235,11 +235,9 @@ final protected function getUserProvider($class)
     /**
      * Decodes the raw cookie value.
      *
-     * @param string $rawCookie
-     *
      * @return array
      */
-    protected function decodeCookie($rawCookie)
+    protected function decodeCookie(string $rawCookie)
     {
         return explode(self::COOKIE_DELIMITER, base64_decode($rawCookie));
     }

diff --git a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
@@ -91,14 +91,12 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt
     /**
      * Generates the cookie value.
      *
-     * @param string $class
-     * @param string $username The username
      * @param int    $expires  The Unix timestamp when the cookie expires
      * @param string $password The encoded password
      *
      * @return string
      */
-    protected function generateCookieValue($class, $username, $expires, $password)
+    protected function generateCookieValue(string $class, string $username, int $expires, string $password)
     {
         // $username is encoded because it might contain COOKIE_DELIMITER,
         // we assume other values don't
@@ -113,14 +111,12 @@ protected function generateCookieValue($class, $username, $expires, $password)
     /**
      * Generates a hash for the cookie to ensure it is not being tampered with.
      *
-     * @param string $class
-     * @param string $username The username
      * @param int    $expires  The Unix timestamp when the cookie expires
      * @param string $password The encoded password
      *
      * @return string
      */
-    protected function generateCookieHash($class, $username, $expires, $password)
+    protected function generateCookieHash(string $class, string $username, int $expires, string $password)
     {
         return hash_hmac('sha256', $class.self::COOKIE_DELIMITER.$username.self::COOKIE_DELIMITER.$expires.self::COOKIE_DELIMITER.$password, $this->getSecret());
     }