From 0581f378a5506a2e7f476ad4ae7614fafa23d958 Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <info@mcnd.ca>
Date: Thu, 17 Oct 2024 17:21:56 +0000
Subject: [PATCH] - Fixed Skeleton and ORM missing namespacing
---
meta/definitions/orm.php | 4 ++
skeleton/meta/definitions/definitions.php | 85 +++++++++--------------
skeleton/meta/definitions/storage.php | 1 -
skeleton/src/Kernel.php | 2 -
4 files changed, 38 insertions(+), 54 deletions(-)
diff --git a/meta/definitions/orm.php b/meta/definitions/orm.php
index 57fac3a..42fe3d1 100644
--- a/meta/definitions/orm.php
+++ b/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 [
diff --git a/skeleton/meta/definitions/definitions.php b/skeleton/meta/definitions/definitions.php
index c237b22..f8075de 100644
--- a/skeleton/meta/definitions/definitions.php
+++ b/skeleton/meta/definitions/definitions.php
@@ -6,58 +6,41 @@ use function DI\autowire, DI\create, DI\get;
$dir = getenv("META_PATH") . "/definitions";
-return array_merge(
- Lean\Lean::autoloadDefinitionsFromComposerExtra(),
-
- [
- '%APPKEY%' => [
- 'picea' => [
- 'context' => "%ESCAPED_NAMESPACE%\\View",
- 'asset' => [],
- 'extensions' => [],
- ],
-
- 'ulmus' => [
- 'entities' => [ '%ESCAPED_NAMESPACE%\\Entity' => getenv("PROJECT_PATH") . '/src/Entity/' ],
- ],
-
- 'routes' => [
- '%ESCAPED_NAMESPACE%\\Controller' => getenv("PROJECT_PATH") . '/src/Controller/',
- ],
-
- 'events' => [
- '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]),
- ],
-
- 'cronard' => [
- '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]),
- ],
-
- 'cli' => [
- '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]),
- ],
-
- 'taxus' => [
- [ new Privilege("dev", "Is a developper of this application."), "is_dev" ],
- [ new Privilege("admin", "Can manage mostly everything from this application."), "is_admin" ],
- [ new Privilege("user", "Is an authenticated user."), "is_user" ],
- [ new Privilege("anonymous", "Is an anonymous (unauthenticated) user."), "is_anonymous" ],
- ]
+return [
+ '%APPKEY%' => [
+ 'picea' => [
+ 'context' => "%ESCAPED_NAMESPACE%\\View",
+ 'asset' => [],
+ 'extensions' => [],
],
- 'app.middlewares' => [],
+ 'ulmus' => [
+ 'entities' => [ '%ESCAPED_NAMESPACE%\\Entity' => getenv("PROJECT_PATH") . '/src/Entity/' ],
+ ],
+
+ 'routes' => [
+ '%ESCAPED_NAMESPACE%\\Controller' => getenv("PROJECT_PATH") . '/src/Controller/',
+ ],
+
+ 'events' => [
+ '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]),
+ ],
+
+ 'cronard' => [
+ '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]),
+ ],
+
+ 'cli' => [
+ '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]),
+ ],
+
+ 'taxus' => [
+ [ new Privilege("dev", "Is a developper of this application."), "is_dev" ],
+ [ new Privilege("admin", "Can manage mostly everything from this application."), "is_admin" ],
+ [ new Privilege("user", "Is an authenticated user."), "is_user" ],
+ [ new Privilege("anonymous", "Is an anonymous (unauthenticated) user."), "is_anonymous" ],
+ ]
],
- 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")
- );
- }
- ]
-);
+ 'app.middlewares' => [],
+];
diff --git a/skeleton/meta/definitions/storage.php b/skeleton/meta/definitions/storage.php
index b0336d4..8b485dc 100644
--- a/skeleton/meta/definitions/storage.php
+++ b/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)
);
},
diff --git a/skeleton/src/Kernel.php b/skeleton/src/Kernel.php
index e5dfc21..3b0aa80 100644
--- a/skeleton/src/Kernel.php
+++ b/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();
}