feature #23262 Add scalar typehints/return types (chalasr, xabbuh)

fabpot · fabpot · commit f53f6de6e0ef · 2017-09-03T09:17:01.000-07:00
This PR was merged into the 4.0-dev branch. Discussion ---------- Add scalar typehints/return types | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no (final, already breaks if doc not respected) | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony/symfony#23242 (comment) | License | MIT | Doc PR | n/a Commits ------- 7b1715b078 [Yaml] use scalar type hints where possible 6ce70e4bf9 Add scalar typehints/return types on final/internal/private code
diff --git a/Core/Authentication/RememberMe/PersistentToken.php b/Core/Authentication/RememberMe/PersistentToken.php
@@ -24,18 +24,7 @@ final class PersistentToken implements PersistentTokenInterface
     private $tokenValue;
     private $lastUsed;
 
-    /**
-     * Constructor.
-     *
-     * @param string    $class
-     * @param string    $username
-     * @param string    $series
-     * @param string    $tokenValue
-     * @param \DateTime $lastUsed
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct($class, $username, $series, $tokenValue, \DateTime $lastUsed)
+    public function __construct(string $class, string $username, string $series, string $tokenValue, \DateTime $lastUsed)
     {
         if (empty($class)) {
             throw new \InvalidArgumentException('$class must not be empty.');
diff --git a/Http/Firewall/ExceptionListener.php b/Http/Firewall/ExceptionListener.php
@@ -104,7 +104,7 @@ public function onKernelException(GetResponseForExceptionEvent $event)
         } while (null !== $exception = $exception->getPrevious());
     }
 
-    private function handleAuthenticationException(GetResponseForExceptionEvent $event, AuthenticationException $exception)
+    private function handleAuthenticationException(GetResponseForExceptionEvent $event, AuthenticationException $exception): void
     {
         if (null !== $this->logger) {
             $this->logger->info('An AuthenticationException was thrown; redirecting to authentication entry point.', array('exception' => $exception));
@@ -167,22 +167,14 @@ private function handleAccessDeniedException(GetResponseForExceptionEvent $event
         }
     }
 
-    private function handleLogoutException(LogoutException $exception)
+    private function handleLogoutException(LogoutException $exception): void
     {
         if (null !== $this->logger) {
             $this->logger->info('A LogoutException was thrown.', array('exception' => $exception));
         }
     }
 
-    /**
-     * @param Request                 $request
-     * @param AuthenticationException $authException
-     *
-     * @return Response
-     *
-     * @throws AuthenticationException
-     */
-    private function startAuthentication(Request $request, AuthenticationException $authException)
+    private function startAuthentication(Request $request, AuthenticationException $authException): Response
     {
         if (null === $this->authenticationEntryPoint) {
             throw $authException;
@@ -216,9 +208,6 @@ private function startAuthentication(Request $request, AuthenticationException $
         return $response;
     }
 
-    /**
-     * @param Request $request
-     */
     protected function setTargetPath(Request $request)
     {
         // session isn't required when using HTTP basic authentication mechanism for example

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function onKernelException(GetResponseForExceptionEvent $event)`
`104`	`104`	`} while (null !== $exception = $exception->getPrevious());`
`105`	`105`	`}`
`106`	`106`
`107`		`- private function handleAuthenticationException(GetResponseForExceptionEvent $event, AuthenticationException $exception)`
	`107`	`+ private function handleAuthenticationException(GetResponseForExceptionEvent $event, AuthenticationException $exception): void`
`108`	`108`	`{`
`109`	`109`	`if (null !== $this->logger) {`
`110`	`110`	`$this->logger->info('An AuthenticationException was thrown; redirecting to authentication entry point.', array('exception' => $exception));`
`@@ -167,22 +167,14 @@ private function handleAccessDeniedException(GetResponseForExceptionEvent $event`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
`170`		`- private function handleLogoutException(LogoutException $exception)`
	`170`	`+ private function handleLogoutException(LogoutException $exception): void`
`171`	`171`	`{`
`172`	`172`	`if (null !== $this->logger) {`
`173`	`173`	`$this->logger->info('A LogoutException was thrown.', array('exception' => $exception));`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
`177`		`- /**`
`178`		`- * @param Request $request`
`179`		`- * @param AuthenticationException $authException`
`180`		`- *`
`181`		`- * @return Response`
`182`		`- *`
`183`		`- * @throws AuthenticationException`
`184`		`- */`
`185`		`- private function startAuthentication(Request $request, AuthenticationException $authException)`
	`177`	`+ private function startAuthentication(Request $request, AuthenticationException $authException): Response`
`186`	`178`	`{`
`187`	`179`	`if (null === $this->authenticationEntryPoint) {`
`188`	`180`	`throw $authException;`
`@@ -216,9 +208,6 @@ private function startAuthentication(Request $request, AuthenticationException $`
`216`	`208`	`return $response;`
`217`	`209`	`}`
`218`	`210`
`219`		`- /**`
`220`		`- * @param Request $request`
`221`		`- */`
`222`	`211`	`protected function setTargetPath(Request $request)`
`223`	`212`	`{`
`224`	`213`	`// session isn't required when using HTTP basic authentication mechanism for example`