From 998a926c3556a6594dda958df1d5f69f7c3bbb10 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sun, 10 Apr 2016 09:52:44 +0200
Subject: [PATCH] Improved configuration

---
 config/app.php       | 12 ++++++++++++
 config/config.php    |  1 -
 config/container.php | 16 ----------------
 public/index.php     |  9 +++------
 4 files changed, 15 insertions(+), 23 deletions(-)
 create mode 100644 config/app.php
 delete mode 100644 config/container.php

diff --git a/config/app.php b/config/app.php
new file mode 100644
index 00000000..4d847f64
--- /dev/null
+++ b/config/app.php
@@ -0,0 +1,12 @@
+<?php
+use Zend\Expressive\Application;
+use Zend\ServiceManager\ServiceManager;
+
+require __DIR__ . '/../vendor/autoload.php';
+
+// Build container
+$config = require __DIR__ . '/config.php';
+$container = new ServiceManager($config['services']);
+$container->setService('config', $config);
+
+return $container->get(Application::class);
diff --git a/config/config.php b/config/config.php
index a5446be7..4838f371 100644
--- a/config/config.php
+++ b/config/config.php
@@ -1,5 +1,4 @@
 <?php
-
 use Zend\Stdlib\ArrayUtils;
 use Zend\Stdlib\Glob;
 
diff --git a/config/container.php b/config/container.php
deleted file mode 100644
index 07d62789..00000000
--- a/config/container.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-use Zend\ServiceManager\Config;
-use Zend\ServiceManager\ServiceManager;
-
-// Load configuration
-$config = require __DIR__ . '/config.php';
-
-// Build container
-$container = new ServiceManager();
-(new Config($config['services']))->configureServiceManager($container);
-
-// Inject config
-$container->setService('config', $config);
-
-return $container;
diff --git a/public/index.php b/public/index.php
index 8324c8d5..cf46cc99 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,11 +1,8 @@
 <?php
+use Zend\Expressive\Application;
 
 chdir(dirname(__DIR__));
-require 'vendor/autoload.php';
 
-/** @var \Interop\Container\ContainerInterface $container */
-$container = require 'config/container.php';
-
-/** @var \Zend\Expressive\Application $app */
-$app = $container->get(\Zend\Expressive\Application::class);
+/** @var Application $app */
+$app = include 'config/app.php';
 $app->run();