Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 6d58e1ac87ab · 2015-10-13T18:11:28.000+02:00
* 2.7:
  [appveyor] fix ini matrix race conditions
  [Http*] Mock time() to fix transient tests
  [ci] Cache phpunit install
  [WebProfiler] [toolbar] Changed profiler toolbar color to comply with WCAG 2.0AA contrast standards

Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
	src/Symfony/Component/HttpFoundation/Response.php
diff --git a/Tests/Extension/Core/Type/DateTimeTypeTest.php b/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -272,7 +272,6 @@ public function testSubmitDifferentPattern()
         $this->assertDateTimeEquals($dateTime, $form->getData());
     }
 
-    // Bug fix
     public function testInitializeWithDateTime()
     {
         // Throws an exception if "data_class" option is not explicitly set
diff --git a/Tests/Extension/Core/Type/DateTypeTest.php b/Tests/Extension/Core/Type/DateTypeTest.php
@@ -715,7 +715,6 @@ public function testPassWidgetToView()
         $this->assertSame('single_text', $view->vars['widget']);
     }
 
-    // Bug fix
     public function testInitializeWithDateTime()
     {
         // Throws an exception if "data_class" option is not explicitly set
diff --git a/Tests/Extension/Core/Type/TimeTypeTest.php b/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -477,7 +477,6 @@ public function testIsPartiallyFilledReturnsTrueIfChoiceAndSecondsEmpty()
         $this->assertTrue($form->isPartiallyFilled());
     }
 
-    // Bug fix
     public function testInitializeWithDateTime()
     {
         // Throws an exception if "data_class" option is not explicitly set

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,6 @@ public function testSubmitDifferentPattern()`
`272`	`272`	`$this->assertDateTimeEquals($dateTime, $form->getData());`
`273`	`273`	`}`
`274`	`274`
`275`		`- // Bug fix`
`276`	`275`	`public function testInitializeWithDateTime()`
`277`	`276`	`{`
`278`	`277`	`// Throws an exception if "data_class" option is not explicitly set`
Original file line number	Diff line number	Diff line change
`@@ -715,7 +715,6 @@ public function testPassWidgetToView()`
`715`	`715`	`$this->assertSame('single_text', $view->vars['widget']);`
`716`	`716`	`}`
`717`	`717`
`718`		`- // Bug fix`
`719`	`718`	`public function testInitializeWithDateTime()`
`720`	`719`	`{`
`721`	`720`	`// Throws an exception if "data_class" option is not explicitly set`
Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,6 @@ public function testIsPartiallyFilledReturnsTrueIfChoiceAndSecondsEmpty()`
`477`	`477`	`$this->assertTrue($form->isPartiallyFilled());`
`478`	`478`	`}`
`479`	`479`
`480`		`- // Bug fix`
`481`	`480`	`public function testInitializeWithDateTime()`
`482`	`481`	`{`
`483`	`482`	`// Throws an exception if "data_class" option is not explicitly set`