From 777f4af1aad472cd7b99e2607276b8294ae9f6ee Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Mon, 21 Aug 2023 15:18:39 -0400 Subject: [PATCH] - Defined some packages as optional now --- composer.json | 20 -------------------- src/Lean.php | 8 ++++---- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/composer.json b/composer.json index 251ead0..1763a42 100644 --- a/composer.json +++ b/composer.json @@ -28,13 +28,9 @@ "mcnd/lean": "dev-master", "mcnd/lean-console": "dev-master", "mcnd/ulmus": "dev-master", - "mcnd/picea": "dev-master", - "mcnd/picea-ui": "dev-master", - "mcnd/cronard": "dev-master", "mcnd/tell": "dev-master", "mcnd/dump": "dev-master", "mcnd/event": "dev-master", - "mcnd/notes-cronard": "dev-master", "mcnd/notes-event": "dev-master", "mcnd/notes-tell": "dev-master", "mcnd/notes-route": "dev-master", @@ -49,10 +45,6 @@ "type": "vcs", "url": "https://git.mcnd.ca/mcndave/lean-console.git" }, - { - "type": "vcs", - "url": "https://git.mcnd.ca/mcndave/cronard.git" - }, { "type": "vcs", "url": "https://git.mcnd.ca/mcndave/event.git" @@ -73,14 +65,6 @@ "type": "vcs", "url": "https://git.mcnd.ca/mcndave/ulmus-user.git" }, - { - "type": "vcs", - "url": "https://git.mcnd.ca/mcndave/picea.git" - }, - { - "type": "vcs", - "url": "https://git.mcnd.ca/mcndave/picea-ui.git" - }, { "type": "vcs", "url": "https://git.mcnd.ca/mcndave/notes.git" @@ -89,10 +73,6 @@ "type": "vcs", "url": "https://git.mcnd.ca/mcndave/notes-route.git" }, - { - "type": "vcs", - "url": "https://git.mcnd.ca/mcndave/notes-cronard.git" - }, { "type": "vcs", "url": "https://git.mcnd.ca/mcndave/notes-security.git" diff --git a/src/Lean.php b/src/Lean.php index 1f6a330..af51de6 100644 --- a/src/Lean.php +++ b/src/Lean.php @@ -133,17 +133,17 @@ class Lean $path = dirname(__DIR__) . "/meta/definitions/"; return array_merge( - require($path . "cli.php"), - require($path . "cronard.php"), + class_exists(\Mcnd\CLI\Middleware::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"), - require($path . "negundo.php"), + class_exists(\Negundo\Client\NegundoMiddleware::class) ? require($path . "negundo.php") : [], require($path . "routes.php"), # require($path . "security.php"), require($path . "software.php"), - require($path . "template.php"), + class_exists(\Picea\Picea::class) ? require($path . "template.php") : [], ); } } \ No newline at end of file