- WIP on leaning lean a bit

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",

meta/definitions/cli.php

@@ -1,33 +0,0 @@
-<?php
-
-use function DI\autowire, DI\create, DI\get;
-
-use Psr\Http\Message\ResponseInterface;
-
-use Mcnd\CLI\CliMiddleware;
-
-use Notes\CLI\CommandFetcher;
-
-use Lean\{ Factory, Lean };
-
-return [
-    CommandFetcher::class => 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");
-        };
-    },
-];

meta/definitions/cronard.php

@@ -1,30 +0,0 @@
-<?php
-
-use function DI\autowire, DI\create, DI\get;
-
-use Cronard\CronardMiddleware,
-    Notes\Cronard\TaskFetcher;
-
-use Psr\Http\Message\ResponseInterface;
-
-use Lean\{ Factory, Lean };
-
-return [
-    CronardMiddleware::class => 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;
-    },
-];

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);
     },

meta/definitions/negundo.php

@@ -1,12 +0,0 @@
-<?php
-
-use function DI\autowire, DI\create, DI\get;
-
-use Negundo\Client\{ SoftwareConfig, Dump, Task, NegundoMiddleware };
-
-return [
-    SoftwareConfig::class => 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),
-];

meta/definitions/software.php

@@ -1,6 +1,5 @@
 <?php
 
-use Taxus\Privilege;
 use function DI\autowire, DI\create, DI\get;
 
 use TheBugs\JavascriptMiddleware;
@@ -66,12 +65,7 @@ return [
 
         'cronard' => [],
 
-        '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),

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());
-    },
 ];