@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | */ |
92 | 92 | public function cacheFor($cacheSeconds) { |
93 | 93 | |
94 | - if($cacheSeconds > 0) { |
|
95 | - $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . ', must-revalidate'); |
|
94 | + if ($cacheSeconds > 0) { |
|
95 | + $this->addHeader('Cache-Control', 'max-age='.$cacheSeconds.', must-revalidate'); |
|
96 | 96 | } else { |
97 | 97 | $this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate'); |
98 | 98 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | * @since 8.0.0 |
147 | 147 | */ |
148 | 148 | public function invalidateCookies(array $cookieNames) { |
149 | - foreach($cookieNames as $cookieName) { |
|
149 | + foreach ($cookieNames as $cookieName) { |
|
150 | 150 | $this->invalidateCookie($cookieName); |
151 | 151 | } |
152 | 152 | return $this; |
@@ -170,11 +170,11 @@ discard block |
||
170 | 170 | * @since 6.0.0 - return value was added in 7.0.0 |
171 | 171 | */ |
172 | 172 | public function addHeader($name, $value) { |
173 | - $name = trim($name); // always remove leading and trailing whitespace |
|
173 | + $name = trim($name); // always remove leading and trailing whitespace |
|
174 | 174 | // to be able to reliably check for security |
175 | 175 | // headers |
176 | 176 | |
177 | - if(is_null($value)) { |
|
177 | + if (is_null($value)) { |
|
178 | 178 | unset($this->headers[$name]); |
179 | 179 | } else { |
180 | 180 | $this->headers[$name] = $value; |
@@ -205,19 +205,19 @@ discard block |
||
205 | 205 | public function getHeaders() { |
206 | 206 | $mergeWith = []; |
207 | 207 | |
208 | - if($this->lastModified) { |
|
208 | + if ($this->lastModified) { |
|
209 | 209 | $mergeWith['Last-Modified'] = |
210 | 210 | $this->lastModified->format(\DateTime::RFC2822); |
211 | 211 | } |
212 | 212 | |
213 | 213 | // Build Content-Security-Policy and use default if none has been specified |
214 | - if(is_null($this->contentSecurityPolicy)) { |
|
214 | + if (is_null($this->contentSecurityPolicy)) { |
|
215 | 215 | $this->setContentSecurityPolicy(new ContentSecurityPolicy()); |
216 | 216 | } |
217 | 217 | $this->headers['Content-Security-Policy'] = $this->contentSecurityPolicy->buildPolicy(); |
218 | 218 | |
219 | - if($this->ETag) { |
|
220 | - $mergeWith['ETag'] = '"' . $this->ETag . '"'; |
|
219 | + if ($this->ETag) { |
|
220 | + $mergeWith['ETag'] = '"'.$this->ETag.'"'; |
|
221 | 221 | } |
222 | 222 | |
223 | 223 | return array_merge($mergeWith, $this->headers); |
@@ -43,12 +43,12 @@ discard block |
||
43 | 43 | * @param array $headers |
44 | 44 | * @since 11.0.0 |
45 | 45 | */ |
46 | - public function __construct($file, $statusCode=Http::STATUS_OK, |
|
47 | - $headers=[]) { |
|
46 | + public function __construct($file, $statusCode = Http::STATUS_OK, |
|
47 | + $headers = []) { |
|
48 | 48 | $this->file = $file; |
49 | 49 | $this->setStatus($statusCode); |
50 | 50 | $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
51 | - $this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"'); |
|
51 | + $this->addHeader('Content-Disposition', 'inline; filename="'.rawurldecode($file->getName()).'"'); |
|
52 | 52 | |
53 | 53 | $this->setETag($file->getEtag()); |
54 | 54 | $lastModified = new \DateTime(); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function callback(IOutput $output) { |
64 | 64 | if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { |
65 | - $output->setHeader('Content-Length: ' . $this->file->getSize()); |
|
65 | + $output->setHeader('Content-Length: '.$this->file->getSize()); |
|
66 | 66 | $output->setOutput($this->file->getContent()); |
67 | 67 | } |
68 | 68 | } |
@@ -70,8 +70,8 @@ discard block |
||
70 | 70 | * @param string $renderAs how the page should be rendered, defaults to user |
71 | 71 | * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0 |
72 | 72 | */ |
73 | - public function __construct($appName, $templateName, array $params=array(), |
|
74 | - $renderAs='user') { |
|
73 | + public function __construct($appName, $templateName, array $params = array(), |
|
74 | + $renderAs = 'user') { |
|
75 | 75 | $this->templateName = $templateName; |
76 | 76 | $this->appName = $appName; |
77 | 77 | $this->params = $params; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | * @return TemplateResponse Reference to this object |
87 | 87 | * @since 6.0.0 - return value was added in 7.0.0 |
88 | 88 | */ |
89 | - public function setParams(array $params){ |
|
89 | + public function setParams(array $params) { |
|
90 | 90 | $this->params = $params; |
91 | 91 | |
92 | 92 | return $this; |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | * @return array the params |
99 | 99 | * @since 6.0.0 |
100 | 100 | */ |
101 | - public function getParams(){ |
|
101 | + public function getParams() { |
|
102 | 102 | return $this->params; |
103 | 103 | } |
104 | 104 | |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | * @return string the name of the used template |
109 | 109 | * @since 6.0.0 |
110 | 110 | */ |
111 | - public function getTemplateName(){ |
|
111 | + public function getTemplateName() { |
|
112 | 112 | return $this->templateName; |
113 | 113 | } |
114 | 114 | |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * @return TemplateResponse Reference to this object |
123 | 123 | * @since 6.0.0 - return value was added in 7.0.0 |
124 | 124 | */ |
125 | - public function renderAs($renderAs){ |
|
125 | + public function renderAs($renderAs) { |
|
126 | 126 | $this->renderAs = $renderAs; |
127 | 127 | |
128 | 128 | return $this; |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | * @return string the renderAs value |
135 | 135 | * @since 6.0.0 |
136 | 136 | */ |
137 | - public function getRenderAs(){ |
|
137 | + public function getRenderAs() { |
|
138 | 138 | return $this->renderAs; |
139 | 139 | } |
140 | 140 | |
@@ -144,13 +144,13 @@ discard block |
||
144 | 144 | * @return string the rendered html |
145 | 145 | * @since 6.0.0 |
146 | 146 | */ |
147 | - public function render(){ |
|
147 | + public function render() { |
|
148 | 148 | // \OCP\Template needs an empty string instead of 'blank' for an unwrapped response |
149 | 149 | $renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs; |
150 | 150 | |
151 | 151 | $template = new \OCP\Template($this->appName, $this->templateName, $renderAs); |
152 | 152 | |
153 | - foreach($this->params as $key => $value){ |
|
153 | + foreach ($this->params as $key => $value) { |
|
154 | 154 | $template->assign($key, $value); |
155 | 155 | } |
156 | 156 |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * @param string|resource $filePath the path to the file or a file handle which should be streamed |
41 | 41 | * @since 8.1.0 |
42 | 42 | */ |
43 | - public function __construct ($filePath) { |
|
43 | + public function __construct($filePath) { |
|
44 | 44 | $this->filePath = $filePath; |
45 | 45 | } |
46 | 46 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | * @param IOutput $output a small wrapper that handles output |
52 | 52 | * @since 8.1.0 |
53 | 53 | */ |
54 | - public function callback (IOutput $output) { |
|
54 | + public function callback(IOutput $output) { |
|
55 | 55 | // handle caching |
56 | 56 | if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { |
57 | 57 | if (!(is_resource($this->filePath) || file_exists($this->filePath))) { |
@@ -45,7 +45,7 @@ |
||
45 | 45 | $this->filename = $filename; |
46 | 46 | $this->contentType = $contentType; |
47 | 47 | |
48 | - $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"'); |
|
48 | + $this->addHeader('Content-Disposition', 'attachment; filename="'.$filename.'"'); |
|
49 | 49 | $this->addHeader('Content-Type', $contentType); |
50 | 50 | } |
51 | 51 |
@@ -55,7 +55,7 @@ |
||
55 | 55 | * @return string the starting namespace for the app |
56 | 56 | * @since 8.0.0 |
57 | 57 | */ |
58 | - public static function buildAppNamespace($appId, $topNamespace='OCA\\') { |
|
58 | + public static function buildAppNamespace($appId, $topNamespace = 'OCA\\') { |
|
59 | 59 | return \OC\AppFramework\App::buildAppNamespace($appId, $topNamespace); |
60 | 60 | } |
61 | 61 |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | * the controller |
54 | 54 | * @since 6.0.0 |
55 | 55 | */ |
56 | - public function beforeController($controller, $methodName){ |
|
56 | + public function beforeController($controller, $methodName) { |
|
57 | 57 | |
58 | 58 | } |
59 | 59 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | * @return Response a Response object in case that the exception was handled |
74 | 74 | * @since 6.0.0 |
75 | 75 | */ |
76 | - public function afterException($controller, $methodName, \Exception $exception){ |
|
76 | + public function afterException($controller, $methodName, \Exception $exception) { |
|
77 | 77 | throw $exception; |
78 | 78 | } |
79 | 79 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * @return Response a Response object |
90 | 90 | * @since 6.0.0 |
91 | 91 | */ |
92 | - public function afterController($controller, $methodName, Response $response){ |
|
92 | + public function afterController($controller, $methodName, Response $response) { |
|
93 | 93 | return $response; |
94 | 94 | } |
95 | 95 | |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | * @return string the output that should be printed |
106 | 106 | * @since 6.0.0 |
107 | 107 | */ |
108 | - public function beforeOutput($controller, $methodName, $output){ |
|
108 | + public function beforeOutput($controller, $methodName, $output) { |
|
109 | 109 | return $output; |
110 | 110 | } |
111 | 111 |
@@ -37,7 +37,7 @@ |
||
37 | 37 | * @param string $msg the error message |
38 | 38 | * @since 7.0.0 |
39 | 39 | */ |
40 | - public function __construct($msg){ |
|
40 | + public function __construct($msg) { |
|
41 | 41 | parent::__construct($msg); |
42 | 42 | } |
43 | 43 |
@@ -48,13 +48,13 @@ discard block |
||
48 | 48 | * mapped to queries without using sql |
49 | 49 | * @since 7.0.0 |
50 | 50 | */ |
51 | - public function __construct(IDBConnection $db, $tableName, $entityClass=null){ |
|
51 | + public function __construct(IDBConnection $db, $tableName, $entityClass = null) { |
|
52 | 52 | $this->db = $db; |
53 | - $this->tableName = '*PREFIX*' . $tableName; |
|
53 | + $this->tableName = '*PREFIX*'.$tableName; |
|
54 | 54 | |
55 | 55 | // if not given set the entity name to the class without the mapper part |
56 | 56 | // cache it here for later use since reflection is slow |
57 | - if($entityClass === null) { |
|
57 | + if ($entityClass === null) { |
|
58 | 58 | $this->entityClass = str_replace('Mapper', '', get_class($this)); |
59 | 59 | } else { |
60 | 60 | $this->entityClass = $entityClass; |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * @return string the table name |
67 | 67 | * @since 7.0.0 |
68 | 68 | */ |
69 | - public function getTableName(){ |
|
69 | + public function getTableName() { |
|
70 | 70 | return $this->tableName; |
71 | 71 | } |
72 | 72 | |
@@ -77,8 +77,8 @@ discard block |
||
77 | 77 | * @return Entity the deleted entity |
78 | 78 | * @since 7.0.0 - return value added in 8.1.0 |
79 | 79 | */ |
80 | - public function delete(Entity $entity){ |
|
81 | - $sql = 'DELETE FROM `' . $this->tableName . '` WHERE `id` = ?'; |
|
80 | + public function delete(Entity $entity) { |
|
81 | + $sql = 'DELETE FROM `'.$this->tableName.'` WHERE `id` = ?'; |
|
82 | 82 | $stmt = $this->execute($sql, [$entity->getId()]); |
83 | 83 | $stmt->closeCursor(); |
84 | 84 | return $entity; |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | * @return Entity the saved entity with the set id |
92 | 92 | * @since 7.0.0 |
93 | 93 | */ |
94 | - public function insert(Entity $entity){ |
|
94 | + public function insert(Entity $entity) { |
|
95 | 95 | // get updated fields to save, fields have to be set using a setter to |
96 | 96 | // be saved |
97 | 97 | $properties = $entity->getUpdatedFields(); |
@@ -101,15 +101,15 @@ discard block |
||
101 | 101 | |
102 | 102 | // build the fields |
103 | 103 | $i = 0; |
104 | - foreach($properties as $property => $updated) { |
|
104 | + foreach ($properties as $property => $updated) { |
|
105 | 105 | $column = $entity->propertyToColumn($property); |
106 | - $getter = 'get' . ucfirst($property); |
|
106 | + $getter = 'get'.ucfirst($property); |
|
107 | 107 | |
108 | - $columns .= '`' . $column . '`'; |
|
108 | + $columns .= '`'.$column.'`'; |
|
109 | 109 | $values .= '?'; |
110 | 110 | |
111 | 111 | // only append colon if there are more entries |
112 | - if($i < count($properties)-1){ |
|
112 | + if ($i < count($properties) - 1) { |
|
113 | 113 | $columns .= ','; |
114 | 114 | $values .= ','; |
115 | 115 | } |
@@ -119,8 +119,8 @@ discard block |
||
119 | 119 | |
120 | 120 | } |
121 | 121 | |
122 | - $sql = 'INSERT INTO `' . $this->tableName . '`(' . |
|
123 | - $columns . ') VALUES(' . $values . ')'; |
|
122 | + $sql = 'INSERT INTO `'.$this->tableName.'`('. |
|
123 | + $columns.') VALUES('.$values.')'; |
|
124 | 124 | |
125 | 125 | $stmt = $this->execute($sql, $params); |
126 | 126 | |
@@ -140,16 +140,16 @@ discard block |
||
140 | 140 | * @return Entity the saved entity with the set id |
141 | 141 | * @since 7.0.0 - return value was added in 8.0.0 |
142 | 142 | */ |
143 | - public function update(Entity $entity){ |
|
143 | + public function update(Entity $entity) { |
|
144 | 144 | // if entity wasn't changed it makes no sense to run a db query |
145 | 145 | $properties = $entity->getUpdatedFields(); |
146 | - if(count($properties) === 0) { |
|
146 | + if (count($properties) === 0) { |
|
147 | 147 | return $entity; |
148 | 148 | } |
149 | 149 | |
150 | 150 | // entity needs an id |
151 | 151 | $id = $entity->getId(); |
152 | - if($id === null){ |
|
152 | + if ($id === null) { |
|
153 | 153 | throw new \InvalidArgumentException( |
154 | 154 | 'Entity which should be updated has no id'); |
155 | 155 | } |
@@ -164,15 +164,15 @@ discard block |
||
164 | 164 | |
165 | 165 | // build the fields |
166 | 166 | $i = 0; |
167 | - foreach($properties as $property => $updated) { |
|
167 | + foreach ($properties as $property => $updated) { |
|
168 | 168 | |
169 | 169 | $column = $entity->propertyToColumn($property); |
170 | - $getter = 'get' . ucfirst($property); |
|
170 | + $getter = 'get'.ucfirst($property); |
|
171 | 171 | |
172 | - $columns .= '`' . $column . '` = ?'; |
|
172 | + $columns .= '`'.$column.'` = ?'; |
|
173 | 173 | |
174 | 174 | // only append colon if there are more entries |
175 | - if($i < count($properties)-1){ |
|
175 | + if ($i < count($properties) - 1) { |
|
176 | 176 | $columns .= ','; |
177 | 177 | } |
178 | 178 | |
@@ -180,8 +180,8 @@ discard block |
||
180 | 180 | $i++; |
181 | 181 | } |
182 | 182 | |
183 | - $sql = 'UPDATE `' . $this->tableName . '` SET ' . |
|
184 | - $columns . ' WHERE `id` = ?'; |
|
183 | + $sql = 'UPDATE `'.$this->tableName.'` SET '. |
|
184 | + $columns.' WHERE `id` = ?'; |
|
185 | 185 | $params[] = $id; |
186 | 186 | |
187 | 187 | $stmt = $this->execute($sql, $params); |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | * @return \PDOStatement the database query result |
228 | 228 | * @since 7.0.0 |
229 | 229 | */ |
230 | - protected function execute($sql, array $params=[], $limit=null, $offset=null){ |
|
230 | + protected function execute($sql, array $params = [], $limit = null, $offset = null) { |
|
231 | 231 | $query = $this->db->prepare($sql, $limit, $offset); |
232 | 232 | |
233 | 233 | if ($this->isAssocArray($params)) { |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | $query->bindValue($key, $param, $pdoConstant); |
237 | 237 | } |
238 | 238 | } else { |
239 | - $index = 1; // bindParam is 1 indexed |
|
239 | + $index = 1; // bindParam is 1 indexed |
|
240 | 240 | foreach ($params as $param) { |
241 | 241 | $pdoConstant = $this->getPDOType($param); |
242 | 242 | $query->bindValue($index, $param, $pdoConstant); |
@@ -263,11 +263,11 @@ discard block |
||
263 | 263 | * @return array the result as row |
264 | 264 | * @since 7.0.0 |
265 | 265 | */ |
266 | - protected function findOneQuery($sql, array $params=[], $limit=null, $offset=null){ |
|
266 | + protected function findOneQuery($sql, array $params = [], $limit = null, $offset = null) { |
|
267 | 267 | $stmt = $this->execute($sql, $params, $limit, $offset); |
268 | 268 | $row = $stmt->fetch(); |
269 | 269 | |
270 | - if($row === false || $row === null){ |
|
270 | + if ($row === false || $row === null) { |
|
271 | 271 | $stmt->closeCursor(); |
272 | 272 | $msg = $this->buildDebugMessage( |
273 | 273 | 'Did expect one result but found none when executing', $sql, $params, $limit, $offset |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | $row2 = $stmt->fetch(); |
278 | 278 | $stmt->closeCursor(); |
279 | 279 | //MDB2 returns null, PDO and doctrine false when no row is available |
280 | - if( ! ($row2 === false || $row2 === null )) { |
|
280 | + if (!($row2 === false || $row2 === null)) { |
|
281 | 281 | $msg = $this->buildDebugMessage( |
282 | 282 | 'Did not expect more than one result when executing', $sql, $params, $limit, $offset |
283 | 283 | ); |
@@ -298,12 +298,12 @@ discard block |
||
298 | 298 | * @return string formatted error message string |
299 | 299 | * @since 9.1.0 |
300 | 300 | */ |
301 | - private function buildDebugMessage($msg, $sql, array $params=[], $limit=null, $offset=null) { |
|
302 | - return $msg . |
|
303 | - ': query "' . $sql . '"; ' . |
|
304 | - 'parameters ' . print_r($params, true) . '; ' . |
|
305 | - 'limit "' . $limit . '"; '. |
|
306 | - 'offset "' . $offset . '"'; |
|
301 | + private function buildDebugMessage($msg, $sql, array $params = [], $limit = null, $offset = null) { |
|
302 | + return $msg. |
|
303 | + ': query "'.$sql.'"; '. |
|
304 | + 'parameters '.print_r($params, true).'; '. |
|
305 | + 'limit "'.$limit.'"; '. |
|
306 | + 'offset "'.$offset.'"'; |
|
307 | 307 | } |
308 | 308 | |
309 | 309 | |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | * @since 7.0.0 |
316 | 316 | */ |
317 | 317 | protected function mapRowToEntity($row) { |
318 | - return call_user_func($this->entityClass .'::fromRow', $row); |
|
318 | + return call_user_func($this->entityClass.'::fromRow', $row); |
|
319 | 319 | } |
320 | 320 | |
321 | 321 | |
@@ -328,12 +328,12 @@ discard block |
||
328 | 328 | * @return array all fetched entities |
329 | 329 | * @since 7.0.0 |
330 | 330 | */ |
331 | - protected function findEntities($sql, array $params=[], $limit=null, $offset=null) { |
|
331 | + protected function findEntities($sql, array $params = [], $limit = null, $offset = null) { |
|
332 | 332 | $stmt = $this->execute($sql, $params, $limit, $offset); |
333 | 333 | |
334 | 334 | $entities = []; |
335 | 335 | |
336 | - while($row = $stmt->fetch()){ |
|
336 | + while ($row = $stmt->fetch()) { |
|
337 | 337 | $entities[] = $this->mapRowToEntity($row); |
338 | 338 | } |
339 | 339 | |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | * @return Entity the entity |
356 | 356 | * @since 7.0.0 |
357 | 357 | */ |
358 | - protected function findEntity($sql, array $params=[], $limit=null, $offset=null){ |
|
358 | + protected function findEntity($sql, array $params = [], $limit = null, $offset = null) { |
|
359 | 359 | return $this->mapRowToEntity($this->findOneQuery($sql, $params, $limit, $offset)); |
360 | 360 | } |
361 | 361 |