@@ -2,6 +2,6 @@ |
||
2 | 2 | use \Divergence\App as App; |
3 | 3 | |
4 | 4 | return [ |
5 | - 'debug' => file_exists(App::$ApplicationPath . '/.debug'), |
|
6 | - 'environment' => (file_exists(App::$ApplicationPath . '/.dev') ? 'dev' : 'production'), |
|
5 | + 'debug' => file_exists(App::$ApplicationPath.'/.debug'), |
|
6 | + 'environment' => (file_exists(App::$ApplicationPath.'/.dev') ? 'dev' : 'production'), |
|
7 | 7 | ]; |
@@ -33,8 +33,8 @@ discard block |
||
33 | 33 | * Keep it. We don't need a database connection to escape strings. |
34 | 34 | */ |
35 | 35 | return str_replace( |
36 | - ["\\", "\x00", "\n", "\r", "'", '"', "\x1a"], |
|
37 | - ["\\\\","\\0","\\n", "\\r", "\'", '\"', "\\Z"], |
|
36 | + ["\\", "\x00", "\n", "\r", "'", '"', "\x1a"], |
|
37 | + ["\\\\", "\\0", "\\n", "\\r", "\'", '\"', "\\Z"], |
|
38 | 38 | $str |
39 | 39 | ); |
40 | 40 | } |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | case 'integer': |
143 | 143 | return 'int'.($field['unsigned'] ? ' unsigned' : '').(!empty($field['zerofill']) ? ' zerofill' : ''); |
144 | 144 | case 'decimal': |
145 | - return sprintf('decimal(%s)', $field['length']).(!empty($field['unsigned']) ? ' unsigned' : '').(!empty($field['zerofill']) ? ' zerofill' : '');; |
|
145 | + return sprintf('decimal(%s)', $field['length']).(!empty($field['unsigned']) ? ' unsigned' : '').(!empty($field['zerofill']) ? ' zerofill' : ''); ; |
|
146 | 146 | case 'float': |
147 | 147 | return 'float'; |
148 | 148 | case 'double': |
@@ -172,10 +172,10 @@ discard block |
||
172 | 172 | return 'year'; |
173 | 173 | |
174 | 174 | case 'enum': |
175 | - return sprintf('enum("%s")', join('","', array_map([static::class,'escape'], $field['values']))); |
|
175 | + return sprintf('enum("%s")', join('","', array_map([static::class, 'escape'], $field['values']))); |
|
176 | 176 | |
177 | 177 | case 'set': |
178 | - return sprintf('set("%s")', join('","', array_map([static::class,'escape'], $field['values']))); |
|
178 | + return sprintf('set("%s")', join('","', array_map([static::class, 'escape'], $field['values']))); |
|
179 | 179 | |
180 | 180 | default: |
181 | 181 | throw new Exception("getSQLType: unhandled type $field[type]"); |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | protected static $LastStatement; |
23 | 23 | protected static $Config; |
24 | 24 | |
25 | - public static function getConnection($label=null) |
|
25 | + public static function getConnection($label = null) |
|
26 | 26 | { |
27 | 27 | if (!$label) { |
28 | 28 | $label = static::getDefaultLabel(); |
@@ -38,10 +38,10 @@ discard block |
||
38 | 38 | |
39 | 39 | if ($config['socket']) { |
40 | 40 | // socket connection |
41 | - $DSN = 'mysql:unix_socket=' . $config['socket'] . ';dbname=' . $config['database']; |
|
41 | + $DSN = 'mysql:unix_socket='.$config['socket'].';dbname='.$config['database']; |
|
42 | 42 | } else { |
43 | 43 | // tcp connection |
44 | - $DSN = 'mysql:host=' . $config['host'] . ';port=' . $config['port'] .';dbname=' . $config['database']; |
|
44 | + $DSN = 'mysql:host='.$config['host'].';port='.$config['port'].';dbname='.$config['database']; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | try { |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | { |
65 | 65 | if (is_string($data)) { |
66 | 66 | $data = static::getConnection()->quote($data); |
67 | - $data = substr($data, 1, strlen($data)-2); |
|
67 | + $data = substr($data, 1, strlen($data) - 2); |
|
68 | 68 | return $data; |
69 | 69 | } elseif (is_array($data)) { |
70 | 70 | foreach ($data as $key=>$string) { |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | $error = static::getConnection()->errorInfo(); |
284 | 284 | $message = $error[2]; |
285 | 285 | |
286 | - if (App::$Config['environment']=='dev') { |
|
286 | + if (App::$Config['environment'] == 'dev') { |
|
287 | 287 | $Handler = \Divergence\App::$whoops->popHandler(); |
288 | 288 | |
289 | 289 | $Handler->addDataTable("Query Information", [ |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | |
318 | 318 | protected static function startQueryLog($query) |
319 | 319 | { |
320 | - if (App::$Config['environment']!='dev') { |
|
320 | + if (App::$Config['environment'] != 'dev') { |
|
321 | 321 | return false; |
322 | 322 | } |
323 | 323 |
@@ -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'])) { |
@@ -66,7 +66,7 @@ |
||
66 | 66 | ]; |
67 | 67 | |
68 | 68 | if ($options['order']) { |
69 | - $query .= ' ORDER BY ' . join(',', static::_mapFieldOrder($options['order'])); |
|
69 | + $query .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order'])); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | if ($options['limit']) { |
@@ -31,8 +31,7 @@ |
||
31 | 31 | } |
32 | 32 | |
33 | 33 | switch ($responseMode ? $responseMode : static::$responseMode) { |
34 | - case 'json': |
|
35 | - JSON::translateAndRespond($responseData); |
|
34 | + case 'json' : JSON::translateAndRespond($responseData); |
|
36 | 35 | break; |
37 | 36 | case 'jsonp': |
38 | 37 | JSONP::translateAndRespond($responseData); |
@@ -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) |
@@ -20,9 +20,9 @@ |
||
20 | 20 | |
21 | 21 | public static function config($Label) |
22 | 22 | { |
23 | - $Config = static::$ApplicationPath . '/config/' . $Label . '.php'; |
|
23 | + $Config = static::$ApplicationPath.'/config/'.$Label.'.php'; |
|
24 | 24 | if (!file_exists($Config)) { |
25 | - throw new \Exception($Config . ' not found in '.static::class.'::config()'); |
|
25 | + throw new \Exception($Config.' not found in '.static::class.'::config()'); |
|
26 | 26 | } |
27 | 27 | return require $Config; |
28 | 28 | } |