Merge branch '3.0'

* 3.0:
  use the clock mock for progress indicator tests
  Removed 3.0 restriction for the Ldap component in the Security component

Conflicts:
	phpunit.xml.dist
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/composer.json

Author: nicolas-grekas

phpunit.xml.dist

@@ -60,6 +60,7 @@
                         <array>
                             <element><string>Cache\IntegrationTests</string></element>
                             <element><string>Doctrine\Common\Cache</string></element>
+                            <element><string>Symfony\Component\Console</string></element>
                             <element><string>Symfony\Component\HttpFoundation</string></element>
                         </array>
                     </element>

src/Symfony/Component/Console/Tests/Helper/ProgressIndicatorTest.php

@@ -5,6 +5,9 @@
 use Symfony\Component\Console\Helper\ProgressIndicator;
 use Symfony\Component\Console\Output\StreamOutput;
 
+/**
+ * @group time-sensitive
+ */
 class ProgressIndicatorTest extends \PHPUnit_Framework_TestCase
 {
     public function testDefaultIndicator()

src/Symfony/Component/Console/phpunit.xml.dist

@@ -26,4 +26,14 @@
             </exclude>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
+            <arguments>
+                <array>
+                    <element key="time-sensitive"><string>Symfony\Component\Console</string></element>
+                </array>
+            </arguments>
+        </listener>
+    </listeners>
 </phpunit>