Merge branch '2.6' into 2.7

nicolas-grekas · nicolas-grekas · commit e6db9ca833a2 · 2015-03-13T18:40:40.000+01:00
* 2.6: [2.6] add @group legacy [2.3] add @group legacy Conflicts: src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidator2Dot4ApiTest.php src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidator2Dot4ApiTest.php src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyAllValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyBlankValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyCallbackValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyCardSchemeValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyChoiceValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArray2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayObject2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorCustomArrayObject2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorArray2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorCountable2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyCurrencyValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyDateTimeValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyDateValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyEmailValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyEqualToValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyExpressionValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorObject2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorPath2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanOrEqualValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyIbanValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyIdenticalToValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyImageValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyIpValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyIsbnValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyIssnValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyLanguageValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyLengthValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanOrEqualValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyLocaleValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyLuhnValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyNotBlankValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyNotEqualToValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyNotIdenticalToValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyNotNullValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyRangeValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyRegexValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyTimeValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyTypeValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyUrlValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/Constraints/LegacyUuidValidator2Dot4ApiTest.php src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
diff --git a/Tests/EventListener/ProfilerListenerTest.php b/Tests/EventListener/ProfilerListenerTest.php
@@ -24,6 +24,8 @@ class ProfilerListenerTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Test to ensure BC without RequestStack
+     *
+     * @group legacy
      */
     public function testLegacyEventsWithoutRequestStack()
     {
diff --git a/Tests/KernelTest.php b/Tests/KernelTest.php
@@ -312,20 +312,29 @@ public function doStuff()
         $this->assertEquals($expected, $output);
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyIsClassInActiveBundleFalse()
     {
         $kernel = $this->getKernelMockForIsClassInActiveBundleTest();
 
         $this->assertFalse($kernel->isClassInActiveBundle('Not\In\Active\Bundle'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyIsClassInActiveBundleFalseNoNamespace()
     {
         $kernel = $this->getKernelMockForIsClassInActiveBundleTest();
 
         $this->assertFalse($kernel->isClassInActiveBundle('NotNamespacedClass'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyIsClassInActiveBundleTrue()
     {
         $kernel = $this->getKernelMockForIsClassInActiveBundleTest();

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ class ProfilerListenerTest extends \PHPUnit_Framework_TestCase`
`24`	`24`	`{`
`25`	`25`	`/**`
`26`	`26`	`* Test to ensure BC without RequestStack`
	`27`	`+ *`
	`28`	`+ * @group legacy`
`27`	`29`	`*/`
`28`	`30`	`public function testLegacyEventsWithoutRequestStack()`
`29`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -312,20 +312,29 @@ public function doStuff()`
`312`	`312`	`$this->assertEquals($expected, $output);`
`313`	`313`	`}`
`314`	`314`
	`315`	`+ /**`
	`316`	`+ * @group legacy`
	`317`	`+ */`
`315`	`318`	`public function testLegacyIsClassInActiveBundleFalse()`
`316`	`319`	`{`
`317`	`320`	`$kernel = $this->getKernelMockForIsClassInActiveBundleTest();`
`318`	`321`
`319`	`322`	`$this->assertFalse($kernel->isClassInActiveBundle('Not\In\Active\Bundle'));`
`320`	`323`	`}`
`321`	`324`
	`325`	`+ /**`
	`326`	`+ * @group legacy`
	`327`	`+ */`
`322`	`328`	`public function testLegacyIsClassInActiveBundleFalseNoNamespace()`
`323`	`329`	`{`
`324`	`330`	`$kernel = $this->getKernelMockForIsClassInActiveBundleTest();`
`325`	`331`
`326`	`332`	`$this->assertFalse($kernel->isClassInActiveBundle('NotNamespacedClass'));`
`327`	`333`	`}`
`328`	`334`
	`335`	`+ /**`
	`336`	`+ * @group legacy`
	`337`	`+ */`
`329`	`338`	`public function testLegacyIsClassInActiveBundleTrue()`
`330`	`339`	`{`
`331`	`340`	`$kernel = $this->getKernelMockForIsClassInActiveBundleTest();`