HexMakina / Crudites

Tracer.php

Spacing +20 added lines, -20 removed lines

@@ -31,9 +31,9 @@ 
 
   public function query_code($sql_statement) : string
   {
-    $first_five = strtolower(substr($sql_statement, 0,6));
+    $first_five = strtolower(substr($sql_statement, 0, 6));
 
-    if(!isset(self::$query_codes[$first_five]))
+    if (!isset(self::$query_codes[$first_five]))
       throw new \Exception('KADRO_ONLY_TRACES_CRUD');
 
     return self::$query_codes[$first_five];
@@ -47,12 +47,12 @@ 
     $trace['query_id'] = $model_id;
     $trace['query_by'] = $operator_id;
 
-    try{
+    try {
       $this->tracing_table()->connection()->transact();
       $query = $this->tracing_table()->insert($trace)->run();
 
       // if we delete a record, we remove all traces of update
-      if($query->is_success() && $trace['query_type'] === self::CODE_DELETE)
+      if ($query->is_success() && $trace['query_type'] === self::CODE_DELETE)
       {
         $trace['query_type'] = self::CODE_UPDATE;
         unset($trace['query_by']);
@@ -61,7 +61,7 @@ 
       $this->tracing_table()->connection()->commit();
       return true;
     }
-    catch(\Exception $e)
+    catch (\Exception $e)
     {
       $this->tracing_table()->connection()->rollback();
       return false;
@@ -87,16 +87,16 @@ 
     return $this->traces(['id' => $m->get_id(), 'table' => get_class($m)::table_name()]);
   }
 
-  public function traces($options=[])
+  public function traces($options = [])
   {
 
-    if(!isset($options['limit']) || empty($options['limit']))
+    if (!isset($options['limit']) || empty($options['limit']))
       $limit = 1000;
     else
       $limit = intval($options['limit']);
 
     // TODO SELECT field order can't change without adapting the result parsing code (foreach $res)
-    $select_fields = ['SUBSTR(query_on, 1, 10) AS working_day', 'query_table', 'query_id',  'GROUP_CONCAT(DISTINCT query_type, "-", query_by) as action_by'];
+    $select_fields = ['SUBSTR(query_on, 1, 10) AS working_day', 'query_table', 'query_id', 'GROUP_CONCAT(DISTINCT query_type, "-", query_by) as action_by'];
     $q = $this->tracing_table()->select($select_fields);
     $q->order_by(['', 'working_day', 'DESC']);
     $q->order_by([$this->tracing_table()->name(), 'query_table', 'DESC']);
@@ -108,21 +108,21 @@ 
     $q->having("action_by NOT LIKE '%D%'");
     $q->limit($limit);
 
-    foreach($options as $o => $v)
+    foreach ($options as $o => $v)
     {
-          if(preg_match('/id/', $o))                    $q->aw_eq('query_id', $v);
-      elseif(preg_match('/tables/', $o))                $q->aw_string_in('query_table', is_array($v) ? $v : [$v]);
-      elseif(preg_match('/table/', $o))                 $q->aw_eq('query_table', $v);
-      elseif(preg_match('/(type|action)/', $o))         $q->aw_string_in('query_type', is_array($v) ? $v : [$v]);
-      elseif(preg_match('/(date|query_on)/', $o))       $q->aw_like('query_on', "$v%");
-      elseif(preg_match('/(oper|user|query_by)/', $o))  $q->aw_eq('query_by', $v);
+          if (preg_match('/id/', $o))                    $q->aw_eq('query_id', $v);
+      elseif (preg_match('/tables/', $o))                $q->aw_string_in('query_table', is_array($v) ? $v : [$v]);
+      elseif (preg_match('/table/', $o))                 $q->aw_eq('query_table', $v);
+      elseif (preg_match('/(type|action)/', $o))         $q->aw_string_in('query_type', is_array($v) ? $v : [$v]);
+      elseif (preg_match('/(date|query_on)/', $o))       $q->aw_like('query_on', "$v%");
+      elseif (preg_match('/(oper|user|query_by)/', $o))  $q->aw_eq('query_by', $v);
     }
 
     // vd($q);
-    try{
+    try {
       $q->run();
     }
-    catch(\Exception $e)
+    catch (\Exception $e)
     {
       return false;
     }
@@ -131,13 +131,13 @@ 
     // ddt($res);
     $ret = [];
 
-    foreach($res as $r)
+    foreach ($res as $r)
     {
       list($working_day, $class, $instance_id, $logs) = $r;
 
-      if(!isset($ret[$working_day]))
+      if (!isset($ret[$working_day]))
         $ret[$working_day] = [];
-      if(!isset($ret[$working_day][$class]))
+      if (!isset($ret[$working_day][$class]))
         $ret[$working_day][$class] = [];
 
       $ret[$working_day][$class][$instance_id] = $logs;

Braces +29 added lines, -20 removed lines

@@ -33,8 +33,9 @@ 
   {
     $first_five = strtolower(substr($sql_statement, 0,6));
 
-    if(!isset(self::$query_codes[$first_five]))
-      throw new \Exception('KADRO_ONLY_TRACES_CRUD');
+    if(!isset(self::$query_codes[$first_five])) {
+          throw new \Exception('KADRO_ONLY_TRACES_CRUD');
+    }
 
     return self::$query_codes[$first_five];
   }
@@ -60,8 +61,7 @@ 
       }
       $this->tracing_table()->connection()->commit();
       return true;
-    }
-    catch(\Exception $e)
+    } catch(\Exception $e)
     {
       $this->tracing_table()->connection()->rollback();
       return false;
@@ -90,10 +90,11 @@ 
   public function traces($options=[])
   {
 
-    if(!isset($options['limit']) || empty($options['limit']))
-      $limit = 1000;
-    else
-      $limit = intval($options['limit']);
+    if(!isset($options['limit']) || empty($options['limit'])) {
+          $limit = 1000;
+    } else {
+          $limit = intval($options['limit']);
+    }
 
     // TODO SELECT field order can't change without adapting the result parsing code (foreach $res)
     $select_fields = ['SUBSTR(query_on, 1, 10) AS working_day', 'query_table', 'query_id',  'GROUP_CONCAT(DISTINCT query_type, "-", query_by) as action_by'];
@@ -110,19 +111,25 @@ 
 
     foreach($options as $o => $v)
     {
-          if(preg_match('/id/', $o))                    $q->aw_eq('query_id', $v);
-      elseif(preg_match('/tables/', $o))                $q->aw_string_in('query_table', is_array($v) ? $v : [$v]);
-      elseif(preg_match('/table/', $o))                 $q->aw_eq('query_table', $v);
-      elseif(preg_match('/(type|action)/', $o))         $q->aw_string_in('query_type', is_array($v) ? $v : [$v]);
-      elseif(preg_match('/(date|query_on)/', $o))       $q->aw_like('query_on', "$v%");
-      elseif(preg_match('/(oper|user|query_by)/', $o))  $q->aw_eq('query_by', $v);
+          if(preg_match('/id/', $o)) {
+            $q->aw_eq('query_id', $v);
+          } elseif(preg_match('/tables/', $o)) {
+        $q->aw_string_in('query_table', is_array($v) ? $v : [$v]);
+      } elseif(preg_match('/table/', $o)) {
+        $q->aw_eq('query_table', $v);
+      } elseif(preg_match('/(type|action)/', $o)) {
+        $q->aw_string_in('query_type', is_array($v) ? $v : [$v]);
+      } elseif(preg_match('/(date|query_on)/', $o)) {
+        $q->aw_like('query_on', "$v%");
+      } elseif(preg_match('/(oper|user|query_by)/', $o)) {
+        $q->aw_eq('query_by', $v);
+      }
     }
 
     // vd($q);
     try{
       $q->run();
-    }
-    catch(\Exception $e)
+    } catch(\Exception $e)
     {
       return false;
     }
@@ -135,10 +142,12 @@ 
     {
       list($working_day, $class, $instance_id, $logs) = $r;
 
-      if(!isset($ret[$working_day]))
-        $ret[$working_day] = [];
-      if(!isset($ret[$working_day][$class]))
-        $ret[$working_day][$class] = [];
+      if(!isset($ret[$working_day])) {
+              $ret[$working_day] = [];
+      }
+      if(!isset($ret[$working_day][$class])) {
+              $ret[$working_day][$class] = [];
+      }
 
       $ret[$working_day][$class][$instance_id] = $logs;
     }

Crudites.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
-  * Crudités, it's a cup of carrots sticks (but are they organic ?)
-  * Codd's Relational model, Unicity, Definitions, Introspection, Tests, Execution & Sets
-  * Create - Retrieve - Update - Delete
-  * API for writing and running SQL queries
-  */
+ * Crudités, it's a cup of carrots sticks (but are they organic ?)
+ * Codd's Relational model, Unicity, Definitions, Introspection, Tests, Execution & Sets
+ * Create - Retrieve - Update - Delete
+ * API for writing and running SQL queries
+ */
 
 namespace HexMakina\Crudites;
 

Spacing +19 added lines, -19 removed lines

@@ -8,7 +8,7 @@ 
 
 namespace HexMakina\Crudites;
 
-use \HexMakina\Crudites\Queries\{BaseQuery,Select};
+use \HexMakina\Crudites\Queries\{BaseQuery, Select};
 use \HexMakina\Crudites\Interfaces\DatabaseInterface;
 use \HexMakina\Crudites\CruditesException;
 
@@ -23,31 +23,31 @@ 
 
   public static function inspect($table_name)
   {
-    if(is_null(self::$database))
+    if (is_null(self::$database))
       throw new CruditesException('NO_DATABASE');
 
     try
     {
       return self::$database->inspect($table_name);
     }
-    catch(\Exception $e)
+    catch (\Exception $e)
     {
       throw new CruditesException('TABLE_INTROSPECTION');
     }
   }
 
-  public static function connect($props=null)
+  public static function connect($props = null)
   {
     // no props, means connection already exists, verify and return
-    if(!isset($props['host'],$props['port'],$props['name'],$props['char'],$props['user'],$props['pass']))
+    if (!isset($props['host'], $props['port'], $props['name'], $props['char'], $props['user'], $props['pass']))
     {
-      if(is_null(self::$database))
+      if (is_null(self::$database))
         throw new CruditesException('CONNECTION_MISSING');
 
       return self::$database->contentConnection();
     }
 
-    $conx = new Connection($props['host'],$props['port'],$props['name'],$props['char'],$props['user'],$props['pass']);
+    $conx = new Connection($props['host'], $props['port'], $props['name'], $props['char'], $props['user'], $props['pass']);
     return $conx;
   }
 
@@ -57,7 +57,7 @@ 
   {
     $Query->select_also(['COUNT(*) as count']);
     $res = $Query->ret_col();
-    if(is_array($res))
+    if (is_array($res))
       return intval(current($res));
     return null;
   }
@@ -69,19 +69,19 @@ 
 
     $ret = [];
 
-    if($Query->run()->is_success())
+    if ($Query->run()->is_success())
     {
-      foreach($Query->ret_ass() as $rec)
+      foreach ($Query->ret_ass() as $rec)
         $ret[$rec[$pk_name]] = $rec;
     }
 
     return $ret;
   }
 
-  public static function raw($sql, $dat_ass=[])
+  public static function raw($sql, $dat_ass = [])
   {
     $conx = self::connect();
-    if(empty($dat_ass))
+    if (empty($dat_ass))
     {
       $res = $conx->query($sql);
       //TODO query | alter !
@@ -97,16 +97,16 @@ 
     return $res;
   }
 
-  public static function distinct_for($table, $column_name, $filter_by_value=null)
+  public static function distinct_for($table, $column_name, $filter_by_value = null)
   {
     $table = self::table_name_to_Table($table);
 
-    if(is_null($table->column($column_name)))
+    if (is_null($table->column($column_name)))
       throw new CruditesException('TABLE_REQUIRES_COLUMN');
 
     $Query = $table->select(["DISTINCT `$column_name`"])->aw_not_empty($column_name)->order_by([$table->name(), $column_name, 'ASC']);
 
-    if(!is_null($filter_by_value))
+    if (!is_null($filter_by_value))
       $Query->aw_like($column_name, "%$filter_by_value%");
 
     $Query->order_by($column_name, 'DESC');
@@ -114,16 +114,16 @@ 
     return $Query->ret_col();
   }
 
-  public static function distinct_for_with_id($table, $column_name, $filter_by_value=null)
+  public static function distinct_for_with_id($table, $column_name, $filter_by_value = null)
   {
     $table = self::table_name_to_Table($table);
 
-    if(is_null($table->column($column_name)))
+    if (is_null($table->column($column_name)))
       throw new CruditesException('TABLE_REQUIRES_COLUMN');
 
     $Query = $table->select(["DISTINCT `id`,`$column_name`"])->aw_not_empty($column_name)->order_by([$table->name(), $column_name, 'ASC']);
 
-    if(!is_null($filter_by_value))
+    if (!is_null($filter_by_value))
       $Query->aw_like($column_name, "%$filter_by_value%");
 
     return $Query->ret_par();
@@ -137,7 +137,7 @@ 
 
     $table = self::table_name_to_Table($table);
 
-    if(is_null($column = $table->column($boolean_column_name)) || !$column->type()->is_boolean())
+    if (is_null($column = $table->column($boolean_column_name)) || !$column->type()->is_boolean())
       return false;
 
     // TODO: still using 'id' instead of table->primaries

Braces +29 added lines, -23 removed lines

@@ -23,14 +23,14 @@ 
 
   public static function inspect($table_name)
   {
-    if(is_null(self::$database))
-      throw new CruditesException('NO_DATABASE');
+    if(is_null(self::$database)) {
+          throw new CruditesException('NO_DATABASE');
+    }
 
     try
     {
       return self::$database->inspect($table_name);
-    }
-    catch(\Exception $e)
+    } catch(\Exception $e)
     {
       throw new CruditesException('TABLE_INTROSPECTION');
     }
@@ -41,8 +41,9 @@ 
     // no props, means connection already exists, verify and return
     if(!isset($props['host'],$props['port'],$props['name'],$props['char'],$props['user'],$props['pass']))
     {
-      if(is_null(self::$database))
-        throw new CruditesException('CONNECTION_MISSING');
+      if(is_null(self::$database)) {
+              throw new CruditesException('CONNECTION_MISSING');
+      }
 
       return self::$database->contentConnection();
     }
@@ -57,8 +58,9 @@ 
   {
     $Query->select_also(['COUNT(*) as count']);
     $res = $Query->ret_col();
-    if(is_array($res))
-      return intval(current($res));
+    if(is_array($res)) {
+          return intval(current($res));
+    }
     return null;
   }
 
@@ -71,8 +73,9 @@ 
 
     if($Query->run()->is_success())
     {
-      foreach($Query->ret_ass() as $rec)
-        $ret[$rec[$pk_name]] = $rec;
+      foreach($Query->ret_ass() as $rec) {
+              $ret[$rec[$pk_name]] = $rec;
+      }
     }
 
     return $ret;
@@ -87,9 +90,7 @@ 
       //TODO query | alter !
       //$res = $conx->alter($sql);
 
-    }
-
-    else
+    } else
     {
       $stmt = $conx->prepare($sql);
       $res = $stmt->execute($dat_ass);
@@ -101,13 +102,15 @@ 
   {
     $table = self::table_name_to_Table($table);
 
-    if(is_null($table->column($column_name)))
-      throw new CruditesException('TABLE_REQUIRES_COLUMN');
+    if(is_null($table->column($column_name))) {
+          throw new CruditesException('TABLE_REQUIRES_COLUMN');
+    }
 
     $Query = $table->select(["DISTINCT `$column_name`"])->aw_not_empty($column_name)->order_by([$table->name(), $column_name, 'ASC']);
 
-    if(!is_null($filter_by_value))
-      $Query->aw_like($column_name, "%$filter_by_value%");
+    if(!is_null($filter_by_value)) {
+          $Query->aw_like($column_name, "%$filter_by_value%");
+    }
 
     $Query->order_by($column_name, 'DESC');
     // ddt($Query);
@@ -118,13 +121,15 @@ 
   {
     $table = self::table_name_to_Table($table);
 
-    if(is_null($table->column($column_name)))
-      throw new CruditesException('TABLE_REQUIRES_COLUMN');
+    if(is_null($table->column($column_name))) {
+          throw new CruditesException('TABLE_REQUIRES_COLUMN');
+    }
 
     $Query = $table->select(["DISTINCT `id`,`$column_name`"])->aw_not_empty($column_name)->order_by([$table->name(), $column_name, 'ASC']);
 
-    if(!is_null($filter_by_value))
-      $Query->aw_like($column_name, "%$filter_by_value%");
+    if(!is_null($filter_by_value)) {
+          $Query->aw_like($column_name, "%$filter_by_value%");
+    }
 
     return $Query->ret_par();
   }
@@ -137,8 +142,9 @@ 
 
     $table = self::table_name_to_Table($table);
 
-    if(is_null($column = $table->column($boolean_column_name)) || !$column->type()->is_boolean())
-      return false;
+    if(is_null($column = $table->column($boolean_column_name)) || !$column->type()->is_boolean()) {
+          return false;
+    }
 
     // TODO: still using 'id' instead of table->primaries
     $Query = $table->update();

Table/Manipulation.php

Spacing +6 added lines, -6 removed lines

@@ -2,14 +2,14 @@ 
 
 namespace HexMakina\Crudites\Table;
 
-use \HexMakina\Crudites\Interfaces\{TableManipulationInterface,SelectInterface};
-use \HexMakina\Crudites\Queries\{Select,Insert,Update,Delete};
+use \HexMakina\Crudites\Interfaces\{TableManipulationInterface, SelectInterface};
+use \HexMakina\Crudites\Queries\{Select, Insert, Update, Delete};
 
 class Manipulation extends Description implements TableManipulationInterface
 {
 
   // creates a new Row based on the table
-  public function produce($dat_ass=[]) : Row
+  public function produce($dat_ass = []) : Row
   {
     return new Row($this, $dat_ass);
   }
@@ -21,7 +21,7 @@ 
     return $row;
   }
 
-  public function insert($values=[]) : Insert
+  public function insert($values = []) : Insert
   {
     $q = new Insert($this, $values);
     $q->connection($this->connection());
@@ -35,14 +35,14 @@ 
     return $q;
   }
 
-  public function delete($conditions=[]) : Delete
+  public function delete($conditions = []) : Delete
   {
     $q = new Delete($this, $conditions);
     $q->connection($this->connection());
     return $q;
   }
 
-  public function select($columns=null, $table_alias=null) : SelectInterface
+  public function select($columns = null, $table_alias = null) : SelectInterface
   {
     $table_alias = $table_alias ?? $this->name();
     $q = new Select($columns ?? [$table_alias.'.*'], $this, $table_alias);

Table/Row.php

Indentation +13 added lines, -13 removed lines

@@ -64,17 +64,17 @@ 
   }
 
   /**
-  * loads row content from database,
-  *
-  * looks for primary key matching data in $dat_ass and sets the $load variable
-  * $load stays null if
-  * 1. not match is found in $dat_ass
-  * 2. multiple records are returned
-  * 3. no record is found
-  *
-  * @param Array $dat_ass an associative array containing primary key data matches
-  * @return $this
-  */
+   * loads row content from database,
+   *
+   * looks for primary key matching data in $dat_ass and sets the $load variable
+   * $load stays null if
+   * 1. not match is found in $dat_ass
+   * 2. multiple records are returned
+   * 3. no record is found
+   *
+   * @param Array $dat_ass an associative array containing primary key data matches
+   * @return $this
+   */
   public function load($dat_ass)
   {
     $pks = $this->table()->primary_keys_match($dat_ass);
@@ -181,8 +181,8 @@ 
 
   //------------------------------------------------------------  type:data validation
   /**
-  * @return array containing all invalid data, indexed by field name, or empty if all valid
-  */
+   * @return array containing all invalid data, indexed by field name, or empty if all valid
+   */
   public function validate() : array
   {
     $errors = [];

Spacing +17 added lines, -17 removed lines

@@ -26,7 +26,7 @@ 
 
   public function __toString()
   {
-    return PHP_EOL .'load: '.json_encode($this->load) . PHP_EOL.'alterations: '.json_encode(array_keys($this->alterations));
+    return PHP_EOL.'load: '.json_encode($this->load).PHP_EOL.'alterations: '.json_encode(array_keys($this->alterations));
   }
 
   public function __debugInfo() : array
@@ -89,7 +89,7 @@ 
   {
     $pks = $this->table()->primary_keys_match($dat_ass);
 
-    if(empty($pks))
+    if (empty($pks))
       return $this;
 
     $this->last_query = $this->table()->select()->aw_primary($pks);
@@ -109,20 +109,20 @@ 
    */
   public function alter($dat_ass)
   {
-    foreach($dat_ass as $field_name => $value)
+    foreach ($dat_ass as $field_name => $value)
     {
       $column = $this->table->column($field_name);
 
       // skips non exisint field name and A_I column
-      if(is_null($column) || $column->is_auto_incremented())
+      if (is_null($column) || $column->is_auto_incremented())
         continue;
 
       // replaces empty strings with null or default value
-      if(trim($dat_ass[$field_name]) === '')
+      if (trim($dat_ass[$field_name]) === '')
         $dat_ass[$field_name] = $column->is_nullable() ? null : $column->default();
 
       // checks for changes with loaded data. using == instead of === is risky but needed
-      if(!is_array($this->load) || $this->load[$field_name] != $dat_ass[$field_name])
+      if (!is_array($this->load) || $this->load[$field_name] != $dat_ass[$field_name])
         $this->alterations[$field_name] = $dat_ass[$field_name];
     }
 
@@ -132,20 +132,20 @@ 
   public function persist() : array
   {
 
-    if(!$this->is_new() && !$this->is_altered()) // existing record with no alterations
+    if (!$this->is_new() && !$this->is_altered()) // existing record with no alterations
       return [];
 
-    if(!empty($errors = $this->validate())) // Table level validation
+    if (!empty($errors = $this->validate())) // Table level validation
       return $errors;
 
     try
     {
-      if($this->is_new())
+      if ($this->is_new())
       {
         $this->last_alter_query = $this->table()->insert($this->export());
         $this->last_alter_query->run();
-        if($this->last_alter_query->is_success() && !is_null($aipk = $this->last_alter_query->table()->auto_incremented_primary_key()))
-          $this->alterations[$aipk->name()]=$this->last_alter_query->inserted_id();
+        if ($this->last_alter_query->is_success() && !is_null($aipk = $this->last_alter_query->table()->auto_incremented_primary_key()))
+          $this->alterations[$aipk->name()] = $this->last_alter_query->inserted_id();
       }
       else
       {
@@ -156,7 +156,7 @@ 
 
       $this->last_query = $this->last_alter_query;
     }
-    catch(CruditesException $e)
+    catch (CruditesException $e)
     {
       return [$e->getMessage()];
     }
@@ -169,13 +169,13 @@ 
     $dat_ass = $this->load ?? $this->fresh ?? $this->alterations;
 
     // need The Primary key, then you can wipe at ease
-    if(!empty($pk_match = $this->table()->primary_keys_match($dat_ass)))
+    if (!empty($pk_match = $this->table()->primary_keys_match($dat_ass)))
     {
       $this->last_alter_query = $this->table->delete($pk_match);
-      try{
+      try {
         $this->last_alter_query->run();
       }
-      catch(CruditesException $e){
+      catch (CruditesException $e) {
         return false;
       }
 
@@ -196,12 +196,12 @@ 
     $dat_ass = $this->export();
 
     // vdt($this->table);
-    foreach($this->table->columns() as $column_name => $column)
+    foreach ($this->table->columns() as $column_name => $column)
     {
       $field_value = $dat_ass[$column_name] ?? null;
 
       $validation = $column->validate_value($field_value);
-      if($validation !== true)
+      if ($validation !== true)
         $errors[$column_name] = $validation;
     }
 

Braces +27 added lines, -20 removed lines

@@ -89,8 +89,9 @@ 
   {
     $pks = $this->table()->primary_keys_match($dat_ass);
 
-    if(empty($pks))
-      return $this;
+    if(empty($pks)) {
+          return $this;
+    }
 
     $this->last_query = $this->table()->select()->aw_primary($pks);
     $res = $this->last_query->ret_ass();
@@ -114,16 +115,19 @@ 
       $column = $this->table->column($field_name);
 
       // skips non exisint field name and A_I column
-      if(is_null($column) || $column->is_auto_incremented())
-        continue;
+      if(is_null($column) || $column->is_auto_incremented()) {
+              continue;
+      }
 
       // replaces empty strings with null or default value
-      if(trim($dat_ass[$field_name]) === '')
-        $dat_ass[$field_name] = $column->is_nullable() ? null : $column->default();
+      if(trim($dat_ass[$field_name]) === '') {
+              $dat_ass[$field_name] = $column->is_nullable() ? null : $column->default();
+      }
 
       // checks for changes with loaded data. using == instead of === is risky but needed
-      if(!is_array($this->load) || $this->load[$field_name] != $dat_ass[$field_name])
-        $this->alterations[$field_name] = $dat_ass[$field_name];
+      if(!is_array($this->load) || $this->load[$field_name] != $dat_ass[$field_name]) {
+              $this->alterations[$field_name] = $dat_ass[$field_name];
+      }
     }
 
     return $this;
@@ -132,11 +136,15 @@ 
   public function persist() : array
   {
 
-    if(!$this->is_new() && !$this->is_altered()) // existing record with no alterations
+    if(!$this->is_new() && !$this->is_altered()) {
+      // existing record with no alterations
       return [];
+    }
 
-    if(!empty($errors = $this->validate())) // Table level validation
+    if(!empty($errors = $this->validate())) {
+      // Table level validation
       return $errors;
+    }
 
     try
     {
@@ -144,10 +152,10 @@ 
       {
         $this->last_alter_query = $this->table()->insert($this->export());
         $this->last_alter_query->run();
-        if($this->last_alter_query->is_success() && !is_null($aipk = $this->last_alter_query->table()->auto_incremented_primary_key()))
-          $this->alterations[$aipk->name()]=$this->last_alter_query->inserted_id();
-      }
-      else
+        if($this->last_alter_query->is_success() && !is_null($aipk = $this->last_alter_query->table()->auto_incremented_primary_key())) {
+                  $this->alterations[$aipk->name()]=$this->last_alter_query->inserted_id();
+        }
+      } else
       {
         $pk_match = $this->table()->primary_keys_match($this->load);
         $this->last_alter_query = $this->table()->update($this->alterations, $pk_match);
@@ -155,8 +163,7 @@ 
       }
 
       $this->last_query = $this->last_alter_query;
-    }
-    catch(CruditesException $e)
+    } catch(CruditesException $e)
     {
       return [$e->getMessage()];
     }
@@ -174,8 +181,7 @@ 
       $this->last_alter_query = $this->table->delete($pk_match);
       try{
         $this->last_alter_query->run();
-      }
-      catch(CruditesException $e){
+      } catch(CruditesException $e){
         return false;
       }
 
@@ -201,8 +207,9 @@ 
       $field_value = $dat_ass[$column_name] ?? null;
 
       $validation = $column->validate_value($field_value);
-      if($validation !== true)
-        $errors[$column_name] = $validation;
+      if($validation !== true) {
+              $errors[$column_name] = $validation;
+      }
     }
 
     return $errors;

Table/ColumnType.php

Spacing +24 added lines, -24 removed lines

@@ -50,40 +50,40 @@ 
 
   public function __construct($specs_type)
   {
-    foreach(self::$types_rx as $type => $rx)
+    foreach (self::$types_rx as $type => $rx)
     {
-      if(preg_match("/$rx/i", $specs_type, $m) === 1)
+      if (preg_match("/$rx/i", $specs_type, $m) === 1)
       {
         $this->name = $type;
 
-        if($this->is_enum())
-          $this->enum_values = explode('\',\'',$m[1]);
-        elseif(preg_match('/([\d]+)/', $specs_type, $m) === 1)
+        if ($this->is_enum())
+          $this->enum_values = explode('\',\'', $m[1]);
+        elseif (preg_match('/([\d]+)/', $specs_type, $m) === 1)
           $this->length = (int)$m[0];
         break;
       }
     }
 
-    if(is_null($this->name))
+    if (is_null($this->name))
       throw new CruditesException('FIELD_TYPE_UNKNOWN');
   }
 
-  public function is_text() : bool        {  return $this->name === self::TYPE_TEXT;}
-  public function is_string() : bool      {  return $this->name === self::TYPE_STRING;}
+  public function is_text() : bool        {  return $this->name === self::TYPE_TEXT; }
+  public function is_string() : bool      {  return $this->name === self::TYPE_STRING; }
 
-  public function is_boolean() : bool     {  return $this->name === self::TYPE_BOOLEAN;}
+  public function is_boolean() : bool     {  return $this->name === self::TYPE_BOOLEAN; }
 
-  public function is_integer() : bool     {  return $this->name === self::TYPE_INTEGER;}
-  public function is_float() : bool       {  return $this->name === self::TYPE_FLOAT;}
-  public function is_decimal() : bool     {  return $this->name === self::TYPE_DECIMAL;}
+  public function is_integer() : bool     {  return $this->name === self::TYPE_INTEGER; }
+  public function is_float() : bool       {  return $this->name === self::TYPE_FLOAT; }
+  public function is_decimal() : bool     {  return $this->name === self::TYPE_DECIMAL; }
 
-  public function is_enum() : bool        {  return $this->name === self::TYPE_ENUM;}
+  public function is_enum() : bool        {  return $this->name === self::TYPE_ENUM; }
 
-  public function is_year() : bool        {  return $this->name === self::TYPE_YEAR;}
-  public function is_date() : bool        {  return $this->name === self::TYPE_DATE;}
-  public function is_time() : bool        {  return $this->name === self::TYPE_TIME;}
-  public function is_timestamp() : bool   {  return $this->name === self::TYPE_TIMESTAMP;}
-  public function is_datetime() : bool    {  return $this->name === self::TYPE_DATETIME;}
+  public function is_year() : bool        {  return $this->name === self::TYPE_YEAR; }
+  public function is_date() : bool        {  return $this->name === self::TYPE_DATE; }
+  public function is_time() : bool        {  return $this->name === self::TYPE_TIME; }
+  public function is_timestamp() : bool   {  return $this->name === self::TYPE_TIMESTAMP; }
+  public function is_datetime() : bool    {  return $this->name === self::TYPE_DATETIME; }
 
   public function is_date_or_time() : bool
   {
@@ -108,22 +108,22 @@ 
 
   public function validate_value($field_value)
   {
-    if($this->is_text())
+    if ($this->is_text())
       return true;
 
-    if($this->is_date_or_time())
+    if ($this->is_date_or_time())
       return date_create($field_value) === false ? 'ERR_FIELD_FORMAT' : true;
 
-    if($this->is_year())
+    if ($this->is_year())
       return preg_match('/^[0-9]{4}$/', $field_value) !== 1 ? 'ERR_FIELD_FORMAT' : true;
 
-    if($this->is_numeric())
+    if ($this->is_numeric())
       return (!is_numeric($field_value)) ? 'ERR_FIELD_FORMAT' : true;
 
-    if($this->is_string())
+    if ($this->is_string())
       return ($this->length() < strlen($field_value)) ? 'ERR_FIELD_TOO_LONG' : true;
 
-    if($this->is_enum())
+    if ($this->is_enum())
       return !in_array($field_value, $this->enum_values()) ? 'ERR_FIELD_VALUE_RESTRICTED_BY_ENUM' : true;
 
     return true;

Braces +26 added lines, -18 removed lines

@@ -56,16 +56,18 @@ 
       {
         $this->name = $type;
 
-        if($this->is_enum())
-          $this->enum_values = explode('\',\'',$m[1]);
-        elseif(preg_match('/([\d]+)/', $specs_type, $m) === 1)
-          $this->length = (int)$m[0];
+        if($this->is_enum()) {
+                  $this->enum_values = explode('\',\'',$m[1]);
+        } elseif(preg_match('/([\d]+)/', $specs_type, $m) === 1) {
+                  $this->length = (int)$m[0];
+        }
         break;
       }
     }
 
-    if(is_null($this->name))
-      throw new CruditesException('FIELD_TYPE_UNKNOWN');
+    if(is_null($this->name)) {
+          throw new CruditesException('FIELD_TYPE_UNKNOWN');
+    }
   }
 
   public function is_text() : bool        {  return $this->name === self::TYPE_TEXT;}
@@ -108,23 +110,29 @@ 
 
   public function validate_value($field_value)
   {
-    if($this->is_text())
-      return true;
+    if($this->is_text()) {
+          return true;
+    }
 
-    if($this->is_date_or_time())
-      return date_create($field_value) === false ? 'ERR_FIELD_FORMAT' : true;
+    if($this->is_date_or_time()) {
+          return date_create($field_value) === false ? 'ERR_FIELD_FORMAT' : true;
+    }
 
-    if($this->is_year())
-      return preg_match('/^[0-9]{4}$/', $field_value) !== 1 ? 'ERR_FIELD_FORMAT' : true;
+    if($this->is_year()) {
+          return preg_match('/^[0-9]{4}$/', $field_value) !== 1 ? 'ERR_FIELD_FORMAT' : true;
+    }
 
-    if($this->is_numeric())
-      return (!is_numeric($field_value)) ? 'ERR_FIELD_FORMAT' : true;
+    if($this->is_numeric()) {
+          return (!is_numeric($field_value)) ? 'ERR_FIELD_FORMAT' : true;
+    }
 
-    if($this->is_string())
-      return ($this->length() < strlen($field_value)) ? 'ERR_FIELD_TOO_LONG' : true;
+    if($this->is_string()) {
+          return ($this->length() < strlen($field_value)) ? 'ERR_FIELD_TOO_LONG' : true;
+    }
 
-    if($this->is_enum())
-      return !in_array($field_value, $this->enum_values()) ? 'ERR_FIELD_VALUE_RESTRICTED_BY_ENUM' : true;
+    if($this->is_enum()) {
+          return !in_array($field_value, $this->enum_values()) ? 'ERR_FIELD_VALUE_RESTRICTED_BY_ENUM' : true;
+    }
 
     return true;
   }

Table/Description.php

Indentation +7 added lines, -7 removed lines

@@ -166,16 +166,16 @@
     if(count($this->unique_keys_by_name()) === 0 || !is_array($dat_ass))
       return [];
 
-		$keys = array_keys($dat_ass);
+    $keys = array_keys($dat_ass);
 
-		foreach($this->unique_keys_by_name() as $constraint_name => $column_names)
-		{
-			if(!is_array($column_names))
-				$column_names = [$column_names];
+    foreach($this->unique_keys_by_name() as $constraint_name => $column_names)
+    {
+      if(!is_array($column_names))
+        $column_names = [$column_names];
 
-			if(empty(array_diff($keys, $column_names)))
+      if(empty(array_diff($keys, $column_names)))
         return $dat_ass;
-		}
+    }
     return [];
   }
 

Spacing +22 added lines, -22 removed lines

@@ -3,7 +3,7 @@ 
 namespace HexMakina\Crudites\Table;
 
 use HexMakina\Crudites\{CruditesException};
-use HexMakina\Crudites\Interfaces\{ConnectionInterface,TableDescriptionInterface,TableColumnInterface};
+use HexMakina\Crudites\Interfaces\{ConnectionInterface, TableDescriptionInterface, TableColumnInterface};
 
 class Description implements TableDescriptionInterface
 {
@@ -42,10 +42,10 @@ 
   {
     $this->columns[$column->name()] = $column;
 
-    if($column->is_primary())
+    if ($column->is_primary())
     {
       $this->add_primary_key($column);
-      if($column->is_auto_incremented())
+      if ($column->is_auto_incremented())
         $this->auto_incremented_primary_key($column);
     }
   }
@@ -57,14 +57,14 @@ 
 
   public function add_unique_key($constraint_name, $columns)
   {
-    if(!isset($this->unique_keys[$constraint_name]))
+    if (!isset($this->unique_keys[$constraint_name]))
       $this->unique_keys[$constraint_name] = $columns;
   }
 
   public function add_foreign_key(TableColumnInterface $column)
   {
     $this->foreign_keys_by_table[$column->foreign_table_name()] = $this->foreign_keys_by_table[$column->foreign_table_name()] ?? [];
-    $this->foreign_keys_by_table[$column->foreign_table_name()] []= $column;
+    $this->foreign_keys_by_table[$column->foreign_table_name()] [] = $column;
 
     $this->foreign_keys_by_name[$column->name()] = $column;
   }
@@ -101,18 +101,18 @@ 
   }
 
   // TableDescriptionInterface implementation
-  public function primary_keys($with_values=null) : array
+  public function primary_keys($with_values = null) : array
   {
-    if(is_null($with_values))
+    if (is_null($with_values))
       return $this->primary_keys;
 
-    if(!is_array($with_values) && count($this->primary_keys) === 1)
+    if (!is_array($with_values) && count($this->primary_keys) === 1)
       $with_values = [current($this->primary_keys)->name() => $with_values];
 
     $valid_dat_ass = [];
-    foreach($this->primary_keys as $pk_name => $pk_field)
+    foreach ($this->primary_keys as $pk_name => $pk_field)
     {
-      if(!isset($with_values[$pk_name]) && !$pk_field->is_nullable())
+      if (!isset($with_values[$pk_name]) && !$pk_field->is_nullable())
         return [];
 
       $valid_dat_ass[$pk_name] = $with_values[$pk_name];
@@ -122,13 +122,13 @@ 
 
   public function match_uniqueness($dat_ass) : array
   {
-    if(!is_array($dat_ass)) // aipk value
+    if (!is_array($dat_ass)) // aipk value
       return $this->primary_keys_match($dat_ass);
 
-    if(!empty($ret = $this->primary_keys_match($dat_ass)))
+    if (!empty($ret = $this->primary_keys_match($dat_ass)))
       return $ret;
 
-    if(!empty($ret = $this->unique_keys_match($dat_ass)))
+    if (!empty($ret = $this->unique_keys_match($dat_ass)))
       return $ret;
 
     return [];
@@ -142,17 +142,17 @@ 
 
   public function primary_keys_match($dat_ass) : array
   {
-    if(count($this->primary_keys()) === 0)
+    if (count($this->primary_keys()) === 0)
       throw new CruditesException('NO_PRIMARY_KEYS_DEFINED');
 
-    if(!is_array($dat_ass) && count($this->primary_keys()) === 1)
+    if (!is_array($dat_ass) && count($this->primary_keys()) === 1)
       $dat_ass = [current($this->primary_keys())->name() => $dat_ass];
 
     $valid_dat_ass = [];
-    foreach($this->primary_keys as $pk_name => $pk_field)
+    foreach ($this->primary_keys as $pk_name => $pk_field)
     {
       // empty ensures non existing keys, null and empty values
-      if(empty($dat_ass[$pk_name]) && !$pk_field->is_nullable())
+      if (empty($dat_ass[$pk_name]) && !$pk_field->is_nullable())
         return [];
 
       $valid_dat_ass[$pk_name] = $dat_ass[$pk_name] ?? null;
@@ -163,17 +163,17 @@ 
 
   public function unique_keys_match($dat_ass) : array
   {
-    if(count($this->unique_keys_by_name()) === 0 || !is_array($dat_ass))
+    if (count($this->unique_keys_by_name()) === 0 || !is_array($dat_ass))
       return [];
 
 		$keys = array_keys($dat_ass);
 
-		foreach($this->unique_keys_by_name() as $constraint_name => $column_names)
+		foreach ($this->unique_keys_by_name() as $constraint_name => $column_names)
 		{
-			if(!is_array($column_names))
+			if (!is_array($column_names))
 				$column_names = [$column_names];
 
-			if(empty(array_diff($keys, $column_names)))
+			if (empty(array_diff($keys, $column_names)))
         return $dat_ass;
 		}
     return [];
@@ -195,7 +195,7 @@ 
   {
     $bonding_column_candidates = $this->foreign_keys_by_table()[$other_table->name()] ?? [];
 
-    if(count($bonding_column_candidates) === 1)
+    if (count($bonding_column_candidates) === 1)
       return current($bonding_column_candidates);
 
     return null;

Braces +45 added lines, -29 removed lines

@@ -45,8 +45,9 @@ 
     if($column->is_primary())
     {
       $this->add_primary_key($column);
-      if($column->is_auto_incremented())
-        $this->auto_incremented_primary_key($column);
+      if($column->is_auto_incremented()) {
+              $this->auto_incremented_primary_key($column);
+      }
     }
   }
 
@@ -57,8 +58,9 @@ 
 
   public function add_unique_key($constraint_name, $columns)
   {
-    if(!isset($this->unique_keys[$constraint_name]))
-      $this->unique_keys[$constraint_name] = $columns;
+    if(!isset($this->unique_keys[$constraint_name])) {
+          $this->unique_keys[$constraint_name] = $columns;
+    }
   }
 
   public function add_foreign_key(TableColumnInterface $column)
@@ -103,17 +105,20 @@ 
   // TableDescriptionInterface implementation
   public function primary_keys($with_values=null) : array
   {
-    if(is_null($with_values))
-      return $this->primary_keys;
+    if(is_null($with_values)) {
+          return $this->primary_keys;
+    }
 
-    if(!is_array($with_values) && count($this->primary_keys) === 1)
-      $with_values = [current($this->primary_keys)->name() => $with_values];
+    if(!is_array($with_values) && count($this->primary_keys) === 1) {
+          $with_values = [current($this->primary_keys)->name() => $with_values];
+    }
 
     $valid_dat_ass = [];
     foreach($this->primary_keys as $pk_name => $pk_field)
     {
-      if(!isset($with_values[$pk_name]) && !$pk_field->is_nullable())
-        return [];
+      if(!isset($with_values[$pk_name]) && !$pk_field->is_nullable()) {
+              return [];
+      }
 
       $valid_dat_ass[$pk_name] = $with_values[$pk_name];
     }
@@ -122,14 +127,18 @@ 
 
   public function match_uniqueness($dat_ass) : array
   {
-    if(!is_array($dat_ass)) // aipk value
+    if(!is_array($dat_ass)) {
+      // aipk value
       return $this->primary_keys_match($dat_ass);
+    }
 
-    if(!empty($ret = $this->primary_keys_match($dat_ass)))
-      return $ret;
+    if(!empty($ret = $this->primary_keys_match($dat_ass))) {
+          return $ret;
+    }
 
-    if(!empty($ret = $this->unique_keys_match($dat_ass)))
-      return $ret;
+    if(!empty($ret = $this->unique_keys_match($dat_ass))) {
+          return $ret;
+    }
 
     return [];
   }
@@ -142,18 +151,21 @@ 
 
   public function primary_keys_match($dat_ass) : array
   {
-    if(count($this->primary_keys()) === 0)
-      throw new CruditesException('NO_PRIMARY_KEYS_DEFINED');
+    if(count($this->primary_keys()) === 0) {
+          throw new CruditesException('NO_PRIMARY_KEYS_DEFINED');
+    }
 
-    if(!is_array($dat_ass) && count($this->primary_keys()) === 1)
-      $dat_ass = [current($this->primary_keys())->name() => $dat_ass];
+    if(!is_array($dat_ass) && count($this->primary_keys()) === 1) {
+          $dat_ass = [current($this->primary_keys())->name() => $dat_ass];
+    }
 
     $valid_dat_ass = [];
     foreach($this->primary_keys as $pk_name => $pk_field)
     {
       // empty ensures non existing keys, null and empty values
-      if(empty($dat_ass[$pk_name]) && !$pk_field->is_nullable())
-        return [];
+      if(empty($dat_ass[$pk_name]) && !$pk_field->is_nullable()) {
+              return [];
+      }
 
       $valid_dat_ass[$pk_name] = $dat_ass[$pk_name] ?? null;
     }
@@ -163,18 +175,21 @@ 
 
   public function unique_keys_match($dat_ass) : array
   {
-    if(count($this->unique_keys_by_name()) === 0 || !is_array($dat_ass))
-      return [];
+    if(count($this->unique_keys_by_name()) === 0 || !is_array($dat_ass)) {
+          return [];
+    }
 
 		$keys = array_keys($dat_ass);
 
 		foreach($this->unique_keys_by_name() as $constraint_name => $column_names)
 		{
-			if(!is_array($column_names))
-				$column_names = [$column_names];
+			if(!is_array($column_names)) {
+							$column_names = [$column_names];
+			}
 
-			if(empty(array_diff($keys, $column_names)))
-        return $dat_ass;
+			if(empty(array_diff($keys, $column_names))) {
+			        return $dat_ass;
+			}
 		}
     return [];
   }
@@ -195,8 +210,9 @@ 
   {
     $bonding_column_candidates = $this->foreign_keys_by_table()[$other_table->name()] ?? [];
 
-    if(count($bonding_column_candidates) === 1)
-      return current($bonding_column_candidates);
+    if(count($bonding_column_candidates) === 1) {
+          return current($bonding_column_candidates);
+    }
 
     return null;
   }

Table/Column.php

Indentation +4 added lines, -4 removed lines

@@ -69,10 +69,10 @@
   }
 
   /**
-  * @return mixed the default value of a field
-  * @return int for integer and boolean fields
-  * @return null where no default is set
-  */
+   * @return mixed the default value of a field
+   * @return int for integer and boolean fields
+   * @return null where no default is set
+   */
   public function default()
   {
     $ret = $this->default_value;

Spacing +25 added lines, -25 removed lines

@@ -48,8 +48,8 @@ 
   {
     $dbg = get_object_vars($this);
 
-    foreach($dbg as $k => $v)
-      if(!isset($dbg[$k]))
+    foreach ($dbg as $k => $v)
+      if (!isset($dbg[$k]))
         unset($dbg[$k]);
 
     return $dbg;
@@ -74,7 +74,7 @@ 
   {
     $ret = $this->default_value;
 
-    if(!is_null($this->default_value) && ($this->type()->is_integer() || $this->type()->is_boolean()))
+    if (!is_null($this->default_value) && ($this->type()->is_integer() || $this->type()->is_boolean()))
       $ret = (int)$ret;
 
     return $ret;
@@ -90,27 +90,27 @@ 
     $this->extra = $v;
   }
 
-  public function is_primary($setter=null) : bool
+  public function is_primary($setter = null) : bool
   {
-    return is_bool($setter)? ($this->primary = $setter) : $this->primary;
+    return is_bool($setter) ? ($this->primary = $setter) : $this->primary;
   }
 
-  public function is_foreign($setter=null) : bool
+  public function is_foreign($setter = null) : bool
   {
     return is_bool($setter) ? ($this->foreign = $setter) : $this->foreign;
   }
 
-  public function unique_name($setter=null)
+  public function unique_name($setter = null)
   {
     return ($this->unique_name = ($setter ?? $this->unique_name));
   }
 
-  public function unique_group_name($setter=null)
+  public function unique_group_name($setter = null)
   {
     return ($this->unique_group_name = ($setter ?? $this->unique_group_name));
   }
 
-  public function setForeignTableName($setter){    $this->foreign_table_name = $setter;}
+  public function setForeignTableName($setter) {    $this->foreign_table_name = $setter; }
   public function foreign_table_name() : string
   {
     return $this->foreign_table_name;
@@ -119,27 +119,27 @@ 
   public function foreign_table_alias() : string
   {
     $ret = $this->foreign_table_name();
-    if(preg_match('/(.+)_('.$this->foreign_column_name().')$/', $this->name(), $m))
+    if (preg_match('/(.+)_('.$this->foreign_column_name().')$/', $this->name(), $m))
       $ret = $m[1];
 
     return $ret;
   }
 
-  public function setForeignColumnName($setter){    $this->foreign_column_name = $setter;}
-  public function foreign_column_name() : string{  return $this->foreign_column_name;}
+  public function setForeignColumnName($setter) {    $this->foreign_column_name = $setter; }
+  public function foreign_column_name() : string{  return $this->foreign_column_name; }
 
 
-  public function is_index($setter=null) : bool
+  public function is_index($setter = null) : bool
   {
     return is_bool($setter) ? ($this->index = $setter) : $this->index;
   }
 
-  public function is_auto_incremented($setter=null) : bool
+  public function is_auto_incremented($setter = null) : bool
   {
     return is_bool($setter) ? ($this->auto_incremented = $setter) : $this->auto_incremented;
   }
 
-  public function is_nullable($setter=null) : bool
+  public function is_nullable($setter = null) : bool
   {
     return is_bool($setter) ? ($this->nullable = $setter) : $this->nullable;
   }
@@ -161,9 +161,9 @@ 
 
   public function import_describe($specs)
   {
-    foreach($specs as $k => $v)
+    foreach ($specs as $k => $v)
     {
-      switch($k)
+      switch ($k)
       {
         case 'Null':          $this->is_nullable($v !== 'NO');
         break;
@@ -176,7 +176,7 @@ 
         break;
 
         case 'Extra':
-          if($v === 'auto_increment')
+          if ($v === 'auto_increment')
             $this->is_auto_incremented(true);
           else
             $this->setExtra($v);
@@ -186,19 +186,19 @@ 
     return $this;
   }
 
-  public function validate_value($field_value=null)
+  public function validate_value($field_value = null)
   {
-    if($this->is_auto_incremented())
+    if ($this->is_auto_incremented())
       return true;
 
-    if($this->type()->is_boolean())
+    if ($this->type()->is_boolean())
       return true;
 
-    if(is_null($field_value))
+    if (is_null($field_value))
     {
-      if($this->is_nullable())
+      if ($this->is_nullable())
         return true;
-      elseif(is_null($this->default()))
+      elseif (is_null($this->default()))
         return 'ERR_FIELD_REQUIRED';
     }
     
@@ -208,7 +208,7 @@ 
 
   public function is_hidden()
   {
-    switch($this->name())
+    switch ($this->name())
     {
       case 'created_by':
       case 'created_on':

Braces +25 added lines, -18 removed lines

@@ -48,9 +48,10 @@ 
   {
     $dbg = get_object_vars($this);
 
-    foreach($dbg as $k => $v)
-      if(!isset($dbg[$k]))
+    foreach($dbg as $k => $v) {
+          if(!isset($dbg[$k]))
         unset($dbg[$k]);
+    }
 
     return $dbg;
   }
@@ -74,8 +75,9 @@ 
   {
     $ret = $this->default_value;
 
-    if(!is_null($this->default_value) && ($this->type()->is_integer() || $this->type()->is_boolean()))
-      $ret = (int)$ret;
+    if(!is_null($this->default_value) && ($this->type()->is_integer() || $this->type()->is_boolean())) {
+          $ret = (int)$ret;
+    }
 
     return $ret;
   }
@@ -119,8 +121,9 @@ 
   public function foreign_table_alias() : string
   {
     $ret = $this->foreign_table_name();
-    if(preg_match('/(.+)_('.$this->foreign_column_name().')$/', $this->name(), $m))
-      $ret = $m[1];
+    if(preg_match('/(.+)_('.$this->foreign_column_name().')$/', $this->name(), $m)) {
+          $ret = $m[1];
+    }
 
     return $ret;
   }
@@ -176,10 +179,11 @@ 
         break;
 
         case 'Extra':
-          if($v === 'auto_increment')
-            $this->is_auto_incremented(true);
-          else
-            $this->setExtra($v);
+          if($v === 'auto_increment') {
+                      $this->is_auto_incremented(true);
+          } else {
+                      $this->setExtra($v);
+          }
         break;
       }
     }
@@ -188,18 +192,21 @@ 
 
   public function validate_value($field_value=null)
   {
-    if($this->is_auto_incremented())
-      return true;
+    if($this->is_auto_incremented()) {
+          return true;
+    }
 
-    if($this->type()->is_boolean())
-      return true;
+    if($this->type()->is_boolean()) {
+          return true;
+    }
 
     if(is_null($field_value))
     {
-      if($this->is_nullable())
-        return true;
-      elseif(is_null($this->default()))
-        return 'ERR_FIELD_REQUIRED';
+      if($this->is_nullable()) {
+              return true;
+      } elseif(is_null($this->default())) {
+              return 'ERR_FIELD_REQUIRED';
+      }
     }
     
     // nothing found on the Column level, lets check for Typing error

TableToModel.php

Spacing +10 added lines, -10 removed lines

@@ -13,10 +13,10 @@ 
     return empty($match);
   }
 
-  public function get_id($mode=null)
+  public function get_id($mode = null)
   {
     $primary_key = static::table()->auto_incremented_primary_key();
-    if(is_null($primary_key) && count($pks = static::table()->primary_keys())==1)
+    if (is_null($primary_key) && count($pks = static::table()->primary_keys()) == 1)
       $primary_key = current($pks);
 
     return $mode === 'name' ? $primary_key->name() : $this->get($primary_key->name());
@@ -24,7 +24,7 @@ 
 
   public function get($prop_name)
   {
-    if(property_exists($this, $prop_name) === true)
+    if (property_exists($this, $prop_name) === true)
       return $this->$prop_name;
 
     return null;
@@ -37,11 +37,11 @@ 
 
   public function import($assoc_data)
   {
-    if(!is_array($assoc_data))
+    if (!is_array($assoc_data))
       throw new \Exception(__FUNCTION__.'(assoc_data) parm is not an array');
 
     // shove it all up in model, god will sort them out
-    foreach($assoc_data as $field => $value)
+    foreach ($assoc_data as $field => $value)
       $this->set($field, $value);
 
     return $this;
@@ -61,10 +61,10 @@ 
 
     $table_name = $reflect->getConstant('TABLE_NAME');
 
-    if($table_name === false)
+    if ($table_name === false)
     {
       $calling_class = $reflect->getShortName();
-      if(defined($const_name = 'TABLE_'.strtoupper($calling_class)))
+      if (defined($const_name = 'TABLE_'.strtoupper($calling_class)))
         $table_name = constant($const_name);
       else
         $table_name = strtolower($calling_class);
@@ -74,15 +74,15 @@ 
   }
 
 
-  public function to_table_row($operator_id=null)
+  public function to_table_row($operator_id = null)
   {
-    if(!is_null($operator_id) && $this->is_new() && is_null($this->get('created_by')))
+    if (!is_null($operator_id) && $this->is_new() && is_null($this->get('created_by')))
       $this->set('created_by', $operator_id);
 
     $model_data = get_object_vars($this);
 
     // 1. Produce OR restore a row
-    if($this->is_new())
+    if ($this->is_new())
       $table_row = static::table()->produce($model_data);
     else
       $table_row = static::table()->restore($model_data);

Braces +25 added lines, -18 removed lines

@@ -16,16 +16,18 @@ 
   public function get_id($mode=null)
   {
     $primary_key = static::table()->auto_incremented_primary_key();
-    if(is_null($primary_key) && count($pks = static::table()->primary_keys())==1)
-      $primary_key = current($pks);
+    if(is_null($primary_key) && count($pks = static::table()->primary_keys())==1) {
+          $primary_key = current($pks);
+    }
 
     return $mode === 'name' ? $primary_key->name() : $this->get($primary_key->name());
   }
 
   public function get($prop_name)
   {
-    if(property_exists($this, $prop_name) === true)
-      return $this->$prop_name;
+    if(property_exists($this, $prop_name) === true) {
+          return $this->$prop_name;
+    }
 
     return null;
   }
@@ -37,12 +39,14 @@ 
 
   public function import($assoc_data)
   {
-    if(!is_array($assoc_data))
-      throw new \Exception(__FUNCTION__.'(assoc_data) parm is not an array');
+    if(!is_array($assoc_data)) {
+          throw new \Exception(__FUNCTION__.'(assoc_data) parm is not an array');
+    }
 
     // shove it all up in model, god will sort them out
-    foreach($assoc_data as $field => $value)
-      $this->set($field, $value);
+    foreach($assoc_data as $field => $value) {
+          $this->set($field, $value);
+    }
 
     return $this;
   }
@@ -64,10 +68,11 @@ 
     if($table_name === false)
     {
       $calling_class = $reflect->getShortName();
-      if(defined($const_name = 'TABLE_'.strtoupper($calling_class)))
-        $table_name = constant($const_name);
-      else
-        $table_name = strtolower($calling_class);
+      if(defined($const_name = 'TABLE_'.strtoupper($calling_class))) {
+              $table_name = constant($const_name);
+      } else {
+              $table_name = strtolower($calling_class);
+      }
     }
 
     return $table_name;
@@ -76,16 +81,18 @@ 
 
   public function to_table_row($operator_id=null)
   {
-    if(!is_null($operator_id) && $this->is_new() && is_null($this->get('created_by')))
-      $this->set('created_by', $operator_id);
+    if(!is_null($operator_id) && $this->is_new() && is_null($this->get('created_by'))) {
+          $this->set('created_by', $operator_id);
+    }
 
     $model_data = get_object_vars($this);
 
     // 1. Produce OR restore a row
-    if($this->is_new())
-      $table_row = static::table()->produce($model_data);
-    else
-      $table_row = static::table()->restore($model_data);
+    if($this->is_new()) {
+          $table_row = static::table()->produce($model_data);
+    } else {
+          $table_row = static::table()->restore($model_data);
+    }
 
     // 2. Apply alterations from form_model data
     $table_row->alter($model_data);

Database.php

Spacing +17 added lines, -17 removed lines

@@ -2,10 +2,10 @@ 
 
 namespace HexMakina\Crudites;
 
-use HexMakina\Crudites\Queries\{Select,Describe};
-use HexMakina\Crudites\Table\{Manipulation,Column};
+use HexMakina\Crudites\Queries\{Select, Describe};
+use HexMakina\Crudites\Table\{Manipulation, Column};
 
-use HexMakina\Crudites\Interfaces\{ConnectionInterface,DatabaseInterface,TableManipulationInterface};
+use HexMakina\Crudites\Interfaces\{ConnectionInterface, DatabaseInterface, TableManipulationInterface};
 
 class Database implements DatabaseInterface
 {
@@ -42,10 +42,10 @@ 
 
   public function introspect(ConnectionInterface $information_schema = null)
   {
-    if(!is_null($information_schema))
+    if (!is_null($information_schema))
       $this->introspection_connection = $information_schema;
 
-    if(is_null($this->introspectionConnection()))
+    if (is_null($this->introspectionConnection()))
       return null;
 
     $statement = sprintf('SELECT TABLE_NAME, CONSTRAINT_NAME, ORDINAL_POSITION, COLUMN_NAME, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME FROM KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = "%s" ORDER BY TABLE_NAME, CONSTRAINT_NAME, ORDINAL_POSITION', $this->name());
@@ -54,17 +54,17 @@ 
     $q->statement($statement);
     $res = $q->ret_ass();
 
-    foreach($res as $key_usage)
+    foreach ($res as $key_usage)
     {
       $table_name = $key_usage['TABLE_NAME'];
 
-      if(isset($key_usage['REFERENCED_TABLE_NAME'])) // FOREIGN KEYS
+      if (isset($key_usage['REFERENCED_TABLE_NAME'])) // FOREIGN KEYS
       {
         $this->fk_by_table[$table_name] = $this->fk_by_table[$table_name] ?? [];
         $this->fk_by_table[$table_name][$key_usage['COLUMN_NAME']] = [$key_usage['REFERENCED_TABLE_NAME'], $key_usage['REFERENCED_COLUMN_NAME']];
       }
 
-      if(!isset($key_usage['POSITION_IN_UNIQUE_CONSTRAINT'])) // PRIMARY & UNIQUES
+      if (!isset($key_usage['POSITION_IN_UNIQUE_CONSTRAINT'])) // PRIMARY & UNIQUES
       {
         $constraint_name = $key_usage['CONSTRAINT_NAME'];
         $column_name = $key_usage['COLUMN_NAME'];
@@ -75,10 +75,10 @@ 
       }
     }
 
-    foreach($this->unique_by_table as $table_name => $uniques)
-      foreach($uniques as $constraint_name => $columns)
+    foreach ($this->unique_by_table as $table_name => $uniques)
+      foreach ($uniques as $constraint_name => $columns)
       {
-        foreach($columns as $column_name)
+        foreach ($columns as $column_name)
           $this->unique_by_table[$table_name][$column_name] = [0 => $constraint_name] + $columns;
         unset($this->unique_by_table[$table_name][$constraint_name]);
       }
@@ -87,7 +87,7 @@ 
   public function inspect($table_name) : TableManipulationInterface
   {
 
-    if(isset($this->table_cache[$table_name]))
+    if (isset($this->table_cache[$table_name]))
       return $this->table_cache[$table_name];
 
 
@@ -96,21 +96,21 @@ 
     $description = $describe->ret();
 
     // TODO test this when all is back to normal 2021.03.09
-    if($description === false)
+    if ($description === false)
       throw new \PDOException("Unable to describe $table_name");
 
     $table = new Manipulation($table_name, $this->contentConnection());
 
-    foreach($description as $column_name => $specs)
+    foreach ($description as $column_name => $specs)
     {
       $column = new Column($table, $column_name, $specs);
 
       // handling usage constraints
-      if(isset($this->unique_by_table[$table_name][$column_name]))
+      if (isset($this->unique_by_table[$table_name][$column_name]))
       {
         $unique_name = $this->unique_by_table[$table_name][$column_name][0];
 
-        switch(count($this->unique_by_table[$table_name][$column_name]))
+        switch (count($this->unique_by_table[$table_name][$column_name]))
         {
           case 2: // constraint name + column
             $column->unique_name($unique_name);
@@ -126,7 +126,7 @@ 
 
       }
       // handling usage foreign keys
-      if(($reference = $this->getForeignKey($table_name, $column_name)) !== false)
+      if (($reference = $this->getForeignKey($table_name, $column_name)) !== false)
       {
         $column->is_foreign(true);
         $column->setForeignTableName($reference[0]);

Braces +21 added lines, -12 removed lines

@@ -42,11 +42,13 @@ 
 
   public function introspect(ConnectionInterface $information_schema = null)
   {
-    if(!is_null($information_schema))
-      $this->introspection_connection = $information_schema;
+    if(!is_null($information_schema)) {
+          $this->introspection_connection = $information_schema;
+    }
 
-    if(is_null($this->introspectionConnection()))
-      return null;
+    if(is_null($this->introspectionConnection())) {
+          return null;
+    }
 
     $statement = sprintf('SELECT TABLE_NAME, CONSTRAINT_NAME, ORDINAL_POSITION, COLUMN_NAME, POSITION_IN_UNIQUE_CONSTRAINT, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME FROM KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = "%s" ORDER BY TABLE_NAME, CONSTRAINT_NAME, ORDINAL_POSITION', $this->name());
     $q = new Select();
@@ -58,15 +60,19 @@ 
     {
       $table_name = $key_usage['TABLE_NAME'];
 
-      if(isset($key_usage['REFERENCED_TABLE_NAME'])) // FOREIGN KEYS
+      if(isset($key_usage['REFERENCED_TABLE_NAME'])) {
+        // FOREIGN KEYS
       {
         $this->fk_by_table[$table_name] = $this->fk_by_table[$table_name] ?? [];
+      }
         $this->fk_by_table[$table_name][$key_usage['COLUMN_NAME']] = [$key_usage['REFERENCED_TABLE_NAME'], $key_usage['REFERENCED_COLUMN_NAME']];
       }
 
-      if(!isset($key_usage['POSITION_IN_UNIQUE_CONSTRAINT'])) // PRIMARY & UNIQUES
+      if(!isset($key_usage['POSITION_IN_UNIQUE_CONSTRAINT'])) {
+        // PRIMARY & UNIQUES
       {
         $constraint_name = $key_usage['CONSTRAINT_NAME'];
+      }
         $column_name = $key_usage['COLUMN_NAME'];
 
         $this->unique_by_table[$table_name] = $this->unique_by_table[$table_name] ?? [];
@@ -75,11 +81,12 @@ 
       }
     }
 
-    foreach($this->unique_by_table as $table_name => $uniques)
-      foreach($uniques as $constraint_name => $columns)
+    foreach($this->unique_by_table as $table_name => $uniques) {
+          foreach($uniques as $constraint_name => $columns)
       {
         foreach($columns as $column_name)
           $this->unique_by_table[$table_name][$column_name] = [0 => $constraint_name] + $columns;
+    }
         unset($this->unique_by_table[$table_name][$constraint_name]);
       }
   }
@@ -87,8 +94,9 @@ 
   public function inspect($table_name) : TableManipulationInterface
   {
 
-    if(isset($this->table_cache[$table_name]))
-      return $this->table_cache[$table_name];
+    if(isset($this->table_cache[$table_name])) {
+          return $this->table_cache[$table_name];
+    }
 
 
     $describe = (new Describe($table_name));
@@ -96,8 +104,9 @@ 
     $description = $describe->ret();
 
     // TODO test this when all is back to normal 2021.03.09
-    if($description === false)
-      throw new \PDOException("Unable to describe $table_name");
+    if($description === false) {
+          throw new \PDOException("Unable to describe $table_name");
+    }
 
     $table = new Manipulation($table_name, $this->contentConnection());