freshsauce / model-orm-php

src/Model/Model.php

Spacing +28 added lines, -28 removed lines

@@ -183,9 +183,9 @@ 
 
         $trace = debug_backtrace();
         throw new \Exception(
-            'Undefined property via __get(): ' . $name .
-            ' in ' . $trace[0]['file'] .
-            ' on line ' . $trace[0]['line'],
+            'Undefined property via __get(): '.$name.
+            ' in '.$trace[0]['file'].
+            ' on line '.$trace[0]['line'],
             1
         );
     }
@@ -310,7 +310,7 @@ 
         if ($part === '*') {
             return $part;
         }
-        return static::$_identifier_quote_character . $part . static::$_identifier_quote_character;
+        return static::$_identifier_quote_character.$part.static::$_identifier_quote_character;
     }
 
     /**
@@ -322,7 +322,7 @@ 
     {
         $class = get_called_class();
         if (!isset(self::$_tableColumns[$class])) {
-            $st                          = static::execute('DESCRIBE ' . static::_quote_identifier(static::$_tableName));
+            $st                          = static::execute('DESCRIBE '.static::_quote_identifier(static::$_tableName));
             self::$_tableColumns[$class] = $st->fetchAll(\PDO::FETCH_COLUMN);
         }
         return self::$_tableColumns[$class];
@@ -388,7 +388,7 @@ 
      */
     static public function getById($id)
     {
-        return static::fetchOneWhere(static::_quote_identifier(static::$_primary_column_name) . ' = ?', array($id));
+        return static::fetchOneWhere(static::_quote_identifier(static::$_primary_column_name).' = ?', array($id));
     }
 
     /**
@@ -398,7 +398,7 @@ 
      */
     static public function first()
     {
-        return static::fetchOneWhere('1=1 ORDER BY ' . static::_quote_identifier(static::$_primary_column_name) . ' ASC');
+        return static::fetchOneWhere('1=1 ORDER BY '.static::_quote_identifier(static::$_primary_column_name).' ASC');
     }
 
     /**
@@ -408,7 +408,7 @@ 
      */
     static public function last()
     {
-        return static::fetchOneWhere('1=1 ORDER BY ' . static::_quote_identifier(static::$_primary_column_name) . ' DESC');
+        return static::fetchOneWhere('1=1 ORDER BY '.static::_quote_identifier(static::$_primary_column_name).' DESC');
     }
 
     /**
@@ -420,7 +420,7 @@ 
      */
     static public function find($id)
     {
-        $find_by_method = 'find_by_' . (static::$_primary_column_name);
+        $find_by_method = 'find_by_'.(static::$_primary_column_name);
         static::$find_by_method($id);
     }
 
@@ -465,12 +465,12 @@ 
             $fieldname = substr($name, 9); // remove find by
             $match     = $arguments[0];
             if (is_array($match)) {
-                return static::countAllWhere(static::_quote_identifier($fieldname) . ' IN (' . static::createInClausePlaceholders($match) . ')', $match);
+                return static::countAllWhere(static::_quote_identifier($fieldname).' IN ('.static::createInClausePlaceholders($match).')', $match);
             } else {
-                return static::countAllWhere(static::_quote_identifier($fieldname) . ' = ?', array($match));
+                return static::countAllWhere(static::_quote_identifier($fieldname).' = ?', array($match));
             }
         }
-        throw new \Exception(__CLASS__ . ' not such static method[' . $name . ']');
+        throw new \Exception(__CLASS__.' not such static method['.$name.']');
     }
 
     /**
@@ -485,9 +485,9 @@ 
     public static function fetchOneWhereMatchingSingleField($fieldname, $match, $order)
     {
         if (is_array($match)) {
-            return static::fetchOneWhere(static::_quote_identifier($fieldname) . ' IN (' . static::createInClausePlaceholders($match) . ') ORDER BY ' . static::_quote_identifier($fieldname) . ' ' . $order, $match);
+            return static::fetchOneWhere(static::_quote_identifier($fieldname).' IN ('.static::createInClausePlaceholders($match).') ORDER BY '.static::_quote_identifier($fieldname).' '.$order, $match);
         } else {
-            return static::fetchOneWhere(static::_quote_identifier($fieldname) . ' = ? ORDER BY ' . static::_quote_identifier($fieldname) . ' ' . $order, array($match));
+            return static::fetchOneWhere(static::_quote_identifier($fieldname).' = ? ORDER BY '.static::_quote_identifier($fieldname).' '.$order, array($match));
         }
     }
 
@@ -503,9 +503,9 @@ 
     public static function fetchAllWhereMatchingSingleField($fieldname, $match)
     {
         if (is_array($match)) {
-            return static::fetchAllWhere(static::_quote_identifier($fieldname) . ' IN (' . static::createInClausePlaceholders($match) . ')', $match);
+            return static::fetchAllWhere(static::_quote_identifier($fieldname).' IN ('.static::createInClausePlaceholders($match).')', $match);
         } else {
-            return static::fetchAllWhere(static::_quote_identifier($fieldname) . ' = ?', array($match));
+            return static::fetchAllWhere(static::_quote_identifier($fieldname).' = ?', array($match));
         }
     }
 
@@ -528,8 +528,8 @@ 
      */
     static public function count()
     {
-        $st = static::execute('SELECT COUNT(*) FROM ' . static::_quote_identifier(static::$_tableName));
-        return (int)$st->fetchColumn(0);
+        $st = static::execute('SELECT COUNT(*) FROM '.static::_quote_identifier(static::$_tableName));
+        return (int) $st->fetchColumn(0);
     }
 
     /**
@@ -543,8 +543,8 @@ 
     static public function countAllWhere($SQLfragment = '', $params = array())
     {
         $SQLfragment = self::addWherePrefix($SQLfragment);
-        $st          = static::execute('SELECT COUNT(*) FROM ' . static::_quote_identifier(static::$_tableName) . $SQLfragment, $params);
-        return (int)$st->fetchColumn(0);
+        $st          = static::execute('SELECT COUNT(*) FROM '.static::_quote_identifier(static::$_tableName).$SQLfragment, $params);
+        return (int) $st->fetchColumn(0);
     }
 
     /**
@@ -556,7 +556,7 @@ 
      */
     static protected function addWherePrefix($SQLfragment)
     {
-        return $SQLfragment ? ' WHERE ' . $SQLfragment : $SQLfragment;
+        return $SQLfragment ? ' WHERE '.$SQLfragment : $SQLfragment;
     }
 
 
@@ -574,7 +574,7 @@ 
         $class       = get_called_class();
         $SQLfragment = self::addWherePrefix($SQLfragment);
         $st          = static::execute(
-            'SELECT * FROM ' . static::_quote_identifier(static::$_tableName) . $SQLfragment . ($limitOne ? ' LIMIT 1' : ''),
+            'SELECT * FROM '.static::_quote_identifier(static::$_tableName).$SQLfragment.($limitOne ? ' LIMIT 1' : ''),
             $params
         );
         $st->setFetchMode(\PDO::FETCH_ASSOC);
@@ -622,7 +622,7 @@ 
     static public function deleteById($id)
     {
         $st = static::execute(
-            'DELETE FROM ' . static::_quote_identifier(static::$_tableName) . ' WHERE ' . static::_quote_identifier(static::$_primary_column_name) . ' = ? LIMIT 1',
+            'DELETE FROM '.static::_quote_identifier(static::$_tableName).' WHERE '.static::_quote_identifier(static::$_primary_column_name).' = ? LIMIT 1',
             array($id)
         );
         return ($st->rowCount() == 1);
@@ -649,7 +649,7 @@ 
     static public function deleteAllWhere($where, $params = array())
     {
         $st = static::execute(
-            'DELETE FROM ' . static::_quote_identifier(static::$_tableName) . ' WHERE ' . $where,
+            'DELETE FROM '.static::_quote_identifier(static::$_tableName).' WHERE '.$where,
             $params
         );
         return $st;
@@ -689,7 +689,7 @@ 
             $this->$pk = null; // ensure id is null
         }
         $set   = $this->setString(!$allowSetPrimaryKey);
-        $query = 'INSERT INTO ' . static::_quote_identifier(static::$_tableName) . ' SET ' . $set['sql'];
+        $query = 'INSERT INTO '.static::_quote_identifier(static::$_tableName).' SET '.$set['sql'];
         $st    = static::execute($query, $set['params']);
         if ($st->rowCount() == 1) {
             $this->{static::$_primary_column_name} = static::$_db->lastInsertId();
@@ -712,7 +712,7 @@ 
         }
         $this->validate();
         $set             = $this->setString();
-        $query           = 'UPDATE ' . static::_quote_identifier(static::$_tableName) . ' SET ' . $set['sql'] . ' WHERE ' . static::_quote_identifier(static::$_primary_column_name) . ' = ? LIMIT 1';
+        $query           = 'UPDATE '.static::_quote_identifier(static::$_tableName).' SET '.$set['sql'].' WHERE '.static::_quote_identifier(static::$_primary_column_name).' = ? LIMIT 1';
         $set['params'][] = $this->{static::$_primary_column_name};
         $st              = static::execute(
             $query,
@@ -798,10 +798,10 @@ 
             if (isset($this->$field) && $this->isFieldDirty($field)) { // Only if dirty
                 if ($this->$field === null) {
                     // if empty set to NULL
-                    $fragments[] = static::_quote_identifier($field) . ' = NULL';
+                    $fragments[] = static::_quote_identifier($field).' = NULL';
                 } else {
                     // Just set value normally as not empty string with NULL allowed
-                    $fragments[] = static::_quote_identifier($field) . ' = ?';
+                    $fragments[] = static::_quote_identifier($field).' = ?';
                     $params[]    = $this->$field;
                 }
             }