Replace the Quickstart class with an App subclass

Author: mnapoli

src/App.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace DI\Bridge\Slim;
+
+use DI\ContainerBuilder;
+
+/**
+ * Slim application configured with PHP-DI.
+ */
+class App extends \Slim\App
+{
+    public function __construct()
+    {
+        $containerBuilder = new ContainerBuilder;
+        $containerBuilder->addDefinitions(__DIR__ . '/config.php');
+        $container = $containerBuilder->build();
+
+        parent::__construct($container);
+    }
+
+    /**
+     * Override this method to configure the container builder.
+     *
+     * For example, to load additional configuration files:
+     *
+     *     protected function configureContainer(ContainerBuilder $builder)
+     *     {
+     *         $builder->addDefinitions(__DIR__ . 'my-config-file.php');
+     *     }
+     */
+    protected function configureContainer(ContainerBuilder $builder)
+    {
+    }
+}

src/Quickstart.php

@@ -2,7 +2,7 @@
 
 namespace DI\Bridge\Slim\Test;
 
-use DI\Bridge\Slim\Quickstart;
+use DI\Bridge\Slim\App;
 use DI\Bridge\Slim\Test\Mock\RequestFactory;
 use Slim\Http\Response;
 
@@ -13,7 +13,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
      */
     public function runs()
     {
-        $app = Quickstart::createApplication();
+        $app = new App;
 
         $called = false;
         $app->get('/', function () use (&$called) {

tests/ApplicationTest.php

@@ -2,8 +2,7 @@
 
 namespace DI\Bridge\Slim\Test;
 
-use DI\Bridge\Slim\Quickstart;
-use Slim\App;
+use DI\Bridge\Slim\App;
 
 class ContainerTest extends \PHPUnit_Framework_TestCase
 {
@@ -15,8 +14,8 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
      */
     public function provides_mandatory_container_entries()
     {
-        $slimDefault = new App;
-        $slimPhpDi = Quickstart::createApplication();
+        $slimDefault = new \Slim\App;
+        $slimPhpDi = new App;
 
         /** @var \Slim\Container $defaultContainer */
         $defaultContainer = $slimDefault->getContainer();
@@ -39,8 +38,8 @@ public function provides_mandatory_container_entries()
      */
     public function provides_default_config_options()
     {
-        $slimDefault = new App;
-        $slimPhpDi = Quickstart::createApplication();
+        $slimDefault = new \Slim\App;
+        $slimPhpDi = new App;
 
         /** @var \Slim\Container $defaultContainer */
         $defaultContainer = $slimDefault->getContainer();

tests/ContainerTest.php

@@ -2,7 +2,7 @@
 
 namespace DI\Bridge\Slim\Test;
 
-use DI\Bridge\Slim\Quickstart;
+use DI\Bridge\Slim\App;
 use DI\Bridge\Slim\Test\Mock\RequestFactory;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -15,7 +15,7 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase
      */
     public function invokes_closure_middleware()
     {
-        $app = Quickstart::createApplication();
+        $app = new App;
         $app->add(function (ServerRequestInterface $request, ResponseInterface $response, callable $next) {
             $response->getBody()->write('Hello ' . $request->getQueryParams()['foo']);
             return $response;

tests/MiddlewareTest.php

@@ -2,7 +2,7 @@
 
 namespace DI\Bridge\Slim\Test;
 
-use DI\Bridge\Slim\Quickstart;
+use DI\Bridge\Slim\App;
 use DI\Bridge\Slim\Test\Fixture\UserController;
 use DI\Bridge\Slim\Test\Mock\RequestFactory;
 use Psr\Http\Message\ResponseInterface;
@@ -16,7 +16,7 @@ class RoutingTest extends \PHPUnit_Framework_TestCase
      */
     public function injects_request_and_response()
     {
-        $app = Quickstart::createApplication();
+        $app = new App;
         // Response and request and inversed to check that they are correctly injected by name
         $app->get('/', function (ResponseInterface $response, ServerRequestInterface $request) {
             $response->getBody()->write('Hello ' . $request->getQueryParams()['foo']);
@@ -32,7 +32,7 @@ public function injects_request_and_response()
      */
     public function injects_request_path_parameters()
     {
-        $app = Quickstart::createApplication();
+        $app = new App;
         $app->get('/{name}', function ($name, $response) {
             $response->getBody()->write('Hello ' . $name);
             return $response;
@@ -47,7 +47,7 @@ public function injects_request_path_parameters()
      */
     public function resolve_controller_from_container()
     {
-        $app = Quickstart::createApplication();
+        $app = new App;
         $app->get('/', [UserController::class, 'dashboard']);
 
         $response = $app->callMiddlewareStack(RequestFactory::create(), new Response);