Merge pull request #99 from mbohal/feature/improve-bootstraping

Improve bootstraping

public/index.php

@@ -18,13 +18,16 @@
 $app = new \Slim\App($settings);
 
 // Set up dependencies
-require __DIR__ . '/../src/dependencies.php';
+$dependencies = require __DIR__ . '/../src/dependencies.php';
+$dependencies($app);
 
 // Register middleware
-require __DIR__ . '/../src/middleware.php';
+$middleware = require __DIR__ . '/../src/middleware.php';
+$middleware($app);
 
 // Register routes
-require __DIR__ . '/../src/routes.php';
+$routes = require __DIR__ . '/../src/routes.php';
+$routes($app);
 
 // Run app
 $app->run();

src/dependencies.php

@@ -1,19 +1,22 @@
 <?php
-// DIC configuration
 
-$container = $app->getContainer();
+use Slim\App;
 
-// view renderer
-$container['renderer'] = function ($c) {
-    $settings = $c->get('settings')['renderer'];
-    return new Slim\Views\PhpRenderer($settings['template_path']);
-};
+return function (App $app) {
+    $container = $app->getContainer();
+
+    // view renderer
+    $container['renderer'] = function ($c) {
+        $settings = $c->get('settings')['renderer'];
+        return new \Slim\Views\PhpRenderer($settings['template_path']);
+    };
 
-// monolog
-$container['logger'] = function ($c) {
-    $settings = $c->get('settings')['logger'];
-    $logger = new Monolog\Logger($settings['name']);
-    $logger->pushProcessor(new Monolog\Processor\UidProcessor());
-    $logger->pushHandler(new Monolog\Handler\StreamHandler($settings['path'], $settings['level']));
-    return $logger;
+    // monolog
+    $container['logger'] = function ($c) {
+        $settings = $c->get('settings')['logger'];
+        $logger = new \Monolog\Logger($settings['name']);
+        $logger->pushProcessor(new \Monolog\Processor\UidProcessor());
+        $logger->pushHandler(new \Monolog\Handler\StreamHandler($settings['path'], $settings['level']));
+        return $logger;
+    };
 };

src/middleware.php

@@ -1,4 +1,7 @@
 <?php
-// Application middleware
 
-// e.g: $app->add(new \Slim\Csrf\Guard);
+use Slim\App;
+
+return function (App $app) {
+    // e.g: $app->add(new \Slim\Csrf\Guard);
+};

src/routes.php

@@ -1,14 +1,17 @@
 <?php
 
+use Slim\App;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-// Routes
+return function (App $app) {
+    $container = $app->getContainer();
 
-$app->get('/[{name}]', function (Request $request, Response $response, array $args) {
-    // Sample log message
-    $this->logger->info("Slim-Skeleton '/' route");
+    $app->get('/[{name}]', function (Request $request, Response $response, array $args) use ($container) {
+        // Sample log message
+        $container->get('logger')->info("Slim-Skeleton '/' route");
 
-    // Render index view
-    return $this->renderer->render($response, 'index.phtml', $args);
-});
+        // Render index view
+        return $container->get('renderer')->render($response, 'index.phtml', $args);
+    });
+};

tests/Functional/BaseTestCase.php

@@ -59,15 +59,18 @@ public function runApp($requestMethod, $requestUri, $requestData = null)
         $app = new App($settings);
 
         // Set up dependencies
-        require __DIR__ . '/../../src/dependencies.php';
+        $dependencies = require __DIR__ . '/../../src/dependencies.php';
+        $dependencies($app);
 
         // Register middleware
         if ($this->withMiddleware) {
-            require __DIR__ . '/../../src/middleware.php';
+            $middleware = require __DIR__ . '/../../src/middleware.php';
+            $middleware($app);
         }
 
         // Register routes
-        require __DIR__ . '/../../src/routes.php';
+        $routes = require __DIR__ . '/../../src/routes.php';
+        $routes($app);
 
         // Process the application
         $response = $app->process($request, $response);