Simplify directory layout with PSR-4

composer.json

@@ -10,9 +10,8 @@
         }
     },
     "autoload-dev": {
-        "psr-0": {
-            "UnitTest\\DI\\Bridge\\Symfony\\": "tests/",
-            "FunctionalTest\\DI\\Bridge\\Symfony\\": "tests/"
+        "psr-4": {
+            "DI\\Bridge\\Symfony\\Test\\": "tests/"
         }
     },
     "require": {

phpunit.xml.dist

@@ -15,8 +15,7 @@
 
     <testsuites>
         <testsuite name="Tests">
-            <directory>./tests/UnitTest</directory>
-            <directory>./tests/FunctionalTest</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 

tests/FunctionalTest/DI/Bridge/Symfony/AbstractFunctionalTest.php → tests/FunctionalTest/AbstractFunctionalTest.php

@@ -1,9 +1,9 @@
 <?php
 
 
-namespace FunctionalTest\DI\Bridge\Symfony;
+namespace DI\Bridge\Symfony\Test\FunctionalTest;
 
-use FunctionalTest\DI\Bridge\Symfony\Fixtures\AppKernel;
+use DI\Bridge\Symfony\Test\FunctionalTest\Fixtures\AppKernel;
 use Symfony\Component\Filesystem\Filesystem;
 
 abstract class AbstractFunctionalTest extends \PHPUnit_Framework_TestCase

tests/FunctionalTest/DI/Bridge/Symfony/ContainerAwareTest.php → tests/FunctionalTest/ContainerAwareTest.php

@@ -7,9 +7,9 @@
  * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
  */
 
-namespace FunctionalTest\DI\Bridge\Symfony;
+namespace DI\Bridge\Symfony\Test\FunctionalTest;
 
-use FunctionalTest\DI\Bridge\Symfony\Fixtures\ContainerAwareController;
+use DI\Bridge\Symfony\Test\FunctionalTest\Fixtures\ContainerAwareController;
 
 /**
  * @coversNothing
@@ -25,7 +25,7 @@ public function testContainerAware()
         $container = $kernel->getContainer();
 
         /** @var ContainerAwareController $class */
-        $class = $container->get('FunctionalTest\DI\Bridge\Symfony\Fixtures\ContainerAwareController');
+        $class = $container->get(ContainerAwareController::class);
 
         $this->assertSame($container, $class->container);
     }

tests/FunctionalTest/DI/Bridge/Symfony/ContainerInteractionTest.php → tests/FunctionalTest/ContainerInteractionTest.php

@@ -7,12 +7,12 @@
  * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
  */
 
-namespace FunctionalTest\DI\Bridge\Symfony;
+namespace DI\Bridge\Symfony\Test\FunctionalTest;
 
 use DI\Bridge\Symfony\SymfonyContainerBridge;
 use DI\Container;
-use FunctionalTest\DI\Bridge\Symfony\Fixtures\Class1;
-use FunctionalTest\DI\Bridge\Symfony\Fixtures\Class2;
+use DI\Bridge\Symfony\Test\FunctionalTest\Fixtures\Class1;
+use DI\Bridge\Symfony\Test\FunctionalTest\Fixtures\Class2;
 
 /**
  * Tests interactions between containers, i.e. entries that reference other entries in
@@ -36,7 +36,7 @@ public function phpdi_should_get_entries_from_symfony()
 
         $phpdiContainer->set(
             'foo',
-            \DI\object('FunctionalTest\DI\Bridge\Symfony\Fixtures\Class1')
+            \DI\object(Class1::class)
                 ->constructor(\DI\link('class2'))
         );
 

tests/FunctionalTest/DI/Bridge/Symfony/Fixtures/AppKernel.php → tests/FunctionalTest/Fixtures/AppKernel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FunctionalTest\DI\Bridge\Symfony\Fixtures;
+namespace DI\Bridge\Symfony\Test\FunctionalTest\Fixtures;
 
 use DI\Bridge\Symfony\Kernel;
 use DI\ContainerBuilder;

tests/FunctionalTest/DI/Bridge/Symfony/Fixtures/Class1.php → tests/FunctionalTest/Fixtures/Class1.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FunctionalTest\DI\Bridge\Symfony\Fixtures;
+namespace DI\Bridge\Symfony\Test\FunctionalTest\Fixtures;
 
 class Class1
 {

tests/FunctionalTest/Fixtures/Class2.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace DI\Bridge\Symfony\Test\FunctionalTest\Fixtures;
+
+class Class2
+{
+}

tests/FunctionalTest/DI/Bridge/Symfony/Fixtures/ContainerAwareController.php → tests/FunctionalTest/Fixtures/ContainerAwareController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FunctionalTest\DI\Bridge\Symfony\Fixtures;
+namespace DI\Bridge\Symfony\Test\FunctionalTest\Fixtures;
 
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;

tests/FunctionalTest/Fixtures/config/class1.yml

@@ -0,0 +1,4 @@
+services:
+    class1:
+        class: DI\Bridge\Symfony\Test\FunctionalTest\Fixtures\Class1
+        arguments: [ '@DI\\Bridge\\Symfony\\Test\\FunctionalTest\\Fixtures\\Class2' ]

tests/FunctionalTest/Fixtures/config/class2.yml

@@ -0,0 +1,3 @@
+services:
+    class2:
+        class: DI\Bridge\Symfony\Test\FunctionalTest\Fixtures\Class2

tests/FunctionalTest/DI/Bridge/Symfony/KernelTest.php → tests/FunctionalTest/KernelTest.php

@@ -7,11 +7,11 @@
  * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
  */
 
-namespace FunctionalTest\DI\Bridge\Symfony;
+namespace DI\Bridge\Symfony\Test\FunctionalTest;
 
 use DI\Bridge\Symfony\SymfonyContainerBridge;
-use FunctionalTest\DI\Bridge\Symfony\Fixtures\Class1;
-use FunctionalTest\DI\Bridge\Symfony\Fixtures\Class2;
+use DI\Bridge\Symfony\Test\FunctionalTest\Fixtures\Class1;
+use DI\Bridge\Symfony\Test\FunctionalTest\Fixtures\Class2;
 
 /**
  * @coversNothing
@@ -35,7 +35,7 @@ public function phpdi_should_resolve_classes()
     {
         $kernel = $this->createKernel();
 
-        $object = $kernel->getContainer()->get('FunctionalTest\DI\Bridge\Symfony\Fixtures\Class1');
+        $object = $kernel->getContainer()->get(Class1::class);
         $this->assertTrue($object instanceof Class1);
     }
 

tests/UnitTest/DI/Bridge/Symfony/SymfonyContainerBridgeTest.php → tests/UnitTest/SymfonyContainerBridgeTest.php

@@ -7,7 +7,7 @@
  * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
  */
 
-namespace UnitTest\DI\Bridge\Symfony;
+namespace DI\Bridge\Symfony\Test\UnitTest;
 
 use DI\Bridge\Symfony\SymfonyContainerBridge;
 use DI\ContainerBuilder;