fix merge

Author: nicolas-grekas

Tests/Collator/AbstractCollatorTest.php

@@ -56,5 +56,5 @@ public function asortProvider()
     /**
      * @return Collator|\Collator
      */
-    abstract protected function getCollator(string $locale): object;
+    abstract protected function getCollator(string $locale);
 }

Tests/DateFormatter/AbstractIntlDateFormatterTest.php

@@ -963,7 +963,7 @@ protected function assertIsIntlSuccess($formatter, $errorMessage, $errorCode)
     /**
      * @return IntlDateFormatter|\IntlDateFormatter
      */
-    abstract protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null): object;
+    abstract protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null);
 
     abstract protected function getIntlErrorMessage(): string;
 

Tests/DateFormatter/IntlDateFormatterTest.php

@@ -177,7 +177,7 @@ public function testParseThreeDigitsYears()
         $this->assertIsIntlSuccess($formatter, 'U_ZERO_ERROR', IntlGlobals::U_ZERO_ERROR);
     }
 
-    protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null): object
+    protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null)
     {
         return new class($locale, $datetype, $timetype, $timezone, $calendar, $pattern) extends IntlDateFormatter {
         };

Tests/DateFormatter/Verification/IntlDateFormatterTest.php

@@ -57,7 +57,7 @@ public function testDateAndTimeType($timestamp, $datetype, $timetype, $expected)
         parent::testDateAndTimeType($timestamp, $datetype, $timetype, $expected);
     }
 
-    protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null): object
+    protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null)
     {
         IntlTestHelper::requireFullIntl($this, '55.1');
 

Tests/NumberFormatter/AbstractNumberFormatterTest.php

@@ -836,7 +836,7 @@ public function testParseWithNotNullPositionValue()
     /**
      * @return NumberFormatter|\NumberFormatter
      */
-    abstract protected function getNumberFormatter(string $locale = 'en', string $style = null, string $pattern = null): object;
+    abstract protected function getNumberFormatter(string $locale = 'en', string $style = null, string $pattern = null);
 
     abstract protected function getIntlErrorMessage(): string;