@@ -57,10 +57,10 @@ discard block |
||
57 | 57 | public function input(string $name, $data) |
58 | 58 | { |
59 | 59 | if (array_key_exists($name, $this->processor)) { |
60 | - if ($this->processor[$name] === ObjectMiddleware::SERIALIZE){ |
|
61 | - return $data === null? $data : serialize($data); |
|
60 | + if ($this->processor[$name] === ObjectMiddleware::SERIALIZE) { |
|
61 | + return $data === null ? $data : serialize($data); |
|
62 | 62 | } |
63 | - if ($this->processor[$name] === ObjectMiddleware::JSON){ |
|
63 | + if ($this->processor[$name] === ObjectMiddleware::JSON) { |
|
64 | 64 | return json_encode($data); |
65 | 65 | } |
66 | 66 | } |
@@ -77,10 +77,10 @@ discard block |
||
77 | 77 | public function output(string $name, $data) |
78 | 78 | { |
79 | 79 | if (array_key_exists($name, $this->processor)) { |
80 | - if ($this->processor[$name] === ObjectMiddleware::SERIALIZE){ |
|
80 | + if ($this->processor[$name] === ObjectMiddleware::SERIALIZE) { |
|
81 | 81 | return unserialize($data) ?: null; |
82 | 82 | } |
83 | - if ($this->processor[$name] === ObjectMiddleware::JSON){ |
|
83 | + if ($this->processor[$name] === ObjectMiddleware::JSON) { |
|
84 | 84 | return json_decode($data); |
85 | 85 | } |
86 | 86 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | if ($doc = $property->getDocComment()) { |
114 | 114 | if (is_string($doc) && preg_match('/@var\s+(\w+)/i', $doc, $match)) { |
115 | 115 | $type = strtolower($match[1]); |
116 | - if (in_array($type, ['boolean', 'bool', 'integer', 'int' , 'float' , 'double', 'string'])) { |
|
116 | + if (in_array($type, ['boolean', 'bool', 'integer', 'int', 'float', 'double', 'string'])) { |
|
117 | 117 | return ObjectMiddleware::RAW; |
118 | 118 | } |
119 | 119 | } |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | */ |
196 | 196 | private function inputSerialize($data) |
197 | 197 | { |
198 | - return $data === null? $data : serialize($data); |
|
198 | + return $data === null ? $data : serialize($data); |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | /** |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | */ |
218 | 218 | private function inputJson($data) |
219 | 219 | { |
220 | - return $data === null? $data : json_encode($data); |
|
220 | + return $data === null ? $data : json_encode($data); |
|
221 | 221 | } |
222 | 222 | |
223 | 223 | /** |
@@ -290,7 +290,7 @@ |
||
290 | 290 | protected static function createDefaultMiddleware(string $object, TableStruct $struct) |
291 | 291 | { |
292 | 292 | $reflectObject = new ReflectionClass($object); |
293 | - $classDoc = is_string($reflectObject->getDocComment())?$reflectObject->getDocComment():''; |
|
293 | + $classDoc = is_string($reflectObject->getDocComment()) ? $reflectObject->getDocComment() : ''; |
|
294 | 294 | if (preg_match('/@field-(serialize|json)\s+(\w+)/i', $classDoc, $matchs)) { |
295 | 295 | return new TableStructMiddleware($object, $struct); |
296 | 296 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | public function __construct($file) |
39 | 39 | { |
40 | - $this->file = $file instanceof SplFileObject? $file : new SplFileObject($file); |
|
40 | + $this->file = $file instanceof SplFileObject ? $file : new SplFileObject($file); |
|
41 | 41 | $this->mime = MimeType::getMimeType($this->file->getExtension()); |
42 | 42 | } |
43 | 43 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | protected function sendMultipleRangePart(Response $response, array $range) |
130 | 130 | { |
131 | 131 | $response->write('Content-Type: '.$this->mime."\r\n"); |
132 | - $response->write('Content-Range: '.$this->getRangeHeader($range) ."\r\n\r\n"); |
|
132 | + $response->write('Content-Range: '.$this->getRangeHeader($range)."\r\n\r\n"); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | /** |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | * @param string $range |
189 | 189 | * @return array |
190 | 190 | */ |
191 | - protected function parseRange(string $range):?array |
|
191 | + protected function parseRange(string $range): ?array |
|
192 | 192 | { |
193 | 193 | $range = trim($range); |
194 | 194 | if (strrpos($range, '-') === strlen($range) - 1) { |
@@ -200,9 +200,9 @@ discard block |
||
200 | 200 | list($start, $end) = explode('-', $range, 2); |
201 | 201 | $length = intval($end - $start); |
202 | 202 | if ($length <= 0) { |
203 | - return ['start' => intval($start) , 'end' => $this->file->getSize() - 1 ]; |
|
203 | + return ['start' => intval($start), 'end' => $this->file->getSize() - 1]; |
|
204 | 204 | } |
205 | - return ['start' => intval($start) , 'end' => intval($end) ]; |
|
205 | + return ['start' => intval($start), 'end' => intval($end)]; |
|
206 | 206 | } |
207 | 207 | return null; |
208 | 208 | } |
@@ -59,7 +59,7 @@ |
||
59 | 59 | * @return DataAccess |
60 | 60 | * @throws ReflectionException |
61 | 61 | */ |
62 | - public static function new(string $object, ?Middleware $middleware = null):DataAccess |
|
62 | + public static function new(string $object, ?Middleware $middleware = null) : DataAccess |
|
63 | 63 | { |
64 | 64 | return new self($object, $middleware); |
65 | 65 | } |
@@ -33,10 +33,10 @@ |
||
33 | 33 | $status = $result ? 'OK' : 'Err'; |
34 | 34 | if ($result) { |
35 | 35 | $effect = $statement->getStatement()->rowCount(); |
36 | - $this->debug->info('query ['.$status.'] '.$query.' '. number_format($timeSpend, 5).'s and effect '. $effect . ' rows'); |
|
36 | + $this->debug->info('query ['.$status.'] '.$query.' '.number_format($timeSpend, 5).'s and effect '.$effect.' rows'); |
|
37 | 37 | } else { |
38 | - $this->debug->error('query ['.$status.'] '.$query.' '. number_format($timeSpend, 5).'s'); |
|
39 | - $this->debug->error('query ['.$status.'] '. implode(':', $statement->getStatement()->errorInfo())); |
|
38 | + $this->debug->error('query ['.$status.'] '.$query.' '.number_format($timeSpend, 5).'s'); |
|
39 | + $this->debug->error('query ['.$status.'] '.implode(':', $statement->getStatement()->errorInfo())); |
|
40 | 40 | } |
41 | 41 | } |
42 | 42 | } |
@@ -44,13 +44,13 @@ discard block |
||
44 | 44 | protected static function fixConfig(Application $application, ?string $module, array $config) |
45 | 45 | { |
46 | 46 | if (!array_key_exists('assets-prefix', $config)) { |
47 | - $config['assets-prefix'] = defined('SUDA_ASSETS') ? constant('SUDA_ASSETS'): 'assets'; |
|
47 | + $config['assets-prefix'] = defined('SUDA_ASSETS') ? constant('SUDA_ASSETS') : 'assets'; |
|
48 | 48 | } |
49 | 49 | if (!array_key_exists('static', $config)) { |
50 | 50 | $config['static'] = 'static'; |
51 | 51 | } |
52 | 52 | if (!array_key_exists('assets-path', $config)) { |
53 | - $config['assets-path'] = SUDA_PUBLIC. '/'.$config['assets-prefix']; |
|
53 | + $config['assets-path'] = SUDA_PUBLIC.'/'.$config['assets-prefix']; |
|
54 | 54 | } |
55 | 55 | if (!array_key_exists('static-name', $config)) { |
56 | 56 | $config['uri-name'] = static::getSafeUriName($application, $module); |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | { |
113 | 113 | $assetRoot = static::getAssetRoot($application, $module); |
114 | 114 | if (in_array($request->getIndex(), $application->conf('index', ['/index.php']))) { |
115 | - $name = static::writableAssets($application, $module) ? dirname($request->getIndex()):$request->getIndex(); |
|
115 | + $name = static::writableAssets($application, $module) ? dirname($request->getIndex()) : $request->getIndex(); |
|
116 | 116 | return rtrim(str_replace('\\', '/', $name), '/').$assetRoot; |
117 | 117 | } |
118 | 118 | return rtrim(str_replace('\\', '/', $request->getIndex()), '/').$assetRoot; |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | public static function getStaticRequestAsset(Application $application, Request $request, ?string $module = null):string |
146 | 146 | { |
147 | 147 | $assetRoot = static::getAssetRoot($application, $module); |
148 | - $name = static::writableAssets($application, $module) ? dirname($request->getIndex()):$request->getIndex(); |
|
148 | + $name = static::writableAssets($application, $module) ? dirname($request->getIndex()) : $request->getIndex(); |
|
149 | 149 | return rtrim(str_replace('\\', '/', $name), '/').$assetRoot; |
150 | 150 | } |
151 | 151 |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | |
110 | 110 | protected function getStaticOutpath() |
111 | 111 | { |
112 | - $path = $this->config['assets-public'] ?? constant('SUDA_PUBLIC').'/assets/'. $this->getStaticName(); |
|
112 | + $path = $this->config['assets-public'] ?? constant('SUDA_PUBLIC').'/assets/'.$this->getStaticName(); |
|
113 | 113 | FileSystem::make($path); |
114 | 114 | return $path; |
115 | 115 | } |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | { |
124 | 124 | $output = $this->config['output'] ?? constant('SUDA_DATA').'/template'; |
125 | 125 | FileSystem::make($output); |
126 | - return $output .'/'. $this->name.'-'.substr(md5_file($this->getSourcePath()), 10, 8).'.php'; |
|
126 | + return $output.'/'.$this->name.'-'.substr(md5_file($this->getSourcePath()), 10, 8).'.php'; |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | * |
132 | 132 | * @return string|null |
133 | 133 | */ |
134 | - public function getSourcePath():?string |
|
134 | + public function getSourcePath(): ?string |
|
135 | 135 | { |
136 | 136 | return $this->source ?? null; |
137 | 137 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | * |
153 | 153 | * @return void |
154 | 154 | */ |
155 | - protected function compile(){ |
|
155 | + protected function compile() { |
|
156 | 156 | $sourcePath = $this->getSourcePath(); |
157 | 157 | $destPath = $this->getPath(); |
158 | 158 | if ($sourcePath === null) { |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | public function include(string $path) |
206 | 206 | { |
207 | 207 | $subfix = $this->config['subfix'] ?? ''; |
208 | - $included = new self(Resource::getPathByRelativePath($path. $subfix, dirname($this->source)), $this->config); |
|
208 | + $included = new self(Resource::getPathByRelativePath($path.$subfix, dirname($this->source)), $this->config); |
|
209 | 209 | $included->parent = $this; |
210 | 210 | echo $included->getRenderedString(); |
211 | 211 | } |
@@ -222,13 +222,13 @@ discard block |
||
222 | 222 | { |
223 | 223 | $this->prepareStaticSource(); |
224 | 224 | if (array_key_exists('assets-prefix', $this->config)) { |
225 | - $prefix = $this->config['assets-prefix'] ; |
|
225 | + $prefix = $this->config['assets-prefix']; |
|
226 | 226 | } elseif (defined('SUDA_ASSETS')) { |
227 | 227 | $prefix = constant('SUDA_ASSETS'); |
228 | 228 | } else { |
229 | 229 | $prefix = '/assets'; |
230 | 230 | } |
231 | - return $prefix .'/'.$this->getStaticName(); |
|
231 | + return $prefix.'/'.$this->getStaticName(); |
|
232 | 232 | } |
233 | 233 | |
234 | 234 | protected function prepareStaticSource() |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * |
30 | 30 | * @return string|null |
31 | 31 | */ |
32 | - public function getSourcePath():?string |
|
32 | + public function getSourcePath(): ?string |
|
33 | 33 | { |
34 | 34 | $subfix = $this->config['subfix'] ?? '.tpl.html'; |
35 | 35 | return $this->getResource($this->module)->getResourcePath($this->getTemplatePath().'/'.$this->name.$subfix); |
@@ -42,9 +42,9 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function getPath() |
44 | 44 | { |
45 | - $output = $this->config['output'] ?? constant('SUDA_DATA').'/template/'. $this->uriName; |
|
45 | + $output = $this->config['output'] ?? constant('SUDA_DATA').'/template/'.$this->uriName; |
|
46 | 46 | FileSystem::make($output); |
47 | - return $output .'/'. $this->name.'.php'; |
|
47 | + return $output.'/'.$this->name.'.php'; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | } |
73 | 73 | return $this->application->getUrl($this->request, $name, $values ?? [], true, $this->module, $this->group); |
74 | 74 | } elseif (is_array($name) && is_string($defaultName)) { |
75 | - return $this->application->getUrl($this->request, $defaultName, array_merge($this->request->get() ?? [], $name) , true, $this->module, $this->group); |
|
75 | + return $this->application->getUrl($this->request, $defaultName, array_merge($this->request->get() ?? [], $name), true, $this->module, $this->group); |
|
76 | 76 | } elseif (is_string($defaultName)) { |
77 | 77 | return $this->application->getUrl($this->request, $defaultName, $this->request->get() ?? [], true, $this->module, $this->group); |
78 | 78 | } |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | if ($this->request->getAttribute('route') === $full) { |
92 | 92 | if (is_array($parameter)) { |
93 | 93 | foreach ($parameter as $key => $value) { |
94 | - if ($this->request->getQuery($key) != $value){ |
|
94 | + if ($this->request->getQuery($key) != $value) { |
|
95 | 95 | return false; |
96 | 96 | } |
97 | 97 | } |