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

Author: derrabus

Data/Generator/LanguageDataGenerator.php

@@ -205,7 +205,7 @@ private function generateAlpha3Codes(array $languageCodes, ArrayAccessibleResour
         return array_keys($alpha3Codes);
     }
 
-    private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $metadataBundle)
+    private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $metadataBundle): array
     {
         $aliases = iterator_to_array($metadataBundle['alias']['language']);
         $alpha2ToAlpha3 = [];

Locale.php

@@ -65,7 +65,7 @@ public static function getDefaultFallback(): ?string
      * @return string|null The ICU locale code of the fallback locale, or null
      *                     if no fallback exists
      */
-    public static function getFallback($locale): ?string
+    public static function getFallback(string $locale): ?string
     {
         if (\function_exists('locale_parse')) {
             $localeSubTags = locale_parse($locale);

Util/GitRepository.php

@@ -44,32 +44,32 @@ public static function download(string $remote, string $targetDir): self
         return new self(realpath($targetDir));
     }
 
-    public function getPath()
+    public function getPath(): string
     {
         return $this->path;
     }
 
-    public function getUrl()
+    public function getUrl(): string
     {
         return $this->getLastLine($this->execInPath('git config --get remote.origin.url'));
     }
 
-    public function getLastCommitHash()
+    public function getLastCommitHash(): string
     {
         return $this->getLastLine($this->execInPath('git log -1 --format="%H"'));
     }
 
-    public function getLastAuthor()
+    public function getLastAuthor(): string
     {
         return $this->getLastLine($this->execInPath('git log -1 --format="%an"'));
     }
 
-    public function getLastAuthoredDate()
+    public function getLastAuthoredDate(): \DateTime
     {
         return new \DateTime($this->getLastLine($this->execInPath('git log -1 --format="%ai"')));
     }
 
-    public function getLastTag(callable $filter = null)
+    public function getLastTag(callable $filter = null): string
     {
         $tags = $this->execInPath('git tag -l --sort=v:refname');
 
@@ -80,17 +80,17 @@ public function getLastTag(callable $filter = null)
         return $this->getLastLine($tags);
     }
 
-    public function checkout($branch)
+    public function checkout(string $branch)
     {
         $this->execInPath(sprintf('git checkout %s', escapeshellarg($branch)));
     }
 
-    private function execInPath(string $command)
+    private function execInPath(string $command): array
     {
         return self::exec(sprintf('cd %s && %s', escapeshellarg($this->path), $command));
     }
 
-    private static function exec($command, $customErrorMessage = null)
+    private static function exec(string $command, string $customErrorMessage = null): array
     {
         exec(sprintf('%s 2>&1', $command), $output, $result);
 
@@ -101,7 +101,7 @@ private static function exec($command, $customErrorMessage = null)
         return $output;
     }
 
-    private function getLastLine(array $output)
+    private function getLastLine(array $output): string
     {
         return array_pop($output);
     }