Divergence / framework

src/Models/ActiveRecord.php

Spacing +21 added lines, -21 removed lines

@@ -531,7 +531,7 @@ 
                         static::$tableName,
                         join(',', $set),
                     ],
-                    [static::class,'handleError']
+                    [static::class, 'handleError']
                 );
                 
                 $this->_record[static::$primaryKey ? static::$primaryKey : 'ID'] = DB::insertID();
@@ -546,7 +546,7 @@ 
                         static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'),
                         $this->getPrimaryKeyValue(),
                     ],
-                    [static::class,'handleError']
+                    [static::class, 'handleError']
                 );
                 
                 $this->_isUpdated = true;
@@ -595,7 +595,7 @@ 
             static::$tableName,
             static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'),
             $id,
-        ], [static::class,'handleError']);
+        ], [static::class, 'handleError']);
         
         return DB::affectedRows() > 0;
     }
@@ -661,9 +661,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']);
         }
     }
     
@@ -697,13 +697,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 = [])
@@ -750,7 +750,7 @@ 
                     return ', '.$value.' AS '.$key;
                 }
             } else {
-                return ', ' . $columns;
+                return ', '.$columns;
             }
         }
     }
@@ -758,7 +758,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).')';
         }
     }
 
@@ -801,7 +801,7 @@ 
         ];
         
         if ($options['order']) {
-            $query .= ' ORDER BY ' . join(',', static::_mapFieldOrder($options['order']));
+            $query .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order']));
         }
         
         if ($options['limit']) {
@@ -809,9 +809,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']);
         }
     }
     
@@ -836,7 +836,7 @@ 
         ];
         
         if ($options['order']) {
-            $query .= ' ORDER BY ' . join(',', static::_mapFieldOrder($options['order']));
+            $query .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order']));
         }
         
         if ($options['limit']) {
@@ -844,20 +844,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']));
     }
 
     
@@ -955,7 +955,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'];
@@ -1316,7 +1316,7 @@ 
                 case 'boolean':
                 {
                     if (!isset($this->_convertedValues[$field])) {
-                        $this->_convertedValues[$field] = (boolean)$value;
+                        $this->_convertedValues[$field] = (boolean) $value;
                     }
                     
                     return $this->_convertedValues[$field];
@@ -1355,7 +1355,7 @@ 
 
     protected function _setBooleanValue($value)
     {
-        return (boolean)$value;
+        return (boolean) $value;
     }
 
     protected function _setDecimalValue($value)
@@ -1595,7 +1595,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';

src/Controllers/RecordsRequestHandler.php

Spacing +7 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
         if (static::peekPath() == 'json') {
             // check access for API response modes
             static::$responseMode = static::shiftPath();
-            if (in_array(static::$responseMode, ['json','jsonp'])) {
+            if (in_array(static::$responseMode, ['json', 'jsonp'])) {
                 if (!static::checkAPIAccess()) {
                     return static::throwAPIUnAuthorizedError();
                 }
@@ -51,8 +51,7 @@ 
     public static function handleRecordsRequest($action = false)
     {
         switch ($action ? $action : $action = static::shiftPath()) {
-            case 'save':
-            {
+            case 'save' : {
                 return static::handleMultiSaveRequest();
             }
             
@@ -190,9 +189,7 @@ 
         }
 
         switch ($action ? $action : $action = static::shiftPath()) {
-            case '':
-            case false:
-            {
+            case '' : case false : {
                 $className = static::$recordClass;
                 
                 return static::respond(static::getTemplateName($className::$singularNoun), [
@@ -280,7 +277,7 @@ 
     {
         $className = static::$recordClass;
             
-        static::prepareResponseModeJSON(['POST','PUT']);
+        static::prepareResponseModeJSON(['POST', 'PUT']);
         
         if ($className::fieldExists(key($_REQUEST['data']))) {
             $_REQUEST['data'] = [$_REQUEST['data']];
@@ -352,7 +349,7 @@ 
     {
         $className = static::$recordClass;
 
-        static::prepareResponseModeJSON(['POST','PUT','DELETE']);
+        static::prepareResponseModeJSON(['POST', 'PUT', 'DELETE']);
         
         if ($className::fieldExists(key($_REQUEST['data']))) {
             $_REQUEST['data'] = [$_REQUEST['data']];
@@ -414,7 +411,7 @@ 
             return static::throwUnauthorizedError();
         }
 
-        if (in_array($_SERVER['REQUEST_METHOD'], ['POST','PUT'])) {
+        if (in_array($_SERVER['REQUEST_METHOD'], ['POST', 'PUT'])) {
             if (static::$responseMode == 'json') {
                 $_REQUEST = JSON::getRequestData();
                 if (is_array($_REQUEST['data'])) {
@@ -575,7 +572,7 @@ 
 
     public static function getTemplateName($noun)
     {
-        return preg_replace_callback('/\s+([a-zA-Z])/', function ($matches) {
+        return preg_replace_callback('/\s+([a-zA-Z])/', function($matches) {
             return strtoupper($matches[1]);
         }, $noun);
     }