Merge branch '2.7' into 2.8

* 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

12 files changed, 23 insertions, 13 deletions

diff --git a/Core/composer.json b/Core/composer.json
index 13feea1..31b4653 100644
--- a/Core/composer.json
+++ b/Core/composer.json
@@ -20,7 +20,6 @@
         "paragonie/random_compat": "~1.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/event-dispatcher": "~2.1|~3.0.0",
         "symfony/expression-language": "~2.6|~3.0.0",
         "symfony/http-foundation": "~2.4|~3.0.0",
diff --git a/Core/phpunit.xml.dist b/Core/phpunit.xml.dist
index 8a1a291..739cb6e 100644
--- a/Core/phpunit.xml.dist
+++ b/Core/phpunit.xml.dist
@@ -30,4 +30,8 @@
             </exclude>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
+    </listeners>
 </phpunit>
diff --git a/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php b/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
index 0039deb..7d3a537 100644
--- a/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
+++ b/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
@@ -50,12 +50,11 @@ class NativeSessionTokenStorageTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(array(self::SESSION_NAMESPACE => array('token_id' => 'TOKEN')), $_SESSION);
     }
 
+    /**
+     * @requires PHP 5.4
+     */
     public function testStoreTokenInClosedSessionWithExistingSessionId()
     {
-        if (PHP_VERSION_ID < 50400) {
-            $this->markTestSkipped('This test requires PHP 5.4 or later.');
-        }
-
         session_id('foobar');
 
         $this->assertSame(PHP_SESSION_NONE, session_status());
diff --git a/Csrf/Tests/TokenStorage/SessionTokenStorageTest.php b/Csrf/Tests/TokenStorage/SessionTokenStorageTest.php
index 4166c1e..0eac0a8 100644
--- a/Csrf/Tests/TokenStorage/SessionTokenStorageTest.php
+++ b/Csrf/Tests/TokenStorage/SessionTokenStorageTest.php
@@ -32,10 +32,6 @@ class SessionTokenStorageTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!interface_exists('Symfony\Component\HttpFoundation\Session\SessionInterface')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $this->session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/Csrf/composer.json b/Csrf/composer.json
index 1596803..2afebf9 100644
--- a/Csrf/composer.json
+++ b/Csrf/composer.json
@@ -21,7 +21,6 @@
         "paragonie/random_compat": "~1.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/http-foundation": "~2.1|~3.0.0"
     },
     "suggest": {
diff --git a/Csrf/phpunit.xml.dist b/Csrf/phpunit.xml.dist
index 8f950a3..3e3d430 100644
--- a/Csrf/phpunit.xml.dist
+++ b/Csrf/phpunit.xml.dist
@@ -30,4 +30,8 @@
             </exclude>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
+    </listeners>
 </phpunit>
diff --git a/Guard/composer.json b/Guard/composer.json
index 176754e..6e863db 100644
--- a/Guard/composer.json
+++ b/Guard/composer.json
@@ -21,7 +21,6 @@
         "symfony/security-http": "~2.7|~3.0.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.8|~3.0.0",
         "psr/log": "~1.0"
     },
     "autoload": {
diff --git a/Guard/phpunit.xml.dist b/Guard/phpunit.xml.dist
index 093628b..99251f1 100644
--- a/Guard/phpunit.xml.dist
+++ b/Guard/phpunit.xml.dist
@@ -30,4 +30,8 @@
             </exclude>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
+    </listeners>
 </phpunit>
diff --git a/Http/composer.json b/Http/composer.json
index 1171c8d..65978ee 100644
--- a/Http/composer.json
+++ b/Http/composer.json
@@ -25,7 +25,6 @@
         "paragonie/random_compat": "~1.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/routing": "~2.2|~3.0.0",
         "symfony/security-csrf": "~2.4|~3.0.0",
         "psr/log": "~1.0"
diff --git a/Http/phpunit.xml.dist b/Http/phpunit.xml.dist
index 49b36f2..33e60d7 100644
--- a/Http/phpunit.xml.dist
+++ b/Http/phpunit.xml.dist
@@ -30,4 +30,8 @@
             </exclude>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
+    </listeners>
 </phpunit>
diff --git a/composer.json b/composer.json
index 4a93578..65a2eb0 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,6 @@
     },
     "require-dev": {
         "symfony/finder": "~2.3|~3.0.0",
-        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/intl": "~2.3|~3.0.0",
         "symfony/routing": "~2.2|~3.0.0",
         "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0d9fe5f..1ca767d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -32,4 +32,8 @@
             </exclude>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
+    </listeners>
 </phpunit>