Use Symfony bundle structure

yoanm · web-flow · commit caaf65e2c48a · 2018-04-07T10:39:32.000+02:00
Fix #8
diff --git a/composer.json b/composer.json
@@ -15,9 +15,7 @@
     ],
     "autoload": {
         "psr-4": {
-            "Yoanm\\SymfonyJsonRpcHttpServer\\App\\": "src/App",
-            "Yoanm\\SymfonyJsonRpcHttpServer\\Domain\\": "src/Domain",
-            "Yoanm\\SymfonyJsonRpcHttpServer\\Infra\\": "src/Infra"
+            "Yoanm\\SymfonyJsonRpcHttpServer\\": "src"
         }
     },
     "autoload-dev": {
diff --git a/features/bootstrap/SymfonyExtensionContext.php b/features/bootstrap/SymfonyExtensionContext.php
@@ -14,8 +14,8 @@
 use Symfony\Component\HttpFoundation\Request;
 use Yoanm\JsonRpcServer\Domain\Model\JsonRpcMethodInterface;
 use Yoanm\JsonRpcServer\Infra\Endpoint\JsonRpcEndpoint;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Endpoint\JsonRpcHttpEndpoint;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension;
+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;
+use Yoanm\SymfonyJsonRpcHttpServer\Endpoint\JsonRpcHttpEndpoint;
 
 /**
  * Defines application features from the specific context.
diff --git a/features/demo_app/default_config_with_bundle/bundles.php b/features/demo_app/default_config_with_bundle/bundles.php
@@ -1,5 +1,5 @@
 <?php
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
-    Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\JsonRpcHttpServerBundle::class => ['all' => true],
+    Yoanm\SymfonyJsonRpcHttpServer\JsonRpcHttpServerBundle::class => ['all' => true],
 ];
diff --git a/features/demo_app/default_config_with_bundle_and_resolver/bundles.php b/features/demo_app/default_config_with_bundle_and_resolver/bundles.php
@@ -1,5 +1,5 @@
 <?php
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
-    Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\JsonRpcHttpServerBundle::class => ['all' => true],
+    Yoanm\SymfonyJsonRpcHttpServer\JsonRpcHttpServerBundle::class => ['all' => true],
 ];
diff --git a/features/demo_app/src/AbstractKernel.php b/features/demo_app/src/AbstractKernel.php
@@ -2,10 +2,7 @@
 namespace DemoApp;
 
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel as BaseHttpKernel;
-use Symfony\Component\Routing\RouteCollectionBuilder;
 
 abstract class AbstractKernel extends BaseHttpKernel
 {
diff --git a/features/demo_app/src/DefaultKernel.php b/features/demo_app/src/DefaultKernel.php
@@ -5,7 +5,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Routing\RouteCollectionBuilder;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension;
+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;
 
 class DefaultKernel extends AbstractKernel implements CompilerPassInterface
 {
diff --git a/features/demo_app/src/KernelWithBundle.php b/features/demo_app/src/KernelWithBundle.php
@@ -5,7 +5,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Routing\RouteCollectionBuilder;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension;
+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;
 
 class KernelWithBundle extends AbstractKernel implements CompilerPassInterface
 {
diff --git a/features/demo_app/src/KernelWithCustomResolver.php b/features/demo_app/src/KernelWithCustomResolver.php
@@ -4,7 +4,7 @@
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Routing\RouteCollectionBuilder;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension;
+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;
 
 class KernelWithCustomResolver extends AbstractKernel
 {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -30,10 +30,10 @@
 >
     <testsuites>
         <testsuite name="functional">
-            <directory>tests/Functional/*</directory>
+            <directory>tests/Functional</directory>
         </testsuite>
         <testsuite name="technical">
-            <directory>tests/Technical/*</directory>
+            <directory>tests/Technical</directory>
         </testsuite>
     </testsuites>
 
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -1,5 +1,5 @@
 <?php
-namespace Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection;
+namespace Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
diff --git a/src/DependencyInjection/JsonRpcHttpServerExtension.php b/src/DependencyInjection/JsonRpcHttpServerExtension.php
@@ -1,7 +1,7 @@
 <?php
-namespace Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection;
+namespace Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection;
 
-use Symfony\Component\Config\Definition\Processor; // <= Must stay optional !
+use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -18,8 +18,8 @@
 use Yoanm\JsonRpcServer\Infra\Serialization\RawRequestSerializer;
 use Yoanm\JsonRpcServer\Infra\Serialization\RawResponseSerializer;
 use Yoanm\JsonRpcServerPsr11Resolver\Infra\Resolver\ContainerMethodResolver;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Endpoint\JsonRpcHttpEndpoint;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Resolver\ServiceNameResolver;
+use Yoanm\SymfonyJsonRpcHttpServer\Endpoint\JsonRpcHttpEndpoint;
+use Yoanm\SymfonyJsonRpcHttpServer\Resolver\ServiceNameResolver; // <= Must stay optional !
 
 /**
  * Class JsonRpcHttpServerExtension
diff --git a/src/Endpoint/JsonRpcHttpEndpoint.php b/src/Endpoint/JsonRpcHttpEndpoint.php
@@ -1,5 +1,5 @@
 <?php
-namespace Yoanm\SymfonyJsonRpcHttpServer\Infra\Endpoint;
+namespace Yoanm\SymfonyJsonRpcHttpServer\Endpoint;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/src/JsonRpcHttpServerBundle.php b/src/JsonRpcHttpServerBundle.php
@@ -1,8 +1,8 @@
 <?php
-namespace Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony;
+namespace Yoanm\SymfonyJsonRpcHttpServer;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension;
+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;
 
 /**
  * Class JsonRpcHttpServerBundle
diff --git a/src/Resolver/ServiceNameResolver.php b/src/Resolver/ServiceNameResolver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Yoanm\SymfonyJsonRpcHttpServer\Infra\Resolver;
+namespace Yoanm\SymfonyJsonRpcHttpServer\Resolver;
 
 use Yoanm\JsonRpcServerPsr11Resolver\Domain\Model\ServiceNameResolverInterface;
 
diff --git a/tests/Common/DependencyInjection/AbstractTestClass.php b/tests/Common/DependencyInjection/AbstractTestClass.php
@@ -1,10 +1,10 @@
 <?php
-namespace Tests\Common\Infra\Symfony\DependencyInjection;
+namespace Tests\Common\DependencyInjection;
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 use Symfony\Component\DependencyInjection\Definition;
 use Yoanm\JsonRpcServer\Domain\Model\MethodResolverInterface;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension;
+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;
 
 abstract class AbstractTestClass extends AbstractExtensionTestCase
 {
diff --git a/tests/Functional/DependencyInjection/JsonRpcHttpServerExtensionTest.php b/tests/Functional/DependencyInjection/JsonRpcHttpServerExtensionTest.php
@@ -1,15 +1,15 @@
 <?php
-namespace Tests\Functional\Infra\Symfony\DependencyInjection;
+namespace Tests\Functional\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Reference;
-use Tests\Common\Infra\Symfony\DependencyInjection\AbstractTestClass;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Endpoint\JsonRpcHttpEndpoint;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Resolver\ServiceNameResolver;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension;
+use Tests\Common\DependencyInjection\AbstractTestClass;
+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;
+use Yoanm\SymfonyJsonRpcHttpServer\Endpoint\JsonRpcHttpEndpoint;
+use Yoanm\SymfonyJsonRpcHttpServer\Resolver\ServiceNameResolver;
 
 /**
- * @covers \Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension
+ * @covers \Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension
  */
 class JsonRpcHttpServerExtensionTest extends AbstractTestClass
 {
diff --git a/tests/Functional/DependencyInjection/JsonRpcHttpServerExtensionWithConfigParsedTest.php b/tests/Functional/DependencyInjection/JsonRpcHttpServerExtensionWithConfigParsedTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace Tests\Functional\Infra\Symfony\DependencyInjection;
+namespace Tests\Functional\DependencyInjection;
 
-use Tests\Common\Infra\Symfony\DependencyInjection\AbstractTestClass;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension;
+use Tests\Common\DependencyInjection\AbstractTestClass;
+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;
 
 /**
- * @covers \Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension
+ * @covers \Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension
  */
 class JsonRpcHttpServerExtensionWithConfigParsedTest extends AbstractTestClass
 {
diff --git a/tests/Functional/Endpoint/JsonRpcHttpEndpointTest.php b/tests/Functional/Endpoint/JsonRpcHttpEndpointTest.php
@@ -1,16 +1,16 @@
 <?php
-namespace Tests\Functional\Infra\Endpoint;
+namespace Tests\Functional\Endpoint;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Yoanm\JsonRpcServer\Infra\Endpoint\JsonRpcEndpoint as SDKJsonRpcEndpoint;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Endpoint\JsonRpcHttpEndpoint;
+use Yoanm\SymfonyJsonRpcHttpServer\Endpoint\JsonRpcHttpEndpoint;
 
 /**
- * @covers \Yoanm\SymfonyJsonRpcHttpServer\Infra\Endpoint\JsonRpcHttpEndpoint
+ * @covers \Yoanm\SymfonyJsonRpcHttpServer\Endpoint\JsonRpcHttpEndpoint
  */
 class JsonRpcHttpEndpointTest extends TestCase
 {
diff --git a/tests/Functional/JsonRpcHttpServerBundleTest.php b/tests/Functional/JsonRpcHttpServerBundleTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace Tests\Functional\Infra\Symfony\DependencyInjection;
+namespace Tests\Functional\DependencyInjection;
 
-use Tests\Common\Infra\Symfony\DependencyInjection\AbstractTestClass;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\JsonRpcHttpServerBundle;
+use Tests\Common\DependencyInjection\AbstractTestClass;
+use Yoanm\SymfonyJsonRpcHttpServer\JsonRpcHttpServerBundle;
 
 /**
- * @covers \Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\JsonRpcHttpServerBundle
+ * @covers \Yoanm\SymfonyJsonRpcHttpServer\JsonRpcHttpServerBundle
  */
 class JsonRpcHttpServerBundleTest extends AbstractTestClass
 {
diff --git a/tests/Functional/Resolver/ServiceNameResolverTest.php b/tests/Functional/Resolver/ServiceNameResolverTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace Tests\Functional\Infra\Endpoint;
+namespace Tests\Functional\Endpoint;
 
 use PHPUnit\Framework\TestCase;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Resolver\ServiceNameResolver;
+use Yoanm\SymfonyJsonRpcHttpServer\Resolver\ServiceNameResolver;
 
 /**
- * @covers \Yoanm\SymfonyJsonRpcHttpServer\Infra\Resolver\ServiceNameResolver
+ * @covers \Yoanm\SymfonyJsonRpcHttpServer\Resolver\ServiceNameResolver
  */
 class ServiceNameResolverTest extends TestCase
 {
diff --git a/tests/Technical/DependencyInjection/ConfigurationTest.php b/tests/Technical/DependencyInjection/ConfigurationTest.php
@@ -1,12 +1,12 @@
 <?php
-namespace Tests\Technical\Infra\Symfony\DependencyInjection;
+namespace Tests\Technical\DependencyInjection;
 
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
 use PHPUnit\Framework\TestCase;
-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\Configuration;
+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\Configuration;
 
 /**
- * @covers \Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\Configuration
+ * @covers \Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\Configuration
  */
 class ConfigurationTest extends TestCase
 {
diff --git a/tests/Technical/DependencyInjection/JsonRpcHttpServerExtensionTest.php b/tests/Technical/DependencyInjection/JsonRpcHttpServerExtensionTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace Tests\Technical\Infra\Symfony\DependencyInjection;
+namespace Tests\Technical\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\Exception\LogicException;
-use Tests\Common\Infra\Symfony\DependencyInjection\AbstractTestClass;
+use Tests\Common\DependencyInjection\AbstractTestClass;
 
 /**
- * @covers \Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension
+ * @covers \Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension
  */
 class JsonRpcHttpServerExtensionTest extends AbstractTestClass
 {

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,7 @@`
`2`	`2`	`namespace DemoApp;`
`3`	`3`
`4`	`4`	`use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;`
`5`		`-use Symfony\Component\Config\Loader\LoaderInterface;`
`6`		`-use Symfony\Component\DependencyInjection\ContainerBuilder;`
`7`	`5`	`use Symfony\Component\HttpKernel\Kernel as BaseHttpKernel;`
`8`		`-use Symfony\Component\Routing\RouteCollectionBuilder;`
`9`	`6`
`10`	`7`	`abstract class AbstractKernel extends BaseHttpKernel`
`11`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;`
`6`	`6`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`7`	`7`	`use Symfony\Component\Routing\RouteCollectionBuilder;`
`8`		`-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension;`
	`8`	`+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;`
`9`	`9`
`10`	`10`	`class DefaultKernel extends AbstractKernel implements CompilerPassInterface`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`use Symfony\Component\Config\Loader\LoaderInterface;`
`5`	`5`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`6`	`6`	`use Symfony\Component\Routing\RouteCollectionBuilder;`
`7`		`-use Yoanm\SymfonyJsonRpcHttpServer\Infra\Symfony\DependencyInjection\JsonRpcHttpServerExtension;`
	`7`	`+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;`
`8`	`8`
`9`	`9`	`class KernelWithCustomResolver extends AbstractKernel`
`10`	`10`	`{`