Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 6f70681a6f6b · 2015-10-10T11:36:22.000+02:00
* 2.7: [tests] Use @requires annotation when possible [tests] Use @requires annotation when possible [ci] Enable collecting and replaying skipped tests [Process] Workaround buggy PHP warning [Console] Add additional ways to detect OS400 platform [Yaml] Allow tabs before comments at the end of a line Added more tests for PropertyAccess Conflicts: .travis.yml src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bridge/Monolog/composer.json src/Symfony/Bridge/ProxyManager/composer.json src/Symfony/Bridge/Swiftmailer/composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/DebugBundle/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Bundle/WebProfilerBundle/composer.json src/Symfony/Component/Asset/composer.json src/Symfony/Component/BrowserKit/composer.json src/Symfony/Component/ClassLoader/composer.json src/Symfony/Component/Config/composer.json src/Symfony/Component/Console/composer.json src/Symfony/Component/CssSelector/composer.json src/Symfony/Component/Debug/composer.json src/Symfony/Component/DependencyInjection/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/ExpressionLanguage/composer.json src/Symfony/Component/Filesystem/composer.json src/Symfony/Component/Finder/composer.json src/Symfony/Component/Form/composer.json src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Intl/composer.json src/Symfony/Component/Locale/composer.json src/Symfony/Component/OptionsResolver/composer.json src/Symfony/Component/Process/composer.json src/Symfony/Component/PropertyAccess/composer.json src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/Acl/composer.json src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/composer.json src/Symfony/Component/Stopwatch/composer.json src/Symfony/Component/Templating/composer.json src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php src/Symfony/Component/Translation/composer.json src/Symfony/Component/Validator/composer.json src/Symfony/Component/VarDumper/composer.json src/Symfony/Component/Yaml/composer.json
diff --git a/Tests/AbstractLayoutTest.php b/Tests/AbstractLayoutTest.php
@@ -23,7 +23,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
     protected function setUp()
     {
         if (!extension_loaded('intl')) {
-            $this->markTestSkipped('The "intl" extension is not available');
+            $this->markTestSkipped('Extension intl is required.');
         }
 
         \Locale::setDefault('en');
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
@@ -116,12 +116,11 @@ public function testTransformDifferentTimezones()
         $this->assertSame($output, $transformer->transform($input));
     }
 
+    /**
+     * @requires PHP 5.5
+     */
     public function testTransformDateTimeImmutable()
     {
-        if (PHP_VERSION_ID < 50500) {
-            $this->markTestSkipped('DateTimeImmutable was introduced in PHP 5.5.0');
-        }
-
         $transformer = new DateTimeToArrayTransformer('America/New_York', 'Asia/Hong_Kong');
 
         $input = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -141,12 +141,11 @@ public function testTransformWithDifferentPatterns()
         $this->assertEquals('02*2010*03 04|05|06', $transformer->transform($this->dateTime));
     }
 
+    /**
+     * @requires PHP 5.5
+     */
     public function testTransformDateTimeImmutableTimezones()
     {
-        if (PHP_VERSION_ID < 50500) {
-            $this->markTestSkipped('DateTimeImmutable was introduced in PHP 5.5.0');
-        }
-
         $transformer = new DateTimeToLocalizedStringTransformer('America/New_York', 'Asia/Hong_Kong');
 
         $input = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
@@ -81,13 +81,10 @@ public function testTransform($fromTz, $toTz, $from, $to)
 
     /**
      * @dataProvider transformProvider
+     * @requires PHP 5.5
      */
     public function testTransformDateTimeImmutable($fromTz, $toTz, $from, $to)
     {
-        if (PHP_VERSION_ID < 50500) {
-            $this->markTestSkipped('DateTimeImmutable was introduced in PHP 5.5.0');
-        }
-
         $transformer = new DateTimeToRfc3339Transformer($fromTz, $toTz);
 
         $this->assertSame($to, $transformer->transform(null !== $from ? new \DateTimeImmutable($from) : null));
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
@@ -94,12 +94,11 @@ public function testTransformWithDifferentTimezones()
         $this->assertEquals($output, $transformer->transform($input));
     }
 
+    /**
+     * @requires PHP 5.5
+     */
     public function testTransformDateTimeImmutable()
     {
-        if (PHP_VERSION_ID < 50500) {
-            $this->markTestSkipped('DateTimeImmutable was introduced in PHP 5.5.0');
-        }
-
         $transformer = new DateTimeToStringTransformer('Asia/Hong_Kong', 'America/New_York', 'Y-m-d H:i:s');
 
         $input = new \DateTimeImmutable('2010-02-03 12:05:06 America/New_York');
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php
@@ -56,12 +56,11 @@ public function testTransformFromDifferentTimezone()
         $this->assertEquals($output, $transformer->transform($input));
     }
 
+    /**
+     * @requires PHP 5.5
+     */
     public function testTransformDateTimeImmutable()
     {
-        if (PHP_VERSION_ID < 50500) {
-            $this->markTestSkipped('DateTimeImmutable was introduced in PHP 5.5.0');
-        }
-
         $transformer = new DateTimeToTimestampTransformer('Asia/Hong_Kong', 'America/New_York');
 
         $input = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');
diff --git a/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
@@ -236,13 +236,13 @@ public function testReverseTransformWithGrouping($to, $from, $locale)
         $this->assertEquals($to, $transformer->reverseTransform($from));
     }
 
-    // https://github.com/symfony/symfony/issues/7609
+    /**
+     * @see https://github.com/symfony/symfony/issues/7609
+     *
+     * @requires extension mbstring
+     */
     public function testReverseTransformWithGroupingAndFixedSpaces()
     {
-        if (!function_exists('mb_detect_encoding')) {
-            $this->markTestSkipped('The "mbstring" extension is required for this test.');
-        }
-
         // Since we test against other locales, we need the full implementation
         IntlTestHelper::requireFullIntl($this);
 
@@ -583,13 +583,10 @@ public function testReverseTransformDisallowsCenteredExtraCharacters()
     /**
      * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
      * @expectedExceptionMessage The number contains unrecognized characters: "foo8"
+     * @requires extension mbstring
      */
     public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
     {
-        if (!function_exists('mb_detect_encoding')) {
-            $this->markTestSkipped('The "mbstring" extension is required for this test.');
-        }
-
         // Since we test against other locales, we need the full implementation
         IntlTestHelper::requireFullIntl($this);
 
@@ -603,13 +600,10 @@ public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
     /**
      * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
      * @expectedExceptionMessage The number contains unrecognized characters: "foo8"
+     * @requires extension mbstring
      */
     public function testReverseTransformIgnoresTrailingSpacesInExceptionMessage()
     {
-        if (!function_exists('mb_detect_encoding')) {
-            $this->markTestSkipped('The "mbstring" extension is required for this test.');
-        }
-
         // Since we test against other locales, we need the full implementation
         IntlTestHelper::requireFullIntl($this);
 
@@ -634,13 +628,10 @@ public function testReverseTransformDisallowsTrailingExtraCharacters()
     /**
      * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
      * @expectedExceptionMessage The number contains unrecognized characters: "foo"
+     * @requires extension mbstring
      */
     public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()
     {
-        if (!function_exists('mb_detect_encoding')) {
-            $this->markTestSkipped('The "mbstring" extension is required for this test.');
-        }
-
         // Since we test against other locales, we need the full implementation
         IntlTestHelper::requireFullIntl($this);
 
diff --git a/Tests/Extension/Core/Type/DateTypeTest.php b/Tests/Extension/Core/Type/DateTypeTest.php
@@ -933,8 +933,7 @@ public function testDayErrorsBubbleUp($widget)
     public function testYearsFor32BitsMachines()
     {
         if (4 !== PHP_INT_SIZE) {
-            $this->markTestSkipped(
-                'PHP must be compiled in 32 bit mode to run this test');
+            $this->markTestSkipped('PHP 32 bit is required.');
         }
 
         $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
diff --git a/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php b/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
@@ -48,14 +48,13 @@ public function testGenerateCsrfToken()
         $this->assertEquals(sha1('SECRET'.'foo'.session_id()), $token);
     }
 
+    /**
+     * @requires PHP 5.4
+     */
     public function testGenerateCsrfTokenOnUnstartedSession()
     {
         session_id('touti');
 
-        if (PHP_VERSION_ID < 50400) {
-            $this->markTestSkipped('This test requires PHP >= 5.4');
-        }
-
         $this->assertSame(PHP_SESSION_NONE, session_status());
 
         $token = $this->provider->generateCsrfToken('foo');
diff --git a/composer.json b/composer.json
@@ -23,7 +23,6 @@
         "symfony/property-access": "~2.3|~3.0.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "doctrine/collections": "~1.0",
         "symfony/validator": "~2.8|~3.0.0",
         "symfony/dependency-injection": "~2.3|~3.0.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -25,4 +25,8 @@
             </exclude>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
+    </listeners>
 </phpunit>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg`
`23`	`23`	`protected function setUp()`
`24`	`24`	`{`
`25`	`25`	`if (!extension_loaded('intl')) {`
`26`		`- $this->markTestSkipped('The "intl" extension is not available');`
	`26`	`+ $this->markTestSkipped('Extension intl is required.');`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`\Locale::setDefault('en');`
Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,11 @@ public function testTransformDifferentTimezones()`
`116`	`116`	`$this->assertSame($output, $transformer->transform($input));`
`117`	`117`	`}`
`118`	`118`
	`119`	`+ /**`
	`120`	`+ * @requires PHP 5.5`
	`121`	`+ */`
`119`	`122`	`public function testTransformDateTimeImmutable()`
`120`	`123`	`{`
`121`		`- if (PHP_VERSION_ID < 50500) {`
`122`		`- $this->markTestSkipped('DateTimeImmutable was introduced in PHP 5.5.0');`
`123`		`- }`
`124`		`-`
`125`	`124`	`$transformer = new DateTimeToArrayTransformer('America/New_York', 'Asia/Hong_Kong');`
`126`	`125`
`127`	`126`	`$input = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');`
Original file line number	Diff line number	Diff line change
`@@ -141,12 +141,11 @@ public function testTransformWithDifferentPatterns()`
`141`	`141`	`$this->assertEquals('02201003 04\|05\|06', $transformer->transform($this->dateTime));`
`142`	`142`	`}`
`143`	`143`
	`144`	`+ /**`
	`145`	`+ * @requires PHP 5.5`
	`146`	`+ */`
`144`	`147`	`public function testTransformDateTimeImmutableTimezones()`
`145`	`148`	`{`
`146`		`- if (PHP_VERSION_ID < 50500) {`
`147`		`- $this->markTestSkipped('DateTimeImmutable was introduced in PHP 5.5.0');`
`148`		`- }`
`149`		`-`
`150`	`149`	`$transformer = new DateTimeToLocalizedStringTransformer('America/New_York', 'Asia/Hong_Kong');`
`151`	`150`
`152`	`151`	`$input = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');`
Original file line number	Diff line number	Diff line change
`@@ -94,12 +94,11 @@ public function testTransformWithDifferentTimezones()`
`94`	`94`	`$this->assertEquals($output, $transformer->transform($input));`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ /**`
	`98`	`+ * @requires PHP 5.5`
	`99`	`+ */`
`97`	`100`	`public function testTransformDateTimeImmutable()`
`98`	`101`	`{`
`99`		`- if (PHP_VERSION_ID < 50500) {`
`100`		`- $this->markTestSkipped('DateTimeImmutable was introduced in PHP 5.5.0');`
`101`		`- }`
`102`		`-`
`103`	`102`	`$transformer = new DateTimeToStringTransformer('Asia/Hong_Kong', 'America/New_York', 'Y-m-d H:i:s');`
`104`	`103`
`105`	`104`	`$input = new \DateTimeImmutable('2010-02-03 12:05:06 America/New_York');`
Original file line number	Diff line number	Diff line change
`@@ -56,12 +56,11 @@ public function testTransformFromDifferentTimezone()`
`56`	`56`	`$this->assertEquals($output, $transformer->transform($input));`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ /**`
	`60`	`+ * @requires PHP 5.5`
	`61`	`+ */`
`59`	`62`	`public function testTransformDateTimeImmutable()`
`60`	`63`	`{`
`61`		`- if (PHP_VERSION_ID < 50500) {`
`62`		`- $this->markTestSkipped('DateTimeImmutable was introduced in PHP 5.5.0');`
`63`		`- }`
`64`		`-`
`65`	`64`	`$transformer = new DateTimeToTimestampTransformer('Asia/Hong_Kong', 'America/New_York');`
`66`	`65`
`67`	`66`	`$input = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');`
Original file line number	Diff line number	Diff line change
`@@ -933,8 +933,7 @@ public function testDayErrorsBubbleUp($widget)`
`933`	`933`	`public function testYearsFor32BitsMachines()`
`934`	`934`	`{`
`935`	`935`	`if (4 !== PHP_INT_SIZE) {`
`936`		`- $this->markTestSkipped(`
`937`		`- 'PHP must be compiled in 32 bit mode to run this test');`
	`936`	`+ $this->markTestSkipped('PHP 32 bit is required.');`
`938`	`937`	`}`
`939`	`938`
`940`	`939`	`$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(`