Merge branch '2.8' into 3.1

nicolas-grekas · nicolas-grekas · commit cbbe9bdb196c · 2016-11-15T07:07:16.000-05:00
* 2.8:
  [ClassLoader] Fix ClassCollectionLoader inlining with __halt_compiler
  [Form] Fix tests to use FQCN
diff --git a/Tests/Extension/Core/Type/TimeTypeTest.php b/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -223,7 +223,7 @@ public function testSubmitStringSingleTextWithoutMinutes()
 
     public function testSubmitWithSecondsAndBrowserOmissionSeconds()
     {
-        $form = $this->factory->create('time', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\TimeType', null, array(
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'string',

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ public function testSubmitStringSingleTextWithoutMinutes()`
`223`	`223`
`224`	`224`	`public function testSubmitWithSecondsAndBrowserOmissionSeconds()`
`225`	`225`	`{`
`226`		`- $form = $this->factory->create('time', null, array(`
	`226`	`+ $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\TimeType', null, array(`
`227`	`227`	`'model_timezone' => 'UTC',`
`228`	`228`	`'view_timezone' => 'UTC',`
`229`	`229`	`'input' => 'string',`