Divergence / framework

src/Models/ActiveRecord.php

Spacing +23 added lines, -23 removed lines

@@ -722,7 +722,7 @@ 
                         static::$tableName,
                         join(',', $set),
                     ],
-                    [static::class,'handleError']
+                    [static::class, 'handleError']
                 );
 
                 $this->_record[static::$primaryKey ? static::$primaryKey : 'ID'] = DB::insertID();
@@ -737,7 +737,7 @@ 
                         static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'),
                         $this->getPrimaryKeyValue(),
                     ],
-                    [static::class,'handleError']
+                    [static::class, 'handleError']
                 );
 
                 $this->_isUpdated = true;
@@ -797,7 +797,7 @@ 
             static::$tableName,
             static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'),
             $id,
-        ], [static::class,'handleError']);
+        ], [static::class, 'handleError']);
 
         return DB::affectedRows() > 0;
     }
@@ -885,9 +885,9 @@ 
 
         if ($cacheIndex) {
             $key = sprintf('%s/%s:%s', static::$tableName, $field, $value);
-            return DB::oneRecordCached($key, $query, $params, [static::class,'handleError']);
+            return DB::oneRecordCached($key, $query, $params, [static::class, 'handleError']);
         } else {
-            return DB::oneRecord($query, $params, [static::class,'handleError']);
+            return DB::oneRecord($query, $params, [static::class, 'handleError']);
         }
     }
 
@@ -935,7 +935,7 @@ 
                 $order ? 'ORDER BY '.join(',', $order) : '',
             ],
 
-            [static::class,'handleError']
+            [static::class, 'handleError']
         );
     }
 
@@ -948,7 +948,7 @@ 
      */
     public static function getByQuery($query, $params = [])
     {
-        return static::instantiateRecord(DB::oneRecord($query, $params, [static::class,'handleError']));
+        return static::instantiateRecord(DB::oneRecord($query, $params, [static::class, 'handleError']));
     }
 
     /**
@@ -1031,7 +1031,7 @@ 
                     return ', '.$value.' AS '.$key;
                 }
             } else {
-                return ', ' . $columns;
+                return ', '.$columns;
             }
         }
     }
@@ -1045,7 +1045,7 @@ 
     public static function buildHaving($having)
     {
         if (!empty($having)) {
-            return ' HAVING (' . (is_array($having) ? join(') AND (', static::_mapConditions($having)) : $having) . ')';
+            return ' HAVING ('.(is_array($having) ? join(') AND (', static::_mapConditions($having)) : $having).')';
         }
     }
 
@@ -1095,7 +1095,7 @@ 
         ];
 
         if ($options['order']) {
-            $query .= ' ORDER BY ' . join(',', static::_mapFieldOrder($options['order']));
+            $query .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order']));
         }
 
         if ($options['limit']) {
@@ -1103,9 +1103,9 @@ 
         }
 
         if ($options['indexField']) {
-            return DB::table(static::_cn($options['indexField']), $query, $params, null, [static::class,'handleError']);
+            return DB::table(static::_cn($options['indexField']), $query, $params, null, [static::class, 'handleError']);
         } else {
-            return DB::allRecords($query, $params, [static::class,'handleError']);
+            return DB::allRecords($query, $params, [static::class, 'handleError']);
         }
     }
 
@@ -1142,7 +1142,7 @@ 
         ];
 
         if ($options['order']) {
-            $query .= ' ORDER BY ' . join(',', static::_mapFieldOrder($options['order']));
+            $query .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order']));
         }
 
         if ($options['limit']) {
@@ -1150,9 +1150,9 @@ 
         }
 
         if ($options['indexField']) {
-            return DB::table(static::_cn($options['indexField']), $query, $params, null, [static::class,'handleError']);
+            return DB::table(static::_cn($options['indexField']), $query, $params, null, [static::class, 'handleError']);
         } else {
-            return DB::allRecords($query, $params, [static::class,'handleError']);
+            return DB::allRecords($query, $params, [static::class, 'handleError']);
         }
     }
 
@@ -1165,12 +1165,12 @@ 
      */
     public static function getAllByQuery($query, $params = [])
     {
-        return static::instantiateRecords(DB::allRecords($query, $params, [static::class,'handleError']));
+        return static::instantiateRecords(DB::allRecords($query, $params, [static::class, 'handleError']));
     }
 
     public static function getTableByQuery($keyField, $query, $params = [])
     {
-        return static::instantiateRecords(DB::table($keyField, $query, $params, [static::class,'handleError']));
+        return static::instantiateRecords(DB::table($keyField, $query, $params, [static::class, 'handleError']));
     }
 
 
@@ -1303,7 +1303,7 @@ 
     {
         static::init();
         if (!static::fieldExists($field)) {
-            throw new Exception('getColumnName called on nonexisting column: ' . get_called_class().'->'.$field);
+            throw new Exception('getColumnName called on nonexisting column: '.get_called_class().'->'.$field);
         }
 
         return static::$_classFields[get_called_class()][$field]['columnName'];
@@ -1406,7 +1406,7 @@ 
 
         if ($deep) {
             // validate relationship objects
-            if(!empty(static::$_classRelationships[get_called_class()])) {
+            if (!empty(static::$_classRelationships[get_called_class()])) {
                 foreach (static::$_classRelationships[get_called_class()] as $relationship => $options) {
                     if (empty($this->_relatedObjects[$relationship])) {
                         continue;
@@ -1738,7 +1738,7 @@ 
                 case 'boolean':
                 {
                     if (!isset($this->_convertedValues[$field])) {
-                        $this->_convertedValues[$field] = (boolean)$value;
+                        $this->_convertedValues[$field] = (boolean) $value;
                     }
 
                     return $this->_convertedValues[$field];
@@ -1777,7 +1777,7 @@ 
 
     protected function _setBooleanValue($value)
     {
-        return (boolean)$value;
+        return (boolean) $value;
     }
 
     protected function _setDecimalValue($value)
@@ -2017,7 +2017,7 @@ 
             foreach ($order as $key => $value) {
                 if (is_string($key)) {
                     $columnName = static::_cn($key);
-                    $direction = strtoupper($value)=='DESC' ? 'DESC' : 'ASC';
+                    $direction = strtoupper($value) == 'DESC' ? 'DESC' : 'ASC';
                 } else {
                     $columnName = static::_cn($value);
                     $direction = 'ASC';
@@ -2034,7 +2034,7 @@ 
     {
         foreach ($conditions as $field => &$condition) {
             if (is_string($field)) {
-                if(isset(static::$_classFields[get_called_class()][$field])) {
+                if (isset(static::$_classFields[get_called_class()][$field])) {
                     $fieldOptions = static::$_classFields[get_called_class()][$field];
                 }