Filter through building container to required strategies

thephpleague · Aug 24, 2015 · 803cad3 · 803cad3
1 parent feb8337
commit 803cad3
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 45 deletions.
diff --git a/src/Strategy/AbstractStrategy.php b/src/Strategy/AbstractStrategy.php
@@ -4,37 +4,14 @@
 
 use League\Container\Container;
 use League\Container\ContainerAwareInterface;
+use League\Container\ContainerAwareTrait;
 use League\Container\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 abstract class AbstractStrategy implements ContainerAwareInterface
 {
-    /**
-     * @var \League\Container\ContainerInterface
-     */
-    protected $container;
-
-    /**
-     * Set a container
-     *
-     * @param \League\Container\ContainerInterface $container
-     */
-    public function setContainer(ContainerInterface $container)
-    {
-        $this->container = $container;
-
-        return $this;
-    }
-
-    /**
-     * Get the container
-     *
-     * @return \League\Container\ContainerInterface
-     */
-    public function getContainer()
-    {
-        return (is_null($this->container)) ? new Container : $this->container;
-    }
+    use ContainerAwareTrait;
 
     /**
      * Invoke a controller action
@@ -75,4 +52,21 @@ protected function determineResponse($response)
 
         return $response;
     }
+
+    /**
+     * Get Request either from the container or else create it from globals.
+     *
+     * @return \Symfony\Component\HttpFoundation\Request
+     */
+    protected function getRequest()
+    {
+        if (
+            $this->getContainer()->isRegistered('Symfony\Component\HttpFoundation\Request') ||
+            $this->getContainer()->isInServiceProvider('Symfony\Component\HttpFoundation\Request')
+        ) {
+            return $this->getContainer()->get('Symfony\Component\HttpFoundation\Request');
+        }
+
+        return Request::createFromGlobals();
+    }
 }
diff --git a/src/Strategy/RequestResponseStrategy.php b/src/Strategy/RequestResponseStrategy.php
@@ -3,7 +3,6 @@
 namespace League\Route\Strategy;
 
 use RuntimeException;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 class RequestResponseStrategy extends AbstractStrategy implements StrategyInterface
@@ -28,20 +27,4 @@ public function dispatch($controller, array $vars)
             'return an instance of [Symfony\Component\HttpFoundation\Response]'
         );
     }
-
-    /**
-     * Get Request either from the container or else create it from globals
-     * @return \Symfony\Component\HttpFoundation\Request
-     */
-    protected function getRequest()
-    {
-        if (
-            $this->getContainer()->isRegistered('Symfony\Component\HttpFoundation\Request') ||
-            $this->getContainer()->isInServiceProvider('Symfony\Component\HttpFoundation\Request')
-        ) {
-            return $this->getContainer()->get('Symfony\Component\HttpFoundation\Request');
-        }
-
-        return Request::createFromGlobals();
-    }
 }
diff --git a/src/Strategy/RestfulStrategy.php b/src/Strategy/RestfulStrategy.php
@@ -16,7 +16,7 @@ public function dispatch($controller, array $vars)
     {
         try {
             $response = $this->invokeController($controller, [
-                $this->getContainer()->get('Symfony\Component\HttpFoundation\Request'),
+                $this->getRequest(),
                 $vars
             ]);
 

diff --git a/tests/DispatcherTest.php b/tests/DispatcherTest.php
@@ -27,8 +27,13 @@ public function testRestfulStrategyReturnsJsonResponseWhenHttpExceptionIsThrown(
                    ->will($this->throwException(new HttpException\ConflictException));
 
         $container = $this->getMock('League\Container\Container');
+        $request   = $this->getMock('Symfony\Component\HttpFoundation\Request');
 
-        $container->expects($this->at(1))
+        $container->expects($this->at(0))->method('isRegistered')->will($this->returnValue(false));
+        $container->expects($this->at(1))->method('isInServiceProvider')->will($this->returnValue(true));
+        $container->expects($this->at(2))->method('get')->will($this->returnValue($request));
+
+        $container->expects($this->at(3))
                   ->method('get')
                   ->with($this->equalTo('SomeClass'))
                   ->will($this->returnValue($controller));