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

@@ -723,14 +723,14 @@ 
 
             // create new or update existing
             if ($this->_isPhantom) {
-                DB::nonQuery((new Insert())->setTable(static::$tableName)->set($set), null, [static::class,'handleError']);
+                DB::nonQuery((new Insert())->setTable(static::$tableName)->set($set), null, [static::class, 'handleError']);
                 $this->_record[$this->getPrimaryKey()] = DB::insertID();
                 $this->_isPhantom = false;
                 $this->_isNew = true;
             } 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,'handleError']);
+                ), null, [static::class, 'handleError']);
 
                 $this->_isUpdated = true;
             }
@@ -762,7 +762,7 @@ 
                 $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']);
             }
         }
 
@@ -777,7 +777,7 @@ 
      */
     public static function delete($id)
     {
-        DB::nonQuery((new Delete())->setTable(static::$tableName)->where(sprintf('`%s` = %u', static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'), $id)), null, [static::class,'handleError']);
+        DB::nonQuery((new Delete())->setTable(static::$tableName)->where(sprintf('`%s` = %u', static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'), $id)), null, [static::class, 'handleError']);
 
         return DB::affectedRows() > 0;
     }
@@ -830,7 +830,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'];
@@ -1235,7 +1235,7 @@ 
                 case 'boolean':
                     {
                         if (!isset($this->_convertedValues[$field])) {
-                            $this->_convertedValues[$field] = (bool)$value;
+                            $this->_convertedValues[$field] = (bool) $value;
                         }
 
                         return $this->_convertedValues[$field];
@@ -1463,7 +1463,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/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/IO/Database/MySQL.php

Spacing +7 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
      * @param string $label
      * @return void
      */
-    public static function setConnection(string $label=null)
+    public static function setConnection(string $label = null)
     {
         if ($label === null && static::$currentConnection === null) {
             static::$currentConnection = static::getDefaultLabel();
@@ -132,7 +132,7 @@ 
      * @uses static::$Timezone
      * @uses PDO
      */
-    public static function getConnection($label=null)
+    public static function getConnection($label = null)
     {
         if ($label === null) {
             if (static::$currentConnection === null) {
@@ -151,10 +151,10 @@ 
 
             if (isset($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 {
@@ -183,7 +183,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) {
@@ -520,7 +520,7 @@ 
         $error = static::getConnection()->errorInfo();
         $message = $error[2];
 
-        if (App::$App->Config['environment']=='dev') {
+        if (App::$App->Config['environment'] == 'dev') {
             $Handler = \Divergence\App::$App->whoops->popHandler();
 
             $Handler->addDataTable("Query Information", [
@@ -561,7 +561,7 @@ 
      */
     protected static function startQueryLog($query)
     {
-        if (App::$App->Config['environment']!='dev') {
+        if (App::$App->Config['environment'] != 'dev') {
             return false;
         }
 

src/App.php

Spacing +2 added lines, -2 removed lines

@@ -43,9 +43,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/Media/Media.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
 
     public static $searchConditions = [
         'Caption' => [
-            'qualifiers' => ['any','caption'],
+            'qualifiers' => ['any', 'caption'],
             'points' => 2,
             'sql' => 'Caption LIKE "%%%s%%"',
         ],
@@ -109,7 +109,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;
 
@@ -628,7 +628,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;