Add Applicaion class

external/import.php

@@ -1,7 +1,6 @@
 <?php
 
-use XHGui\Saver\SaverInterface;
-use XHGui\ServiceContainer;
+use XHGui\Application;
 
 require __DIR__ . '/../vendor/autoload.php';
 
@@ -21,9 +20,8 @@
     throw new RuntimeException('Can\'t open ' . $file);
 }
 
-$container = ServiceContainer::instance();
-/** @var SaverInterface $saver */
-$saver = $container['saver'];
+$app = new Application();
+$saver = $app->getSaver();
 
 while (!feof($fp)) {
     $line = fgets($fp);

src/Application.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace XHGui;
+
+use Pimple\Container;
+use Slim\Slim as App;
+use XHGui\Saver\SaverInterface;
+
+class Application extends Container
+{
+    /** @var bool */
+    private $booted = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->register(new ServiceProvider\ServiceProvider());
+        $this->register(new ServiceProvider\ConfigProvider());
+        $this->register(new ServiceProvider\PdoStorageProvider());
+        $this->register(new ServiceProvider\MongoStorageProvider());
+        $this->register(new ServiceProvider\SlimProvider());
+    }
+
+    public function run(): void
+    {
+        $this->boot()->getSlim()->run();
+    }
+
+    public function boot(): self
+    {
+        if (!$this->booted) {
+            $this->register(new ServiceProvider\RouteProvider());
+            $this->booted = true;
+        }
+
+        return $this;
+    }
+
+    public function getSlim(): App
+    {
+        return $this['app'];
+    }
+
+    public function getSaver(): SaverInterface
+    {
+        return $this['saver'];
+    }
+}

tests/LazyContainerProperties.php

@@ -6,18 +6,18 @@
 use MongoDB;
 use Slim\Slim as App;
 use Slim\View;
+use XHGui\Application;
 use XHGui\Controller;
 use XHGui\Saver\SaverInterface;
 use XHGui\Searcher\MongoSearcher;
 use XHGui\Searcher\SearcherInterface;
-use XHGui\ServiceContainer;
 use XHGui\Twig\TwigExtension;
 
 trait LazyContainerProperties
 {
     use LazyPropertiesTrait;
 
-    /** @var ServiceContainer */
+    /** @var Application */
     protected $di;
     /** @var Controller\ImportController */
     protected $import;
@@ -59,7 +59,7 @@ protected function setupProperties(): void
 
     protected function getDi()
     {
-        $di = new ServiceContainer();
+        $di = new Application();
         $config = $di['config'];
 
         // Use a test databases

webroot/index.php

@@ -1,11 +1,8 @@
 <?php
 
-use Slim\Slim as App;
-use XHGui\ServiceContainer;
+use XHGui\Application;
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$di = ServiceContainer::instance();
-/** @var App $app */
-$app = $di['app'];
+$app = new Application();
 $app->run();