Divergence / framework

src/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');
         }
 
 

src/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)

src/Models/ActiveRecord.php

Indentation +2 added lines, -2 removed lines

@@ -84,8 +84,8 @@
     
     
     /**
-    * @var array $validators Validation checks
-    */
+     * @var array $validators Validation checks
+     */
     public static $validators = [];
 
     /**

Spacing +12 added lines, -12 removed lines

@@ -737,7 +737,7 @@ 
 
             // create new or update existing
             if ($this->_isPhantom) {
-                DB::nonQuery((new Insert())->setTable(static::$tableName)->set($set), null, [static::class,'handleException']);
+                DB::nonQuery((new Insert())->setTable(static::$tableName)->set($set), null, [static::class, 'handleException']);
                 $primaryKey = $this->getPrimaryKey();
                 $insertID = DB::insertID();
                 $fields = static::getClassFields();
@@ -750,8 +750,8 @@ 
                 $this->_isNew = true;
             } elseif (count($set)) {
                 DB::nonQuery((new Update())->setTable(static::$tableName)->set($set)->where(
-                    sprintf('`%s` = %u', static::_cn($this->getPrimaryKey()), (string)$this->getPrimaryKeyValue())
-                ), null, [static::class,'handleException']);
+                    sprintf('`%s` = %u', static::_cn($this->getPrimaryKey()), (string) $this->getPrimaryKeyValue())
+                ), null, [static::class, 'handleException']);
 
                 $this->_isUpdated = true;
             }
@@ -783,11 +783,11 @@ 
                 $recordValues = $this->_prepareRecordValues();
                 $set = static::_mapValuesToSet($recordValues);
 
-                DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class,'handleException']);
+                DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class, 'handleException']);
             }
         }
 
-        return static::delete((string)$this->getPrimaryKeyValue());
+        return static::delete((string) $this->getPrimaryKeyValue());
     }
 
     /**
@@ -798,7 +798,7 @@ 
      */
     public static function delete($id): bool
     {
-        DB::nonQuery((new Delete())->setTable(static::$tableName)->where(sprintf('`%s` = %u', static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'), $id)), null, [static::class,'handleException']);
+        DB::nonQuery((new Delete())->setTable(static::$tableName)->where(sprintf('`%s` = %u', static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'), $id)), null, [static::class, 'handleException']);
 
         return DB::affectedRows() > 0;
     }
@@ -851,7 +851,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'];
@@ -1018,7 +1018,7 @@ 
             // clear buffer (required for the next query to work without running fetchAll first
             $Statement->closeCursor();
 
-            return $Connection->query((string)$query); // now the query should finish with no error
+            return $Connection->query((string) $query); // now the query should finish with no error
         } else {
             return DB::handleException($e, $query, $queryLog);
         }
@@ -1117,8 +1117,8 @@ 
 
                     // skip these because they are built in
                     if (in_array($property->getName(), [
-                        '_classFields','_classRelationships','_classBeforeSave','_classAfterSave','_fieldsDefined','_relationshipsDefined','_eventsDefined','_record','_validator'
-                        ,'_validationErrors','_isDirty','_isValid','_convertedValues','_originalValues','_isPhantom','_wasPhantom','_isNew','_isUpdated','_relatedObjects'
+                        '_classFields', '_classRelationships', '_classBeforeSave', '_classAfterSave', '_fieldsDefined', '_relationshipsDefined', '_eventsDefined', '_record', '_validator'
+                        ,'_validationErrors', '_isDirty', '_isValid', '_convertedValues', '_originalValues', '_isPhantom', '_wasPhantom', '_isNew', '_isUpdated', '_relatedObjects'
                     ])) {
                         continue;
                     }
@@ -1248,7 +1248,7 @@ 
     private function applyNewValue($type, $field, $value)
     {
         if (!isset($this->_convertedValues[$field])) {
-            if (is_null($value) && !in_array($type, ['set','list'])) {
+            if (is_null($value) && !in_array($type, ['set', 'list'])) {
                 unset($this->_convertedValues[$field]);
                 return null;
             }
@@ -1521,7 +1521,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/IO/Database/SQL.php

Spacing +4 added lines, -4 removed lines

@@ -32,8 +32,8 @@ 
     public static function escape($str)
     {
         return str_replace(
-            ["\\",  "\x00", "\n",  "\r",  "'",  '"', "\x1a"],
-            ["\\\\","\\0","\\n", "\\r", "\'", '\"', "\\Z"],
+            ["\\", "\x00", "\n", "\r", "'", '"', "\x1a"],
+            ["\\\\", "\\0", "\\n", "\\r", "\'", '\"', "\\Z"],
             $str
         );
     }
@@ -210,10 +210,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]");

src/Models/Auth/Session.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
             $Session->setFields($sessionData);
             if (function_exists('fastcgi_finish_request')) {
                 // @codeCoverageIgnoreStart
-                register_shutdown_function(function ($Session) {
+                register_shutdown_function(function($Session) {
                     $Session->save();
                 }, $Session);
             // @codeCoverageIgnoreEnd

src/Models/Versioning.php

Spacing +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
             // save a copy to history table
             $recordValues = $this->_prepareRecordValues();
             $set = static::_mapValuesToSet($recordValues);
-            DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class,'handleError']);
+            DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class, 'handleError']);
         }
     }
 }

src/IO/Database/Query/Select.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
     public function __toString(): string
     {
-        $expression = ($this->calcFoundRows ? 'SQL_CALC_FOUND_ROWS ' : '') . $this->expression;
+        $expression = ($this->calcFoundRows ? 'SQL_CALC_FOUND_ROWS ' : '').$this->expression;
 
         if (isset($this->tableAlias)) {
             $from = sprintf('`%s` AS `%s`', $this->table, $this->tableAlias);

config/app.php

Spacing +2 added lines, -2 removed lines

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

src/Controllers/RecordsRequestHandler.php

Spacing +7 added lines, -10 removed lines

@@ -69,7 +69,7 @@ 
             // check access for API response modes
             $this->responseBuilder = JsonBuilder::class;
 
-            if (in_array($this->responseBuilder, [JsonBuilder::class,JsonpBuilder::class])) {
+            if (in_array($this->responseBuilder, [JsonBuilder::class, JsonpBuilder::class])) {
                 if (!$this->checkAPIAccess()) {
                     return $this->throwAPIUnAuthorizedError();
                 }
@@ -82,8 +82,7 @@ 
     public function handleRecordsRequest($action = false): ResponseInterface
     {
         switch ($action ? $action : $action = $this->shiftPath()) {
-            case 'save':
-                {
+            case 'save' : {
                     return $this->handleMultiSaveRequest();
                 }
 
@@ -224,9 +223,7 @@ 
         }
 
         switch ($action ? $action : $action = $this->shiftPath()) {
-            case '':
-            case false:
-                {
+            case '' : case false : {
                     $className = static::$recordClass;
 
                     return $this->respond($this->getTemplateName($className::$singularNoun), [
@@ -314,7 +311,7 @@ 
     {
         $className = static::$recordClass;
 
-        $this->prepareResponseModeJSON(['POST','PUT']);
+        $this->prepareResponseModeJSON(['POST', 'PUT']);
 
         if (!empty($_REQUEST['data'])) {
             if ($className::fieldExists(key($_REQUEST['data']))) {
@@ -389,7 +386,7 @@ 
     {
         $className = static::$recordClass;
 
-        $this->prepareResponseModeJSON(['POST','PUT','DELETE']);
+        $this->prepareResponseModeJSON(['POST', 'PUT', 'DELETE']);
 
         if (!empty($_REQUEST['data'])) {
             if ($className::fieldExists(key($_REQUEST['data']))) {
@@ -453,7 +450,7 @@ 
             return $this->throwUnauthorizedError();
         }
 
-        if (in_array($_SERVER['REQUEST_METHOD'], ['POST','PUT'])) {
+        if (in_array($_SERVER['REQUEST_METHOD'], ['POST', 'PUT'])) {
             if ($this->responseBuilder === JsonBuilder::class) {
                 $_REQUEST = JSON::getRequestData();
                 if (is_array($_REQUEST['data'])) {
@@ -603,7 +600,7 @@ 
 
     public 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);
     }