Divergence / framework

src/Models/Media/Video.php

Spacing +4 added lines, -4 removed lines

@@ -121,7 +121,7 @@ 
         }
 
         // extract video streams
-        $videoStreams = array_filter($output['streams'], function ($streamInfo) {
+        $videoStreams = array_filter($output['streams'], function($streamInfo) {
             return $streamInfo['codec_type'] == 'video';
         });
 
@@ -133,9 +133,9 @@ 
         $mediaInfo['streams'] = $output['streams'];
         $mediaInfo['videoStream'] = array_shift($videoStreams);
 
-        $mediaInfo['width'] = (int)$mediaInfo['videoStream']['width'];
-        $mediaInfo['height'] = (int)$mediaInfo['videoStream']['height'];
-        $mediaInfo['duration'] = (float)$mediaInfo['videoStream']['duration'];
+        $mediaInfo['width'] = (int) $mediaInfo['videoStream']['width'];
+        $mediaInfo['height'] = (int) $mediaInfo['videoStream']['height'];
+        $mediaInfo['duration'] = (float) $mediaInfo['videoStream']['duration'];
 
         return $mediaInfo;
     }

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/Models/Getters.php

Spacing +10 added lines, -10 removed lines

@@ -166,7 +166,7 @@ 
         return DB::oneRecord(
             (new Select())->setTable(static::$tableName)->where(join(') AND (', $conditions))->order($order ? join(',', $order) : '')->limit('1'),
             null,
-            [static::class,'handleException']
+            [static::class, 'handleException']
         );
     }
 
@@ -179,7 +179,7 @@ 
      */
     public static function getByQuery($query, $params = [])
     {
-        return static::instantiateRecord(DB::oneRecord($query, $params, [static::class,'handleException']));
+        return static::instantiateRecord(DB::oneRecord($query, $params, [static::class, 'handleException']));
     }
 
     /**
@@ -285,9 +285,9 @@ 
             $select->limit(sprintf('%u,%u', $options['offset'], $options['limit']));
         }
         if ($options['indexField']) {
-            return DB::table(static::_cn($options['indexField']), $select, null, null, [static::class,'handleException']);
+            return DB::table(static::_cn($options['indexField']), $select, null, null, [static::class, 'handleException']);
         } else {
-            return DB::allRecords($select, null, [static::class,'handleException']);
+            return DB::allRecords($select, null, [static::class, 'handleException']);
         }
     }
 
@@ -300,12 +300,12 @@ 
      */
     public static function getAllByQuery($query, $params = [])
     {
-        return static::instantiateRecords(DB::allRecords($query, $params, [static::class,'handleException']));
+        return static::instantiateRecords(DB::allRecords($query, $params, [static::class, 'handleException']));
     }
 
     public static function getTableByQuery($keyField, $query, $params = [])
     {
-        return static::instantiateRecords(DB::table($keyField, $query, $params, [static::class,'handleException']));
+        return static::instantiateRecords(DB::table($keyField, $query, $params, [static::class, 'handleException']));
     }
 
     /**
@@ -363,9 +363,9 @@ 
         }
 
         if ($options['indexField']) {
-            return DB::table(static::_cn($options['indexField']), $select, null, null, [static::class,'handleException']);
+            return DB::table(static::_cn($options['indexField']), $select, null, null, [static::class, 'handleException']);
         } else {
-            return DB::allRecords($select, null, [static::class,'handleException']);
+            return DB::allRecords($select, null, [static::class, 'handleException']);
         }
     }
 
@@ -435,7 +435,7 @@ 
                     return ', '.$value.' AS '.$key;
                 }
             } else {
-                return ', ' . $columns;
+                return ', '.$columns;
             }
         }
     }
@@ -449,7 +449,7 @@ 
     public static function buildHaving($having)
     {
         if (!empty($having)) {
-            return ' (' . (is_array($having) ? join(') AND (', static::_mapConditions($having)) : $having) . ')';
+            return ' ('.(is_array($having) ? join(') AND (', static::_mapConditions($having)) : $having).')';
         }
     }
 }

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

src/Models/SetMappers/DefaultSetMapper.php

Spacing +4 added lines, -4 removed lines

@@ -24,22 +24,22 @@
 {
     public function setStringValue($value): ?string
     {
-        return mb_convert_encoding($value??'', DB::$encoding, 'auto'); // normalize encoding to ASCII
+        return mb_convert_encoding($value ?? '', DB::$encoding, 'auto'); // normalize encoding to ASCII
     }
 
     public function setBooleanValue($value): bool
     {
-        return (bool)$value;
+        return (bool) $value;
     }
 
     public function setDecimalValue($value): ?float
     {
-        return is_null($value) ? null : (float)preg_replace('/[^-\d.]/', '', $value);
+        return is_null($value) ? null : (float) preg_replace('/[^-\d.]/', '', $value);
     }
 
     public function setIntegerValue($value): ?int
     {
-        return is_null($value) ? null : (int)preg_replace('/[^-\d]/', '', $value);
+        return is_null($value) ? null : (int) preg_replace('/[^-\d]/', '', $value);
     }
 
     public function setTimestampValue($value): ?string

src/App.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
     {
         $this->ApplicationPath = $Path;
 
-        if (php_sapi_name()!=='cli') {
+        if (php_sapi_name() !== 'cli') {
             $this->Path = new Path($_SERVER['REQUEST_URI']);
         }
         
@@ -46,9 +46,9 @@ 
 
     public function config($Label)
     {
-        $Config = $this->ApplicationPath . '/config/' . $Label . '.php';
+        $Config = $this->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;
     }

src/Models/ActiveRecord.php

Indentation +3 added lines, -3 removed lines

@@ -93,8 +93,8 @@ 
 
 
     /**
-    * @var array $validators Validation checks
-    */
+     * @var array $validators Validation checks
+     */
     public static $validators = [];
 
     /**
@@ -1134,7 +1134,7 @@ 
                         }
                     }
                 }
-             }
+                }
         }
         return [
             'fields' => $fields,

Spacing +16 added lines, -16 removed lines

@@ -727,11 +727,11 @@ 
 
             // 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();
-                if ( ($fields[$primaryKey]['type'] ?? false) === 'integer') {
+                if (($fields[$primaryKey]['type'] ?? false) === 'integer') {
                     $insertID = intval($insertID);
                 }
                 $this->_record[$primaryKey] = $insertID;
@@ -741,7 +741,7 @@ 
             } elseif (count($set)) {
                 DB::nonQuery((new Update())->setTable(static::$tableName)->set($set)->where(
                     sprintf('`%s` = %u', static::_cn($this->getPrimaryKey()), $this->getPrimaryKeyValue())
-                ), null, [static::class,'handleException']);
+                ), null, [static::class, 'handleException']);
 
                 $this->_isUpdated = true;
             }
@@ -773,7 +773,7 @@ 
                 $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']);
             }
         }
 
@@ -788,7 +788,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;
     }
@@ -841,7 +841,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'];
@@ -1008,7 +1008,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);
         }
@@ -1082,7 +1082,7 @@ 
             }
             $attributeFields = $class::_definedAttributeFields();
             if (!empty($attributeFields['fields'])) {
-                static::$_classFields[$className] = array_merge(static::$_classFields[$className],$attributeFields['fields']);
+                static::$_classFields[$className] = array_merge(static::$_classFields[$className], $attributeFields['fields']);
             }
             if (!empty($attributeFields['relations'])) {
                 $class::$relationships = $attributeFields['relations'];
@@ -1101,14 +1101,14 @@ 
         $fields = [];
         $relations = [];
         $properties = (new ReflectionClass(static::class))->getProperties();
-        if(!empty($properties)) {
+        if (!empty($properties)) {
             foreach ($properties as $property) {
                 if ($property->isProtected()) {
 
                     // skip these because they are built in
-                    if (in_array($property->getName(),[
-                        '_classFields','_classRelationships','_classBeforeSave','_classAfterSave','_fieldsDefined','_relationshipsDefined','_eventsDefined','_record','_validator'
-                        ,'_validationErrors','_isDirty','_isValid','fieldSetMapper','_convertedValues','_originalValues','_isPhantom','_wasPhantom','_isNew','_isUpdated','_relatedObjects'
+                    if (in_array($property->getName(), [
+                        '_classFields', '_classRelationships', '_classBeforeSave', '_classAfterSave', '_fieldsDefined', '_relationshipsDefined', '_eventsDefined', '_record', '_validator'
+                        ,'_validationErrors', '_isDirty', '_isValid', 'fieldSetMapper', '_convertedValues', '_originalValues', '_isPhantom', '_wasPhantom', '_isNew', '_isUpdated', '_relatedObjects'
                     ])) {
                         continue;
                     }
@@ -1116,10 +1116,10 @@ 
                     $isRelationship = false;
 
                     if ($attributes = $property->getAttributes()) {
-                        foreach($attributes as $attribute) {
+                        foreach ($attributes as $attribute) {
                             $attributeName = $attribute->getName();
                             if ($attributeName === Column::class) {
-                                $fields[$property->getName()] = array_merge($attribute->getArguments(),['attributeField'=>true]);
+                                $fields[$property->getName()] = array_merge($attribute->getArguments(), ['attributeField'=>true]);
                             }
 
                             if ($attributeName === Relation::class) {
@@ -1302,7 +1302,7 @@ 
                 case 'boolean':
                     {
                         if (!isset($this->_convertedValues[$field])) {
-                            $this->_convertedValues[$field] = (bool)$value;
+                            $this->_convertedValues[$field] = (bool) $value;
                         }
 
                         return $this->_convertedValues[$field];
@@ -1538,7 +1538,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/Models/Auth/Session.php

Spacing +6 added lines, -6 removed lines

@@ -49,16 +49,16 @@ 
     #[Column(notnull: false, default:null)]
     protected $ContextClass;
 
-    #[Column(type:'int',notnull: false, default:null)]
+    #[Column(type:'int', notnull: false, default:null)]
     protected $ContextID;
 
-    #[Column(unique:true,length:32)]
+    #[Column(unique:true, length:32)]
     protected $Handle;
 
-    #[Column(type:'timestamp',notnull:false)]
+    #[Column(type:'timestamp', notnull:false)]
     protected $LastRequest;
 
-    #[Column(type:'binary',length:16)]
+    #[Column(type:'binary', length:16)]
     protected $LastIP;
 
     /**
@@ -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
@@ -149,7 +149,7 @@ 
     {
         // set handle
         if (!$this->__get('Handle')) {
-            $this->__set('Handle',static::generateUniqueHandle());
+            $this->__set('Handle', static::generateUniqueHandle());
         }
 
         // call parent