Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 9494c37c4785 · 2015-10-10T11:26:25.000+02:00
* 2.3: [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 Conflicts: composer.json src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php src/Symfony/Bridge/Monolog/composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Asset/composer.json src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php src/Symfony/Component/Console/composer.json src/Symfony/Component/Debug/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Intl/composer.json src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/composer.json src/Symfony/Component/Templating/composer.json src/Symfony/Component/Translation/composer.json src/Symfony/Component/Validator/composer.json
diff --git a/Tests/Dumper/IcuResFileDumperTest.php b/Tests/Dumper/IcuResFileDumperTest.php
@@ -16,12 +16,11 @@
 
 class IcuResFileDumperTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @requires extension mbstring
+     */
     public function testDump()
     {
-        if (!function_exists('mb_convert_encoding')) {
-            $this->markTestSkipped('This test requires mbstring to work.');
-        }
-
         $catalogue = new MessageCatalogue('en');
         $catalogue->add(array('foo' => 'bar'));
 
diff --git a/Tests/Loader/IcuDatFileLoaderTest.php b/Tests/Loader/IcuDatFileLoaderTest.php
@@ -14,15 +14,11 @@
 use Symfony\Component\Translation\Loader\IcuDatFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
 
+/**
+ * @requires extension intl
+ */
 class IcuDatFileLoaderTest extends LocalizedTestCase
 {
-    protected function setUp()
-    {
-        if (!extension_loaded('intl')) {
-            $this->markTestSkipped('This test requires intl extension to work.');
-        }
-    }
-
     /**
      * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
      */
diff --git a/Tests/Loader/IcuResFileLoaderTest.php b/Tests/Loader/IcuResFileLoaderTest.php
@@ -14,15 +14,11 @@
 use Symfony\Component\Translation\Loader\IcuResFileLoader;
 use Symfony\Component\Config\Resource\DirectoryResource;
 
+/**
+ * @requires extension intl
+ */
 class IcuResFileLoaderTest extends LocalizedTestCase
 {
-    protected function setUp()
-    {
-        if (!extension_loaded('intl')) {
-            $this->markTestSkipped('This test requires intl extension to work.');
-        }
-    }
-
     public function testLoad()
     {
         // resource is build using genrb command
diff --git a/Tests/Loader/LocalizedTestCase.php b/Tests/Loader/LocalizedTestCase.php
@@ -16,7 +16,7 @@ abstract class LocalizedTestCase extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         if (!extension_loaded('intl')) {
-            $this->markTestSkipped('The "intl" extension is not available');
+            $this->markTestSkipped('Extension intl is required.');
         }
     }
 }
diff --git a/Tests/Loader/XliffFileLoaderTest.php b/Tests/Loader/XliffFileLoaderTest.php
@@ -59,12 +59,11 @@ public function testIncompleteResource()
         $this->assertEquals(array('foo' => 'bar', 'extra' => 'extra', 'key' => '', 'test' => 'with'), $catalogue->all('domain1'));
     }
 
+    /**
+     * @requires extension mbstring
+     */
     public function testEncoding()
     {
-        if (!function_exists('iconv') && !function_exists('mb_convert_encoding')) {
-            $this->markTestSkipped('The iconv and mbstring extensions are not available.');
-        }
-
         $loader = new XliffFileLoader();
         $catalogue = $loader->load(__DIR__.'/../fixtures/encoding.xlf', 'en', 'domain1');
 
diff --git a/composer.json b/composer.json
@@ -19,7 +19,6 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
         "symfony/config": "~2.7",
         "symfony/intl": "~2.4",
         "symfony/yaml": "~2.2",
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
`@@ -16,12 +16,11 @@`
`16`	`16`
`17`	`17`	`class IcuResFileDumperTest extends \PHPUnit_Framework_TestCase`
`18`	`18`	`{`
	`19`	`+ /**`
	`20`	`+ * @requires extension mbstring`
	`21`	`+ */`
`19`	`22`	`public function testDump()`
`20`	`23`	`{`
`21`		`- if (!function_exists('mb_convert_encoding')) {`
`22`		`- $this->markTestSkipped('This test requires mbstring to work.');`
`23`		`- }`
`24`		`-`
`25`	`24`	`$catalogue = new MessageCatalogue('en');`
`26`	`25`	`$catalogue->add(array('foo' => 'bar'));`
`27`	`26`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ abstract class LocalizedTestCase extends \PHPUnit_Framework_TestCase`
`16`	`16`	`protected function setUp()`
`17`	`17`	`{`
`18`	`18`	`if (!extension_loaded('intl')) {`
`19`		`- $this->markTestSkipped('The "intl" extension is not available');`
	`19`	`+ $this->markTestSkipped('Extension intl is required.');`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,11 @@ public function testIncompleteResource()`
`59`	`59`	`$this->assertEquals(array('foo' => 'bar', 'extra' => 'extra', 'key' => '', 'test' => 'with'), $catalogue->all('domain1'));`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ /**`
	`63`	`+ * @requires extension mbstring`
	`64`	`+ */`
`62`	`65`	`public function testEncoding()`
`63`	`66`	`{`
`64`		`- if (!function_exists('iconv') && !function_exists('mb_convert_encoding')) {`
`65`		`- $this->markTestSkipped('The iconv and mbstring extensions are not available.');`
`66`		`- }`
`67`		`-`
`68`	`67`	`$loader = new XliffFileLoader();`
`69`	`68`	`$catalogue = $loader->load(__DIR__.'/../fixtures/encoding.xlf', 'en', 'domain1');`
`70`	`69`