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/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/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;
     }

classes/Divergence/Helpers/JSONP.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
             throw new \Exception(json_last_error_msg());
         }
         header('Content-type: application/javascript; charset=utf-8', true);
-        echo 'var data = ' . $JSON;
+        echo 'var data = '.$JSON;
     }
     
     public static function translateAndRespond($data)

classes/Divergence/IO/Database/SQL.php

Spacing +5 added lines, -5 removed lines

@@ -33,8 +33,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
         );
     }
@@ -142,7 +142,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':
@@ -172,10 +172,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:
                 throw new Exception("getSQLType: unhandled type $field[type]");