Merge branch 'master' of https://git.mcnd.ca/mcndave/lean

meta/definitions/orm.php

@@ -2,6 +2,10 @@
 
 use Ulmus\Container\AdapterProxy;
 
+use Psr\Container\ContainerInterface;
+
+use Ulmus\ConnectionAdapter;
+
 use function DI\autowire, DI\create, DI\get, DI\add;
 
 return [

skeleton/meta/definitions/definitions.php

@@ -6,10 +6,7 @@ use function DI\autowire, DI\create, DI\get;
 
 $dir = getenv("META_PATH") . "/definitions";
 
-return array_merge(
-    Lean\Lean::autoloadDefinitionsFromComposerExtra(),
-
-    [
+return [
     '%APPKEY%' => [
         'picea' => [
             'context' => "%ESCAPED_NAMESPACE%\\View",
@@ -46,18 +43,4 @@ return array_merge(
     ],
 
     'app.middlewares' => [],
-    ],
-
-    require("$dir/auth.php"),
-    require("$dir/storage.php"),
-    require("$dir/security.php"),
-    require("$dir/env/" . getenv('APP_ENV') . ".php"),
-    [
-        'config' => function () {
-            return array_merge_recursive(
-                Lean\Lean::autoloadConfigFromComposerExtra(),
-                require(getenv("META_PATH")."/config.php")
-            );
-        }
-    ]
-);
+];

skeleton/meta/definitions/storage.php

@@ -19,7 +19,6 @@ return [
 
     AdapterProxy::class => function (ContainerInterface $c) {
         return new AdapterProxy(
-            $c->get('lean:adapter.sqlite'),
             $c->get(ConnectionAdapter::class)
         );
     },

skeleton/src/Kernel.php

@@ -23,8 +23,6 @@ new class(dirname(__DIR__)) extends \Lean\Kernel {
     {
         $this->errorLogPath = getenv("LOGS_PATH") . DIRECTORY_SEPARATOR. date("Y-m").".log";
 
-        $this->definitionFilePaths = Lean::getDefinitionsPathsFromComposer();
-
         return parent::initializeEngine();
     }