From 23af120020daafc01c3092993c138326bb35e569 Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <info@mcnd.ca>
Date: Wed, 24 Mar 2021 13:50:51 +0000
Subject: [PATCH] - Fixed a bug where LDAP entities were crashing the storage
 interface

---
 meta/i18n/fr/lean.nav.json     | 32 ++++++++++++++++++++++++++++++++
 meta/i18n/fr/lean.request.json | 12 ++++++++++++
 meta/i18n/fr/lean.setup.json   |  2 +-
 meta/i18n/fr/lean.storage.json | 25 +++++++++++++++++++++++++
 src/Controller/Console.php     |  3 ---
 src/Form/Database.php          |  6 ++++++
 src/Lib/DatabaseMigrations.php |  5 +++++
 7 files changed, 81 insertions(+), 4 deletions(-)
 create mode 100644 meta/i18n/fr/lean.nav.json
 create mode 100644 meta/i18n/fr/lean.request.json
 create mode 100644 meta/i18n/fr/lean.storage.json

diff --git a/meta/i18n/fr/lean.nav.json b/meta/i18n/fr/lean.nav.json
new file mode 100644
index 0000000..36650ef
--- /dev/null
+++ b/meta/i18n/fr/lean.nav.json
@@ -0,0 +1,32 @@
+{
+    "lean": {
+      "label": "Lean",
+      "dashboard": "Dashboard"
+    },
+
+    "storage": {
+      "label": "Stockage",
+      "summary": "Sommaire",
+      "database": "Base de données",
+      "session": "Session"
+    },
+
+    "templating": {
+      "label": "Templating",
+      "picea": "Picea"
+    },
+
+    "caching": {
+      "label": "Caching"
+    },
+
+    "request": {
+      "label": "Request",
+      "routes": "Routes"
+    },
+
+    "email": {
+      "label": "Email",
+      "routes": "Activity"
+    }
+}
\ No newline at end of file
diff --git a/meta/i18n/fr/lean.request.json b/meta/i18n/fr/lean.request.json
new file mode 100644
index 0000000..18015de
--- /dev/null
+++ b/meta/i18n/fr/lean.request.json
@@ -0,0 +1,12 @@
+{
+  "title": "Request -- LEAN",
+  "page-title": "LEAN - Request",
+  "route": {
+    "header": "List of active routes",
+    "name": "Name",
+    "uri": "URI",
+    "methods": "HTTP Methods",
+    "target": "class::method()"
+  }
+
+}
\ No newline at end of file
diff --git a/meta/i18n/fr/lean.setup.json b/meta/i18n/fr/lean.setup.json
index 08fa935..61f1f30 100644
--- a/meta/i18n/fr/lean.setup.json
+++ b/meta/i18n/fr/lean.setup.json
@@ -2,6 +2,6 @@
     "title" : "Setup -- LEAN",
 
     "breadcrumb" : {
-        "index" : "Negundo"
+        "index" : ""
     }
 }
diff --git a/meta/i18n/fr/lean.storage.json b/meta/i18n/fr/lean.storage.json
new file mode 100644
index 0000000..3459fd2
--- /dev/null
+++ b/meta/i18n/fr/lean.storage.json
@@ -0,0 +1,25 @@
+{
+  "title": "Storage -- LEAN",
+  "page-title": "LEAN - Storage",
+
+  "database": {
+    "header": "List of databases",
+    "name": "Database",
+    "adapter": "Adapter",
+    "host": "Hostname:port",
+    "username": "Username",
+    "connection": "Connection",
+
+    "table": {
+      "header": "Tables details",
+      "fields": "{$count} fields",
+      "name": "Name",
+      "actions": "Actions",
+      "table-fields" : "Fields in table",
+      "create": "Create table",
+      "createAll": "Create all tables",
+      "query": "SQL Query"
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/src/Controller/Console.php b/src/Controller/Console.php
index 73e68c5..aedde98 100644
--- a/src/Controller/Console.php
+++ b/src/Controller/Console.php
@@ -19,9 +19,6 @@ class Console {
 
     /**
      * @Route("/", "name" => "lean.console:home")
-     * @param ServerRequestInterface $request
-     * @param array $arguments
-     * @return ResponseInterface
      */
     public function home(ServerRequestInterface $request, array $arguments) : ResponseInterface
     {
diff --git a/src/Form/Database.php b/src/Form/Database.php
index abc36cc..0156d5f 100644
--- a/src/Form/Database.php
+++ b/src/Form/Database.php
@@ -24,6 +24,12 @@ class Database implements FormInterface
         $context->tableExist = [];
 
         foreach($this->migration->entities as $entity => $table) {
+            $tableName = $table->tableName();
+            $databaseName = $table->databaseName();
+
+            if ( ! $tableName || ! $databaseName ) {
+                continue;
+            }
 
             $table = Table::repository()->where(Table::field('name'), $table->tableName())
                 ->where(Table::field('schema'), $table->databaseName())
diff --git a/src/Lib/DatabaseMigrations.php b/src/Lib/DatabaseMigrations.php
index 76b6037..e169793 100644
--- a/src/Lib/DatabaseMigrations.php
+++ b/src/Lib/DatabaseMigrations.php
@@ -22,6 +22,11 @@ class DatabaseMigrations
                 $name = $file->getBasename("." . $file->getExtension());
                 $subNs = substr($file->getPath(), strlen($folder));
                 $entity = rtrim($namespace, "\\") . ( $subNs ? "\\$subNs" : "" ) . "\\{$name}";
+
+                if ( ! method_exists($entity, 'resolveEntity') ) {
+                    continue;
+                }
+
                 $this->entities[$entity] = $entity::resolveEntity();
             }
         }