fix merge

nicolas-grekas · nicolas-grekas · commit 36466a3ab5a8 · 2019-08-06T09:38:50.000+02:00
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
@@ -69,7 +69,7 @@ public function testDateTimeZoneInputWithBc()
         $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());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function testDateTimeZoneInputWithBc()`
`69`	`69`	`$form->submit('Europe/Saratov');`
`70`	`70`
`71`	`71`	`$this->assertEquals(new \DateTimeZone('Europe/Saratov'), $form->getData());`
`72`		`- $this->assertStringContainsString('Europe/Saratov', $form->getConfig()->getAttribute('choice_list')->getValues());`
	`72`	`+ $this->assertContainsEquals('Europe/Saratov', $form->getConfig()->getAttribute('choice_list')->getValues());`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/**`