Removes container from Talus - not needed

avalanche-development · Nov 12, 2016 · ecae989 · ecae989
1 parent 68c5e14
commit ecae989
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 76 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,6 @@
     ],
     "require": {
         "php": ">=5.6.0",
-        "container-interop/container-interop": "^1.1",
         "psr/http-message": "^1.0",
         "psr/log": "^1.0",
         "avalanche-development/swagger-router-middleware": "^0.3",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Talus.php b/src/Talus.php
@@ -12,7 +12,6 @@
 
 use AvalancheDevelopment\CrashPad\ErrorHandler;
 use AvalancheDevelopment\SwaggerRouterMiddleware\Router;
-use Interop\Container\ContainerInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerAwareInterface;
@@ -29,9 +28,6 @@ class Talus implements LoggerAwareInterface
 
     use MiddlewareAwareTrait;
 
-    /** @var ContainerInterface $container */
-    protected $container;
-
     /** @var array $swagger */
     protected $swagger;
 
@@ -43,12 +39,10 @@ class Talus implements LoggerAwareInterface
 
     /**
      * @param array $swagger
-     * @param ContainerInterface $container
      */
-    public function __construct(array $swagger, ContainerInterface $container)
+    public function __construct(array $swagger)
     {
         $this->swagger = $swagger;
-        $this->container = $container;
 
         $this->logger = new NullLogger;
         $this->errorHandler = new ErrorHandler;

diff --git a/tests/TalusTest.php b/tests/TalusTest.php
@@ -9,7 +9,6 @@
 
 use AvalancheDevelopment\CrashPad\ErrorHandler;
 use AvalancheDevelopment\SwaggerRouterMiddleware\Router;
-use Interop\Container\ContainerInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -23,59 +22,41 @@ class TalusTest extends PHPUnit_Framework_TestCase
 
     public function testIsInstanceOfTalus()
     {
-        $container = $this->createMock(ContainerInterface::class);
-
-        $talus = new Talus([], $container);
+        $talus = new Talus([]);
 
         $this->assertInstanceOf(Talus::class, $talus);
     }
 
     public function testTalusImplementsLoggerInterface()
     {
-        $container = $this->createMock(ContainerInterface::class);
-
-        $talus = new Talus([], $container);
+        $talus = new Talus([]);
 
         $this->assertInstanceOf(LoggerAwareInterface::class, $talus);
     }
 
     public function testConstructSetsNullLogger()
     {
-        $container = $this->createMock(ContainerInterface::class);
-
-        $talus = new Talus([], $container);
+        $talus = new Talus([]);
 
         $this->assertAttributeInstanceOf(NullLogger::class, 'logger', $talus);
     }
 
     public function testConstructSetsErrorHandler()
     {
-        $container = $this->createMock(ContainerInterface::class);
-
-        $talus = new Talus([], $container);
+        $talus = new Talus([]);
 
         $this->assertAttributeInstanceOf(ErrorHandler::class, 'errorHandler', $talus);
     }
 
     public function testConstructSetsSwagger()
     {
-        $container = $this->createMock(ContainerInterface::class);
         $swagger = ['swagger'];
 
-        $talus = new Talus($swagger, $container);
+        $talus = new Talus($swagger);
 
         $this->assertAttributeEquals($swagger, 'swagger', $talus);
     }
 
-    public function testConstructSetsContainer()
-    {
-        $container = $this->createMock(ContainerInterface::class);
-
-        $talus = new Talus([], $container);
-
-        $this->assertAttributeSame($container, 'container', $talus);
-    }
-
     public function testAddController()
     {
         $operationId = 'getThings';