Completed
Push — master ( 3aa751...345dfa )
by Lars
02:57
created
src/idiorm/orm/ORM.php 1 patch
Spacing   +20 added lines, -21 removed lines patch added patch discarded remove patch
@@ -983,10 +983,10 @@  discard block
 block discarded – undo
983 983
     if ($result !== false && isset($result->$alias)) {
984 984
       if (!is_numeric($result->$alias)) {
985 985
         $return_value = $result->$alias;
986
-      } elseif ((int)$result->$alias == (float)$result->$alias) {
987
-        $return_value = (int)$result->$alias;
986
+      } elseif ((int) $result->$alias == (float) $result->$alias) {
987
+        $return_value = (int) $result->$alias;
988 988
       } else {
989
-        $return_value = (float)$result->$alias;
989
+        $return_value = (float) $result->$alias;
990 990
       }
991 991
     }
992 992
 
@@ -1069,7 +1069,7 @@  discard block
 block discarded – undo
1069 1069
   protected function _add_result_column($expr, $alias = null)
1070 1070
   {
1071 1071
     if (null !== $alias) {
1072
-      $expr .= ' AS ' . $this->_quote_identifier($alias);
1072
+      $expr .= ' AS '.$this->_quote_identifier($alias);
1073 1073
     }
1074 1074
 
1075 1075
     if ($this->_using_default_result_columns) {
@@ -1795,7 +1795,7 @@  discard block
 block discarded – undo
1795 1795
 
1796 1796
         $query[] = $this->_quote_identifier($key);
1797 1797
         $data[] = $subItem;
1798
-        $query[] = $op . ' ?';
1798
+        $query[] = $op.' ?';
1799 1799
       }
1800 1800
     }
1801 1801
     $query[] = '))';
@@ -2366,13 +2366,13 @@  discard block
 block discarded – undo
2366 2366
     }
2367 2367
 
2368 2368
     if ($this->_distinct) {
2369
-      $result_columns = 'DISTINCT ' . $result_columns;
2369
+      $result_columns = 'DISTINCT '.$result_columns;
2370 2370
     }
2371 2371
 
2372
-    $fragment .= "{$result_columns} FROM " . $this->_quote_identifier($this->_table_name);
2372
+    $fragment .= "{$result_columns} FROM ".$this->_quote_identifier($this->_table_name);
2373 2373
 
2374 2374
     if (null !== $this->_table_alias) {
2375
-      $fragment .= ' ' . $this->_quote_identifier($this->_table_alias);
2375
+      $fragment .= ' '.$this->_quote_identifier($this->_table_alias);
2376 2376
     }
2377 2377
 
2378 2378
     return $fragment;
@@ -2415,7 +2415,7 @@  discard block
 block discarded – undo
2415 2415
       return '';
2416 2416
     }
2417 2417
 
2418
-    return 'GROUP BY ' . implode(', ', $this->_group_by);
2418
+    return 'GROUP BY '.implode(', ', $this->_group_by);
2419 2419
   }
2420 2420
 
2421 2421
   /**
@@ -2440,7 +2440,7 @@  discard block
 block discarded – undo
2440 2440
       $this->_values = array_merge($this->_values, $condition[static::CONDITION_VALUES]);
2441 2441
     }
2442 2442
 
2443
-    return strtoupper($type) . ' ' . implode(' AND ', $conditions);
2443
+    return strtoupper($type).' '.implode(' AND ', $conditions);
2444 2444
   }
2445 2445
 
2446 2446
   /**
@@ -2454,7 +2454,7 @@  discard block
 block discarded – undo
2454 2454
 
2455 2455
     $db = static::get_db(self::DEFAULT_CONNECTION);
2456 2456
 
2457
-    return 'ORDER BY ' . trim($db->quote(implode(', ', $this->_order_by)), "'");
2457
+    return 'ORDER BY '.trim($db->quote(implode(', ', $this->_order_by)), "'");
2458 2458
   }
2459 2459
 
2460 2460
   /**
@@ -2476,7 +2476,7 @@  discard block
 block discarded – undo
2476 2476
         $fragment = 'LIMIT';
2477 2477
       }
2478 2478
 
2479
-      $this->_limit = (int)$this->_limit;
2479
+      $this->_limit = (int) $this->_limit;
2480 2480
 
2481 2481
       $fragment .= " {$this->_limit}";
2482 2482
     }
@@ -2495,9 +2495,9 @@  discard block
 block discarded – undo
2495 2495
         $clause = 'TO';
2496 2496
       }
2497 2497
 
2498
-      $this->_offset = (int)$this->_offset;
2498
+      $this->_offset = (int) $this->_offset;
2499 2499
 
2500
-      return "$clause " . $this->_offset;
2500
+      return "$clause ".$this->_offset;
2501 2501
     }
2502 2502
 
2503 2503
     return '';
@@ -2583,7 +2583,7 @@  discard block
 block discarded – undo
2583 2583
     $quote_character = static::$_config[$this->_connection_name]['identifier_quote_character'];
2584 2584
 
2585 2585
     // double up any identifier quotes to escape them
2586
-    return $quote_character . str_replace($quote_character, $quote_character . $quote_character, $part) . $quote_character;
2586
+    return $quote_character.str_replace($quote_character, $quote_character.$quote_character, $part).$quote_character;
2587 2587
   }
2588 2588
 
2589 2589
   /**
@@ -2614,7 +2614,7 @@  discard block
 block discarded – undo
2614 2614
       );
2615 2615
     }
2616 2616
     $parameter_string = implode(',', $parameters);
2617
-    $key = $query . ':' . $parameter_string;
2617
+    $key = $query.':'.$parameter_string;
2618 2618
 
2619 2619
     return sha1($key);
2620 2620
   }
@@ -3076,14 +3076,14 @@  discard block
 block discarded – undo
3076 3076
     $query[] = 'INSERT INTO';
3077 3077
     $query[] = $this->_quote_identifier($this->_table_name);
3078 3078
     $field_list = array_map(array($this, '_quote_identifier'), array_keys($this->_dirty_fields));
3079
-    $query[] = '(' . implode(', ', $field_list) . ')';
3079
+    $query[] = '('.implode(', ', $field_list).')';
3080 3080
     $query[] = 'VALUES';
3081 3081
 
3082 3082
     $placeholders = $this->_create_placeholders($this->_dirty_fields);
3083 3083
     $query[] = "({$placeholders})";
3084 3084
 
3085 3085
     if (static::get_db($this->_connection_name)->getAttribute(\PDO::ATTR_DRIVER_NAME) == 'pgsql') {
3086
-      $query[] = 'RETURNING ' . $this->_quote_identifier($this->_get_id_column_name());
3086
+      $query[] = 'RETURNING '.$this->_quote_identifier($this->_get_id_column_name());
3087 3087
     }
3088 3088
 
3089 3089
     return implode(' ', $query);
@@ -3102,8 +3102,7 @@  discard block
 block discarded – undo
3102 3102
 
3103 3103
     return static::_execute(
3104 3104
         implode(' ', $query), is_array($this->id(true)) ?
3105
-        array_values($this->id(true)) :
3106
-        array($this->id(true)), $this->_connection_name
3105
+        array_values($this->id(true)) : array($this->id(true)), $this->_connection_name
3107 3106
     );
3108 3107
   }
3109 3108
 
@@ -3199,7 +3198,7 @@  discard block
 block discarded – undo
3199 3198
     if (method_exists($this, $method)) {
3200 3199
       return call_user_func_array(array($this, $method), $arguments);
3201 3200
     } else {
3202
-      throw new IdiormMethodMissingException("Method $name() does not exist in class " . get_class($this));
3201
+      throw new IdiormMethodMissingException("Method $name() does not exist in class ".get_class($this));
3203 3202
     }
3204 3203
   }
3205 3204
 
Please login to merge, or discard this patch.