Add return types to tests and final|internal|private methods

Author: nicolas-grekas

Intl.php

@@ -109,7 +109,7 @@ final class Intl
      *
      * @return bool Returns true if the intl extension is installed, false otherwise
      */
-    public static function isExtensionLoaded()
+    public static function isExtensionLoaded(): bool
     {
         return class_exists('\ResourceBundle');
     }
@@ -121,7 +121,7 @@ public static function isExtensionLoaded()
      *
      * @deprecated since Symfony 4.3, to be removed in 5.0. Use {@see Currencies} instead.
      */
-    public static function getCurrencyBundle()
+    public static function getCurrencyBundle(): CurrencyBundleInterface
     {
         @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.3, use "%s" instead.', __METHOD__, Currencies::class), E_USER_DEPRECATED);
 
@@ -143,7 +143,7 @@ public static function getCurrencyBundle()
      *
      * @deprecated since Symfony 4.3, to be removed in 5.0. Use {@see Languages} or {@see Scripts} instead.
      */
-    public static function getLanguageBundle()
+    public static function getLanguageBundle(): LanguageBundleInterface
     {
         @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.3, use "%s" or "%s" instead.', __METHOD__, Languages::class, Scripts::class), E_USER_DEPRECATED);
 
@@ -169,7 +169,7 @@ public static function getLanguageBundle()
      *
      * @deprecated since Symfony 4.3, to be removed in 5.0. Use {@see Locales} instead.
      */
-    public static function getLocaleBundle()
+    public static function getLocaleBundle(): LocaleBundleInterface
     {
         @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.3, use "%s" instead.', __METHOD__, Locales::class), E_USER_DEPRECATED);
 
@@ -190,7 +190,7 @@ public static function getLocaleBundle()
      *
      * @deprecated since Symfony 4.3, to be removed in 5.0. Use {@see Countries} instead.
      */
-    public static function getRegionBundle()
+    public static function getRegionBundle(): RegionBundleInterface
     {
         @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.3, use "%s" instead.', __METHOD__, Countries::class), E_USER_DEPRECATED);
 
@@ -210,7 +210,7 @@ public static function getRegionBundle()
      *
      * @return string|null The ICU version or NULL if it could not be determined
      */
-    public static function getIcuVersion()
+    public static function getIcuVersion(): ?string
     {
         if (false === self::$icuVersion) {
             if (!self::isExtensionLoaded()) {
@@ -240,7 +240,7 @@ public static function getIcuVersion()
      *
      * @return string The version of the installed ICU data
      */
-    public static function getIcuDataVersion()
+    public static function getIcuDataVersion(): string
     {
         if (false === self::$icuDataVersion) {
             self::$icuDataVersion = trim(file_get_contents(self::getDataDirectory().'/version.txt'));
@@ -254,7 +254,7 @@ public static function getIcuDataVersion()
      *
      * @return string The ICU version of the stub classes
      */
-    public static function getIcuStubVersion()
+    public static function getIcuStubVersion(): string
     {
         return '64.2';
     }
@@ -264,7 +264,7 @@ public static function getIcuStubVersion()
      *
      * @return string The absolute path to the data directory
      */
-    public static function getDataDirectory()
+    public static function getDataDirectory(): string
     {
         return __DIR__.'/Resources/data';
     }

Tests/Collator/AbstractCollatorTest.php

@@ -54,9 +54,7 @@ public function asortProvider()
     }
 
     /**
-     * @param string $locale
-     *
-     * @return \Collator
+     * @return Collator|\Collator
      */
-    abstract protected function getCollator($locale);
+    abstract protected function getCollator(string $locale);
 }

Tests/Collator/CollatorTest.php

@@ -95,7 +95,7 @@ public function testStaticCreate()
         $this->assertInstanceOf('\Symfony\Component\Intl\Collator\Collator', $collator);
     }
 
-    protected function getCollator($locale)
+    protected function getCollator(?string $locale): Collator
     {
         return new class($locale) extends Collator {
         };

Tests/Collator/Verification/CollatorTest.php

@@ -29,7 +29,7 @@ protected function setUp(): void
         parent::setUp();
     }
 
-    protected function getCollator($locale)
+    protected function getCollator(?string $locale): \Collator
     {
         return new \Collator($locale);
     }

Tests/Data/Provider/AbstractDataProviderTest.php

@@ -756,19 +756,13 @@ protected function getRootLocales()
         return self::$rootLocales;
     }
 
-    /**
-     * @return BundleEntryReader
-     */
-    protected function createEntryReader()
+    protected function createEntryReader(): BundleEntryReader
     {
         $entryReader = new BundleEntryReader($this->createBundleReader());
         $entryReader->setLocaleAliases($this->getLocaleAliases());
 
         return $entryReader;
     }
 
-    /**
-     * @return BundleReaderInterface
-     */
-    abstract protected function createBundleReader();
+    abstract protected function createBundleReader(): BundleReaderInterface;
 }

Tests/Data/Provider/Json/JsonCurrencyDataProviderTest.php

@@ -28,10 +28,7 @@ protected function getDataDirectory()
         return Intl::getDataDirectory();
     }
 
-    /**
-     * @return BundleReaderInterface
-     */
-    protected function createBundleReader()
+    protected function createBundleReader(): BundleReaderInterface
     {
         return new JsonBundleReader();
     }

Tests/Data/Provider/Json/JsonLanguageDataProviderTest.php

@@ -28,10 +28,7 @@ protected function getDataDirectory()
         return Intl::getDataDirectory();
     }
 
-    /**
-     * @return BundleReaderInterface
-     */
-    protected function createBundleReader()
+    protected function createBundleReader(): BundleReaderInterface
     {
         return new JsonBundleReader();
     }

Tests/Data/Provider/Json/JsonLocaleDataProviderTest.php

@@ -28,10 +28,7 @@ protected function getDataDirectory()
         return Intl::getDataDirectory();
     }
 
-    /**
-     * @return BundleReaderInterface
-     */
-    protected function createBundleReader()
+    protected function createBundleReader(): BundleReaderInterface
     {
         return new JsonBundleReader();
     }

Tests/Data/Provider/Json/JsonRegionDataProviderTest.php

@@ -28,10 +28,7 @@ protected function getDataDirectory()
         return Intl::getDataDirectory();
     }
 
-    /**
-     * @return BundleReaderInterface
-     */
-    protected function createBundleReader()
+    protected function createBundleReader(): BundleReaderInterface
     {
         return new JsonBundleReader();
     }

Tests/Data/Provider/Json/JsonScriptDataProviderTest.php

@@ -28,10 +28,7 @@ protected function getDataDirectory()
         return Intl::getDataDirectory();
     }
 
-    /**
-     * @return BundleReaderInterface
-     */
-    protected function createBundleReader()
+    protected function createBundleReader(): BundleReaderInterface
     {
         return new JsonBundleReader();
     }