Merge branch '2.3' into 2.6

nicolas-grekas · nicolas-grekas · commit 93de99966c82 · 2015-03-13T18:11:24.000+01:00
* 2.3: [2.3] add @group legacy
diff --git a/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php b/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php
@@ -21,6 +21,9 @@ public function testGetIndicesForValuesIgnoresNonExistingValues()
         $this->markTestSkipped('Non-existing values are not detected for unloaded choice lists.');
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForValuesIgnoresNonExistingValues()
     {
         $this->markTestSkipped('Non-existing values are not detected for unloaded choice lists.');

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ public function testGetIndicesForValuesIgnoresNonExistingValues()`
`21`	`21`	`$this->markTestSkipped('Non-existing values are not detected for unloaded choice lists.');`
`22`	`22`	`}`
`23`	`23`
	`24`	`+ /**`
	`25`	`+ * @group legacy`
	`26`	`+ */`
`24`	`27`	`public function testLegacyGetIndicesForValuesIgnoresNonExistingValues()`
`25`	`28`	`{`
`26`	`29`	`$this->markTestSkipped('Non-existing values are not detected for unloaded choice lists.');`