Version 0.0.46

javanile · Oct 8, 2017 · 08f8ca1 · 08f8ca1
1 parent f501bc2
commit 08f8ca1
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "javanile/moldable",
     "type": "library",
-    "version": "0.0.45",
+    "version": "0.0.46",
     "description": "Uknown PHP Database Abstraction Layer",
     "keywords": [
         "moldable",

diff --git a/src/Database/SchemaApi.php b/src/Database/SchemaApi.php
@@ -484,7 +484,7 @@ public function info($model = null)
                 $this->info($m);
             }
         } elseif (is_array($model) && count($model) == 0) {
-            echo '<pre><table border="1" style="'.$style.'">'
+            echo '<pre><table border="1">'
                .'<tr><th>No database tables</th></tr></table></pre>'
                .'</table></pre>';
         } else {

diff --git a/src/Functions.php b/src/Functions.php
@@ -38,11 +38,11 @@ public static function varDump($var)
     public static function dumpGrid($grid, $title = null)
     {
         $key = key($grid);
-        $n = count($grid) > 0 ? count((array) $grid[$key]) : 1;
+        $colspan = count($grid) > 0 ? count((array) $grid[$key]) : 1;
 
         echo '<pre><table border="1" style="text-align:center;margin-bottom:1px;"><thead>';
         if ($title) {
-            echo '<tr><th colspan="'.$n.'">'.$title.'</th></tr>';
+            echo '<tr><th colspan="'.$colspan.'">'.$title.'</th></tr>';
         }
 
         if (isset($grid[$key]) && is_array($grid[$key])) {

diff --git a/src/Model/FieldApi.php b/src/Model/FieldApi.php
@@ -81,7 +81,7 @@ public function fillSchemaFields($values, $map = null, $prefix = null)
     /**
      * Retrieve primary key field name.
      *
-     * @return bool
+     * @return string
      */
     public static function getPrimaryKey()
     {
@@ -92,8 +92,8 @@ public static function getPrimaryKey()
             $key = null;
             $schema = static::getSchema();
 
-            foreach ($schema as $field => &$attributes) {
-                if ($attributes['Key'] == 'PRI') {
+            foreach ($schema as $field => $aspects) {
+                if ($aspects['Key'] == 'PRI') {
                     $key = $field;
                     break;
                 }
@@ -123,7 +123,7 @@ public function getPrimaryKeyValue()
     /**
      * Retrieve primary key field name.
      *
-     * @return bool
+     * @return string
      */
     public static function getMainField()
     {
@@ -158,6 +158,9 @@ public static function getMainField()
         return static::getClassAttribute($attribute);
     }
 
+    /**
+     * @return mixed
+     */
     public function getMainFieldValue()
     {
         //
@@ -182,7 +185,7 @@ protected static function getPrimaryKeyOrMainField()
     /**
      * Retrieve primary key field name.
      *
-     * @return bool
+     * @return array
      */
     protected static function getDefaultFields()
     {
@@ -214,6 +217,9 @@ protected static function getDefaultFields()
         return static::getClassAttribute($attribute);
     }
 
+    /**
+     *
+     */
     public static function getFieldValues($field)
     {
         //
@@ -251,6 +257,9 @@ protected static function getStaticFields()
         return static::getClassAttribute($attribute);
     }
 
+/**
+ *
+ */
     protected static function getAllFieldsValues()
     {
         $attribute = 'fields-values';
@@ -265,6 +274,9 @@ protected static function getAllFieldsValues()
         return static::getClassAttribute($attribute);
     }
 
+    /**
+     *
+     */
     protected static function getAllFields()
     {
         return array_keys(get_class_vars(static::getClass()));

diff --git a/src/Model/UpdateApi.php b/src/Model/UpdateApi.php
@@ -41,7 +41,6 @@ public static function update($query, $values = null, $map = null)
         $params = [];
         $setArray = [];
         $whereArray = [];
-        $valuesArray = [];
 
         foreach ($query as $field => $value) {
             $token = ':'.$field.'0';

diff --git a/src/Parser/Mysql/DatetimeTrait.php b/src/Parser/Mysql/DatetimeTrait.php
@@ -41,6 +41,9 @@ private function getNotationAspectsDatetime(
         return $aspects;
     }
 
+    /**
+     *
+     */
     private static function getNotationAspectsTimestamp(
         $notation,
         $aspects

diff --git a/src/Parser/Mysql/EnumTrait.php b/src/Parser/Mysql/EnumTrait.php
@@ -22,7 +22,7 @@ private function getNotationAspectsEnum($notation, $aspects)
         //
         $enum = $this->parseEnumNotation($notation);
         if (!$enum) {
-            return $this->getNotationAttributes('', $field, $before);
+            return $aspects;
         }
 
         //