Divergence / framework

classes/Divergence/Controllers/RecordsRequestHandler.php

Spacing +7 added lines, -10 removed lines

@@ -35,7 +35,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();
                 }
@@ -49,8 +49,7 @@ 
     public static function handleRecordsRequest($action = false)
     {
         switch ($action ? $action : $action = static::shiftPath()) {
-            case 'save':
-            {
+            case 'save' : {
                 return static::handleMultiSaveRequest();
             }
             
@@ -175,9 +174,7 @@ 
     public static function handleRecordRequest(ActiveRecord $Record, $action = false)
     {
         switch ($action ? $action : $action = static::shiftPath()) {
-            case '':
-            case false:
-            {
+            case '' : case false : {
                 $className = static::$recordClass;
                 
                 return static::respond(static::getTemplateName($className::$singularNoun), [
@@ -211,7 +208,7 @@ 
     
         $PrimaryKey = $className::getPrimaryKey();
             
-        if (static::$responseMode == 'json' && in_array($_SERVER['REQUEST_METHOD'], ['POST','PUT'])) {
+        if (static::$responseMode == 'json' && in_array($_SERVER['REQUEST_METHOD'], ['POST', 'PUT'])) {
             $JSONData = JSON::getRequestData();
             if (is_array($JSONData)) {
                 $_REQUEST = $JSONData;
@@ -299,7 +296,7 @@ 
 
         $PrimaryKey = $className::getPrimaryKey();
             
-        if (static::$responseMode == 'json' && in_array($_SERVER['REQUEST_METHOD'], ['POST','PUT','DELETE'])) {
+        if (static::$responseMode == 'json' && in_array($_SERVER['REQUEST_METHOD'], ['POST', 'PUT', 'DELETE'])) {
             $JSONData = JSON::getRequestData();
             if (is_array($JSONData)) {
                 $_REQUEST = $JSONData;
@@ -394,7 +391,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'])) {
@@ -554,7 +551,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);
     }

classes/Divergence/Controllers/RequestHandler.php

Spacing +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
         }
     
         switch ($responseMode ? $responseMode : static::$responseMode) {
-            case 'json':
-                JSON::translateAndRespond($responseData);
+            case 'json' : JSON::translateAndRespond($responseData);
                 break;
             case 'jsonp':
                 JSONP::translateAndRespond($responseData);

classes/Divergence/Models/ActiveRecord.php

Indentation +6 added lines, -6 removed lines

@@ -11,9 +11,9 @@ 
 {
     // configurables
     /**
-    * Set this to true if you want the table(s) to automatically be created when not found.
-    * @var bool
-    */
+     * Set this to true if you want the table(s) to automatically be created when not found.
+     * @var bool
+     */
     public static $autoCreateTables = true;
     
     /**
@@ -63,9 +63,9 @@ 
     
     
     /**
-    * Validation checks
-    * @var array
-    */
+     * Validation checks
+     * @var array
+     */
     public static $validators = [];
 
     /**

Spacing +22 added lines, -22 removed lines

@@ -414,7 +414,7 @@ 
                         static::$tableName
                         , join(',', $set),
                     ],
-                    [static::class,'handleError']
+                    [static::class, 'handleError']
                 );
                 
                 $this->_record[static::$primaryKey ? static::$primaryKey : 'ID'] = DB::insertID();
@@ -429,7 +429,7 @@ 
                         , static::_cn(static::$primaryKey ? static::$primaryKey : 'ID')
                         , $this->getPrimaryKeyValue(),
                     ],
-                    [static::class,'handleError']
+                    [static::class, 'handleError']
                 );
                 
                 $this->_isUpdated = true;
@@ -497,7 +497,7 @@ 
             static::$tableName
             ,static::_cn(static::$primaryKey ? static::$primaryKey : 'ID')
             ,$id,
-        ], [static::class,'handleError']);
+        ], [static::class, 'handleError']);
         
         return DB::affectedRows() > 0;
     }
@@ -563,9 +563,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']);
         }
     }
     
@@ -599,13 +599,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 = [])
@@ -700,7 +700,7 @@ 
         }
         
         // build query
-        $query  = 'SELECT %1$s `%3$s`.*';
+        $query = 'SELECT %1$s `%3$s`.*';
         
         if (!empty($options['extraColumns'])) {
             if (is_array($options['extraColumns'])) {
@@ -708,14 +708,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 = [
@@ -729,7 +729,7 @@ 
         
 
         if ($options['order']) {
-            $query .= ' ORDER BY ' . join(',', static::_mapFieldOrder($options['order']));
+            $query .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order']));
         }
         
         if ($options['limit']) {
@@ -737,9 +737,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']);
         }
     }
     
@@ -764,7 +764,7 @@ 
         ];
         
         if ($options['order']) {
-            $query .= ' ORDER BY ' . join(',', static::_mapFieldOrder($options['order']));
+            $query .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order']));
         }
         
         if ($options['limit']) {
@@ -772,20 +772,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']));
     }
 
     
@@ -888,7 +888,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'];
@@ -1219,7 +1219,7 @@ 
                 case 'boolean':
                 {
                     if (!isset($this->_convertedValues[$field])) {
-                        $this->_convertedValues[$field] = (boolean)$value;
+                        $this->_convertedValues[$field] = (boolean) $value;
                     }
                     
                     return $this->_convertedValues[$field];
@@ -1300,7 +1300,7 @@ 
             
             case 'boolean':
             {
-                $value = (boolean)$value;
+                $value = (boolean) $value;
             }
             
             case 'decimal':
@@ -1495,7 +1495,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';

classes/Divergence/Models/Versioning.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         ];
         
         if ($options['order']) {
-            $query .= ' ORDER BY ' . join(',', static::_mapFieldOrder($options['order']));
+            $query .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order']));
         }
         
         if ($options['limit']) {

classes/Divergence/Models/RecordValidator.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 
         // check validator
         if (!is_callable($validator)) {
-            throw new Exception('Validator for field ' . $options['id'] . ' is not callable');
+            throw new Exception('Validator for field '.$options['id'].' is not callable');
         }
 
 

classes/Divergence/Models/Relations.php

Spacing +4 added lines, -4 removed lines

@@ -68,7 +68,7 @@ 
         
         if ($options['type'] == 'one-one') {
             if (empty($options['local'])) {
-                $options['local'] = $relationship . 'ID';
+                $options['local'] = $relationship.'ID';
             }
                 
             if (empty($options['foreign'])) {
@@ -80,7 +80,7 @@ 
             }
                     
             if (empty($options['foreign'])) {
-                $options['foreign'] =  $classShortName. 'ID';
+                $options['foreign'] = $classShortName.'ID';
             }
                 
             if (!isset($options['indexField'])) {
@@ -142,12 +142,12 @@ 
             }
                 
             if (empty($options['linkLocal'])) {
-                $options['linkLocal'] = $classShortName . 'ID';
+                $options['linkLocal'] = $classShortName.'ID';
             }
         
             if (empty($options['linkForeign'])) {
                 $foreignShortname = basename(str_replace('\\', '/', $options['class']::$rootClass));
-                $options['linkForeign'] =  $foreignShortname . 'ID';
+                $options['linkForeign'] = $foreignShortname.'ID';
             }
         
             if (empty($options['local'])) {

classes/Divergence/IO/Database/MySQL.php

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
     protected static $LastStatement;
     protected static $Config;
     
-    public static function getConnection($label=null)
+    public static function getConnection($label = null)
     {
         if (!$label) {
             $label = static::getDefaultLabel();
@@ -38,10 +38,10 @@ 
             
             if ($config['socket']) {
                 // socket connection
-                $DSN = 'mysql:unix_socket=' . $config['socket'] . ';dbname=' . $config['database'];
+                $DSN = 'mysql:unix_socket='.$config['socket'].';dbname='.$config['database'];
             } else {
                 // tcp connection
-                $DSN = 'mysql:host=' . $config['host'] . ';port=' . $config['port'] .';dbname=' . $config['database'];
+                $DSN = 'mysql:host='.$config['host'].';port='.$config['port'].';dbname='.$config['database'];
             }
             
             try {
@@ -64,7 +64,7 @@ 
     {
         if (is_string($data)) {
             $data = static::getConnection()->quote($data);
-            $data = substr($data, 1, strlen($data)-2);
+            $data = substr($data, 1, strlen($data) - 2);
             return $data;
         } elseif (is_array($data)) {
             foreach ($data as $key=>$string) {
@@ -283,7 +283,7 @@ 
         $error = static::getConnection()->errorInfo();
         $message = $error[2];
         
-        if (App::$Config['environment']=='dev') {
+        if (App::$Config['environment'] == 'dev') {
             $Handler = \Divergence\App::$whoops->popHandler();
             
             $Handler->addDataTable("Query Information", [
@@ -317,7 +317,7 @@ 
     
     protected static function startQueryLog($query)
     {
-        if (App::$Config['environment']!='dev') {
+        if (App::$Config['environment'] != 'dev') {
             return false;
         }
         

classes/Divergence/IO/Database/SQL.php

Spacing +5 added lines, -5 removed lines

@@ -13,8 +13,8 @@ 
          * Keep it. We don't need a database connection to escape strings.
          */
         return str_replace(
-            ["\\",  "\x00", "\n",  "\r",  "'",  '"', "\x1a"],
-            ["\\\\","\\0","\\n", "\\r", "\'", '\"', "\\Z"],
+            ["\\", "\x00", "\n", "\r", "'", '"', "\x1a"],
+            ["\\\\", "\\0", "\\n", "\\r", "\'", '\"', "\\Z"],
             $str
         );
     }
@@ -130,7 +130,7 @@ 
             case 'integer':
                 return 'int'.($field['unsigned'] ? ' unsigned' : '').(!empty($field['zerofill']) ? ' zerofill' : '');
             case 'decimal':
-                return sprintf('decimal(%s)', $field['length']).(!empty($field['unsigned']) ? ' unsigned' : '').(!empty($field['zerofill']) ? ' zerofill' : '');;
+                return sprintf('decimal(%s)', $field['length']).(!empty($field['unsigned']) ? ' unsigned' : '').(!empty($field['zerofill']) ? ' zerofill' : ''); ;
             case 'float':
                 return 'float';
             case 'double':
@@ -160,10 +160,10 @@ 
                 return 'year';
 
             case 'enum':
-                return sprintf('enum("%s")', join('","', array_map([static::class,'escape'], $field['values'])));
+                return sprintf('enum("%s")', join('","', array_map([static::class, 'escape'], $field['values'])));
 
             case 'set':
-                return sprintf('set("%s")', join('","', array_map([static::class,'escape'], $field['values'])));
+                return sprintf('set("%s")', join('","', array_map([static::class, 'escape'], $field['values'])));
 
             default:
                 die("getSQLType: unhandled type $field[type]");

classes/Divergence/App.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
     
     public static function config($Label)
     {
-        $Config = static::$ApplicationPath . '/config/' . $Label . '.php';
+        $Config = static::$ApplicationPath.'/config/'.$Label.'.php';
         if (!file_exists($Config)) {
-            throw new \Exception($Config . ' not found in '.static::class.'::config()');
+            throw new \Exception($Config.' not found in '.static::class.'::config()');
         }
         return require $Config;
     }