moved component and bridge unit tests to the src/ directory

This is the first step to make each Symfony Component and Bridge self-contained.

check_cs

@@ -26,7 +26,7 @@ $finder
     ->name('*.xml')
     ->name('*.xml.dist')
     ->name('*.yml')
-    ->in(array(__DIR__.'/src', __DIR__.'/tests'))
+    ->in(__DIR__.'/src')
     ->notName(basename(__FILE__))
     ->exclude('.git')
     ->exclude('vendor')

phpunit.xml.dist

@@ -9,11 +9,12 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="autoload.php.dist"
 >
     <testsuites>
         <testsuite name="Symfony Test Suite">
-            <directory>./tests/Symfony/</directory>
+            <directory>./src/Symfony/Bridge/*/Tests/</directory>
+            <directory>./src/Symfony/Component/*/Tests/</directory>
             <directory>./src/Symfony/Bundle/*/Tests/</directory>
         </testsuite>
     </testsuites>
@@ -29,8 +30,10 @@
         <whitelist>
             <directory>./src/Symfony/</directory>
             <exclude>
-                <directory>./src/Symfony/Bundle/*/Resources</directory>
+                <directory>./src/Symfony/Bridge/*/Tests</directory>
+                <directory>./src/Symfony/Component/*/Tests</directory>
                 <directory>./src/Symfony/Bundle/*/Tests</directory>
+                <directory>./src/Symfony/Bundle/*/Resources</directory>
                 <directory>./src/Symfony/Component/*/Resources</directory>
                 <directory>./src/Symfony/Component/*/*/Resources</directory>
             </exclude>

src/Symfony/Bridge/Doctrine/README.md

@@ -4,9 +4,31 @@ Doctrine Bridge
 Provides integration for [Doctrine](http://www.doctrine-project.org/) with
 various Symfony2 components.
 
+Twig Bridge
+===========
+
+Provides integration for [Twig](http://twig.sensiolabs.org/) with various
+Symfony2 components.
+
 Resources
 ---------
 
-Unit tests:
+You can run the unit tests with the following command:
+
+    phpunit -c src/Symfony/Bridge/Doctrine/
+
+If you also want to run the unit tests that depend on other Symfony
+Components, declare the following environment variables before running
+PHPUnit:
 
-https://github.com/symfony/symfony/tree/master/tests/Symfony/Tests/Bridge/Doctrine
+    export DOCTRINE_COMMON=../path/to/doctrine-common
+    export DOCTRINE_DBAL=../path/to/doctrine-dbal
+    export DOCTRINE_ORM=../path/to/doctrine
+    export DOCTRINE_FIXTURES=../path/to/doctrine-fixtures
+    export SYMFONY_HTTP_FOUNDATION=../path/to/HttpFoundation
+    export SYMFONY_DEPENDENCY_INJECTION=../path/to/DependencyInjection
+    export SYMFONY_FORM=../path/to/Form
+    export SYMFONY_SECURITY=../path/to/Security
+    export SYMFONY_VALIDATOR=../path/to/Validator
+    export SYMFONY_HTTP_KERNEL=../path/to/HttpKernel
+    export SYMFONY_EVENT_DISPATCHER=../path/to/EventDispatcher

tests/Symfony/Tests/Bridge/Doctrine/ContainerAwareEventManagerTest.php → src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Doctrine\Bundle\DoctrineBundle\Tests;
+namespace Symfony\Bridge\Doctrine\Tests;
 
 use Symfony\Bridge\Doctrine\ContainerAwareEventManager;
 use Symfony\Component\DependencyInjection\Container;
@@ -18,6 +18,10 @@ class ContainerAwareEventManagerTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
+        if (!class_exists('Symfony\Component\DependencyInjection\Container')) {
+            $this->markTestSkipped('The "DependencyInjection" component is not available');
+        }
+
         $this->container = new Container();
         $this->evm = new ContainerAwareEventManager($this->container);
     }

tests/Symfony/Tests/Bridge/Doctrine/DataCollector/DoctrineDataCollectorTest.php → src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Bridge\Doctrine\DataCollector;
+namespace Symfony\Bridge\Doctrine\Tests\DataCollector;
 
 use Doctrine\DBAL\Platforms\MySqlPlatform;
 use Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector;
@@ -18,6 +18,17 @@
 
 class DoctrineDataCollectorTest extends \PHPUnit_Framework_TestCase
 {
+    protected function setUp()
+    {
+        if (!class_exists('Doctrine\DBAL\Platforms\MySqlPlatform')) {
+            $this->markTestSkipped('Doctrine DBAL is not available.');
+        }
+
+        if (!class_exists('Symfony\Component\HttpKernel\HttpKernel')) {
+            $this->markTestSkipped('The "HttpKernel" component is not available');
+        }
+    }
+
     public function testCollectConnections()
     {
         $c = $this->createCollector(array());

tests/Symfony/Tests/Bridge/Doctrine/DataFixtures/ContainerAwareLoaderTest.php → src/Symfony/Bridge/Doctrine/Tests/DataFixtures/ContainerAwareLoaderTest.php

@@ -9,15 +9,19 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Bridge\Doctrine\DataFixtures;
+namespace Symfony\Bridge\Doctrine\Tests\DataFixtures;
 
 use Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader;
-use Symfony\Tests\Bridge\Doctrine\Fixtures\ContainerAwareFixture;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\ContainerAwareFixture;
 
 class ContainerAwareLoaderTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
+        if (!class_exists('Symfony\Component\DependencyInjection\Container')) {
+            $this->markTestSkipped('The "DependencyInjection" component is not available');
+        }
+
         if (!class_exists('Doctrine\Common\DataFixtures\Loader')) {
             $this->markTestSkipped('Doctrine Data Fixtures is not available.');
         }

tests/Symfony/Tests/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php → src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php

@@ -9,13 +9,20 @@
 * file that was distributed with this source code.
 */
 
-namespace Symfony\Tests\Bridge\Doctrine\DependencyInjection\Compiler;
+namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection\Compiler;
 
 use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class RegisterEventListenersAndSubscribersPassTest extends \PHPUnit_Framework_TestCase
 {
+    protected function setUp()
+    {
+        if (!class_exists('Symfony\Component\DependencyInjection\Container')) {
+            $this->markTestSkipped('The "DependencyInjection" component is not available');
+        }
+    }
+
     public function testProcessEventListenersWithPriorities()
     {
         $container = $this->createBuilder();

tests/Symfony/Tests/Bridge/Doctrine/DoctrineOrmTestCase.php → src/Symfony/Bridge/Doctrine/Tests/DoctrineOrmTestCase.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Bridge\Doctrine;
+namespace Symfony\Bridge\Doctrine\Tests;
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
@@ -19,8 +19,16 @@ abstract class DoctrineOrmTestCase extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
-        if (!class_exists('Doctrine\\Common\\Version')) {
-            $this->markTestSkipped('Doctrine is not available.');
+        if (!class_exists('Doctrine\Common\Version')) {
+            $this->markTestSkipped('Doctrine Common is not available.');
+        }
+
+        if (!class_exists('Doctrine\DBAL\Platforms\MySqlPlatform')) {
+            $this->markTestSkipped('Doctrine DBAL is not available.');
+        }
+
+        if (!class_exists('Doctrine\ORM\EntityManager')) {
+            $this->markTestSkipped('Doctrine ORM is not available.');
         }
     }
 
@@ -33,7 +41,7 @@ static public function createTestEntityManager($paths = array())
             self::markTestSkipped('This test requires SQLite support in your environment');
         }
         $config = new \Doctrine\ORM\Configuration();
-        $config->setEntityNamespaces(array('SymfonyTestsDoctrine' => 'Symfony\Tests\Bridge\Doctrine\Fixtures'));
+        $config->setEntityNamespaces(array('SymfonyTestsDoctrine' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'));
         $config->setAutoGenerateProxyClasses(true);
         $config->setProxyDir(\sys_get_temp_dir());
         $config->setProxyNamespace('SymfonyTests\Doctrine');

tests/Symfony/Tests/Bridge/Doctrine/Fixtures/AssociationEntity.php → src/Symfony/Bridge/Doctrine/Tests/Fixtures/AssociationEntity.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Tests\Bridge\Doctrine\Fixtures;
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
 
 use Doctrine\ORM\Mapping AS ORM;
 
@@ -18,7 +18,7 @@ class AssociationEntity
 
     /**
      * @ORM\ManyToOne(targetEntity="SingleIdentEntity")
-     * @var \Symfony\Tests\Bridge\Doctrine\Form\Fixtures\SingleIdentEntity
+     * @var \Symfony\Bridge\Doctrine\Tests\Form\Fixtures\SingleIdentEntity
      */
     public $single;
 
@@ -28,7 +28,7 @@ class AssociationEntity
      *  @ORM\JoinColumn(name="composite_id1", referencedColumnName="id1"),
      *  @ORM\JoinColumn(name="composite_id2", referencedColumnName="id2")
      * })
-     * @var \Symfony\Tests\Bridge\Doctrine\Form\Fixtures\CompositeIdentEntity
+     * @var \Symfony\Bridge\Doctrine\Tests\Form\Fixtures\CompositeIdentEntity
      */
     public $composite;
 }

tests/Symfony/Tests/Bridge/Doctrine/Fixtures/CompositeIdentEntity.php → src/Symfony/Bridge/Doctrine/Tests/Fixtures/CompositeIdentEntity.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Tests\Bridge\Doctrine\Fixtures;
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
 
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\Column;

tests/Symfony/Tests/Bridge/Doctrine/Fixtures/CompositeStringIdentEntity.php → src/Symfony/Bridge/Doctrine/Tests/Fixtures/CompositeStringIdentEntity.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Tests\Bridge\Doctrine\Fixtures;
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
 
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\Column;

tests/Symfony/Tests/Bridge/Doctrine/Fixtures/ContainerAwareFixture.php → src/Symfony/Bridge/Doctrine/Tests/Fixtures/ContainerAwareFixture.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Tests\Bridge\Doctrine\Fixtures;
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;

tests/Symfony/Tests/Bridge/Doctrine/Fixtures/ItemGroupEntity.php → src/Symfony/Bridge/Doctrine/Tests/Fixtures/ItemGroupEntity.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Tests\Bridge\Doctrine\Fixtures;
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
 
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\Column;

tests/Symfony/Tests/Bridge/Doctrine/Fixtures/NoToStringSingleIdentEntity.php → src/Symfony/Bridge/Doctrine/Tests/Fixtures/NoToStringSingleIdentEntity.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Tests\Bridge\Doctrine\Fixtures;
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
 
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\Column;

tests/Symfony/Tests/Bridge/Doctrine/Fixtures/SingleIdentEntity.php → src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIdentEntity.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Tests\Bridge\Doctrine\Fixtures;
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
 
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\Column;

tests/Symfony/Tests/Bridge/Doctrine/Fixtures/SingleStringIdentEntity.php → src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleStringIdentEntity.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Tests\Bridge\Doctrine\Fixtures;
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
 
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\Column;

tests/Symfony/Tests/Bridge/Doctrine/Form/ChoiceList/EntityChoiceListTest.php → src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/EntityChoiceListTest.php

@@ -9,32 +9,31 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Bridge\Doctrine\Form\ChoiceList;
+namespace Symfony\Bridge\Doctrine\Tests\Form\ChoiceList;
 
-require_once __DIR__.'/../../DoctrineOrmTestCase.php';
-require_once __DIR__.'/../../Fixtures/ItemGroupEntity.php';
-require_once __DIR__.'/../../Fixtures/SingleIdentEntity.php';
-require_once __DIR__.'/../../Fixtures/NoToStringSingleIdentEntity.php';
-
-use Symfony\Tests\Bridge\Doctrine\DoctrineOrmTestCase;
-use Symfony\Tests\Bridge\Doctrine\Fixtures\ItemGroupEntity;
-use Symfony\Tests\Bridge\Doctrine\Fixtures\SingleIdentEntity;
-use Symfony\Tests\Bridge\Doctrine\Fixtures\NoToStringSingleIdentEntity;
+use Symfony\Bridge\Doctrine\Tests\DoctrineOrmTestCase;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\ItemGroupEntity;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\NoToStringSingleIdentEntity;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityChoiceList;
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
 
 class EntityChoiceListTest extends DoctrineOrmTestCase
 {
-    const ITEM_GROUP_CLASS = 'Symfony\Tests\Bridge\Doctrine\Fixtures\ItemGroupEntity';
+    const ITEM_GROUP_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\ItemGroupEntity';
 
-    const SINGLE_IDENT_CLASS = 'Symfony\Tests\Bridge\Doctrine\Fixtures\SingleIdentEntity';
+    const SINGLE_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity';
 
-    const COMPOSITE_IDENT_CLASS = 'Symfony\Tests\Bridge\Doctrine\Fixtures\CompositeIdentEntity';
+    const COMPOSITE_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIdentEntity';
 
     private $em;
 
     protected function setUp()
     {
+        if (!class_exists('Symfony\Component\Form\Form')) {
+            $this->markTestSkipped('The "Form" component is not available');
+        }
+
         parent::setUp();
 
         $this->em = $this->createTestEntityManager();
@@ -49,7 +48,7 @@ protected function tearDown()
 
     /**
      * @expectedException Symfony\Component\Form\Exception\FormException
-     * @expectedMessage   Entity "Symfony\Tests\Bridge\Doctrine\Fixtures\SingleIdentEntity" passed to the choice field must have a "__toString()" method defined (or you can also override the "property" option).
+     * @expectedMessage   Entity "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity" passed to the choice field must have a "__toString()" method defined (or you can also override the "property" option).
      */
     public function testEntitesMustHaveAToStringMethod()
     {