Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 37f7e3140c6b · 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/Test/DoctrineTestHelper.php b/Test/DoctrineTestHelper.php
@@ -29,8 +29,8 @@ class DoctrineTestHelper
      */
     public static function createTestEntityManager()
     {
-        if (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers())) {
-            \PHPUnit_Framework_TestCase::markTestSkipped('This test requires SQLite support in your environment');
+        if (!extension_loaded('pdo_sqlite')) {
+            \PHPUnit_Framework_TestCase::markTestSkipped('Extension pdo_sqlite is required.');
         }
 
         $config = new \Doctrine\ORM\Configuration();
diff --git a/Tests/Logger/DbalLoggerTest.php b/Tests/Logger/DbalLoggerTest.php
@@ -132,12 +132,11 @@ public function testLogLongString()
         ));
     }
 
+    /**
+     * @requires extension mbstring
+     */
     public function testLogUTF8LongString()
     {
-        if (!function_exists('mb_detect_encoding')) {
-            $this->markTestSkipped('Testing log shortening of utf8 charsets requires the mb_detect_encoding() function.');
-        }
-
         $logger = $this->getMock('Psr\\Log\\LoggerInterface');
 
         $dbalLogger = $this
diff --git a/composer.json b/composer.json
@@ -20,7 +20,6 @@
         "doctrine/common": "~2.4"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
         "symfony/stopwatch": "~2.2",
         "symfony/dependency-injection": "~2.2",
         "symfony/form": "~2.7,>=2.7.1",
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
`@@ -29,8 +29,8 @@ class DoctrineTestHelper`
`29`	`29`	`*/`
`30`	`30`	`public static function createTestEntityManager()`
`31`	`31`	`{`
`32`		`- if (!class_exists('PDO') \|\| !in_array('sqlite', \PDO::getAvailableDrivers())) {`
`33`		`- \PHPUnit_Framework_TestCase::markTestSkipped('This test requires SQLite support in your environment');`
	`32`	`+ if (!extension_loaded('pdo_sqlite')) {`
	`33`	`+ \PHPUnit_Framework_TestCase::markTestSkipped('Extension pdo_sqlite is required.');`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`$config = new \Doctrine\ORM\Configuration();`
Original file line number	Diff line number	Diff line change
`@@ -132,12 +132,11 @@ public function testLogLongString()`
`132`	`132`	`));`
`133`	`133`	`}`
`134`	`134`
	`135`	`+ /**`
	`136`	`+ * @requires extension mbstring`
	`137`	`+ */`
`135`	`138`	`public function testLogUTF8LongString()`
`136`	`139`	`{`
`137`		`- if (!function_exists('mb_detect_encoding')) {`
`138`		`- $this->markTestSkipped('Testing log shortening of utf8 charsets requires the mb_detect_encoding() function.');`
`139`		`- }`
`140`		`-`
`141`	`140`	`$logger = $this->getMock('Psr\\Log\\LoggerInterface');`
`142`	`141`
`143`	`142`	`$dbalLogger = $this`