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/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'])) {

src/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']) {

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 +21 added lines, -21 removed lines

@@ -720,7 +720,7 @@ 
                         static::$tableName,
                         join(',', $set),
                     ],
-                    [static::class,'handleError']
+                    [static::class, 'handleError']
                 );
                 $this->_record[static::$primaryKey ? static::$primaryKey : 'ID'] = DB::insertID();
                 $this->_isPhantom = false;
@@ -734,7 +734,7 @@ 
                         static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'),
                         $this->getPrimaryKeyValue(),
                     ],
-                    [static::class,'handleError']
+                    [static::class, 'handleError']
                 );
 
                 $this->_isUpdated = true;
@@ -792,7 +792,7 @@ 
             static::$tableName,
             static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'),
             $id,
-        ], [static::class,'handleError']);
+        ], [static::class, 'handleError']);
 
         return DB::affectedRows() > 0;
     }
@@ -880,9 +880,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']);
         }
     }
 
@@ -928,7 +928,7 @@ 
                 join(') AND (', $conditions),
                 $order ? 'ORDER BY '.join(',', $order) : '',
             ],
-            [static::class,'handleError']
+            [static::class, 'handleError']
         );
     }
 
@@ -941,7 +941,7 @@ 
      */
     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']));
     }
 
     /**
@@ -1024,7 +1024,7 @@ 
                     return ', '.$value.' AS '.$key;
                 }
             } else {
-                return ', ' . $columns;
+                return ', '.$columns;
             }
         }
     }
@@ -1038,7 +1038,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).')';
         }
     }
 
@@ -1088,7 +1088,7 @@ 
         ];
 
         if ($options['order']) {
-            $query .= ' ORDER BY ' . join(',', static::_mapFieldOrder($options['order']));
+            $query .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order']));
         }
 
         if ($options['limit']) {
@@ -1096,9 +1096,9 @@ 
         }
 
         if ($options['indexField']) {
-            return DB::table(static::_cn($options['indexField']), $query, $params, null, [static::class,'handleError']);
+            return DB::table(static::_cn($options['indexField']), $query, $params, null, [static::class, 'handleError']);
         } else {
-            return DB::allRecords($query, $params, [static::class,'handleError']);
+            return DB::allRecords($query, $params, [static::class, 'handleError']);
         }
     }
 
@@ -1135,7 +1135,7 @@ 
         ];
 
         if ($options['order']) {
-            $query .= ' ORDER BY ' . join(',', static::_mapFieldOrder($options['order']));
+            $query .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order']));
         }
 
         if ($options['limit']) {
@@ -1143,9 +1143,9 @@ 
         }
 
         if ($options['indexField']) {
-            return DB::table(static::_cn($options['indexField']), $query, $params, null, [static::class,'handleError']);
+            return DB::table(static::_cn($options['indexField']), $query, $params, null, [static::class, 'handleError']);
         } else {
-            return DB::allRecords($query, $params, [static::class,'handleError']);
+            return DB::allRecords($query, $params, [static::class, 'handleError']);
         }
     }
 
@@ -1158,12 +1158,12 @@ 
      */
     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']));
     }
 
 
@@ -1296,7 +1296,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'];
@@ -1731,7 +1731,7 @@ 
                 case 'boolean':
                 {
                     if (!isset($this->_convertedValues[$field])) {
-                        $this->_convertedValues[$field] = (boolean)$value;
+                        $this->_convertedValues[$field] = (boolean) $value;
                     }
 
                     return $this->_convertedValues[$field];
@@ -1770,7 +1770,7 @@ 
 
     protected function _setBooleanValue($value)
     {
-        return (boolean)$value;
+        return (boolean) $value;
     }
 
     protected function _setDecimalValue($value)
@@ -2010,7 +2010,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 +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
             // update session
             $Session->setFields($sessionData);
             if (function_exists('fastcgi_finish_request')) {
-                register_shutdown_function(function (&$Session) {
+                register_shutdown_function(function(&$Session) {
                     $Session->save();
                 }, $Session);
             } else {

src/Models/Media/Audio.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
         $PreviewMedia = Media::createFromFile($previewPath, [
             'ContextClass' => 'Media'
             ,'ContextID' => $this->ID
-            ,'Caption' => sprintf('%u sec preview (%us-%us)', static::$previewDuration, $startTime, $startTime+static::$previewDuration),
+            ,'Caption' => sprintf('%u sec preview (%us-%us)', static::$previewDuration, $startTime, $startTime + static::$previewDuration),
         ]);
 
         return $PreviewMedia;

src/Models/Media/Media.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
 
     public static $searchConditions = [
         'Caption' => [
-            'qualifiers' => ['any','caption']
+            'qualifiers' => ['any', 'caption']
             ,'points' => 2
             ,'sql' => 'Caption LIKE "%%%s%%"',
         ]
@@ -97,7 +97,7 @@ 
     public static $defaultFilenameFormat = 'default.%s.jpg';
     public static $newDirectoryPermissions = 0775;
     public static $newFilePermissions = 0664;
-    public static $magicPath = null;//'/usr/share/misc/magic.mgc';
+    public static $magicPath = null; //'/usr/share/misc/magic.mgc';
     public static $useFaceDetection = true;
     public static $faceDetectionTimeLimit = 10;
 
@@ -612,7 +612,7 @@ 
 
     public static function getBlankPath($contextClass)
     {
-        $path = ['site-root','img',sprintf(static::$defaultFilenameFormat, $contextClass)];
+        $path = ['site-root', 'img', sprintf(static::$defaultFilenameFormat, $contextClass)];
 
         if ($node = Site::resolvePath($path)) {
             return $node->RealPath;

src/Models/Media/Video.php

Spacing +4 added lines, -4 removed lines

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