Add types to constructors and private/final/internal methods (Batch III)

Author: derrabus

Command/LintCommand.php

@@ -137,7 +137,7 @@ private function validate(string $content, int $flags, string $file = null)
         return ['file' => $file, 'valid' => true];
     }
 
-    private function display(SymfonyStyle $io, array $files)
+    private function display(SymfonyStyle $io, array $files): int
     {
         switch ($this->format) {
             case 'txt':
@@ -149,7 +149,7 @@ private function display(SymfonyStyle $io, array $files)
         }
     }
 
-    private function displayTxt(SymfonyStyle $io, array $filesInfo)
+    private function displayTxt(SymfonyStyle $io, array $filesInfo): int
     {
         $countFiles = \count($filesInfo);
         $erroredFiles = 0;
@@ -178,7 +178,7 @@ private function displayTxt(SymfonyStyle $io, array $filesInfo)
         return min($erroredFiles, 1);
     }
 
-    private function displayJson(SymfonyStyle $io, array $filesInfo)
+    private function displayJson(SymfonyStyle $io, array $filesInfo): int
     {
         $errors = 0;
 
@@ -198,7 +198,7 @@ private function displayJson(SymfonyStyle $io, array $filesInfo)
         return min($errors, 1);
     }
 
-    private function getFiles(string $fileOrDirectory)
+    private function getFiles(string $fileOrDirectory): iterable
     {
         if (is_file($fileOrDirectory)) {
             yield new \SplFileInfo($fileOrDirectory);
@@ -225,7 +225,7 @@ private function getStdin(): string
         return $yaml;
     }
 
-    private function getParser()
+    private function getParser(): Parser
     {
         if (!$this->parser) {
             $this->parser = new Parser();
@@ -234,7 +234,7 @@ private function getParser()
         return $this->parser;
     }
 
-    private function getDirectoryIterator(string $directory)
+    private function getDirectoryIterator(string $directory): iterable
     {
         $default = function ($directory) {
             return new \RecursiveIteratorIterator(
@@ -250,7 +250,7 @@ private function getDirectoryIterator(string $directory)
         return $default($directory);
     }
 
-    private function isReadable(string $fileOrDirectory)
+    private function isReadable(string $fileOrDirectory): bool
     {
         $default = function ($fileOrDirectory) {
             return is_readable($fileOrDirectory);

Parser.php

@@ -1134,7 +1134,7 @@ private function getLineTag(string $value, int $flags, bool $nextLineCheck = tru
         throw new ParseException(sprintf('Tags support is not enabled. You must use the flag "Yaml::PARSE_CUSTOM_TAGS" to use "%s".', $matches['tag']), $this->getRealCurrentLineNb() + 1, $value, $this->filename);
     }
 
-    private function parseQuotedString($yaml)
+    private function parseQuotedString(string $yaml): ?string
     {
         if ('' === $yaml || ('"' !== $yaml[0] && "'" !== $yaml[0])) {
             throw new \InvalidArgumentException(sprintf('"%s" is not a quoted string.', $yaml));
@@ -1223,7 +1223,7 @@ private function lexInlineMapping(string $yaml): string
         return implode("\n", $lines);
     }
 
-    private function lexInlineSequence($yaml)
+    private function lexInlineSequence(string $yaml): string
     {
         if ('' === $yaml || '[' !== $yaml[0]) {
             throw new \InvalidArgumentException(sprintf('"%s" is not a sequence.', $yaml));