[Intl] make polyfill classes abstract, fix edge case

nicolas-grekas · nicolas-grekas · commit ffde7c5f8c90 · 2019-08-21T12:11:32.000+02:00
diff --git a/Collator/Collator.php b/Collator/Collator.php
@@ -33,7 +33,7 @@
  *
  * @internal
  */
-class Collator
+abstract class Collator
 {
     /* Attribute constants */
     const FRENCH_COLLATION = 0;
@@ -86,13 +86,13 @@ public function __construct(?string $locale)
      *
      * @param string|null $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
      *
-     * @return self
+     * @return static
      *
      * @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed
      */
     public static function create($locale)
     {
-        return new self($locale);
+        return new static($locale);
     }
 
     /**
diff --git a/DateFormatter/IntlDateFormatter.php b/DateFormatter/IntlDateFormatter.php
@@ -46,7 +46,7 @@
  *
  * @internal
  */
-class IntlDateFormatter
+abstract class IntlDateFormatter
 {
     /**
      * The error code from the last operation.
@@ -78,9 +78,9 @@ class IntlDateFormatter
      */
     private $defaultDateFormats = [
         self::NONE => '',
-        self::FULL => 'EEEE, LLLL d, y',
-        self::LONG => 'LLLL d, y',
-        self::MEDIUM => 'LLL d, y',
+        self::FULL => 'EEEE, MMMM d, y',
+        self::LONG => 'MMMM d, y',
+        self::MEDIUM => 'MMM d, y',
         self::SHORT => 'M/d/yy',
     ];
 
@@ -160,7 +160,7 @@ public function __construct(?string $locale, ?int $datetype, ?int $timetype, $ti
      *                                                          One of the calendar constants
      * @param string|null                             $pattern  Optional pattern to use when formatting
      *
-     * @return self
+     * @return static
      *
      * @see https://php.net/intldateformatter.create
      * @see http://userguide.icu-project.org/formatparse/datetime
@@ -170,7 +170,7 @@ public function __construct(?string $locale, ?int $datetype, ?int $timetype, $ti
      */
     public static function create($locale, $datetype, $timetype, $timezone = null, $calendar = self::GREGORIAN, $pattern = null)
     {
-        return new self($locale, $datetype, $timetype, $timezone, $calendar, $pattern);
+        return new static($locale, $datetype, $timetype, $timezone, $calendar, $pattern);
     }
 
     /**
@@ -600,14 +600,19 @@ protected function createDateTime($timestamp)
      */
     protected function getDefaultPattern()
     {
-        $patternParts = [];
+        $pattern = '';
         if (self::NONE !== $this->datetype) {
-            $patternParts[] = $this->defaultDateFormats[$this->datetype];
+            $pattern = $this->defaultDateFormats[$this->datetype];
         }
         if (self::NONE !== $this->timetype) {
-            $patternParts[] = $this->defaultTimeFormats[$this->timetype];
+            if (self::FULL === $this->datetype || self::LONG === $this->datetype) {
+                $pattern .= ' \'at\' ';
+            } elseif (self::NONE !== $this->datetype) {
+                $pattern .= ', ';
+            }
+            $pattern .= $this->defaultTimeFormats[$this->timetype];
         }
 
-        return implode(', ', $patternParts);
+        return $pattern;
     }
 }
diff --git a/Locale/Locale.php b/Locale/Locale.php
@@ -24,7 +24,7 @@
  *
  * @internal
  */
-class Locale
+abstract class Locale
 {
     const DEFAULT_LOCALE = null;
 
diff --git a/NumberFormatter/NumberFormatter.php b/NumberFormatter/NumberFormatter.php
@@ -40,7 +40,7 @@
  *
  * @internal
  */
-class NumberFormatter
+abstract class NumberFormatter
 {
     /* Format style constants */
     const PATTERN_DECIMAL = 0;
@@ -286,7 +286,7 @@ public function __construct(?string $locale = 'en', int $style = null, $pattern
      *                             NumberFormat::PATTERN_RULEBASED. It must conform to  the syntax
      *                             described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
      *
-     * @return self
+     * @return static
      *
      * @see https://php.net/numberformatter.create
      * @see http://www.icu-project.org/apiref/icu4c/classDecimalFormat.html#_details
@@ -298,7 +298,7 @@ public function __construct(?string $locale = 'en', int $style = null, $pattern
      */
     public static function create($locale = 'en', $style = null, $pattern = null)
     {
-        return new self($locale, $style, $pattern);
+        return new static($locale, $style, $pattern);
     }
 
     /**
diff --git a/Tests/Collator/CollatorTest.php b/Tests/Collator/CollatorTest.php
@@ -19,7 +19,7 @@ class CollatorTest extends AbstractCollatorTest
     public function testConstructorWithUnsupportedLocale()
     {
         $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
-        new Collator('pt_BR');
+        $this->getCollator('pt_BR');
     }
 
     public function testCompare()
@@ -90,12 +90,14 @@ public function testSetStrength()
 
     public function testStaticCreate()
     {
-        $collator = Collator::create('en');
+        $collator = $this->getCollator('en');
+        $collator = $collator::create('en');
         $this->assertInstanceOf('\Symfony\Component\Intl\Collator\Collator', $collator);
     }
 
     protected function getCollator($locale)
     {
-        return new Collator($locale);
+        return new class($locale) extends Collator {
+        };
     }
 }
diff --git a/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
@@ -43,8 +43,6 @@ protected function tearDown(): void
 
     /**
      * When a time zone is not specified, it uses the system default however it returns null in the getter method.
-     *
-     * @see StubIntlDateFormatterTest::testDefaultTimeZoneIntl()
      */
     public function testConstructorDefaultTimeZone()
     {
@@ -60,14 +58,14 @@ public function testConstructorDefaultTimeZone()
 
     public function testConstructorWithoutDateType()
     {
-        $formatter = new IntlDateFormatter('en', null, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN);
+        $formatter = $this->getDateFormatter('en', null, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN);
 
-        $this->assertSame('EEEE, LLLL d, y, h:mm a', $formatter->getPattern());
+        $this->assertSame('EEEE, MMMM d, y \'at\' h:mm a', $formatter->getPattern());
     }
 
     public function testConstructorWithoutTimeType()
     {
-        $formatter = new IntlDateFormatter('en', IntlDateFormatter::SHORT, null, 'UTC', IntlDateFormatter::GREGORIAN);
+        $formatter = $this->getDateFormatter('en', IntlDateFormatter::SHORT, null, 'UTC', IntlDateFormatter::GREGORIAN);
 
         $this->assertSame('M/d/yy, h:mm:ss a zzzz', $formatter->getPattern());
     }
@@ -963,14 +961,7 @@ protected function assertIsIntlSuccess($formatter, $errorMessage, $errorCode)
     }
 
     /**
-     * @param $locale
-     * @param $datetype
-     * @param $timetype
-     * @param null $timezone
-     * @param int  $calendar
-     * @param null $pattern
-     *
-     * @return mixed
+     * @return IntlDateFormatter|\IntlDateFormatter
      */
     abstract protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null);
 
diff --git a/Tests/DateFormatter/IntlDateFormatterTest.php b/Tests/DateFormatter/IntlDateFormatterTest.php
@@ -18,31 +18,32 @@ class IntlDateFormatterTest extends AbstractIntlDateFormatterTest
 {
     public function testConstructor()
     {
-        $formatter = new IntlDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, 'y-M-d');
+        $formatter = $this->getDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, 'y-M-d');
         $this->assertEquals('y-M-d', $formatter->getPattern());
     }
 
     public function testConstructorWithoutLocale()
     {
-        $formatter = new IntlDateFormatter(null, IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, 'y-M-d');
+        $formatter = $this->getDateFormatter(null, IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, 'y-M-d');
         $this->assertEquals('y-M-d', $formatter->getPattern());
     }
 
     public function testConstructorWithoutCalendar()
     {
-        $formatter = new IntlDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', null, 'y-M-d');
+        $formatter = $this->getDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', null, 'y-M-d');
         $this->assertEquals('y-M-d', $formatter->getPattern());
     }
 
     public function testConstructorWithUnsupportedLocale()
     {
         $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
-        new IntlDateFormatter('pt_BR', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT);
+        $this->getDateFormatter('pt_BR', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT);
     }
 
     public function testStaticCreate()
     {
-        $formatter = IntlDateFormatter::create('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT);
+        $formatter = $this->getDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT);
+        $formatter = $formatter::create('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT);
         $this->assertInstanceOf('\Symfony\Component\Intl\DateFormatter\IntlDateFormatter', $formatter);
     }
 
@@ -75,7 +76,7 @@ public function testFormatWithUnimplementedChars()
     {
         $this->expectException('Symfony\Component\Intl\Exception\NotImplementedException');
         $pattern = 'Y';
-        $formatter = new IntlDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, $pattern);
+        $formatter = $this->getDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, $pattern);
         $formatter->format(0);
     }
 
@@ -178,7 +179,8 @@ public function testParseThreeDigitsYears()
 
     protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null)
     {
-        return new IntlDateFormatter($locale, $datetype, $timetype, $timezone, $calendar, $pattern);
+        return new class($locale, $datetype, $timetype, $timezone, $calendar, $pattern) extends IntlDateFormatter {
+        };
     }
 
     protected function getIntlErrorMessage()
diff --git a/Tests/NumberFormatter/NumberFormatterTest.php b/Tests/NumberFormatter/NumberFormatterTest.php
@@ -23,19 +23,19 @@ class NumberFormatterTest extends AbstractNumberFormatterTest
     public function testConstructorWithUnsupportedLocale()
     {
         $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
-        new NumberFormatter('pt_BR');
+        $this->getNumberFormatter('pt_BR');
     }
 
     public function testConstructorWithUnsupportedStyle()
     {
         $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
-        new NumberFormatter('en', NumberFormatter::PATTERN_DECIMAL);
+        $this->getNumberFormatter('en', NumberFormatter::PATTERN_DECIMAL);
     }
 
     public function testConstructorWithPatternDifferentThanNull()
     {
         $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentNotImplementedException');
-        new NumberFormatter('en', NumberFormatter::DECIMAL, '');
+        $this->getNumberFormatter('en', NumberFormatter::DECIMAL, '');
     }
 
     public function testSetAttributeWithUnsupportedAttribute()
@@ -62,10 +62,8 @@ public function testConstructWithoutLocale()
 
     public function testCreate()
     {
-        $this->assertInstanceOf(
-            '\Symfony\Component\Intl\NumberFormatter\NumberFormatter',
-            NumberFormatter::create('en', NumberFormatter::DECIMAL)
-        );
+        $formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
+        $this->assertInstanceOf(NumberFormatter::class, $formatter::create('en', NumberFormatter::DECIMAL));
     }
 
     public function testFormatWithCurrencyStyle()
@@ -171,7 +169,8 @@ public function testSetTextAttribute()
 
     protected function getNumberFormatter($locale = 'en', $style = null, $pattern = null)
     {
-        return new NumberFormatter($locale, $style, $pattern);
+        return new class($locale, $style, $pattern) extends NumberFormatter {
+        };
     }
 
     protected function getIntlErrorMessage()

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`*`
`34`	`34`	`* @internal`
`35`	`35`	`*/`
`36`		`-class Collator`
	`36`	`+abstract class Collator`
`37`	`37`	`{`
`38`	`38`	`/* Attribute constants */`
`39`	`39`	`const FRENCH_COLLATION = 0;`
`@@ -86,13 +86,13 @@ public function __construct(?string $locale)`
`86`	`86`	`*`
`87`	`87`	`* @param string\|null $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")`
`88`	`88`	`*`
`89`		`- * @return self`
	`89`	`+ * @return static`
`90`	`90`	`*`
`91`	`91`	`* @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed`
`92`	`92`	`*/`
`93`	`93`	`public static function create($locale)`
`94`	`94`	`{`
`95`		`- return new self($locale);`
	`95`	`+ return new static($locale);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`*`
`47`	`47`	`* @internal`
`48`	`48`	`*/`
`49`		`-class IntlDateFormatter`
	`49`	`+abstract class IntlDateFormatter`
`50`	`50`	`{`
`51`	`51`	`/**`
`52`	`52`	`* The error code from the last operation.`
`@@ -78,9 +78,9 @@ class IntlDateFormatter`
`78`	`78`	`*/`
`79`	`79`	`private $defaultDateFormats = [`
`80`	`80`	`self::NONE => '',`
`81`		`- self::FULL => 'EEEE, LLLL d, y',`
`82`		`- self::LONG => 'LLLL d, y',`
`83`		`- self::MEDIUM => 'LLL d, y',`
	`81`	`+ self::FULL => 'EEEE, MMMM d, y',`
	`82`	`+ self::LONG => 'MMMM d, y',`
	`83`	`+ self::MEDIUM => 'MMM d, y',`
`84`	`84`	`self::SHORT => 'M/d/yy',`
`85`	`85`	`];`
`86`	`86`
`@@ -160,7 +160,7 @@ public function __construct(?string $locale, ?int $datetype, ?int $timetype, $ti`
`160`	`160`	`* One of the calendar constants`
`161`	`161`	`* @param string\|null $pattern Optional pattern to use when formatting`
`162`	`162`	`*`
`163`		`- * @return self`
	`163`	`+ * @return static`
`164`	`164`	`*`
`165`	`165`	`* @see https://php.net/intldateformatter.create`
`166`	`166`	`* @see http://userguide.icu-project.org/formatparse/datetime`
`@@ -170,7 +170,7 @@ public function __construct(?string $locale, ?int $datetype, ?int $timetype, $ti`
`170`	`170`	`*/`
`171`	`171`	`public static function create($locale, $datetype, $timetype, $timezone = null, $calendar = self::GREGORIAN, $pattern = null)`
`172`	`172`	`{`
`173`		`- return new self($locale, $datetype, $timetype, $timezone, $calendar, $pattern);`
	`173`	`+ return new static($locale, $datetype, $timetype, $timezone, $calendar, $pattern);`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`/**`
`@@ -600,14 +600,19 @@ protected function createDateTime($timestamp)`
`600`	`600`	`*/`
`601`	`601`	`protected function getDefaultPattern()`
`602`	`602`	`{`
`603`		`- $patternParts = [];`
	`603`	`+ $pattern = '';`
`604`	`604`	`if (self::NONE !== $this->datetype) {`
`605`		`- $patternParts[] = $this->defaultDateFormats[$this->datetype];`
	`605`	`+ $pattern = $this->defaultDateFormats[$this->datetype];`
`606`	`606`	`}`
`607`	`607`	`if (self::NONE !== $this->timetype) {`
`608`		`- $patternParts[] = $this->defaultTimeFormats[$this->timetype];`
	`608`	`+ if (self::FULL === $this->datetype \|\| self::LONG === $this->datetype) {`
	`609`	`+ $pattern .= ' \'at\' ';`
	`610`	`+ } elseif (self::NONE !== $this->datetype) {`
	`611`	`+ $pattern .= ', ';`
	`612`	`+ }`
	`613`	`+ $pattern .= $this->defaultTimeFormats[$this->timetype];`
`609`	`614`	`}`
`610`	`615`
`611`		`- return implode(', ', $patternParts);`
	`616`	`+ return $pattern;`
`612`	`617`	`}`
`613`	`618`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*`
`25`	`25`	`* @internal`
`26`	`26`	`*/`
`27`		`-class Locale`
	`27`	`+abstract class Locale`
`28`	`28`	`{`
`29`	`29`	`const DEFAULT_LOCALE = null;`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`*`
`41`	`41`	`* @internal`
`42`	`42`	`*/`
`43`		`-class NumberFormatter`
	`43`	`+abstract class NumberFormatter`
`44`	`44`	`{`
`45`	`45`	`/* Format style constants */`
`46`	`46`	`const PATTERN_DECIMAL = 0;`
`@@ -286,7 +286,7 @@ public function __construct(?string $locale = 'en', int $style = null, $pattern`
`286`	`286`	`* NumberFormat::PATTERN_RULEBASED. It must conform to the syntax`
`287`	`287`	`* described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation`
`288`	`288`	`*`
`289`		`- * @return self`
	`289`	`+ * @return static`
`290`	`290`	`*`
`291`	`291`	`* @see https://php.net/numberformatter.create`
`292`	`292`	`* @see http://www.icu-project.org/apiref/icu4c/classDecimalFormat.html#_details`
`@@ -298,7 +298,7 @@ public function __construct(?string $locale = 'en', int $style = null, $pattern`
`298`	`298`	`*/`
`299`	`299`	`public static function create($locale = 'en', $style = null, $pattern = null)`
`300`	`300`	`{`
`301`		`- return new self($locale, $style, $pattern);`
	`301`	`+ return new static($locale, $style, $pattern);`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class CollatorTest extends AbstractCollatorTest`
`19`	`19`	`public function testConstructorWithUnsupportedLocale()`
`20`	`20`	`{`
`21`	`21`	`$this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');`
`22`		`- new Collator('pt_BR');`
	`22`	`+ $this->getCollator('pt_BR');`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function testCompare()`
`@@ -90,12 +90,14 @@ public function testSetStrength()`
`90`	`90`
`91`	`91`	`public function testStaticCreate()`
`92`	`92`	`{`
`93`		`- $collator = Collator::create('en');`
	`93`	`+ $collator = $this->getCollator('en');`
	`94`	`+ $collator = $collator::create('en');`
`94`	`95`	`$this->assertInstanceOf('\Symfony\Component\Intl\Collator\Collator', $collator);`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`protected function getCollator($locale)`
`98`	`99`	`{`
`99`		`- return new Collator($locale);`
	`100`	`+ return new class($locale) extends Collator {`
	`101`	`+ };`
`100`	`102`	`}`
`101`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,6 @@ protected function tearDown(): void`
`43`	`43`
`44`	`44`	`/**`
`45`	`45`	`* When a time zone is not specified, it uses the system default however it returns null in the getter method.`
`46`		`- *`
`47`		`- * @see StubIntlDateFormatterTest::testDefaultTimeZoneIntl()`
`48`	`46`	`*/`
`49`	`47`	`public function testConstructorDefaultTimeZone()`
`50`	`48`	`{`
`@@ -60,14 +58,14 @@ public function testConstructorDefaultTimeZone()`
`60`	`58`
`61`	`59`	`public function testConstructorWithoutDateType()`
`62`	`60`	`{`
`63`		`- $formatter = new IntlDateFormatter('en', null, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN);`
	`61`	`+ $formatter = $this->getDateFormatter('en', null, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN);`
`64`	`62`
`65`		`- $this->assertSame('EEEE, LLLL d, y, h:mm a', $formatter->getPattern());`
	`63`	`+ $this->assertSame('EEEE, MMMM d, y \'at\' h:mm a', $formatter->getPattern());`
`66`	`64`	`}`
`67`	`65`
`68`	`66`	`public function testConstructorWithoutTimeType()`
`69`	`67`	`{`
`70`		`- $formatter = new IntlDateFormatter('en', IntlDateFormatter::SHORT, null, 'UTC', IntlDateFormatter::GREGORIAN);`
	`68`	`+ $formatter = $this->getDateFormatter('en', IntlDateFormatter::SHORT, null, 'UTC', IntlDateFormatter::GREGORIAN);`
`71`	`69`
`72`	`70`	`$this->assertSame('M/d/yy, h:mm:ss a zzzz', $formatter->getPattern());`
`73`	`71`	`}`
`@@ -963,14 +961,7 @@ protected function assertIsIntlSuccess($formatter, $errorMessage, $errorCode)`
`963`	`961`	`}`
`964`	`962`
`965`	`963`	`/**`
`966`		`- * @param $locale`
`967`		`- * @param $datetype`
`968`		`- * @param $timetype`
`969`		`- * @param null $timezone`
`970`		`- * @param int $calendar`
`971`		`- * @param null $pattern`
`972`		`- *`
`973`		`- * @return mixed`
	`964`	`+ * @return IntlDateFormatter\|\IntlDateFormatter`
`974`	`965`	`*/`
`975`	`966`	`abstract protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null);`
`976`	`967`
Original file line number	Diff line number	Diff line change
`@@ -18,31 +18,32 @@ class IntlDateFormatterTest extends AbstractIntlDateFormatterTest`
`18`	`18`	`{`
`19`	`19`	`public function testConstructor()`
`20`	`20`	`{`
`21`		`- $formatter = new IntlDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, 'y-M-d');`
	`21`	`+ $formatter = $this->getDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, 'y-M-d');`
`22`	`22`	`$this->assertEquals('y-M-d', $formatter->getPattern());`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function testConstructorWithoutLocale()`
`26`	`26`	`{`
`27`		`- $formatter = new IntlDateFormatter(null, IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, 'y-M-d');`
	`27`	`+ $formatter = $this->getDateFormatter(null, IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, 'y-M-d');`
`28`	`28`	`$this->assertEquals('y-M-d', $formatter->getPattern());`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public function testConstructorWithoutCalendar()`
`32`	`32`	`{`
`33`		`- $formatter = new IntlDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', null, 'y-M-d');`
	`33`	`+ $formatter = $this->getDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', null, 'y-M-d');`
`34`	`34`	`$this->assertEquals('y-M-d', $formatter->getPattern());`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function testConstructorWithUnsupportedLocale()`
`38`	`38`	`{`
`39`	`39`	`$this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');`
`40`		`- new IntlDateFormatter('pt_BR', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT);`
	`40`	`+ $this->getDateFormatter('pt_BR', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public function testStaticCreate()`
`44`	`44`	`{`
`45`		`- $formatter = IntlDateFormatter::create('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT);`
	`45`	`+ $formatter = $this->getDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT);`
	`46`	`+ $formatter = $formatter::create('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT);`
`46`	`47`	`$this->assertInstanceOf('\Symfony\Component\Intl\DateFormatter\IntlDateFormatter', $formatter);`
`47`	`48`	`}`
`48`	`49`
`@@ -75,7 +76,7 @@ public function testFormatWithUnimplementedChars()`
`75`	`76`	`{`
`76`	`77`	`$this->expectException('Symfony\Component\Intl\Exception\NotImplementedException');`
`77`	`78`	`$pattern = 'Y';`
`78`		`- $formatter = new IntlDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, $pattern);`
	`79`	`+ $formatter = $this->getDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, $pattern);`
`79`	`80`	`$formatter->format(0);`
`80`	`81`	`}`
`81`	`82`
`@@ -178,7 +179,8 @@ public function testParseThreeDigitsYears()`
`178`	`179`
`179`	`180`	`protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null)`
`180`	`181`	`{`
`181`		`- return new IntlDateFormatter($locale, $datetype, $timetype, $timezone, $calendar, $pattern);`
	`182`	`+ return new class($locale, $datetype, $timetype, $timezone, $calendar, $pattern) extends IntlDateFormatter {`
	`183`	`+ };`
`182`	`184`	`}`
`183`	`185`
`184`	`186`	`protected function getIntlErrorMessage()`
Original file line number	Diff line number	Diff line change
`@@ -23,19 +23,19 @@ class NumberFormatterTest extends AbstractNumberFormatterTest`
`23`	`23`	`public function testConstructorWithUnsupportedLocale()`
`24`	`24`	`{`
`25`	`25`	`$this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');`
`26`		`- new NumberFormatter('pt_BR');`
	`26`	`+ $this->getNumberFormatter('pt_BR');`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public function testConstructorWithUnsupportedStyle()`
`30`	`30`	`{`
`31`	`31`	`$this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');`
`32`		`- new NumberFormatter('en', NumberFormatter::PATTERN_DECIMAL);`
	`32`	`+ $this->getNumberFormatter('en', NumberFormatter::PATTERN_DECIMAL);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public function testConstructorWithPatternDifferentThanNull()`
`36`	`36`	`{`
`37`	`37`	`$this->expectException('Symfony\Component\Intl\Exception\MethodArgumentNotImplementedException');`
`38`		`- new NumberFormatter('en', NumberFormatter::DECIMAL, '');`
	`38`	`+ $this->getNumberFormatter('en', NumberFormatter::DECIMAL, '');`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public function testSetAttributeWithUnsupportedAttribute()`
`@@ -62,10 +62,8 @@ public function testConstructWithoutLocale()`
`62`	`62`
`63`	`63`	`public function testCreate()`
`64`	`64`	`{`
`65`		`- $this->assertInstanceOf(`
`66`		`- '\Symfony\Component\Intl\NumberFormatter\NumberFormatter',`
`67`		`- NumberFormatter::create('en', NumberFormatter::DECIMAL)`
`68`		`- );`
	`65`	`+ $formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);`
	`66`	`+ $this->assertInstanceOf(NumberFormatter::class, $formatter::create('en', NumberFormatter::DECIMAL));`
`69`	`67`	`}`
`70`	`68`
`71`	`69`	`public function testFormatWithCurrencyStyle()`
`@@ -171,7 +169,8 @@ public function testSetTextAttribute()`
`171`	`169`
`172`	`170`	`protected function getNumberFormatter($locale = 'en', $style = null, $pattern = null)`
`173`	`171`	`{`
`174`		`- return new NumberFormatter($locale, $style, $pattern);`
	`172`	`+ return new class($locale, $style, $pattern) extends NumberFormatter {`
	`173`	`+ };`
`175`	`174`	`}`
`176`	`175`
`177`	`176`	`protected function getIntlErrorMessage()`