@@ -98,7 +98,7 @@ |
||
98 | 98 | |
99 | 99 | // check validator |
100 | 100 | if (!is_callable($validator)) { |
101 | - throw new Exception('Validator for field ' . $options['id'] . ' is not callable'); |
|
101 | + throw new Exception('Validator for field '.$options['id'].' is not callable'); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | |
69 | 69 | if ($options['type'] == 'one-one') { |
70 | 70 | if (empty($options['local'])) { |
71 | - $options['local'] = $relationship . 'ID'; |
|
71 | + $options['local'] = $relationship.'ID'; |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | if (empty($options['foreign'])) { |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | } |
81 | 81 | |
82 | 82 | if (empty($options['foreign'])) { |
83 | - $options['foreign'] = $classShortName. 'ID'; |
|
83 | + $options['foreign'] = $classShortName.'ID'; |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | if (!isset($options['indexField'])) { |
@@ -142,12 +142,12 @@ discard block |
||
142 | 142 | } |
143 | 143 | |
144 | 144 | if (empty($options['linkLocal'])) { |
145 | - $options['linkLocal'] = $classShortName . 'ID'; |
|
145 | + $options['linkLocal'] = $classShortName.'ID'; |
|
146 | 146 | } |
147 | 147 | |
148 | 148 | if (empty($options['linkForeign'])) { |
149 | 149 | $foreignShortname = basename(str_replace('\\', '/', $options['class']::$rootClass)); |
150 | - $options['linkForeign'] = $foreignShortname . 'ID'; |
|
150 | + $options['linkForeign'] = $foreignShortname.'ID'; |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | if (empty($options['local'])) { |
@@ -11,7 +11,7 @@ |
||
11 | 11 | throw new \Exception(json_last_error_msg()); |
12 | 12 | } |
13 | 13 | header('Content-type: application/javascript; charset=utf-8', true); |
14 | - echo 'var data = ' . $JSON; |
|
14 | + echo 'var data = '.$JSON; |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | public static function translateAndRespond($data) |
@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | public static function escape($str) |
33 | 33 | { |
34 | 34 | return str_replace( |
35 | - ["\\", "\x00", "\n", "\r", "'", '"', "\x1a"], |
|
36 | - ["\\\\","\\0","\\n", "\\r", "\'", '\"', "\\Z"], |
|
35 | + ["\\", "\x00", "\n", "\r", "'", '"', "\x1a"], |
|
36 | + ["\\\\", "\\0", "\\n", "\\r", "\'", '\"', "\\Z"], |
|
37 | 37 | $str |
38 | 38 | ); |
39 | 39 | } |
@@ -210,10 +210,10 @@ discard block |
||
210 | 210 | return 'year'; |
211 | 211 | |
212 | 212 | case 'enum': |
213 | - return sprintf('enum("%s")', join('","', array_map([static::class,'escape'], $field['values']))); |
|
213 | + return sprintf('enum("%s")', join('","', array_map([static::class, 'escape'], $field['values']))); |
|
214 | 214 | |
215 | 215 | case 'set': |
216 | - return sprintf('set("%s")', join('","', array_map([static::class,'escape'], $field['values']))); |
|
216 | + return sprintf('set("%s")', join('","', array_map([static::class, 'escape'], $field['values']))); |
|
217 | 217 | |
218 | 218 | default: |
219 | 219 | throw new Exception("getSQLType: unhandled type $field[type]"); |
@@ -90,7 +90,7 @@ |
||
90 | 90 | $PreviewMedia = Media::createFromFile($previewPath, [ |
91 | 91 | 'ContextClass' => 'Media' |
92 | 92 | ,'ContextID' => $this->ID |
93 | - ,'Caption' => sprintf('%u sec preview (%us-%us)', static::$previewDuration, $startTime, $startTime+static::$previewDuration), |
|
93 | + ,'Caption' => sprintf('%u sec preview (%us-%us)', static::$previewDuration, $startTime, $startTime + static::$previewDuration), |
|
94 | 94 | ]); |
95 | 95 | |
96 | 96 | return $PreviewMedia; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | * @param string $label |
100 | 100 | * @return void |
101 | 101 | */ |
102 | - public static function setConnection(string $label=null) |
|
102 | + public static function setConnection(string $label = null) |
|
103 | 103 | { |
104 | 104 | if ($label === null && static::$currentConnection === null) { |
105 | 105 | static::$currentConnection = static::getDefaultLabel(); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * @uses static::$Timezone |
133 | 133 | * @uses PDO |
134 | 134 | */ |
135 | - public static function getConnection($label=null) |
|
135 | + public static function getConnection($label = null) |
|
136 | 136 | { |
137 | 137 | if ($label === null) { |
138 | 138 | if (static::$currentConnection === null) { |
@@ -151,10 +151,10 @@ discard block |
||
151 | 151 | |
152 | 152 | if (isset($config['socket'])) { |
153 | 153 | // socket connection |
154 | - $DSN = 'mysql:unix_socket=' . $config['socket'] . ';dbname=' . $config['database']; |
|
154 | + $DSN = 'mysql:unix_socket='.$config['socket'].';dbname='.$config['database']; |
|
155 | 155 | } else { |
156 | 156 | // tcp connection |
157 | - $DSN = 'mysql:host=' . $config['host'] . ';port=' . $config['port'] .';dbname=' . $config['database']; |
|
157 | + $DSN = 'mysql:host='.$config['host'].';port='.$config['port'].';dbname='.$config['database']; |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | try { |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | { |
184 | 184 | if (is_string($data)) { |
185 | 185 | $data = static::getConnection()->quote($data); |
186 | - $data = substr($data, 1, strlen($data)-2); |
|
186 | + $data = substr($data, 1, strlen($data) - 2); |
|
187 | 187 | return $data; |
188 | 188 | } elseif (is_array($data)) { |
189 | 189 | foreach ($data as $key=>$string) { |
@@ -520,7 +520,7 @@ discard block |
||
520 | 520 | $error = static::getConnection()->errorInfo(); |
521 | 521 | $message = $error[2]; |
522 | 522 | |
523 | - if (App::$App->Config['environment']=='dev') { |
|
523 | + if (App::$App->Config['environment'] == 'dev') { |
|
524 | 524 | $Handler = \Divergence\App::$App->whoops->popHandler(); |
525 | 525 | |
526 | 526 | $Handler->addDataTable("Query Information", [ |
@@ -561,7 +561,7 @@ discard block |
||
561 | 561 | */ |
562 | 562 | protected static function startQueryLog($query) |
563 | 563 | { |
564 | - if (App::$App->Config['environment']!='dev') { |
|
564 | + if (App::$App->Config['environment'] != 'dev') { |
|
565 | 565 | return false; |
566 | 566 | } |
567 | 567 |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | |
81 | 81 | public static $searchConditions = [ |
82 | 82 | 'Caption' => [ |
83 | - 'qualifiers' => ['any','caption'], |
|
83 | + 'qualifiers' => ['any', 'caption'], |
|
84 | 84 | 'points' => 2, |
85 | 85 | 'sql' => 'Caption LIKE "%%%s%%"', |
86 | 86 | ], |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | public static $defaultFilenameFormat = 'default.%s.jpg'; |
110 | 110 | public static $newDirectoryPermissions = 0775; |
111 | 111 | public static $newFilePermissions = 0664; |
112 | - public static $magicPath = null;//'/usr/share/misc/magic.mgc'; |
|
112 | + public static $magicPath = null; //'/usr/share/misc/magic.mgc'; |
|
113 | 113 | public static $useFaceDetection = true; |
114 | 114 | public static $faceDetectionTimeLimit = 10; |
115 | 115 | |
@@ -628,7 +628,7 @@ discard block |
||
628 | 628 | |
629 | 629 | public static function getBlankPath($contextClass) |
630 | 630 | { |
631 | - $path = ['site-root','img',sprintf(static::$defaultFilenameFormat, $contextClass)]; |
|
631 | + $path = ['site-root', 'img', sprintf(static::$defaultFilenameFormat, $contextClass)]; |
|
632 | 632 | |
633 | 633 | if ($node = Site::resolvePath($path)) { |
634 | 634 | return $node->RealPath; |
@@ -153,7 +153,7 @@ |
||
153 | 153 | // save a copy to history table |
154 | 154 | $recordValues = $this->_prepareRecordValues(); |
155 | 155 | $set = static::_mapValuesToSet($recordValues); |
156 | - DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class,'handleError']); |
|
156 | + DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class, 'handleError']); |
|
157 | 157 | } |
158 | 158 | } |
159 | 159 | } |
@@ -51,7 +51,7 @@ |
||
51 | 51 | |
52 | 52 | public function __toString(): string |
53 | 53 | { |
54 | - $expression = ($this->calcFoundRows ? 'SQL_CALC_FOUND_ROWS ' : '') . $this->expression; |
|
54 | + $expression = ($this->calcFoundRows ? 'SQL_CALC_FOUND_ROWS ' : '').$this->expression; |
|
55 | 55 | |
56 | 56 | if (isset($this->tableAlias)) { |
57 | 57 | $from = sprintf('`%s` AS `%s`', $this->table, $this->tableAlias); |