From f3c4cbd95ac823f27a294d58f75b3a418c204ac3 Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Wed, 15 Nov 2023 22:11:17 -0500 Subject: [PATCH] - WIP on leaning lean a bit --- composer.json | 3 -- meta/config.php | 2 +- meta/definitions/cli.php | 33 ------------ meta/definitions/cronard.php | 30 ----------- meta/definitions/language.php | 1 - meta/definitions/negundo.php | 12 ----- meta/definitions/software.php | 8 +-- meta/definitions/template.php | 61 ++--------------------- skeleton/meta/definitions/definitions.php | 12 +++-- skeleton/meta/definitions/security.php | 5 +- skeleton/meta/definitions/storage.php | 1 + src/Application.php | 35 +++++++++---- src/Lean.php | 18 +------ 13 files changed, 41 insertions(+), 180 deletions(-) delete mode 100644 meta/definitions/cli.php delete mode 100644 meta/definitions/cronard.php delete mode 100644 meta/definitions/negundo.php diff --git a/composer.json b/composer.json index 70aebd2..7c292d5 100644 --- a/composer.json +++ b/composer.json @@ -140,13 +140,10 @@ "definitions" : [ "meta/definitions/software.php", "meta/definitions/authorize.php", - "meta/definitions/cli.php", - "meta/definitions/cronard.php", "meta/definitions/email.php", "meta/definitions/event.php", "meta/definitions/http.php", "meta/definitions/language.php", - "meta/definitions/negundo.php", "meta/definitions/routes.php", "meta/definitions/software.php", "meta/definitions/storage.php", diff --git a/meta/config.php b/meta/config.php index d1e8b59..7e5ad72 100644 --- a/meta/config.php +++ b/meta/config.php @@ -3,7 +3,7 @@ return [ 'ulmus' => [ 'connections' => [ - 'sqlite' => [ + 'lean' => [ 'adapter' => 'SQLite', 'path' => getenv('PROJECT_PATH') . DIRECTORY_SEPARATOR . "var/lean.sqlite3", 'pragma_begin' => "journal_mode=WAL", diff --git a/meta/definitions/cli.php b/meta/definitions/cli.php deleted file mode 100644 index 903aedf..0000000 --- a/meta/definitions/cli.php +++ /dev/null @@ -1,33 +0,0 @@ - function($c) { - $fetcher = new CommandFetcher(null, null, $c->get('cli.caching')); - - $fetcher->setFolderList(array_map(function($item) { - return $item; - }, $c->get(Lean::class)->getCli())); - - return $fetcher; - }, - - CliMiddleware::class => function($c) { - return new CliMiddleware($c, $c->get('cli.response:default'), $c->get(CommandFetcher::class)); - }, - - 'cli.response:default' => function($c) { - return function() { - return Factory\HttpFactory::createTextResponse("This is the default response from CLI middleware which indicates that no command were registered for this application.\n"); - }; - }, -]; diff --git a/meta/definitions/cronard.php b/meta/definitions/cronard.php deleted file mode 100644 index ee1fc5c..0000000 --- a/meta/definitions/cronard.php +++ /dev/null @@ -1,30 +0,0 @@ - function($c) { - $cronardMiddleware = new CronardMiddleware($c, getenv('CRON_KEY'), function() : ResponseInterface { - return Factory\HttpFactory::createHtmlResponse(sprintf("%s - cron task begin...", date('Y-m-d H:i:s'))); - }, []); - - return $cronardMiddleware->fromFile(getenv("META_PATH")."/crontab.php")->fromAnnotations($c->get(TaskFetcher::class)); - }, - - TaskFetcher::class => function($c) { - $fetcher = new TaskFetcher(null, null, $c->get('cronard.caching')); - - $fetcher->setFolderList(array_map(function($item) { - return $item; - }, $c->get(Lean::class)->getCronard())); - - return $fetcher; - }, -]; diff --git a/meta/definitions/language.php b/meta/definitions/language.php index f72b077..2438eaa 100644 --- a/meta/definitions/language.php +++ b/meta/definitions/language.php @@ -19,7 +19,6 @@ return [ return $i18n; }, - # TODO -- accept folders from Lean Apps Tell\Reader\PhpReader::class => function($c) { return new Tell\Reader\PhpReader($c->get(Lean\Lean::class)->getI18n('php'), false); }, diff --git a/meta/definitions/negundo.php b/meta/definitions/negundo.php deleted file mode 100644 index 67fb3ee..0000000 --- a/meta/definitions/negundo.php +++ /dev/null @@ -1,12 +0,0 @@ - create(SoftwareConfig::class)->constructor(getenv('NEGUNDO_HASH'), getenv('NEGUNDO_SERVER')), - NegundoMiddleware::class => autowire(NegundoMiddleware::class), - Dump::class => autowire(Dump::class), - Task::class => autowire(Task::class), -]; diff --git a/meta/definitions/software.php b/meta/definitions/software.php index ebb1344..c6b8605 100644 --- a/meta/definitions/software.php +++ b/meta/definitions/software.php @@ -1,6 +1,5 @@ [], - '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" ], - ] + 'taxus' => [], ], Lean::class => autowire(Lean::class), diff --git a/meta/definitions/template.php b/meta/definitions/template.php index e799323..46a4d8b 100644 --- a/meta/definitions/template.php +++ b/meta/definitions/template.php @@ -2,68 +2,13 @@ use function DI\autowire, DI\create, DI\get; -use Picea\{ - Language\LanguageRegistration, - Caching\Cache, - Caching\Opcache, - Compiler, - Compiler\Context, - Compiler\BaseContext, - FileFetcher, - Method\Request}; +use Picea\{ Language\LanguageRegistration, }; -use Picea\Extension\{ LanguageHandlerInterface, LanguageExtension, TitleExtension, NumberExtension, UrlExtension }; +use Picea\Extension\{ LanguageHandlerInterface, }; -use Picea\Ui\{ Method, Ui }; +use Picea\Ui\{ Ui }; return [ - Picea\Picea::class => function($c) { - return new Picea\Picea($c->get(Context::class), $c->get(Cache::class), $c->get(Compiler::class), null, $c->get(FileFetcher::class), null, getenv("DEBUG")); - }, - - Context::class => function($c) { - return new BaseContext($c->get(Lean\Lean::class)->getPiceaContext()); - }, - - Ui::class => autowire(Ui::class), - - Compiler::class => autowire(Compiler::class), - - Request::class => autowire(Request::class), - - Method\Form::class => autowire(Method\Form::class), - - Method\Pagination::class => autowire(Method\Pagination::class), - - LanguageExtension::class => create(LanguageExtension::class)->constructor(get(LanguageHandlerInterface::class)), - LanguageHandlerInterface::class => autowire(\Lean\LanguageHandler::class), - LanguageRegistration::class => create(\Lean\PiceaDefaultRegistration::class)->constructor(get('picea.extensions'), [], [], get(Ui::class), null), - - 'picea.extensions' => function(\Psr\Container\ContainerInterface $c) { - return array_merge([ - $c->get(LanguageExtension::class), - $c->get(TitleExtension::class), - $c->get(NumberExtension::class), - $c->get(UrlExtension::class), - $c->get(Method\Form::class), - $c->get(Method\Pagination::class), - $c->get(Request::class), - ], class_exists(\Taxus\Picea\Extension::class) ? [ $c->get(\Taxus\Picea\Extension::class) ] : [], - array_map(fn($class) => $c->get($class), $c->get(Lean\Lean::class)->getPiceaExtensions()) - ); - }, - - TitleExtension::class => autowire(TitleExtension::class), - - NumberExtension::class => autowire(NumberExtension::class), - - UrlExtension::class => create(UrlExtension::class)->constructor(getenv("URL_BASE"), get('git.commit'), explode(',', getenv('APP_URL')), (bool) getenv('FORCE_SSL')), - - Cache::class => create(Opcache::class)->constructor(getenv("CACHE_PATH"), get(Context::class)), - - FileFetcher::class => function($c) { - return new FileFetcher($c->get(Lean\Lean::class)->getViewPaths()); - }, ]; \ No newline at end of file diff --git a/skeleton/meta/definitions/definitions.php b/skeleton/meta/definitions/definitions.php index ed85eec..c237b22 100644 --- a/skeleton/meta/definitions/definitions.php +++ b/skeleton/meta/definitions/definitions.php @@ -1,12 +1,12 @@ "%ESCAPED_NAMESPACE%\\View", 'asset' => [], 'extensions' => [], - ], 'ulmus' => [ @@ -37,6 +36,13 @@ return array_merge( '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" ], + ] ], 'app.middlewares' => [], diff --git a/skeleton/meta/definitions/security.php b/skeleton/meta/definitions/security.php index 7647b7f..531fff1 100644 --- a/skeleton/meta/definitions/security.php +++ b/skeleton/meta/definitions/security.php @@ -11,10 +11,7 @@ use function DI\autowire, DI\create, DI\get; return [ Taxus::class => function ($c) { return ( new Taxus( $c->get(PermissionGrantInterface::class) ) )->add( - [ 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" ], + $c->get(Lean\Lean::class)->getTaxusPrivileges() ); }, diff --git a/skeleton/meta/definitions/storage.php b/skeleton/meta/definitions/storage.php index 8b485dc..b0336d4 100644 --- a/skeleton/meta/definitions/storage.php +++ b/skeleton/meta/definitions/storage.php @@ -19,6 +19,7 @@ return [ AdapterProxy::class => function (ContainerInterface $c) { return new AdapterProxy( + $c->get('lean:adapter.sqlite'), $c->get(ConnectionAdapter::class) ); }, diff --git a/src/Application.php b/src/Application.php index f242282..424c727 100644 --- a/src/Application.php +++ b/src/Application.php @@ -28,6 +28,8 @@ class Application public array $tellPhp; + public array $taxus; + public array $data = []; public function __construct(string $name) { @@ -38,7 +40,14 @@ class Application { $this->data = array_replace($this->data, $data); - if (is_array($picea = $data['picea'] ?? false)) { + $this->loadData(); + + return $this; + } + + public function loadData() : static + { + if (is_array($picea = $this->data['picea'] ?? false)) { if ($picea['context'] ?? false ) { $this->piceaContext = $picea['context']; } @@ -56,13 +65,13 @@ class Application } } - if (is_array($ulmus = $data['ulmus'] ?? false)) { + if (is_array($ulmus = $this->data['ulmus'] ?? false)) { if ($ulmus['entities'] ?? false) { $this->entities = $ulmus['entities']; } } - if (is_array($tell = $data['tell'] ?? false)) { + if (is_array($tell = $this->data['tell'] ?? false)) { if ($tell['json'] ?? false) { $this->tellJson = $tell['json']; } @@ -72,20 +81,24 @@ class Application } } - if (is_array($data['routes'] ?? false)) { - $this->routes = $data['routes']; + if (is_array($this->data['routes'] ?? false)) { + $this->routes = $this->data['routes']; } - if (is_array($data['cronard'] ?? false)) { - $this->cronard = $data['cronard']; + if (is_array($this->data['cronard'] ?? false)) { + $this->cronard = $this->data['cronard']; } - if (is_array($data['events'] ?? false)) { - $this->events = $data['events']; + if (is_array($this->data['events'] ?? false)) { + $this->events = $this->data['events']; } - if (is_array($data['cli'] ?? false)) { - $this->cli = $data['cli']; + if (is_array($this->data['cli'] ?? false)) { + $this->cli = $this->data['cli']; + } + + if (is_array($this->data['taxus'] ?? false)) { + $this->taxus = $this->data['taxus']; } return $this; diff --git a/src/Lean.php b/src/Lean.php index eecad36..0a01724 100644 --- a/src/Lean.php +++ b/src/Lean.php @@ -155,26 +155,10 @@ class Lean return null; } + #[\Deprecated("Definitions are now loaded automatically from composer extra array.")] public static function definitions() : array { return []; - - $path = dirname(__DIR__) . "/meta/definitions/"; - - return array_replace( - require($path . "authorize.php"), - class_exists(\Mcnd\CLI\CliMiddleware::class) ? require($path . "cli.php") : [], - class_exists(\Cronard\CronardMiddleware::class) ? require($path . "cronard.php") : [], - require($path . "email.php"), - require($path . "event.php"), - require($path . "http.php"), - require($path . "language.php"), - class_exists(\Negundo\Client\NegundoMiddleware::class) ? require($path . "negundo.php") : [], - require($path . "routes.php"), - require($path . "software.php"), - require($path . "storage.php"), - class_exists(\Picea\Picea::class) ? require($path . "template.php") : [], - ); } public static function autoloadDefinitionsFromComposerExtra() : array