Merge branch '4.4'

* 4.4:
  Fixed tests on the Security and Form components
  Add return types to tests and final|internal|private methods

Author: nicolas-grekas

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/DateFormatter/AbstractIntlDateFormatterTest.php

@@ -965,10 +965,7 @@ protected function assertIsIntlSuccess($formatter, $errorMessage, $errorCode)
      */
     abstract protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null);
 
-    /**
-     * @return string
-     */
-    abstract protected function getIntlErrorMessage();
+    abstract protected function getIntlErrorMessage(): string;
 
     /**
      * @return int
@@ -977,8 +974,6 @@ abstract protected function getIntlErrorCode();
 
     /**
      * @param int $errorCode
-     *
-     * @return bool
      */
-    abstract protected function isIntlFailure($errorCode);
+    abstract protected function isIntlFailure($errorCode): bool;
 }

Tests/DateFormatter/IntlDateFormatterTest.php

@@ -183,7 +183,7 @@ protected function getDateFormatter($locale, $datetype, $timetype, $timezone = n
         };
     }
 
-    protected function getIntlErrorMessage()
+    protected function getIntlErrorMessage(): string
     {
         return IntlGlobals::getErrorMessage();
     }
@@ -193,7 +193,7 @@ protected function getIntlErrorCode()
         return IntlGlobals::getErrorCode();
     }
 
-    protected function isIntlFailure($errorCode)
+    protected function isIntlFailure($errorCode): bool
     {
         return IntlGlobals::isFailure($errorCode);
     }

Tests/DateFormatter/Verification/IntlDateFormatterTest.php

@@ -68,7 +68,7 @@ protected function getDateFormatter($locale, $datetype, $timetype, $timezone = n
         return $formatter;
     }
 
-    protected function getIntlErrorMessage()
+    protected function getIntlErrorMessage(): string
     {
         return intl_get_error_message();
     }
@@ -78,7 +78,7 @@ protected function getIntlErrorCode()
         return intl_get_error_code();
     }
 
-    protected function isIntlFailure($errorCode)
+    protected function isIntlFailure($errorCode): bool
     {
         return intl_is_failure($errorCode);
     }

Tests/NumberFormatter/AbstractNumberFormatterTest.php

@@ -834,18 +834,11 @@ public function testParseWithNotNullPositionValue()
     }
 
     /**
-     * @param string $locale
-     * @param null   $style
-     * @param null   $pattern
-     *
-     * @return \NumberFormatter
+     * @return NumberFormatter|\NumberFormatter
      */
-    abstract protected function getNumberFormatter($locale = 'en', $style = null, $pattern = null);
+    abstract protected function getNumberFormatter(string $locale = 'en', string $style = null, string $pattern = null);
 
-    /**
-     * @return string
-     */
-    abstract protected function getIntlErrorMessage();
+    abstract protected function getIntlErrorMessage(): string;
 
     /**
      * @return int
@@ -854,8 +847,6 @@ abstract protected function getIntlErrorCode();
 
     /**
      * @param int $errorCode
-     *
-     * @return bool
      */
-    abstract protected function isIntlFailure($errorCode);
+    abstract protected function isIntlFailure($errorCode): bool;
 }

Tests/NumberFormatter/NumberFormatterTest.php

@@ -168,13 +168,13 @@ public function testSetTextAttribute()
         $formatter->setTextAttribute(NumberFormatter::NEGATIVE_PREFIX, '-');
     }
 
-    protected function getNumberFormatter($locale = 'en', $style = null, $pattern = null)
+    protected function getNumberFormatter(?string $locale = 'en', string $style = null, string $pattern = null): NumberFormatter
     {
         return new class($locale, $style, $pattern) extends NumberFormatter {
         };
     }
 
-    protected function getIntlErrorMessage()
+    protected function getIntlErrorMessage(): string
     {
         return IntlGlobals::getErrorMessage();
     }
@@ -184,7 +184,7 @@ protected function getIntlErrorCode()
         return IntlGlobals::getErrorCode();
     }
 
-    protected function isIntlFailure($errorCode)
+    protected function isIntlFailure($errorCode): bool
     {
         return IntlGlobals::isFailure($errorCode);
     }

Tests/NumberFormatter/Verification/NumberFormatterTest.php

@@ -39,12 +39,12 @@ public function testGetTextAttribute()
         parent::testGetTextAttribute();
     }
 
-    protected function getNumberFormatter($locale = 'en', $style = null, $pattern = null)
+    protected function getNumberFormatter(?string $locale = 'en', string $style = null, string $pattern = null): \NumberFormatter
     {
         return new \NumberFormatter($locale, $style, $pattern);
     }
 
-    protected function getIntlErrorMessage()
+    protected function getIntlErrorMessage(): string
     {
         return intl_get_error_message();
     }
@@ -54,7 +54,7 @@ protected function getIntlErrorCode()
         return intl_get_error_code();
     }
 
-    protected function isIntlFailure($errorCode)
+    protected function isIntlFailure($errorCode): bool
     {
         return intl_is_failure($errorCode);
     }