Divergence / framework

classes/Divergence/Models/ActiveRecord.php

Spacing +22 added lines, -22 removed lines

@@ -438,7 +438,7 @@ 
                         static::$tableName,
                         join(',', $set),
                     ],
-                    [static::class,'handleError']
+                    [static::class, 'handleError']
                 );
                 
                 $this->_record[static::$primaryKey ? static::$primaryKey : 'ID'] = DB::insertID();
@@ -453,7 +453,7 @@ 
                         static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'),
                         $this->getPrimaryKeyValue(),
                     ],
-                    [static::class,'handleError']
+                    [static::class, 'handleError']
                 );
                 
                 $this->_isUpdated = true;
@@ -521,7 +521,7 @@ 
             static::$tableName,
             static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'),
             $id,
-        ], [static::class,'handleError']);
+        ], [static::class, 'handleError']);
         
         return DB::affectedRows() > 0;
     }
@@ -587,9 +587,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']);
         }
     }
     
@@ -623,13 +623,13 @@ 
                 $order ? 'ORDER BY '.join(',', $order) : '',
             ],
         
-            [static::class,'handleError']
+            [static::class, 'handleError']
         );
     }
     
     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']));
     }
 
     public static function getAllByClass($className = false, $options = [])
@@ -724,7 +724,7 @@ 
         }
         
         // build query
-        $query  = 'SELECT %1$s `%3$s`.*';
+        $query = 'SELECT %1$s `%3$s`.*';
         
         if (!empty($options['extraColumns'])) {
             if (is_array($options['extraColumns'])) {
@@ -732,14 +732,14 @@ 
                     $query .= ', '.$value.' AS '.$key;
                 }
             } else {
-                $query .= ', ' . $options['extraColumns'];
+                $query .= ', '.$options['extraColumns'];
             }
         }
         $query .= ' FROM `%2$s` AS `%3$s` %4$s';
         $query .= ' WHERE (%5$s)';
         
         if (!empty($options['having'])) {
-            $query .= ' HAVING (' . (is_array($options['having']) ? join(') AND (', static::_mapConditions($options['having'])) : $options['having']) . ')';
+            $query .= ' HAVING ('.(is_array($options['having']) ? join(') AND (', static::_mapConditions($options['having'])) : $options['having']).')';
         }
         
         $params = [
@@ -753,7 +753,7 @@ 
         
 
         if ($options['order']) {
-            $query .= ' ORDER BY ' . join(',', static::_mapFieldOrder($options['order']));
+            $query .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order']));
         }
         
         if ($options['limit']) {
@@ -761,9 +761,9 @@ 
         }
         
         if ($options['indexField']) {
-            return DB::table(static::_cn($options['indexField']), $query, $params, [static::class,'handleError']);
+            return DB::table(static::_cn($options['indexField']), $query, $params, [static::class, 'handleError']);
         } else {
-            return DB::allRecords($query, $params, [static::class,'handleError']);
+            return DB::allRecords($query, $params, [static::class, 'handleError']);
         }
     }
     
@@ -788,7 +788,7 @@ 
         ];
         
         if ($options['order']) {
-            $query .= ' ORDER BY ' . join(',', static::_mapFieldOrder($options['order']));
+            $query .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order']));
         }
         
         if ($options['limit']) {
@@ -796,20 +796,20 @@ 
         }
 
         if ($options['indexField']) {
-            return DB::table(static::_cn($options['indexField']), $query, $params, [static::class,'handleError']);
+            return DB::table(static::_cn($options['indexField']), $query, $params, [static::class, 'handleError']);
         } else {
-            return DB::allRecords($query, $params, [static::class,'handleError']);
+            return DB::allRecords($query, $params, [static::class, 'handleError']);
         }
     }
     
     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']));
     }
 
     
@@ -912,7 +912,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'];
@@ -1243,7 +1243,7 @@ 
                 case 'boolean':
                 {
                     if (!isset($this->_convertedValues[$field])) {
-                        $this->_convertedValues[$field] = (boolean)$value;
+                        $this->_convertedValues[$field] = (boolean) $value;
                     }
                     
                     return $this->_convertedValues[$field];
@@ -1324,7 +1324,7 @@ 
             
             case 'boolean':
             {
-                $value = (boolean)$value;
+                $value = (boolean) $value;
             }
             
             case 'decimal':
@@ -1519,7 +1519,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';

config/app.php

Spacing +2 added lines, -2 removed lines

@@ -2,6 +2,6 @@
 use \Divergence\App as App;
 
 return [
-    'debug'			=>	file_exists(App::$ApplicationPath . '/.debug'),
-    'environment'	=>	(file_exists(App::$ApplicationPath . '/.dev') ? 'dev' : 'production'),
+    'debug'			=>	file_exists(App::$ApplicationPath.'/.debug'),
+    'environment'	=>	(file_exists(App::$ApplicationPath.'/.dev') ? 'dev' : 'production'),
 ];