HexMakina / TightORM

TableModel.php

Indentation +32 added lines, -32 removed lines

@@ -107,67 +107,67 @@ 
     // DEPRECATED, only exist for unit testing vis-a-vis TightModelSelector
     public static function query_retrieve($filters = [], $options = []): SelectInterface
     {
-      $class = get_called_class();
-      $table = $class::table();
+        $class = get_called_class();
+        $table = $class::table();
 
-      $Query = $table->select(null, $class::table_alias());
+        $Query = $table->select(null, $class::table_alias());
 
 
-      if(!isset($options['eager']) || $options['eager'] !== false)
-      {
+        if(!isset($options['eager']) || $options['eager'] !== false)
+        {
         $Query->eager();
-      }
+        }
 
 
-      foreach($table->columns() as $column_name => $column)
-      {
+        foreach($table->columns() as $column_name => $column)
+        {
         if(isset($filters[$column_name]) && is_string($filters[$column_name]))
-          $Query->aw_eq($column_name, $filters[$column_name]);
-      }
+            $Query->aw_eq($column_name, $filters[$column_name]);
+        }
 
-      if(is_subclass_of($event = new $class(), '\HexMakina\kadro\Models\Interfaces\EventInterface'))
-      {
+        if(is_subclass_of($event = new $class(), '\HexMakina\kadro\Models\Interfaces\EventInterface'))
+        {
         if(!empty($filters['date_start']))
-          $Query->aw_gte($event->event_field(), $filters['date_start'], $Query->table_label(), ':filter_date_start');
+            $Query->aw_gte($event->event_field(), $filters['date_start'], $Query->table_label(), ':filter_date_start');
 
         if(!empty($filters['date_stop']))
-          $Query->aw_lte($event->event_field(), $filters['date_stop'], $Query->table_label(), ':filter_date_stop');
+            $Query->aw_lte($event->event_field(), $filters['date_stop'], $Query->table_label(), ':filter_date_stop');
 
         if(empty($options['order_by']))
-          $Query->order_by([$event->event_field(), 'DESC']);
-      }
+            $Query->order_by([$event->event_field(), 'DESC']);
+        }
 
-      if(isset($filters['content'])) $Query->aw_filter_content($filters['content']);
+        if(isset($filters['content'])) $Query->aw_filter_content($filters['content']);
 
-      if(isset($filters['ids']))
-      {
+        if(isset($filters['ids']))
+        {
         if(empty($filters['ids']))
-          $Query->and_where('1=0'); // TODO: this is a new low.. find another way to cancel query
+            $Query->and_where('1=0'); // TODO: this is a new low.. find another way to cancel query
         else $Query->aw_numeric_in('id', $filters['ids'], $Query->table_label());
-      }
+        }
 
-      if(isset($options['order_by'])) // TODO commenting required about the array situation
-      {
+        if(isset($options['order_by'])) // TODO commenting required about the array situation
+        {
         $order_by = $options['order_by'];
 
         if(is_string($order_by))
-          $Query->order_by($order_by);
+            $Query->order_by($order_by);
 
         elseif(is_array($order_by))
-          foreach($options['order_by'] as $order_by)
-          {
+            foreach($options['order_by'] as $order_by)
+            {
             if(!isset($order_by[2]))
-              array_unshift($order_by, '');
+                array_unshift($order_by, '');
 
             list($order_table, $order_field, $order_direction) = $order_by;
             $Query->order_by([$order_table ?? '', $order_field, $order_direction]);
-          }
-      }
+            }
+        }
 
-      if(isset($options['limit']) && is_array($options['limit']))
+        if(isset($options['limit']) && is_array($options['limit']))
         $Query->limit($options['limit'][1], $options['limit'][0]);
 
-      return $Query;
+        return $Query;
     }
 
 
@@ -191,7 +191,7 @@ 
 
         if ($Query->is_success()) {
             foreach ($Query->ret_obj(get_called_class()) as $rec) {
-                  $ret[$rec->get($pk_name)] = $rec;
+                    $ret[$rec->get($pk_name)] = $rec;
             }
         }
 

Spacing +19 added lines, -19 removed lines

@@ -45,7 +45,7 @@ 
     public function import($assoc_data)
     {
         if (!is_array($assoc_data)) {
-            throw new \Exception(__FUNCTION__ . '(assoc_data) parm is not an array');
+            throw new \Exception(__FUNCTION__.'(assoc_data) parm is not an array');
         }
 
         // shove it all up in model, god will sort them out
@@ -72,7 +72,7 @@ 
 
         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);
@@ -113,50 +113,50 @@ 
       $Query = $table->select(null, $class::table_alias());
 
 
-      if(!isset($options['eager']) || $options['eager'] !== false)
+      if (!isset($options['eager']) || $options['eager'] !== false)
       {
         $Query->eager();
       }
 
 
-      foreach($table->columns() as $column_name => $column)
+      foreach ($table->columns() as $column_name => $column)
       {
-        if(isset($filters[$column_name]) && is_string($filters[$column_name]))
+        if (isset($filters[$column_name]) && is_string($filters[$column_name]))
           $Query->aw_eq($column_name, $filters[$column_name]);
       }
 
-      if(is_subclass_of($event = new $class(), '\HexMakina\kadro\Models\Interfaces\EventInterface'))
+      if (is_subclass_of($event = new $class(), '\HexMakina\kadro\Models\Interfaces\EventInterface'))
       {
-        if(!empty($filters['date_start']))
+        if (!empty($filters['date_start']))
           $Query->aw_gte($event->event_field(), $filters['date_start'], $Query->table_label(), ':filter_date_start');
 
-        if(!empty($filters['date_stop']))
+        if (!empty($filters['date_stop']))
           $Query->aw_lte($event->event_field(), $filters['date_stop'], $Query->table_label(), ':filter_date_stop');
 
-        if(empty($options['order_by']))
+        if (empty($options['order_by']))
           $Query->order_by([$event->event_field(), 'DESC']);
       }
 
-      if(isset($filters['content'])) $Query->aw_filter_content($filters['content']);
+      if (isset($filters['content'])) $Query->aw_filter_content($filters['content']);
 
-      if(isset($filters['ids']))
+      if (isset($filters['ids']))
       {
-        if(empty($filters['ids']))
+        if (empty($filters['ids']))
           $Query->and_where('1=0'); // TODO: this is a new low.. find another way to cancel query
         else $Query->aw_numeric_in('id', $filters['ids'], $Query->table_label());
       }
 
-      if(isset($options['order_by'])) // TODO commenting required about the array situation
+      if (isset($options['order_by'])) // TODO commenting required about the array situation
       {
         $order_by = $options['order_by'];
 
-        if(is_string($order_by))
+        if (is_string($order_by))
           $Query->order_by($order_by);
 
-        elseif(is_array($order_by))
-          foreach($options['order_by'] as $order_by)
+        elseif (is_array($order_by))
+          foreach ($options['order_by'] as $order_by)
           {
-            if(!isset($order_by[2]))
+            if (!isset($order_by[2]))
               array_unshift($order_by, '');
 
             list($order_table, $order_field, $order_direction) = $order_by;
@@ -164,7 +164,7 @@ 
           }
       }
 
-      if(isset($options['limit']) && is_array($options['limit']))
+      if (isset($options['limit']) && is_array($options['limit']))
         $Query->limit($options['limit'][1], $options['limit'][0]);
 
       return $Query;
@@ -178,7 +178,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]);
         }

Braces +33 added lines, -20 removed lines

@@ -121,51 +121,64 @@
 
       foreach($table->columns() as $column_name => $column)
       {
-        if(isset($filters[$column_name]) && is_string($filters[$column_name]))
-          $Query->aw_eq($column_name, $filters[$column_name]);
+        if(isset($filters[$column_name]) && is_string($filters[$column_name])) {
+                  $Query->aw_eq($column_name, $filters[$column_name]);
+        }
       }
 
       if(is_subclass_of($event = new $class(), '\HexMakina\kadro\Models\Interfaces\EventInterface'))
       {
-        if(!empty($filters['date_start']))
-          $Query->aw_gte($event->event_field(), $filters['date_start'], $Query->table_label(), ':filter_date_start');
+        if(!empty($filters['date_start'])) {
+                  $Query->aw_gte($event->event_field(), $filters['date_start'], $Query->table_label(), ':filter_date_start');
+        }
 
-        if(!empty($filters['date_stop']))
-          $Query->aw_lte($event->event_field(), $filters['date_stop'], $Query->table_label(), ':filter_date_stop');
+        if(!empty($filters['date_stop'])) {
+                  $Query->aw_lte($event->event_field(), $filters['date_stop'], $Query->table_label(), ':filter_date_stop');
+        }
 
-        if(empty($options['order_by']))
-          $Query->order_by([$event->event_field(), 'DESC']);
+        if(empty($options['order_by'])) {
+                  $Query->order_by([$event->event_field(), 'DESC']);
+        }
       }
 
-      if(isset($filters['content'])) $Query->aw_filter_content($filters['content']);
+      if(isset($filters['content'])) {
+          $Query->aw_filter_content($filters['content']);
+      }
 
       if(isset($filters['ids']))
       {
-        if(empty($filters['ids']))
-          $Query->and_where('1=0'); // TODO: this is a new low.. find another way to cancel query
-        else $Query->aw_numeric_in('id', $filters['ids'], $Query->table_label());
+        if(empty($filters['ids'])) {
+                  $Query->and_where('1=0');
+        }
+        // TODO: this is a new low.. find another way to cancel query
+        else {
+            $Query->aw_numeric_in('id', $filters['ids'], $Query->table_label());
+        }
       }
 
-      if(isset($options['order_by'])) // TODO commenting required about the array situation
+      if(isset($options['order_by'])) {
+          // TODO commenting required about the array situation
       {
         $order_by = $options['order_by'];
+      }
 
-        if(is_string($order_by))
-          $Query->order_by($order_by);
-
-        elseif(is_array($order_by))
-          foreach($options['order_by'] as $order_by)
+        if(is_string($order_by)) {
+                  $Query->order_by($order_by);
+        } elseif(is_array($order_by)) {
+                  foreach($options['order_by'] as $order_by)
           {
             if(!isset($order_by[2]))
               array_unshift($order_by, '');
+        }
 
             list($order_table, $order_field, $order_direction) = $order_by;
             $Query->order_by([$order_table ?? '', $order_field, $order_direction]);
           }
       }
 
-      if(isset($options['limit']) && is_array($options['limit']))
-        $Query->limit($options['limit'][1], $options['limit'][0]);
+      if(isset($options['limit']) && is_array($options['limit'])) {
+              $Query->limit($options['limit'][1], $options['limit'][0]);
+      }
 
       return $Query;
     }