Commands and factories moved to their own packages

bin/console

@@ -1,14 +1,4 @@
 #!/usr/bin/env php
 <?php
-declare(strict_types=1);
 
-chdir(dirname(__DIR__));
-
-require_once './vendor/autoload.php';
-
-use Selami\Console\ApplicationFactory;
-
-$container  = require './config/container.php';
-
-$cli = ApplicationFactory::makeApplication($container);
-$cli->run();
+include __DIR__.'/console.php';

bin/console.php

@@ -0,0 +1,8 @@
+<?php
+declare(strict_types=1);
+chdir(dirname(__DIR__));
+require_once './vendor/autoload.php';
+use Selami\Console\ApplicationFactory;
+$container  = require './config/container.php';
+$cli = ApplicationFactory::makeApplication($container);
+$cli->run();

composer.json

@@ -5,9 +5,9 @@
     "require": {
         "php": "^7.1",
         "selami/stdlib": "^1.3",
-        "selami/foundation": "~0.10",
-        "selami/console": "~0.2",
-        "symfony/process": "~3.3",
+        "selami/foundation": "^0.10",
+        "selami/commands": "dev-master",
+        "selami/zend-servicemanager-factories": "^0.1",
         "symfony/http-foundation": "~3.3"
     },
     "require-dev": {
@@ -29,11 +29,7 @@
     "minimum-stability": "stable",
     "autoload": {
         "psr-4": {
-            "SelamiApp\\Controller\\": "src/apps/www/controllers",
-            "SelamiApp\\Command\\": "src/commands",
-            "SelamiApp\\Extension\\": "src/extensions",
-            "SelamiApp\\Factories\\": "src/factories"
-
+            "SelamiApp\\Controller\\": "src/apps/www/controllers"
         }
     },
     "scripts": {
@@ -42,6 +38,8 @@
         ],
         "post-create-project-cmd": [
             "cp config/autoload/local.php.dist config/autoload/local.php",
+            "cp config/autoload/view.local.php.dist config/autoload/view.local.php",
+            "cp config/autoload/commands.local.php.dist config/autoload/commands.local.php",
             "composer dump-autoload -o"
         ]
     }

config/autoload/commands.global.php

@@ -3,11 +3,12 @@
 
 return [
     'commands' => [
-        SelamiApp\Command\Info::class,
-        SelamiApp\Command\Server\ServerRun::class,
+        Selami\Command\Info::class,
+        Selami\Command\Server\ServerRun::class,
         // Cache Commands
-        SelamiApp\Command\Cache\ClearAll::class,
-        SelamiApp\Command\Cache\ClearConfig::class,
-        SelamiApp\Command\Cache\ClearRouteDispatcherData::class
+        Selami\Command\Cache\ClearAll::class,
+        Selami\Command\Cache\ClearConfig::class,
+        Selami\Command\Cache\ClearRouteDispatcherData::class,
+        Selami\Command\Cache\ClearViewData::class
     ]
 ];

config/autoload/commands.local.php.dist

@@ -0,0 +1,7 @@
+<?php
+declare(strict_types=1);
+
+return [
+    'commands' => [
+     ]
+];

config/autoload/dependencies.global.php

@@ -2,13 +2,12 @@
 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;
+use Selami\Factories;
 return [
     'dependencies' => [
         'factories' => [
@@ -17,7 +16,7 @@
             Session::class => Factories\SymfonySessionFactory::class,
             Router::class => Factories\RouterFactory::class,
             TwigEnvironment::class => Factories\TwigFactory::class,
-            SelamiView::class => Factories\SelamiViewFactory::class
+            SelamiView::class => Factories\SelamiViewTwigFactory::class
         ],
     ]
 ];

config/autoload/view.local.php.dist

@@ -0,0 +1,12 @@
+<?php
+declare(strict_types=1);
+
+return [
+    'view' => [
+        'type' => 'twig',
+        'twig' => [
+            'cache' => './cache/twig',
+            'debug' => false,
+        ]
+    ]
+];

config/config.php

@@ -19,12 +19,13 @@
     foreach (Glob::glob(__DIR__ . '/autoload/{{,*.}global,{,*.}local}.php', Glob::GLOB_BRACE) as $file) {
         $config = ArrayUtils::merge($config, include $file);
     }
-
     if (defined('RUNTIME_LANG')) {
-        $config = ArrayUtils::merge($config, include __DIR__ . '/lang/' . RUNTIME_LANG . '.php');
+        $config['view'] = ArrayUtils::merge($config['view'], include __DIR__ . '/lang/' . RUNTIME_LANG . '.php');
     }
+
     if (isset($config['config_cache_enabled']) && $config['config_cache_enabled'] === true) {
         file_put_contents($cachedConfigFile, json_encode($config));
     }
 }
+
 return $config;

config/container.php

@@ -7,13 +7,15 @@
 $config = include __DIR__ . '/config.php';
 
 $globals = include __DIR__. '/globals.php';
-
-$container = new ServiceManager($config['dependencies']);
-
 if (PHP_SAPI !== 'cli') {
     $config['app']['base_url'] = BaseUrlExtractor::getBaseUrl($_SERVER);
+}
+$container = new ServiceManager($config['dependencies']);
+if (isset($routes)) {
     $container->setService('routes', $routes);
 }
+
+
 $container->setService('config', $config);
 $container->setService('globals', $globals);
 $container->setService('commands', $config['commands']);