fixed database aliases

src/Utils/Controller/LuticateApplication.php

@@ -34,7 +34,7 @@ class LuticateApplication implements MessageComponentInterface
     public static function getDatabase($name, $databases)
     {
         foreach ($databases as $database) {
-            if (is_array($database) && $database["name"] == $name) {
+            if (is_array($database) && $database["name"] == $name && !isset($database["alias"])) {
                 return $database;
             }
         }
@@ -44,9 +44,23 @@ class LuticateApplication implements MessageComponentInterface
     public static function resolveDatabases($databases) {
         $dbs = [];
         foreach ($databases as $database) {
-            if (is_string($database)) {
-                $database = static::getDatabase($database, $databases);
+            if (isset($database["alias"])) {
+                $db = static::getDatabase($database["alias"], $databases);
+                unset($database["alias"]);
+                if (!is_null($db)) {
+                    $database = array_merge($db, $database);
+                }
+                else {
+                    $database = null;
+                }
             }
+//            if (is_string($database)) {
+//                $name = $database;
+//                $database = static::getDatabase($name, $databases);
+//                if (!is_null($database)) {
+//                    $database["name"] = $name;
+//                }
+//            }
             if (is_array($database)) {
                 $dbs[] = $database;
             }

tests/LuApplicationTest.php

@@ -45,8 +45,10 @@ class LuApplicationTest extends \PHPUnit_Framework_TestCase
     public function testResolveDatabases1()
     {
         $db1 = ["name" => "mydb", "other_info" => 42];
-        $dbs = [$db1, "mydb"];
-        $this->assertSame([$db1, $db1], LuticateApplication::resolveDatabases($dbs));
+        $dbs = [$db1, ["name" => "mydb2", "alias" => "mydb"]];
+        $dbRes = $db1;
+        $dbRes["name"] = "mydb2";
+        $this->assertSame([$db1, $dbRes], LuticateApplication::resolveDatabases($dbs));
     }
 
     public function testResolveDatabases2()
@@ -59,15 +61,27 @@ class LuApplicationTest extends \PHPUnit_Framework_TestCase
     public function testResolveDatabases3()
     {
         $db1 = ["name" => "mydb", "other_info" => 42];
-        $dbs = ["mydb2", $db1];
+        $dbs = [["name" => "mydb2", "alias" => "mydb2"], $db1];
         $this->assertSame([$db1], LuticateApplication::resolveDatabases($dbs));
     }
 
     public function testResolveDatabases4()
     {
         $db1 = ["name" => "mydb", "other_info" => 42];
-        $dbs = ["mydb", $db1];
-        $this->assertSame([$db1, $db1], LuticateApplication::resolveDatabases($dbs));
+        $dbs = [["name" => "mydb2", "alias" => "mydb"], $db1];
+        $dbRes = $db1;
+        $dbRes["name"] = "mydb2";
+        $this->assertSame([$dbRes, $db1], LuticateApplication::resolveDatabases($dbs));
+    }
+
+    public function testResolveDatabases5()
+    {
+        $db1 = ["name" => "mydb", "other_info" => 42, "other_info2" => 24];
+        $dbs = [["name" => "mydb2", "alias" => "mydb", "other_info2" => 42], $db1];
+        $dbRes = $db1;
+        $dbRes["name"] = "mydb2";
+        $dbRes["other_info2"] = 42;
+        $this->assertSame([$dbRes, $db1], LuticateApplication::resolveDatabases($dbs));
     }
 
     public function testSettings1()