Added more parameter type declarations.

derrabus · derrabus · commit 772c6bb2f13d · 2019-08-14T10:14:39.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -126,7 +126,7 @@ private function sanitizeQueries(string $connectionName, array $queries)
         return $queries;
     }
 
-    private function sanitizeQuery(string $connectionName, $query)
+    private function sanitizeQuery(string $connectionName, array $query): array
     {
         $query['explainable'] = true;
         if (null === $query['params']) {
diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
@@ -133,7 +133,7 @@ public function format(array $record)
     /**
      * @internal
      */
-    public function echoLine($line, $depth, $indentPad)
+    public function echoLine(string $line, int $depth, string $indentPad)
     {
         if (-1 !== $depth) {
             fwrite($this->outputBuffer, $line);
@@ -143,7 +143,7 @@ public function echoLine($line, $depth, $indentPad)
     /**
      * @internal
      */
-    public function castObject($v, array $a, Stub $s, $isNested)
+    public function castObject($v, array $a, Stub $s, bool $isNested)
     {
         if ($this->options['multiline']) {
             return $a;
@@ -180,7 +180,7 @@ private function replacePlaceHolder(array $record)
         return $record;
     }
 
-    private function dumpData($data, $colors = null)
+    private function dumpData($data, bool $colors = null): string
     {
         if (null === $this->dumper) {
             return '';
diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
@@ -118,13 +118,13 @@ protected function findFiles(string $filename)
         throw new RuntimeException(sprintf('File or directory "%s" is not readable', $filename));
     }
 
-    private function validate(string $template, $file)
+    private function validate(string $template, string $file): array
     {
         $realLoader = $this->twig->getLoader();
         try {
-            $temporaryLoader = new ArrayLoader([(string) $file => $template]);
+            $temporaryLoader = new ArrayLoader([$file => $template]);
             $this->twig->setLoader($temporaryLoader);
-            $nodeTree = $this->twig->parse($this->twig->tokenize(new Source($template, (string) $file)));
+            $nodeTree = $this->twig->parse($this->twig->tokenize(new Source($template, $file)));
             $this->twig->compile($nodeTree);
             $this->twig->setLoader($realLoader);
         } catch (Error $e) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
@@ -72,7 +72,7 @@ protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array
     /**
      * @internal
      */
-    final protected function ignoreAutoloadException($class, \Exception $exception)
+    final protected function ignoreAutoloadException(string $class, \Exception $exception)
     {
         try {
             ClassExistenceResource::throwOnRequiredClass($class, $exception);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\StyleInterface;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
@@ -26,6 +27,9 @@
  */
 abstract class AbstractConfigCommand extends ContainerDebugCommand
 {
+    /**
+     * @param OutputInterface|StyleInterface $output
+     */
     protected function listBundles($output)
     {
         $title = 'Available registered bundles with their extension alias if available';
diff --git a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
@@ -128,7 +128,7 @@ public function __sleep(): array
      *
      * @internal
      */
-    public static function throwOnRequiredClass($class, \Exception $previous = null)
+    public static function throwOnRequiredClass(string $class, \Exception $previous = null)
     {
         // If the passed class is the resource being checked, we shouldn't throw.
         if (null === $previous && self::$autoloadedClass === $class) {

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private function sanitizeQueries(string $connectionName, array $queries)`
`126`	`126`	`return $queries;`
`127`	`127`	`}`
`128`	`128`
`129`		`- private function sanitizeQuery(string $connectionName, $query)`
	`129`	`+ private function sanitizeQuery(string $connectionName, array $query): array`
`130`	`130`	`{`
`131`	`131`	`$query['explainable'] = true;`
`132`	`132`	`if (null === $query['params']) {`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function format(array $record)`
`133`	`133`	`/**`
`134`	`134`	`* @internal`
`135`	`135`	`*/`
`136`		`- public function echoLine($line, $depth, $indentPad)`
	`136`	`+ public function echoLine(string $line, int $depth, string $indentPad)`
`137`	`137`	`{`
`138`	`138`	`if (-1 !== $depth) {`
`139`	`139`	`fwrite($this->outputBuffer, $line);`
`@@ -143,7 +143,7 @@ public function echoLine($line, $depth, $indentPad)`
`143`	`143`	`/**`
`144`	`144`	`* @internal`
`145`	`145`	`*/`
`146`		`- public function castObject($v, array $a, Stub $s, $isNested)`
	`146`	`+ public function castObject($v, array $a, Stub $s, bool $isNested)`
`147`	`147`	`{`
`148`	`148`	`if ($this->options['multiline']) {`
`149`	`149`	`return $a;`
`@@ -180,7 +180,7 @@ private function replacePlaceHolder(array $record)`
`180`	`180`	`return $record;`
`181`	`181`	`}`
`182`	`182`
`183`		`- private function dumpData($data, $colors = null)`
	`183`	`+ private function dumpData($data, bool $colors = null): string`
`184`	`184`	`{`
`185`	`185`	`if (null === $this->dumper) {`
`186`	`186`	`return '';`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array`
`72`	`72`	`/**`
`73`	`73`	`* @internal`
`74`	`74`	`*/`
`75`		`- final protected function ignoreAutoloadException($class, \Exception $exception)`
	`75`	`+ final protected function ignoreAutoloadException(string $class, \Exception $exception)`
`76`	`76`	`{`
`77`	`77`	`try {`
`78`	`78`	`ClassExistenceResource::throwOnRequiredClass($class, $exception);`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public function __sleep(): array`
`128`	`128`	`*`
`129`	`129`	`* @internal`
`130`	`130`	`*/`
`131`		`- public static function throwOnRequiredClass($class, \Exception $previous = null)`
	`131`	`+ public static function throwOnRequiredClass(string $class, \Exception $previous = null)`
`132`	`132`	`{`
`133`	`133`	`// If the passed class is the resource being checked, we shouldn't throw.`
`134`	`134`	`if (null === $previous && self::$autoloadedClass === $class) {`