Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 855a483f40e3 · 2015-10-13T18:05:47.000+02:00
* 2.3:
  [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:
	appveyor.yml
	src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
diff --git a/Tests/Extension/Core/Type/DateTimeTypeTest.php b/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -262,7 +262,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
@@ -705,7 +705,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
@@ -467,7 +467,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
`@@ -262,7 +262,6 @@ public function testSubmitDifferentPattern()`
`262`	`262`	`$this->assertDateTimeEquals($dateTime, $form->getData());`
`263`	`263`	`}`
`264`	`264`
`265`		`- // Bug fix`
`266`	`265`	`public function testInitializeWithDateTime()`
`267`	`266`	`{`
`268`	`267`	`// Throws an exception if "data_class" option is not explicitly set`
Original file line number	Diff line number	Diff line change
`@@ -705,7 +705,6 @@ public function testPassWidgetToView()`
`705`	`705`	`$this->assertSame('single_text', $view->vars['widget']);`
`706`	`706`	`}`
`707`	`707`
`708`		`- // Bug fix`
`709`	`708`	`public function testInitializeWithDateTime()`
`710`	`709`	`{`
`711`	`710`	`// Throws an exception if "data_class" option is not explicitly set`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,6 @@ public function testIsPartiallyFilledReturnsTrueIfChoiceAndSecondsEmpty()`
`467`	`467`	`$this->assertTrue($form->isPartiallyFilled());`
`468`	`468`	`}`
`469`	`469`
`470`		`- // Bug fix`
`471`	`470`	`public function testInitializeWithDateTime()`
`472`	`471`	`{`
`473`	`472`	`// Throws an exception if "data_class" option is not explicitly set`