fixed spaces in doc parsers; changed default sql to php type to mixed

src/Utils/Business/LuMethodDocParser.php

@@ -93,13 +93,13 @@ class LuMethodDocParser
             if (preg_match("/ *\\** *(.*) */", $line, $lineMatches) === 1) {
                 $line = $lineMatches[1];
                 $commandMatches = [];
-                if (preg_match("/@([^ ]+) *(.*)/", $line, $commandMatches)) {
+                if (preg_match("/@([^ ]+) +(.*)/", $line, $commandMatches)) {
                     $command = strtolower($commandMatches[1]);
                     $line = $commandMatches[2];
                     if ($command == "param") {
                         $currentParam = new LuParameterDbo();
                         $paramMatches = [];
-                        if (preg_match("/([^ ]+) *([^ ]+) *(.*)/", $line, $paramMatches) === 1) {
+                        if (preg_match("/([^ ]+) +([^ ]+) +(.*)/", $line, $paramMatches) === 1) {
                             if ($paramMatches[1][0] == "$") {
                                 $currentParam->setName(substr($paramMatches[1], 1, strlen($paramMatches[1]) - 1));
                                 $currentParam->setType($paramMatches[2]);

src/Utils/Business/LuPropertyDocParser.php

@@ -44,12 +44,12 @@ class LuPropertyDocParser
             if (preg_match("/ *\\** *(.*) */", $line, $lineMatches) === 1) {
                 $line = $lineMatches[1];
                 $commandMatches = [];
-                if (preg_match("/@([^ ]+) *(.*)/", $line, $commandMatches)) {
+                if (preg_match("/@([^ ]+) +(.*)/", $line, $commandMatches)) {
                     $command = strtolower($commandMatches[1]);
                     $line = $commandMatches[2];
                     if ($command == "var") {
                         $paramMatches = [];
-                        if (preg_match("/([^ ]+) *([^ ]+) *(.*)/", $line, $paramMatches) === 1) {
+                        if (preg_match("/([^ ]+) +([^ ]+) +(.*)/", $line, $paramMatches) === 1) {
                             if ($paramMatches[1][0] == "$") {
                                 $currentParam->setName(substr($paramMatches[1], 1, strlen($paramMatches[1]) - 1));
                                 $currentParam->setType($paramMatches[2]);

src/Utils/DataAccess/PgSqlDataAccess.php

@@ -117,7 +117,7 @@ class PgSqlDataAccess extends AbstractDbDataAccess
             $sqlType = substr($sqlType, 0, strlen($sqlType) - 2);
         }
         if (!isset(static::$types) || static::$types[$sqlType] == "") {
-            return "string";
+            return "mixed";
         }
         return static::$types[$sqlType] . ($isArray ? "[]" : "");
     }

tests/DatabaseTest.php

@@ -135,18 +135,18 @@ class DatabaseTest extends \PHPUnit_Framework_TestCase
 {
     public function testSetup()
     {
-        $config = ['databases' => [
-            [
-                'name'      => 'mydb',
-                'driver'    => 'pgsql',
-                'host'      => '172.17.0.1',
-                'database'  => 'intra_betaclean',
-                'username'  => 'dev',
-                'password'  => 'dev'
-            ]
-        ]];
-        $app = new LuticateApplication($config);
-        $app->setupDatabases();
+//        $config = ['databases' => [
+//            [
+//                'name'      => 'mydb',
+//                'driver'    => 'pgsql',
+//                'host'      => '172.17.0.1',
+//                'database'  => 'intra_betaclean',
+//                'username'  => 'dev',
+//                'password'  => 'dev'
+//            ]
+//        ]];
+//        $app = new LuticateApplication($config);
+//        $app->setupDatabases();
         
 //        $dbo = new TestTableDbo();
 //        $dbo->setId(11);
@@ -167,9 +167,9 @@ class DatabaseTest extends \PHPUnit_Framework_TestCase
 //        }, ['Id']));
 
 
-        $pdo = TestTableDataAccess::getPdo();
-        $pgsql = new PgSqlDataAccess();
+//        $pdo = TestTableDataAccess::getPdo();
+//        $pgsql = new PgSqlDataAccess();
 //        $pgsql->getStoredProceduresFull($pdo);
-        var_dump($pgsql->getStoredProceduresFull($pdo));
+//        var_dump($pgsql->getStoredProceduresFull($pdo));
     }
 }