diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
index 1328447bdd..f9ccf63397 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
@@ -47,13 +47,11 @@ class ExceptionController
     /**
      * Renders the exception panel for the given token.
      *
-     * @param string $token The profiler token
-     *
      * @return Response A Response instance
      *
      * @throws NotFoundHttpException
      */
-    public function showAction($token)
+    public function showAction(string $token)
     {
         if (null === $this->profiler) {
             throw new NotFoundHttpException('The profiler must be enabled.');
@@ -85,13 +83,11 @@ class ExceptionController
     /**
      * Renders the exception panel stylesheet for the given token.
      *
-     * @param string $token The profiler token
-     *
      * @return Response A Response instance
      *
      * @throws NotFoundHttpException
      */
-    public function cssAction($token)
+    public function cssAction(string $token)
     {
         if (null === $this->profiler) {
             throw new NotFoundHttpException('The profiler must be enabled.');
@@ -114,7 +110,7 @@ class ExceptionController
     }
 
     // to be removed when the minimum required version of Twig is >= 2.0
-    protected function templateExists($template)
+    protected function templateExists(string $template)
     {
         $loader = $this->twig->getLoader();
         if ($loader instanceof ExistsLoaderInterface) {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
index 410f202871..6110f0f2b9 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -62,14 +62,11 @@ class ProfilerController
     /**
      * Renders a profiler panel for the given token.
      *
-     * @param Request $request The current HTTP request
-     * @param string  $token   The profiler token
-     *
      * @return Response A Response instance
      *
      * @throws NotFoundHttpException
      */
-    public function panelAction(Request $request, $token)
+    public function panelAction(Request $request, string $token)
     {
         $this->denyAccessIfProfilerDisabled();
 
@@ -108,14 +105,11 @@ class ProfilerController
     /**
      * Renders the Web Debug Toolbar.
      *
-     * @param Request $request The current HTTP Request
-     * @param string  $token   The profiler token
-     *
      * @return Response A Response instance
      *
      * @throws NotFoundHttpException
      */
-    public function toolbarAction(Request $request, $token)
+    public function toolbarAction(Request $request, string $token = null)
     {
         if (null === $this->profiler) {
             throw new NotFoundHttpException('The profiler must be enabled.');
@@ -210,14 +204,11 @@ class ProfilerController
     /**
      * Renders the search results.
      *
-     * @param Request $request The current HTTP Request
-     * @param string  $token   The token
-     *
      * @return Response A Response instance
      *
      * @throws NotFoundHttpException
      */
-    public function searchResultsAction(Request $request, $token)
+    public function searchResultsAction(Request $request, string $token)
     {
         $this->denyAccessIfProfilerDisabled();
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
index f3f68fe5d8..95850fae0c 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
@@ -45,13 +45,11 @@ class RouterController
     /**
      * Renders the profiler panel for the given token.
      *
-     * @param string $token The profiler token
-     *
      * @return Response A Response instance
      *
      * @throws NotFoundHttpException
      */
-    public function panelAction($token)
+    public function panelAction(string $token)
     {
         if (null === $this->profiler) {
             throw new NotFoundHttpException('The profiler must be enabled.');
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
index a38e7c686f..a1b7dc4737 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
@@ -190,7 +190,7 @@ class ContentSecurityPolicyHandler
      *
      * @return array The directive set
      */
-    private function parseDirectives($header)
+    private function parseDirectives(string $header)
     {
         $directives = [];
 
@@ -214,7 +214,7 @@ class ContentSecurityPolicyHandler
      *
      * @return bool
      */
-    private function authorizesInline(array $directivesSet, $type)
+    private function authorizesInline(array $directivesSet, string $type)
     {
         if (isset($directivesSet[$type])) {
             $directives = $directivesSet[$type];
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
index fed7a6463b..5b75e795df 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
@@ -42,14 +42,11 @@ class TemplateManager
     /**
      * Gets the template name for a given panel.
      *
-     * @param Profile $profile
-     * @param string  $panel
-     *
      * @return mixed
      *
      * @throws NotFoundHttpException
      */
-    public function getName(Profile $profile, $panel)
+    public function getName(Profile $profile, string $panel)
     {
         $templates = $this->getNames($profile);
 
@@ -97,7 +94,7 @@ class TemplateManager
     }
 
     // to be removed when the minimum required version of Twig is >= 2.0
-    protected function templateExists($template)
+    protected function templateExists(string $template)
     {
         $loader = $this->twig->getLoader();
         if ($loader instanceof ExistsLoaderInterface) {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
index 4494783633..b14eb362c8 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
@@ -69,7 +69,7 @@ class WebProfilerExtension extends ProfilerExtension
         ];
     }
 
-    public function dumpData(Environment $env, Data $data, $maxDepth = 0)
+    public function dumpData(Environment $env, Data $data, int $maxDepth = 0)
     {
         $this->dumper->setCharset($env->getCharset());
         $this->dumper->dump($data, null, [
@@ -83,7 +83,7 @@ class WebProfilerExtension extends ProfilerExtension
         return str_replace("\n</pre", '</pre', rtrim($dump));
     }
 
-    public function dumpLog(Environment $env, $message, Data $context = null)
+    public function dumpLog(Environment $env, string $message, Data $context = null)
     {
         $message = twig_escape_filter($env, $message);
         $message = preg_replace('/&quot;(.*?)&quot;/', '&quot;<b>$1</b>&quot;', $message);