[WebProfilerBundle] Use scalar type-hints where possible

Matthew Smeets · Matthew Smeets · commit 15a7e8e9ba19 · 2019-06-27T12:43:34.000+02:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
@@ -49,7 +49,7 @@ public function __construct(Profiler $profiler = null, Environment $twig, bool $
      *
      * @throws NotFoundHttpException
      */
-    public function showAction($token)
+    public function showAction(string $token)
     {
         if (null === $this->profiler) {
             throw new NotFoundHttpException('The profiler must be enabled.');
@@ -89,7 +89,7 @@ public function showAction($token)
      *
      * @throws NotFoundHttpException
      */
-    public function cssAction($token)
+    public function cssAction(string $token)
     {
         if (null === $this->profiler) {
             throw new NotFoundHttpException('The profiler must be enabled.');
@@ -115,7 +115,7 @@ protected function getTemplate()
     }
 
     // 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
@@ -69,7 +69,7 @@ public function homeAction()
      *
      * @throws NotFoundHttpException
      */
-    public function panelAction(Request $request, $token)
+    public function panelAction(Request $request, string $token)
     {
         $this->denyAccessIfProfilerDisabled();
 
@@ -115,7 +115,7 @@ public function panelAction(Request $request, $token)
      *
      * @throws NotFoundHttpException
      */
-    public function toolbarAction(Request $request, $token)
+    public function toolbarAction(Request $request, string $token)
     {
         if (null === $this->profiler) {
             throw new NotFoundHttpException('The profiler must be enabled.');
@@ -156,9 +156,9 @@ public function toolbarAction(Request $request, $token)
     /**
      * Renders the profiler search bar.
      *
-     * @return Response A Response instance
+     * @param Request $request
      *
-     * @throws NotFoundHttpException
+     * @return Response A Response instance
      */
     public function searchBarAction(Request $request)
     {
@@ -217,7 +217,7 @@ public function searchBarAction(Request $request)
      *
      * @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
@@ -51,7 +51,7 @@ public function __construct(Profiler $profiler = null, Environment $twig, UrlMat
      *
      * @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
@@ -190,7 +190,7 @@ private function generateCspHeader(array $directives)
      *
      * @return array The directive set
      */
-    private function parseDirectives($header)
+    private function parseDirectives(string $header)
     {
         $directives = [];
 
@@ -214,7 +214,7 @@ private function parseDirectives($header)
      *
      * @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
@@ -49,7 +49,7 @@ public function __construct(Profiler $profiler, Environment $twig, array $templa
      *
      * @throws NotFoundHttpException
      */
-    public function getName(Profile $profile, $panel)
+    public function getName(Profile $profile, string $panel)
     {
         $templates = $this->getNames($profile);
 
@@ -97,7 +97,7 @@ public function getNames(Profile $profile)
     }
 
     // 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
@@ -69,7 +69,7 @@ public function getFunctions()
         ];
     }
 
-    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 @@ public function dumpData(Environment $env, Data $data, $maxDepth = 0)
         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);

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function __construct(Profiler $profiler = null, Environment $twig, bool $`
`49`	`49`	`*`
`50`	`50`	`* @throws NotFoundHttpException`
`51`	`51`	`*/`
`52`		`- public function showAction($token)`
	`52`	`+ public function showAction(string $token)`
`53`	`53`	`{`
`54`	`54`	`if (null === $this->profiler) {`
`55`	`55`	`throw new NotFoundHttpException('The profiler must be enabled.');`
`@@ -89,7 +89,7 @@ public function showAction($token)`
`89`	`89`	`*`
`90`	`90`	`* @throws NotFoundHttpException`
`91`	`91`	`*/`
`92`		`- public function cssAction($token)`
	`92`	`+ public function cssAction(string $token)`
`93`	`93`	`{`
`94`	`94`	`if (null === $this->profiler) {`
`95`	`95`	`throw new NotFoundHttpException('The profiler must be enabled.');`
`@@ -115,7 +115,7 @@ protected function getTemplate()`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`// to be removed when the minimum required version of Twig is >= 2.0`
`118`		`- protected function templateExists($template)`
	`118`	`+ protected function templateExists(string $template)`
`119`	`119`	`{`
`120`	`120`	`$loader = $this->twig->getLoader();`
`121`	`121`	`if ($loader instanceof ExistsLoaderInterface) {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function homeAction()`
`69`	`69`	`*`
`70`	`70`	`* @throws NotFoundHttpException`
`71`	`71`	`*/`
`72`		`- public function panelAction(Request $request, $token)`
	`72`	`+ public function panelAction(Request $request, string $token)`
`73`	`73`	`{`
`74`	`74`	`$this->denyAccessIfProfilerDisabled();`
`75`	`75`
`@@ -115,7 +115,7 @@ public function panelAction(Request $request, $token)`
`115`	`115`	`*`
`116`	`116`	`* @throws NotFoundHttpException`
`117`	`117`	`*/`
`118`		`- public function toolbarAction(Request $request, $token)`
	`118`	`+ public function toolbarAction(Request $request, string $token)`
`119`	`119`	`{`
`120`	`120`	`if (null === $this->profiler) {`
`121`	`121`	`throw new NotFoundHttpException('The profiler must be enabled.');`
`@@ -156,9 +156,9 @@ public function toolbarAction(Request $request, $token)`
`156`	`156`	`/**`
`157`	`157`	`* Renders the profiler search bar.`
`158`	`158`	`*`
`159`		`- * @return Response A Response instance`
	`159`	`+ * @param Request $request`
`160`	`160`	`*`
`161`		`- * @throws NotFoundHttpException`
	`161`	`+ * @return Response A Response instance`
`162`	`162`	`*/`
`163`	`163`	`public function searchBarAction(Request $request)`
`164`	`164`	`{`
`@@ -217,7 +217,7 @@ public function searchBarAction(Request $request)`
`217`	`217`	`*`
`218`	`218`	`* @throws NotFoundHttpException`
`219`	`219`	`*/`
`220`		`- public function searchResultsAction(Request $request, $token)`
	`220`	`+ public function searchResultsAction(Request $request, string $token)`
`221`	`221`	`{`
`222`	`222`	`$this->denyAccessIfProfilerDisabled();`
`223`	`223`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function __construct(Profiler $profiler = null, Environment $twig, UrlMat`
`51`	`51`	`*`
`52`	`52`	`* @throws NotFoundHttpException`
`53`	`53`	`*/`
`54`		`- public function panelAction($token)`
	`54`	`+ public function panelAction(string $token)`
`55`	`55`	`{`
`56`	`56`	`if (null === $this->profiler) {`
`57`	`57`	`throw new NotFoundHttpException('The profiler must be enabled.');`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ private function generateCspHeader(array $directives)`
`190`	`190`	`*`
`191`	`191`	`* @return array The directive set`
`192`	`192`	`*/`
`193`		`- private function parseDirectives($header)`
	`193`	`+ private function parseDirectives(string $header)`
`194`	`194`	`{`
`195`	`195`	`$directives = [];`
`196`	`196`
`@@ -214,7 +214,7 @@ private function parseDirectives($header)`
`214`	`214`	`*`
`215`	`215`	`* @return bool`
`216`	`216`	`*/`
`217`		`- private function authorizesInline(array $directivesSet, $type)`
	`217`	`+ private function authorizesInline(array $directivesSet, string $type)`
`218`	`218`	`{`
`219`	`219`	`if (isset($directivesSet[$type])) {`
`220`	`220`	`$directives = $directivesSet[$type];`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function getFunctions()`
`69`	`69`	`];`
`70`	`70`	`}`
`71`	`71`
`72`		`- public function dumpData(Environment $env, Data $data, $maxDepth = 0)`
	`72`	`+ public function dumpData(Environment $env, Data $data, int $maxDepth = 0)`
`73`	`73`	`{`
`74`	`74`	`$this->dumper->setCharset($env->getCharset());`
`75`	`75`	`$this->dumper->dump($data, null, [`
`@@ -83,7 +83,7 @@ public function dumpData(Environment $env, Data $data, $maxDepth = 0)`
`83`	`83`	`return str_replace("\n</pre", '</pre', rtrim($dump));`
`84`	`84`	`}`
`85`	`85`
`86`		`- public function dumpLog(Environment $env, $message, Data $context = null)`
	`86`	`+ public function dumpLog(Environment $env, string $message, Data $context = null)`
`87`	`87`	`{`
`88`	`88`	`$message = twig_escape_filter($env, $message);`
`89`	`89`	`$message = preg_replace('/"(.*?)"/', '"<b>$1</b>"', $message);`