HexMakina / Crudites

TightModel.php

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
 
             if (!is_null($probe_res = $this->get($probe_name))) {
                 $extract_model->set($column_name, $probe_res);
-            } elseif (!$column->is_nullable() && $ignore_nullable===false) {
+            } elseif (!$column->is_nullable() && $ignore_nullable === false) {
                 return null;
             }
         }
@@ -95,15 +95,15 @@ 
     public function save($operator_id, $tracer = null) : ?array
     {
         try {
-            if (!empty($errors=$this->search_and_execute_trait_methods('before_save'))) {
+            if (!empty($errors = $this->search_and_execute_trait_methods('before_save'))) {
                 return $errors;
             }
 
-            if (!empty($errors=$this->before_save())) {
+            if (!empty($errors = $this->before_save())) {
                 return $errors;
             }
 
-            if (!empty($errors=$this->validate())) { // Model level validation
+            if (!empty($errors = $this->validate())) { // Model level validation
                 return $errors;
             }
 
@@ -112,7 +112,7 @@ 
 
 
             if ($table_row->is_altered()) { // someting to save ?
-                if (!empty($persistence_errors=$table_row->persist())) { // validate and persist
+                if (!empty($persistence_errors = $table_row->persist())) { // validate and persist
                     $errors = [];
                     foreach ($persistence_errors as $column_name => $err) {
                         $errors[sprintf('MODEL_%s_FIELD_%s', static::model_type(), $column_name)] = $err;
@@ -211,7 +211,7 @@ 
    */
     public static function one($arg1, $arg2 = null)
     {
-        $mixed_info = is_null($arg2)? $arg1 : [$arg1=>$arg2];
+        $mixed_info = is_null($arg2) ? $arg1 : [$arg1=>$arg2];
 
         $unique_identifiers = get_called_class()::table()->match_uniqueness($mixed_info);
 
@@ -252,7 +252,7 @@ 
         $ret = [];
         $pk_name = implode('_', array_keys($Query->table()->primary_keys()));
 
-        if (count($pks = $Query->table()->primary_keys())>1) {
+        if (count($pks = $Query->table()->primary_keys()) > 1) {
             $concat_pk = sprintf('CONCAT(%s) as %s', implode(',', $pks), $pk_name);
             $Query->select_also([$concat_pk]);
         }

Queries/ClauseJoin.php

Spacing +9 added lines, -9 removed lines

@@ -43,7 +43,7 @@ 
                   // $foreign_table_alias = 'creator';
                   // $select_also=['id','name'];
                 } else {
-                    $m=[];
+                    $m = [];
                     if (preg_match('/(.+)_('.$fk_column->foreign_column_name().')$/', $fk_column->name(), $m)) {
                         $foreign_table_alias = $m[1];
                     } else {
@@ -57,7 +57,7 @@ 
                 if (empty($select_also)) {
                     foreach ($foreign_table->columns() as $col) {
                         if (!$col->is_hidden()) {
-                            $select_also []= "$col";
+                            $select_also [] = "$col";
                         }
                     }
                 }
@@ -70,7 +70,7 @@ 
 
     public function join($table_names, $joins, $join_type = '')
     {
-        list($join_table_name,$join_table_alias) = self::process_param_table_names($table_names);
+        list($join_table_name, $join_table_alias) = self::process_param_table_names($table_names);
 
         if (preg_match('/^(INNER|LEFT|RIGHT|FULL)(\sOUTER)?/i', $join_type) !== 1) {
             $join_type = '';
@@ -101,13 +101,13 @@ 
         if (!is_null($bonding_column = $this->table()->single_foreign_key_to($other_table))) {
             $relation_type = $relation_type ?? $bonding_column->is_nullable() ? 'LEFT OUTER' : 'INNER';
           // $joins []= [$bonding_column->table_name(), $bonding_column->name(), $other_table_alias ?? $bonding_column->foreign_table_alias(), $bonding_column->foreign_column_name()];
-            $joins []= [$this->table_alias(), $bonding_column->name(), $other_table_alias ?? $bonding_column->foreign_table_alias(), $bonding_column->foreign_column_name()];
+            $joins [] = [$this->table_alias(), $bonding_column->name(), $other_table_alias ?? $bonding_column->foreign_table_alias(), $bonding_column->foreign_column_name()];
         }
       // elseif(count($bonding_column = $other_table->foreign_keys_by_table()[$this->table()->name()] ?? []) === 1)
         elseif (!is_null($bonding_column = $other_table->single_foreign_key_to($this->table()))) {
           // vd(__FUNCTION__.' : '.$other_table.' has fk to '.$this->table());
             $relation_type = $relation_type ?? 'LEFT OUTER';
-            $joins []= [$this->table_label(), $bonding_column->foreign_column_name(), $other_table_alias ?? $other_table->name(), $bonding_column->name()];
+            $joins [] = [$this->table_label(), $bonding_column->foreign_column_name(), $other_table_alias ?? $other_table->name(), $bonding_column->name()];
         } else {
             $bondable_tables = $this->joinable_tables();
             if (isset($bondable_tables[$other_table_name])) {
@@ -136,11 +136,11 @@ 
                     $joins = [];
 
                     $bonding_column = current($bonding_column);
-                    $joins []= [$other_table_alias, $bonding_column->name(), $bonding_column->foreign_table_alias(), $bonding_column->foreign_column_name()];
+                    $joins [] = [$other_table_alias, $bonding_column->name(), $bonding_column->foreign_table_alias(), $bonding_column->foreign_column_name()];
 
                   // vd($other_table_alias);
                     $bonding_column = current($bondable_tables[$table_name]);
-                    $joins []= [$bonding_column->table_name(), $bonding_column->name(), $bonding_column->foreign_table_alias(), $bonding_column->foreign_column_name()];
+                    $joins [] = [$bonding_column->table_name(), $bonding_column->name(), $bonding_column->foreign_table_alias(), $bonding_column->foreign_column_name()];
 
                   // $relation_type = $relation_type ?? (($parent_column->is_nullable() || $bonding_column->is_nullable()) ? 'LEFT OUTER' : 'INNER');
                     $relation_type = $relation_type ?? (($bonding_column->is_nullable()) ? 'LEFT OUTER' : 'INNER');
@@ -182,13 +182,13 @@ 
         foreach ($join_fields as $join_cond) {
             if (isset($join_cond[3])) { // 4 joins param -> t.f = t.f
                 list($table, $field, $join_table, $join_table_field) = $join_cond;
-                $join_parts []= $this->field_label($field, $table) . ' = ' . $this->field_label($join_table_field, $join_table);
+                $join_parts [] = $this->field_label($field, $table).' = '.$this->field_label($join_table_field, $join_table);
             } elseif (isset($join_cond[2])) { // 3 joins param -> t.f = v
                 list($table, $field, $value) = $join_cond;
                 $bind_label = ':loj_'.$join_table_alias.'_'.$table.'_'.$field;
                 $this->add_binding($bind_label, $value);
 
-                $join_parts []= $this->field_label($field, $table) . ' = ' . $bind_label;
+                $join_parts [] = $this->field_label($field, $table).' = '.$bind_label;
             }
         }
         return sprintf('%s JOIN `%s` %s ON %s', $join_type, $join_table_name, $join_table_alias, implode(' AND ', $join_parts));

Queries/Select.php

Spacing +5 added lines, -5 removed lines

@@ -156,25 +156,25 @@
 
         $query_fields = empty($this->selection) ? ['*'] : $this->selection;
 
-        $ret = PHP_EOL . 'SELECT '.implode(', '.PHP_EOL, $query_fields);
-        $ret.= PHP_EOL . sprintf(' FROM `%s` %s ', $this->table_name(), $this->table_alias);
+        $ret = PHP_EOL.'SELECT '.implode(', '.PHP_EOL, $query_fields);
+        $ret .= PHP_EOL.sprintf(' FROM `%s` %s ', $this->table_name(), $this->table_alias);
 
         if (!empty($this->join)) {
-            $ret.= PHP_EOL . ' '.implode(PHP_EOL.' ', $this->join);
+            $ret .= PHP_EOL.' '.implode(PHP_EOL.' ', $this->join);
         }
 
         $ret .= $this->generate_where();
 
         foreach (['group' => 'GROUP BY', 'having' => 'HAVING', 'order' => 'ORDER BY'] as $part => $prefix) {
             if (!empty($this->$part)) {
-                $ret.= PHP_EOL . " $prefix " . implode(', ', $this->$part);
+                $ret .= PHP_EOL." $prefix ".implode(', ', $this->$part);
             }
         }
 
         if (!empty($this->limit_number)) {
             $offset = $this->limit_offset ?? 0;
             $number = $this->limit_number;
-            $ret.= PHP_EOL . " LIMIT $offset, $number";
+            $ret .= PHP_EOL." LIMIT $offset, $number";
         }
 
         return $ret;

Queries/ClauseWhere.php

Indentation +8 added lines, -8 removed lines

@@ -72,20 +72,20 @@ 
 
     public function aw_eq($field, $value, $table_name = null, $bindname = null)
     {
-               return $this->aw_bind_field($table_name, $field, self::$OP_EQ, $value, $bindname);
+                return $this->aw_bind_field($table_name, $field, self::$OP_EQ, $value, $bindname);
     }
     public function aw_gt($field, $value, $table_name = null, $bindname = null)
     {
-               return $this->aw_bind_field($table_name, $field, self::$OP_GT, $value, $bindname);
+                return $this->aw_bind_field($table_name, $field, self::$OP_GT, $value, $bindname);
     }
     public function aw_lt($field, $value, $table_name = null, $bindname = null)
     {
-               return $this->aw_bind_field($table_name, $field, self::$OP_LT, $value, $bindname);
+                return $this->aw_bind_field($table_name, $field, self::$OP_LT, $value, $bindname);
     }
 
     public function aw_gte($field, $value, $table_name = null, $bindname = null)
     {
-               return $this->aw_bind_field($table_name, $field, self::$OP_GTE, $value, $bindname);
+                return $this->aw_bind_field($table_name, $field, self::$OP_GTE, $value, $bindname);
     }
     public function aw_lte($field, $value, $table_name = null, $bindname = null)
     {
@@ -184,10 +184,10 @@ 
     }
 
   /**
-  * @param array $filters_content with 2 indexes: 'term', the search string, 'fields', the search fields
-  * @param $search_table String to filter
-  * @param $filters_operator Object, inclusive or exclusive search
-  */
+   * @param array $filters_content with 2 indexes: 'term', the search string, 'fields', the search fields
+   * @param $search_table String to filter
+   * @param $filters_operator Object, inclusive or exclusive search
+   */
     public function aw_filter_content($filters_content, $search_table = null, $filters_operator = null) // sub array filters[$content]
     {
         if (!isset($filters_content['term']) || !isset($filters_content['fields'])) {

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
     {
         $this->where = $this->where ?? [];
 
-        $this->where[]= "($where_condition)";
+        $this->where[] = "($where_condition)";
 
         foreach ($where_bindings as $k => $v) {
             $this->add_binding($k, $v);
@@ -212,11 +212,11 @@ 
             $search_field = $this->field_label($search_field, $search_table);
 
             if ($search_mode === self::$OP_EQ) {
-                $content_wc []= "$search_field = '$search_term' "; // TODO bindthis
+                $content_wc [] = "$search_field = '$search_term' "; // TODO bindthis
             } else // %%
             {
                 $pattern = str_replace('TERM', $search_term, $search_mode);
-                $content_wc []= " $search_field LIKE '$pattern' "; // TODO bindthis
+                $content_wc [] = " $search_field LIKE '$pattern' "; // TODO bindthis
             }
         }
 
@@ -247,7 +247,7 @@ 
     protected function generate_where()
     {
         if (!empty($this->where)) {
-            return PHP_EOL .' WHERE '. implode(PHP_EOL.' AND ', $this->where);
+            return PHP_EOL.' WHERE '.implode(PHP_EOL.' AND ', $this->where);
         }
     }
 }

Queries/Update.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
             $binding_name = $this->bind_label($field_name);
             $this->add_binding($binding_name, $value);
-            $this->alterations []= $this->field_label($field_name)." = $binding_name";
+            $this->alterations [] = $this->field_label($field_name)." = $binding_name";
         }
         return $this;
     }

Queries/Delete.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     public function generate() : string
     {
         if (empty($this->where)) {
-            throw new CruditesException('DELETE_USED_AS_TRUNCATE');  // prevents haphazardous generation of dangerous DELETE statement
+            throw new CruditesException('DELETE_USED_AS_TRUNCATE'); // prevents haphazardous generation of dangerous DELETE statement
         }
 
         return sprintf('DELETE FROM `%s` %s ', $this->table_name(), $this->generate_where());

Queries/BaseQuery.php

Spacing +8 added lines, -9 removed lines

@@ -13,15 +13,15 @@ 
 
     const STATE_SUCCESS = '00000'; //PDO "error" code for "all is fine"
 
-    const CODE_CREATE =   'C';
+    const CODE_CREATE = 'C';
     const CODE_RETRIEVE = 'R';
-    const CODE_UPDATE =   'U';
-    const CODE_DELETE =   'D';
+    const CODE_UPDATE = 'U';
+    const CODE_DELETE = 'D';
 
-    protected $database=null;
-    protected $table=null;
-    protected $statement=null;
-    protected $bindings=[];
+    protected $database = null;
+    protected $table = null;
+    protected $statement = null;
+    protected $bindings = [];
 
     protected $connection = null;
     protected $executed = false;
@@ -179,8 +179,7 @@ 
                 $this->prepared_statement = $this->connection()->prepare($this->statement());
             }
 
-            if ($this->prepared_statement->execute($this->bindings()) !== false) { // execute returns TRUE on success or FALSE on failure.
-                ++self::$executions;
+            if ($this->prepared_statement->execute($this->bindings()) !== false) { // execute returns TRUE on success or FALSE on failure.++self::$executions;
 
                 $this->is_executed(true);
 

Tracer.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
         }
 
       // 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']);

Table/Row.php

Indentation +13 added lines, -13 removed lines

@@ -74,17 +74,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);
@@ -186,8 +186,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 +2 added lines, -2 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
@@ -148,7 +148,7 @@ 
                 $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();
+                    $this->alterations[$aipk->name()] = $this->last_alter_query->inserted_id();
                 }
             } else {
                 $pk_match = $this->table()->primary_keys_match($this->load);