Dependencies moved to Factory classes

composer.json

@@ -5,7 +5,7 @@
     "require": {
         "php": "^7.1",
         "selami/stdlib": "^1.3",
-        "selami/foundation": "~0.9",
+        "selami/foundation": "~0.10",
         "symfony/http-foundation": "~3.3",
         "selami/console": "~0.2",
         "symfony/process": "~3.3"
@@ -32,7 +32,7 @@
             "SelamiApp\\Controller\\": "src/apps/www/controllers",
             "SelamiApp\\Command\\": "src/commands",
             "SelamiApp\\Extension\\": "src/extensions",
-            "SelamiApp\\": "src/base"
+            "SelamiApp\\Factories\\": "src/factories"
 
         }
     },

config/autoload/dependencies.global.php

@@ -1,7 +1,23 @@
 <?php
 declare(strict_types=1);
 
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Selami\Router;
+use Selami\View\ViewInterface as SelamiView;
+use Twig_Environment as TwigEnvironment;
+use Selami\Foundation\App as SelamiApplication;
+use SelamiApp\Factories;
 return [
     'dependencies' => [
+        'factories' => [
+            ServerRequestInterface::class => Factories\ServerRequestFactory::class,
+            SelamiApplication::class => Factories\SelamiApplicationFactory::class,
+            Session::class => Factories\SymfonySessionFactory::class,
+            Router::class => Factories\RouterFactory::class,
+            TwigEnvironment::class => Factories\TwigFactory::class,
+            SelamiView::class => Factories\SelamiViewFactory::class
+        ],
     ]
 ];

config/config.php

@@ -5,9 +5,7 @@
 use Zend\Stdlib\Glob;
 
 $siteBasedConfig = '';
-if (defined('RUNTIME_PLATFORM')) {
-    $siteBasedConfig = RUNTIME_PLATFORM.'_';
-}
+
 if (defined('RUNTIME_LANG')) {
     $siteBasedConfig .= RUNTIME_LANG.'_';
 }
@@ -21,9 +19,6 @@
     foreach (Glob::glob(__DIR__ . '/autoload/{{,*.}global,{,*.}local}.php', Glob::GLOB_BRACE) as $file) {
         $config = ArrayUtils::merge($config, include $file);
     }
-    if (defined('RUNTIME_PLATFORM')) {
-        $config = ArrayUtils::merge($config, include __DIR__ . '/sites/'.RUNTIME_PLATFORM.'.config.php');
-    }
 
     if (defined('RUNTIME_LANG')) {
         $config = ArrayUtils::merge($config, include __DIR__ . '/lang/' . RUNTIME_LANG . '.php');