Merge branch '3.4' into 4.3

* 3.4:
  Minor fixes
  Use namespaced Phpunit classes
  [Form] remove leftover int child phpdoc
  Support DateTimeInterface in IntlDateFormatter::format
  [PhpUnitBridge] fixed PHPUnit 8.3 compatibility: method handleError was renamed to __invoke
  Use PHPunit assertion

Author: nicolas-grekas

DateFormatter/IntlDateFormatter.php

@@ -176,7 +176,7 @@ public static function create($locale, $datetype, $timetype, $timezone = null, $
     /**
      * Format the date/time value (timestamp) as a string.
      *
-     * @param int|\DateTime $timestamp The timestamp to format
+     * @param int|\DateTimeInterface $timestamp The timestamp to format
      *
      * @return string|bool The formatted value or false if formatting failed
      *
@@ -195,7 +195,7 @@ public function format($timestamp)
 
         // behave like the intl extension
         $argumentError = null;
-        if (!\is_int($timestamp) && !$timestamp instanceof \DateTime) {
+        if (!\is_int($timestamp) && !$timestamp instanceof \DateTimeInterface) {
             $argumentError = sprintf('datefmt_format: string \'%s\' is not numeric, which would be required for it to be a valid date', $timestamp);
         }
 
@@ -207,7 +207,7 @@ public function format($timestamp)
             return false;
         }
 
-        if ($timestamp instanceof \DateTime) {
+        if ($timestamp instanceof \DateTimeInterface) {
             $timestamp = $timestamp->getTimestamp();
         }
 

Tests/DateFormatter/AbstractIntlDateFormatterTest.php

@@ -76,6 +76,7 @@ public function testFormat($pattern, $timestamp, $expected)
     public function formatProvider()
     {
         $dateTime = new \DateTime('@0');
+        $dateTimeImmutable = new \DateTimeImmutable('@0');
 
         $formatData = [
             /* general */
@@ -250,6 +251,12 @@ public function formatProvider()
         $formatData[] = ['h:mm a', $dateTime, '12:00 AM'];
         $formatData[] = ['yyyyy.MMMM.dd hh:mm aaa', $dateTime, '01970.January.01 12:00 AM'];
 
+        /* general, DateTimeImmutable */
+        $formatData[] = ['y-M-d', $dateTimeImmutable, '1970-1-1'];
+        $formatData[] = ["EEE, MMM d, ''yy", $dateTimeImmutable, "Thu, Jan 1, '70"];
+        $formatData[] = ['h:mm a', $dateTimeImmutable, '12:00 AM'];
+        $formatData[] = ['yyyyy.MMMM.dd hh:mm aaa', $dateTimeImmutable, '01970.January.01 12:00 AM'];
+
         if (IcuVersion::compare(Intl::getIcuVersion(), '59.1', '>=', 1)) {
             // Before ICU 59.1 GMT was used instead of UTC
             $formatData[] = ["yyyy.MM.dd 'at' HH:mm:ss zzz", 0, '1970.01.01 at 00:00:00 UTC'];
@@ -269,6 +276,8 @@ public function testFormatUtcAndGmtAreSplit()
 
         $this->assertSame('1970.01.01 at 00:00:00 GMT', $gmtFormatter->format(new \DateTime('@0')));
         $this->assertSame('1970.01.01 at 00:00:00 UTC', $utcFormatter->format(new \DateTime('@0')));
+        $this->assertSame('1970.01.01 at 00:00:00 GMT', $gmtFormatter->format(new \DateTimeImmutable('@0')));
+        $this->assertSame('1970.01.01 at 00:00:00 UTC', $utcFormatter->format(new \DateTimeImmutable('@0')));
     }
 
     /**

Tests/IntlTest.php

@@ -73,7 +73,7 @@ public function testGetIcuStubVersionReadsTheVersionOfBundledStubs()
 
     public function testGetDataDirectoryReturnsThePathToIcuData()
     {
-        $this->assertTrue(is_dir(Intl::getDataDirectory()));
+        $this->assertDirectoryExists(Intl::getDataDirectory());
     }
 
     /**

Tests/NumberFormatter/AbstractNumberFormatterTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Intl\Tests\NumberFormatter;
 
+use PHPUnit\Framework\Error\Warning;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Globals\IntlGlobals;
 use Symfony\Component\Intl\NumberFormatter\NumberFormatter;
@@ -323,13 +324,7 @@ public function formatTypeDoubleWithCurrencyStyleProvider()
      */
     public function testFormatTypeCurrency($formatter, $value)
     {
-        $exceptionCode = 'PHPUnit\Framework\Error\Warning';
-
-        if (class_exists('PHPUnit_Framework_Error_Warning')) {
-            $exceptionCode = 'PHPUnit_Framework_Error_Warning';
-        }
-
-        $this->expectException($exceptionCode);
+        $this->expectException(Warning::class);
 
         $formatter->format($value, NumberFormatter::TYPE_CURRENCY);
     }
@@ -706,13 +701,7 @@ public function parseProvider()
 
     public function testParseTypeDefault()
     {
-        $exceptionCode = 'PHPUnit\Framework\Error\Warning';
-
-        if (class_exists('PHPUnit_Framework_Error_Warning')) {
-            $exceptionCode = 'PHPUnit_Framework_Error_Warning';
-        }
-
-        $this->expectException($exceptionCode);
+        $this->expectException(Warning::class);
 
         $formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
         $formatter->parse('1', NumberFormatter::TYPE_DEFAULT);
@@ -832,13 +821,7 @@ public function parseTypeDoubleProvider()
 
     public function testParseTypeCurrency()
     {
-        $exceptionCode = 'PHPUnit\Framework\Error\Warning';
-
-        if (class_exists('PHPUnit_Framework_Error_Warning')) {
-            $exceptionCode = 'PHPUnit_Framework_Error_Warning';
-        }
-
-        $this->expectException($exceptionCode);
+        $this->expectException(Warning::class);
 
         $formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
         $formatter->parse('1', NumberFormatter::TYPE_CURRENCY);

Tests/Util/GitRepositoryTest.php

@@ -51,7 +51,7 @@ public function testItClonesTheRepository()
         $git = GitRepository::download(self::REPO_URL, $this->targetDir);
 
         $this->assertInstanceOf(GitRepository::class, $git);
-        $this->assertTrue(is_dir($this->targetDir.'/.git'));
+        $this->assertDirectoryExists($this->targetDir.'/.git');
         $this->assertSame($this->targetDir, $git->getPath());
         $this->assertSame(self::REPO_URL, $git->getUrl());
         $this->assertRegExp('#^[0-9a-z]{40}$#', $git->getLastCommitHash());