Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 6c84cc8c69e4 · 2021-05-27T14:56:16.000+02:00
* 5.2:
  [Form] Use !isset for checks cause this doesn't falsely include 0
  [Mailer] Fix typo in README
  sync ./phpunit in all branches
diff --git a/phpunit b/phpunit
@@ -1,14 +1,18 @@
 #!/usr/bin/env php
 <?php
 
-// Cache-Id: 2021-05-10 15:20 UTC
+// Cache-Id: 2021-05-27 20:30 UTC
+// For caching to work properly on appveyor, this file
+// must be exactly the same in all maintained branches
 
 if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
     echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";
     exit(1);
 }
 if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
-    if (\PHP_VERSION_ID < 70300) {
+    if (\PHP_VERSION_ID < 70200) {
+        putenv('SYMFONY_PHPUNIT_VERSION=7.5');
+    } elseif (\PHP_VERSION_ID < 70300) {
         putenv('SYMFONY_PHPUNIT_VERSION=8.5');
     } else {
         putenv('SYMFONY_PHPUNIT_VERSION=9.5');
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -170,9 +170,9 @@ public function reverseTransform($value)
                 empty($value['year']) ? $this->referenceDate->format('Y') : $value['year'],
                 empty($value['month']) ? $this->referenceDate->format('m') : $value['month'],
                 empty($value['day']) ? $this->referenceDate->format('d') : $value['day'],
-                empty($value['hour']) ? $this->referenceDate->format('H') : $value['hour'],
-                empty($value['minute']) ? $this->referenceDate->format('i') : $value['minute'],
-                empty($value['second']) ? $this->referenceDate->format('s') : $value['second']
+                $value['hour'] ?? $this->referenceDate->format('H'),
+                $value['minute'] ?? $this->referenceDate->format('i'),
+                $value['second'] ?? $this->referenceDate->format('s')
                 ),
                 new \DateTimeZone($this->outputTimezone)
             );
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -204,6 +204,32 @@ public function testSubmitFromSingleTextRaw()
         $this->assertEquals('02.06.2010', $form->getViewData());
     }
 
+    public function testArrayDateWithReferenceDoesUseReferenceTimeOnZero()
+    {
+        // we test against "de_DE", so we need the full implementation
+        IntlTestHelper::requireFullIntl($this, false);
+
+        \Locale::setDefault('de_DE');
+
+        $input = [
+            'day' => '0',
+            'month' => '0',
+            'year' => '0',
+        ];
+
+        $form = $this->factory->create(static::TESTED_TYPE, $input, [
+            'format' => \IntlDateFormatter::MEDIUM,
+            'html5' => false,
+            'model_timezone' => 'UTC',
+            'view_timezone' => 'Europe/Berlin',
+            'input' => 'array',
+            'widget' => 'single_text',
+        ]);
+
+        $this->assertSame($input, $form->getData());
+        $this->assertEquals('01.01.1970', $form->getViewData());
+    }
+
     public function testSubmitFromText()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -978,6 +978,28 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = [], $expectedDat
         $this->assertSame($expectedData, $form->getData());
     }
 
+    public function testArrayTimeWithReferenceDoesNotUseReferenceTimeOnZero()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'model_timezone' => 'UTC',
+            'view_timezone' => 'Europe/Berlin',
+            'reference_date' => new \DateTimeImmutable('01-01-2021 12:34:56', new \DateTimeZone('UTC')),
+            'input' => 'array',
+        ]);
+
+        $input = [
+            'hour' => '0',
+            'minute' => '0',
+        ];
+        $form->submit($input);
+
+        $this->assertEquals([
+            'hour' => '23',
+            'minute' => '0',
+        ], $form->getData());
+        $this->assertSame($input, $form->getViewData());
+    }
+
     /**
      * @dataProvider provideEmptyData
      */
diff --git a/src/Symfony/Component/Mailer/README.md b/src/Symfony/Component/Mailer/README.md
@@ -36,16 +36,20 @@ set up the `BodyRenderer`:
 
 ```php
 use Symfony\Bridge\Twig\Mime\BodyRenderer;
+use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Mailer\EventListener\MessageListener;
+use Symfony\Component\Mailer\Mailer;
+use Symfony\Component\Mailer\Transport;
 use Twig\Environment as TwigEnvironment;
 
 $twig = new TwigEnvironment(...);
-$messageListener = new MessageListener(new BodyRenderer($twig));
+$messageListener = new MessageListener(null, new BodyRenderer($twig));
 
 $eventDispatcher = new EventDispatcher();
 $eventDispatcher->addSubscriber($messageListener);
 
+$transport = Transport::fromDsn('smtp://localhost', $eventDispatcher);
 $mailer = new Mailer($transport, null, $eventDispatcher);
 
 $email = (new TemplatedEmail())
@@ -56,7 +60,7 @@ $email = (new TemplatedEmail())
         'username' => 'foo',
     ])
 ;
-$mailer->mail($email);
+$mailer->send($email);
 ```
 
 Resources
