Refactor for PSR4 compliance

Author: alafon

Tests/DependencyInjection/Compiler/FakeCompilerPass.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Overblog\GraphQLBundle\Tests\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Class FakeCompilerPass
+ * @package DependencyInjection\Compiler
+ */
+class FakeCompilerPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        $container
+            ->getDefinition('test_resolver')
+            ->addArgument(new Reference('injected_service'))
+        ;
+    }
+}

Tests/DependencyInjection/Compiler/FakeInjectedService.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Overblog\GraphQLBundle\Tests\DependencyInjection\Compiler;
+
+/**
+ * Class FakeInjectedService
+ */
+class FakeInjectedService
+{
+    public function doSomething()
+    {
+        return true;
+    }
+}

Tests/DependencyInjection/Compiler/ResolverTaggedServiceMappingPassTest.php

@@ -3,12 +3,8 @@
 namespace Overblog\GraphQLBundle\Tests\DependencyInjection\Compiler;
 
 use Overblog\GraphQLBundle\DependencyInjection\Compiler\ResolverTaggedServiceMappingPass;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * Class ResolverTaggedServiceMappingPassTest
@@ -34,21 +30,20 @@ public function setUp()
             "Overblog\\GraphQLBundle\\Resolver\\ResolverResolver"
         );
 
-        $fakeResolver = new Definition('Overblog\GraphQLBundle\Tests\DependencyInjection\Compiler\FakeResolverService');
-        $fakeResolver
+        $testResolver = new Definition('Overblog\GraphQLBundle\Tests\DependencyInjection\Compiler\ResolverTestService');
+        $testResolver
             ->addTag( 'overblog_graphql.resolver', [
-                'alias' => 'fake_resolver', 'method' => 'doSomethingWithContainer'
+                'alias' => 'test_resolver', 'method' => 'doSomethingWithContainer'
             ]);
 
-        $container->setDefinition('fake_resolver', $fakeResolver);
+        $container->setDefinition('test_resolver', $testResolver);
 
         $this->container = $container;
     }
 
     private function addCompilerPassesAndCompile()
     {
             $this->container->addCompilerPass(new ResolverTaggedServiceMappingPass());
-            // Manipulate container after ResolverTaggedServiceMappingPass
             $this->container->addCompilerPass(new FakeCompilerPass());
             $this->container->compile();
     }
@@ -57,40 +52,6 @@ public function testCompilationWorksPassConfigDirective()
     {
         $this->addCompilerPassesAndCompile();
 
-        $this->assertTrue($this->container->has('fake_resolver'));
-    }
-}
-
-class FakeCompilerPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container)
-    {
-        $container
-            ->getDefinition('fake_resolver')
-            ->addArgument(new Reference('injected_service'))
-        ;
-    }
-}
-
-// Instantiate ContainerAwareInterface to trigger the problem in ResolverTaggedServiceMappingPass
-class FakeResolverService implements ContainerAwareInterface
-{
-    use ContainerAwareTrait;
-
-    public function __construct($service)
-    {
-    }
-
-    public function doSomethingWithContainer()
-    {
-        return $this->container->get('injected_service')->doSomething();
-    }
-}
-
-class FakeInjectedService
-{
-    public function doSomething()
-    {
-        return true;
+        $this->assertTrue($this->container->has('test_resolver'));
     }
 }

Tests/DependencyInjection/Compiler/ResolverTestService.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+
+/**
+ * Class ResolverTestService
+ * @package DependencyInjection\Compiler
+ */
+class ResolverTestService implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    public function __construct($service)
+    {
+    }
+
+    public function doSomethingWithContainer()
+    {
+        return $this->container->get('injected_service')->doSomething();
+    }
+}