Merge branch '4.3' into 4.4

* 4.3:
  fix merge
This commit is contained in:
Nicolas Grekas 2019-08-06 09:39:58 +02:00
commit 405c64c16d

View File

@ -69,7 +69,7 @@ class TimezoneTypeTest extends BaseTypeTest
$form->submit('Europe/Saratov');
$this->assertEquals(new \DateTimeZone('Europe/Saratov'), $form->getData());
$this->assertStringContainsString('Europe/Saratov', $form->getConfig()->getAttribute('choice_list')->getValues());
$this->assertContainsEquals('Europe/Saratov', $form->getConfig()->getAttribute('choice_list')->getValues());
}
/**