@@ -246,7 +246,7 @@ |
||
246 | 246 | } |
247 | 247 | |
248 | 248 | /** |
249 | - * @return array|null |
|
249 | + * @return string |
|
250 | 250 | */ |
251 | 251 | public function getLocalSystemAddressBook() { |
252 | 252 | if (is_null($this->localSystemAddressBook)) { |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) { |
100 | 100 | // remote server revoked access to the address book, remove it |
101 | 101 | $this->backend->deleteAddressBook($addressBookId); |
102 | - $this->logger->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']); |
|
102 | + $this->logger->info('Authorization failed, remove address book: '.$url, ['app' => 'dav']); |
|
103 | 103 | throw $ex; |
104 | 104 | } |
105 | 105 | } |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | */ |
150 | 150 | protected function getClient($url, $userName, $sharedSecret) { |
151 | 151 | $settings = [ |
152 | - 'baseUri' => $url . '/', |
|
152 | + 'baseUri' => $url.'/', |
|
153 | 153 | 'userName' => $userName, |
154 | 154 | 'password' => $sharedSecret, |
155 | 155 | ]; |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | */ |
270 | 270 | public function deleteUser($userOrCardId) { |
271 | 271 | $systemAddressBook = $this->getLocalSystemAddressBook(); |
272 | - if ($userOrCardId instanceof IUser){ |
|
272 | + if ($userOrCardId instanceof IUser) { |
|
273 | 273 | $name = $userOrCardId->getBackendClassName(); |
274 | 274 | $userId = $userOrCardId->getUID(); |
275 | 275 | |
@@ -285,7 +285,7 @@ discard block |
||
285 | 285 | if (is_null($this->localSystemAddressBook)) { |
286 | 286 | $systemPrincipal = "principals/system/system"; |
287 | 287 | $this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [ |
288 | - '{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance' |
|
288 | + '{'.Plugin::NS_CARDDAV.'}addressbook-description' => 'System addressbook which holds all users of this instance' |
|
289 | 289 | ]); |
290 | 290 | } |
291 | 291 | |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | |
304 | 304 | // remove no longer existing |
305 | 305 | $allCards = $this->backend->getCards($systemAddressBook['id']); |
306 | - foreach($allCards as $card) { |
|
306 | + foreach ($allCards as $card) { |
|
307 | 307 | $vCard = Reader::read($card['carddata']); |
308 | 308 | $uid = $vCard->UID->getValue(); |
309 | 309 | // load backend and see if user exists |
@@ -93,7 +93,7 @@ |
||
93 | 93 | /** |
94 | 94 | * returns a list of all possible property names |
95 | 95 | * |
96 | - * @return array |
|
96 | + * @return string[] |
|
97 | 97 | */ |
98 | 98 | static public function getPropertyNames() { |
99 | 99 | return [ |
@@ -86,14 +86,14 @@ discard block |
||
86 | 86 | $this->logger = $logger; |
87 | 87 | |
88 | 88 | $methods = get_class_methods($this->comment); |
89 | - $methods = array_filter($methods, function($name){ |
|
89 | + $methods = array_filter($methods, function($name) { |
|
90 | 90 | return strpos($name, 'get') === 0; |
91 | 91 | }); |
92 | - foreach($methods as $getter) { |
|
93 | - if($getter === 'getMentions') { |
|
94 | - continue; // special treatment |
|
92 | + foreach ($methods as $getter) { |
|
93 | + if ($getter === 'getMentions') { |
|
94 | + continue; // special treatment |
|
95 | 95 | } |
96 | - $name = '{'.self::NS_OWNCLOUD.'}' . lcfirst(substr($getter, 3)); |
|
96 | + $name = '{'.self::NS_OWNCLOUD.'}'.lcfirst(substr($getter, 3)); |
|
97 | 97 | $this->properties[$name] = $getter; |
98 | 98 | } |
99 | 99 | $this->userManager = $userManager; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | protected function checkWriteAccessOnComment() { |
134 | 134 | $user = $this->userSession->getUser(); |
135 | - if( $this->comment->getActorType() !== 'users' |
|
135 | + if ($this->comment->getActorType() !== 'users' |
|
136 | 136 | || is_null($user) |
137 | 137 | || $this->comment->getActorId() !== $user->getUID() |
138 | 138 | ) { |
@@ -196,9 +196,9 @@ discard block |
||
196 | 196 | return true; |
197 | 197 | } catch (\Exception $e) { |
198 | 198 | $this->logger->logException($e, ['app' => 'dav/comments']); |
199 | - if($e instanceof MessageTooLongException) { |
|
199 | + if ($e instanceof MessageTooLongException) { |
|
200 | 200 | $msg = 'Message exceeds allowed character limit of '; |
201 | - throw new BadRequest($msg . IComment::MAX_MESSAGE_LENGTH, 0, $e); |
|
201 | + throw new BadRequest($msg.IComment::MAX_MESSAGE_LENGTH, 0, $e); |
|
202 | 202 | } |
203 | 203 | throw $e; |
204 | 204 | } |
@@ -240,14 +240,14 @@ discard block |
||
240 | 240 | $properties = array_keys($this->properties); |
241 | 241 | |
242 | 242 | $result = []; |
243 | - foreach($properties as $property) { |
|
243 | + foreach ($properties as $property) { |
|
244 | 244 | $getter = $this->properties[$property]; |
245 | - if(method_exists($this->comment, $getter)) { |
|
245 | + if (method_exists($this->comment, $getter)) { |
|
246 | 246 | $result[$property] = $this->comment->$getter(); |
247 | 247 | } |
248 | 248 | } |
249 | 249 | |
250 | - if($this->comment->getActorType() === 'users') { |
|
250 | + if ($this->comment->getActorType() === 'users') { |
|
251 | 251 | $user = $this->userManager->get($this->comment->getActorId()); |
252 | 252 | $displayName = is_null($user) ? null : $user->getDisplayName(); |
253 | 253 | $result[self::PROPERTY_NAME_ACTOR_DISPLAYNAME] = $displayName; |
@@ -256,14 +256,14 @@ discard block |
||
256 | 256 | $result[self::PROPERTY_NAME_MENTIONS] = $this->composeMentionsPropertyValue(); |
257 | 257 | |
258 | 258 | $unread = null; |
259 | - $user = $this->userSession->getUser(); |
|
260 | - if(!is_null($user)) { |
|
259 | + $user = $this->userSession->getUser(); |
|
260 | + if (!is_null($user)) { |
|
261 | 261 | $readUntil = $this->commentsManager->getReadMark( |
262 | 262 | $this->comment->getObjectType(), |
263 | 263 | $this->comment->getObjectId(), |
264 | 264 | $user |
265 | 265 | ); |
266 | - if(is_null($readUntil)) { |
|
266 | + if (is_null($readUntil)) { |
|
267 | 267 | $unread = 'true'; |
268 | 268 | } else { |
269 | 269 | $unread = $this->comment->getCreationDateTime() > $readUntil; |
@@ -138,7 +138,7 @@ |
||
138 | 138 | * This will be used in the {DAV:}supported-report-set property. |
139 | 139 | * |
140 | 140 | * @param string $uri |
141 | - * @return array |
|
141 | + * @return string[] |
|
142 | 142 | */ |
143 | 143 | public function getSupportedReportSet($uri) { |
144 | 144 | return [self::REPORT_NAME]; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | function initialize(Server $server) { |
86 | 86 | $this->server = $server; |
87 | - if(strpos($this->server->getRequestUri(), 'comments/') !== 0) { |
|
87 | + if (strpos($this->server->getRequestUri(), 'comments/') !== 0) { |
|
88 | 88 | return; |
89 | 89 | } |
90 | 90 | |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | // having their own comments marked as unread |
125 | 125 | $node->setReadMarker(null); |
126 | 126 | |
127 | - $url = rtrim($request->getUrl(), '/') . '/' . urlencode($comment->getId()); |
|
127 | + $url = rtrim($request->getUrl(), '/').'/'.urlencode($comment->getId()); |
|
128 | 128 | |
129 | 129 | $response->setHeader('Content-Location', $url); |
130 | 130 | |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | */ |
158 | 158 | public function onReport($reportName, $report, $uri) { |
159 | 159 | $node = $this->server->tree->getNodeForPath($uri); |
160 | - if(!$node instanceof EntityCollection || $reportName !== self::REPORT_NAME) { |
|
160 | + if (!$node instanceof EntityCollection || $reportName !== self::REPORT_NAME) { |
|
161 | 161 | throw new ReportNotSupported(); |
162 | 162 | } |
163 | 163 | $args = ['limit' => 0, 'offset' => 0, 'datetime' => null]; |
@@ -166,27 +166,27 @@ discard block |
||
166 | 166 | $this::REPORT_PARAM_OFFSET, |
167 | 167 | $this::REPORT_PARAM_TIMESTAMP |
168 | 168 | ]; |
169 | - $ns = '{' . $this::NS_OWNCLOUD . '}'; |
|
170 | - foreach($report as $parameter) { |
|
171 | - if(!in_array($parameter['name'], $acceptableParameters) || empty($parameter['value'])) { |
|
169 | + $ns = '{'.$this::NS_OWNCLOUD.'}'; |
|
170 | + foreach ($report as $parameter) { |
|
171 | + if (!in_array($parameter['name'], $acceptableParameters) || empty($parameter['value'])) { |
|
172 | 172 | continue; |
173 | 173 | } |
174 | 174 | $args[str_replace($ns, '', $parameter['name'])] = $parameter['value']; |
175 | 175 | } |
176 | 176 | |
177 | - if(!is_null($args['datetime'])) { |
|
177 | + if (!is_null($args['datetime'])) { |
|
178 | 178 | $args['datetime'] = new \DateTime($args['datetime']); |
179 | 179 | } |
180 | 180 | |
181 | 181 | $results = $node->findChildren($args['limit'], $args['offset'], $args['datetime']); |
182 | 182 | |
183 | 183 | $responses = []; |
184 | - foreach($results as $node) { |
|
185 | - $nodePath = $this->server->getRequestUri() . '/' . $node->comment->getId(); |
|
184 | + foreach ($results as $node) { |
|
185 | + $nodePath = $this->server->getRequestUri().'/'.$node->comment->getId(); |
|
186 | 186 | $resultSet = $this->server->getPropertiesForPath($nodePath, CommentNode::getPropertyNames()); |
187 | - if(isset($resultSet[0]) && isset($resultSet[0][200])) { |
|
187 | + if (isset($resultSet[0]) && isset($resultSet[0][200])) { |
|
188 | 188 | $responses[] = new Response( |
189 | - $this->server->getBaseUri() . $nodePath, |
|
189 | + $this->server->getBaseUri().$nodePath, |
|
190 | 190 | [200 => $resultSet[0][200]], |
191 | 191 | 200 |
192 | 192 | ); |
@@ -227,14 +227,14 @@ discard block |
||
227 | 227 | |
228 | 228 | $actorType = $data['actorType']; |
229 | 229 | $actorId = null; |
230 | - if($actorType === 'users') { |
|
230 | + if ($actorType === 'users') { |
|
231 | 231 | $user = $this->userSession->getUser(); |
232 | - if(!is_null($user)) { |
|
232 | + if (!is_null($user)) { |
|
233 | 233 | $actorId = $user->getUID(); |
234 | 234 | } |
235 | 235 | } |
236 | - if(is_null($actorId)) { |
|
237 | - throw new BadRequest('Invalid actor "' . $actorType .'"'); |
|
236 | + if (is_null($actorId)) { |
|
237 | + throw new BadRequest('Invalid actor "'.$actorType.'"'); |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | try { |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | throw new BadRequest('Invalid input values', 0, $e); |
248 | 248 | } catch (\OCP\Comments\MessageTooLongException $e) { |
249 | 249 | $msg = 'Message exceeds allowed character limit of '; |
250 | - throw new BadRequest($msg . \OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0, $e); |
|
250 | + throw new BadRequest($msg.\OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0, $e); |
|
251 | 251 | } |
252 | 252 | } |
253 | 253 |
@@ -115,7 +115,7 @@ |
||
115 | 115 | /** |
116 | 116 | * Returns an array with all the child nodes |
117 | 117 | * |
118 | - * @return \Sabre\DAV\INode[] |
|
118 | + * @return CommentNode[] |
|
119 | 119 | */ |
120 | 120 | function getChildren() { |
121 | 121 | return $this->findChildren(); |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * @package OCA\DAV\Comments |
42 | 42 | */ |
43 | 43 | class EntityCollection extends RootCollection implements IProperties { |
44 | - const PROPERTY_NAME_READ_MARKER = '{http://owncloud.org/ns}readMarker'; |
|
44 | + const PROPERTY_NAME_READ_MARKER = '{http://owncloud.org/ns}readMarker'; |
|
45 | 45 | |
46 | 46 | /** @var string */ |
47 | 47 | protected $id; |
@@ -65,10 +65,10 @@ discard block |
||
65 | 65 | IUserSession $userSession, |
66 | 66 | ILogger $logger |
67 | 67 | ) { |
68 | - foreach(['id', 'name'] as $property) { |
|
68 | + foreach (['id', 'name'] as $property) { |
|
69 | 69 | $$property = trim($$property); |
70 | - if(empty($$property) || !is_string($$property)) { |
|
71 | - throw new \InvalidArgumentException('"' . $property . '" parameter must be non-empty string'); |
|
70 | + if (empty($$property) || !is_string($$property)) { |
|
71 | + throw new \InvalidArgumentException('"'.$property.'" parameter must be non-empty string'); |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 | $this->id = $id; |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | function findChildren($limit = 0, $offset = 0, \DateTime $datetime = null) { |
135 | 135 | $comments = $this->commentsManager->getForObject($this->name, $this->id, $limit, $offset, $datetime); |
136 | 136 | $result = []; |
137 | - foreach($comments as $comment) { |
|
137 | + foreach ($comments as $comment) { |
|
138 | 138 | $result[] = new CommentNode( |
139 | 139 | $this->commentsManager, |
140 | 140 | $comment, |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | function getProperties($properties) { |
188 | 188 | $marker = null; |
189 | 189 | $user = $this->userSession->getUser(); |
190 | - if(!is_null($user)) { |
|
190 | + if (!is_null($user)) { |
|
191 | 191 | $marker = $this->commentsManager->getReadMark($this->name, $this->id, $user); |
192 | 192 | } |
193 | 193 | return [self::PROPERTY_NAME_READ_MARKER => $marker]; |
@@ -75,7 +75,7 @@ |
||
75 | 75 | private $cache = []; |
76 | 76 | |
77 | 77 | /** |
78 | - * @param Tree $tree node tree |
|
78 | + * @param ObjectTree $tree node tree |
|
79 | 79 | * @param IDBConnection $connection database connection |
80 | 80 | * @param IUser $user owner of the tree and properties |
81 | 81 | */ |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | // we catch the exception to prevent breaking the whole list with a 404 |
112 | 112 | // (soft fail) |
113 | 113 | \OC::$server->getLogger()->warning( |
114 | - 'Could not get node for path: \"' . $path . '\" : ' . $e->getMessage(), |
|
114 | + 'Could not get node for path: \"'.$path.'\" : '.$e->getMessage(), |
|
115 | 115 | array('app' => 'files') |
116 | 116 | ); |
117 | 117 | return; |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $statement = $this->connection->prepare( |
171 | 171 | 'DELETE FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?' |
172 | 172 | ); |
173 | - $statement->execute(array($this->user, '/' . $path)); |
|
173 | + $statement->execute(array($this->user, '/'.$path)); |
|
174 | 174 | $statement->closeCursor(); |
175 | 175 | |
176 | 176 | unset($this->cache[$path]); |
@@ -186,10 +186,10 @@ discard block |
||
186 | 186 | */ |
187 | 187 | public function move($source, $destination) { |
188 | 188 | $statement = $this->connection->prepare( |
189 | - 'UPDATE `*PREFIX*properties` SET `propertypath` = ?' . |
|
189 | + 'UPDATE `*PREFIX*properties` SET `propertypath` = ?'. |
|
190 | 190 | ' WHERE `userid` = ? AND `propertypath` = ?' |
191 | 191 | ); |
192 | - $statement->execute(array('/' . $destination, $this->user, '/' . $source)); |
|
192 | + $statement->execute(array('/'.$destination, $this->user, '/'.$source)); |
|
193 | 193 | $statement->closeCursor(); |
194 | 194 | } |
195 | 195 | |
@@ -250,13 +250,13 @@ discard block |
||
250 | 250 | private function updateProperties($node, $properties) { |
251 | 251 | $path = $node->getPath(); |
252 | 252 | |
253 | - $deleteStatement = 'DELETE FROM `*PREFIX*properties`' . |
|
253 | + $deleteStatement = 'DELETE FROM `*PREFIX*properties`'. |
|
254 | 254 | ' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?'; |
255 | 255 | |
256 | - $insertStatement = 'INSERT INTO `*PREFIX*properties`' . |
|
256 | + $insertStatement = 'INSERT INTO `*PREFIX*properties`'. |
|
257 | 257 | ' (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)'; |
258 | 258 | |
259 | - $updateStatement = 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ?' . |
|
259 | + $updateStatement = 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ?'. |
|
260 | 260 | ' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?'; |
261 | 261 | |
262 | 262 | // TODO: use "insert or update" strategy ? |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | |
330 | 330 | $result = $this->connection->executeQuery( |
331 | 331 | $sql, |
332 | - array($this->user, $this->connection->escapeLikeParameter(rtrim($path, '/')) . '/%', $requestedProperties), |
|
332 | + array($this->user, $this->connection->escapeLikeParameter(rtrim($path, '/')).'/%', $requestedProperties), |
|
333 | 333 | array(null, null, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY) |
334 | 334 | ); |
335 | 335 |
@@ -232,6 +232,9 @@ |
||
232 | 232 | return '"' . $this->info->getEtag() . '"'; |
233 | 233 | } |
234 | 234 | |
235 | + /** |
|
236 | + * @param string $path |
|
237 | + */ |
|
235 | 238 | private function getPartFileBasePath($path) { |
236 | 239 | $partFileInStorage = \OC::$server->getConfig()->getSystemValue('part_file_in_storage', true); |
237 | 240 | if ($partFileInStorage) { |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | throw new Forbidden(); |
93 | 93 | } |
94 | 94 | } catch (StorageNotAvailableException $e) { |
95 | - throw new ServiceUnavailable("File is not updatable: " . $e->getMessage()); |
|
95 | + throw new ServiceUnavailable("File is not updatable: ".$e->getMessage()); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | // verify path of the target |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | |
113 | 113 | if ($needsPartFile) { |
114 | 114 | // mark file as partial while uploading (ignored by the scanner) |
115 | - $partFilePath = $this->getPartFileBasePath($this->path) . '.ocTransferId' . rand() . '.part'; |
|
115 | + $partFilePath = $this->getPartFileBasePath($this->path).'.ocTransferId'.rand().'.part'; |
|
116 | 116 | } else { |
117 | 117 | // upload file directly as the final path |
118 | 118 | $partFilePath = $this->path; |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | if (isset($_SERVER['CONTENT_LENGTH'])) { |
139 | 139 | $expected = $_SERVER['CONTENT_LENGTH']; |
140 | 140 | } |
141 | - throw new Exception('Error while copying file to target location (copied bytes: ' . $count . ', expected filesize: ' . $expected . ' )'); |
|
141 | + throw new Exception('Error while copying file to target location (copied bytes: '.$count.', expected filesize: '.$expected.' )'); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | // if content length is sent by client: |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] === 'PUT') { |
148 | 148 | $expected = $_SERVER['CONTENT_LENGTH']; |
149 | 149 | if ($count != $expected) { |
150 | - throw new BadRequest('expected filesize ' . $expected . ' got ' . $count); |
|
150 | + throw new BadRequest('expected filesize '.$expected.' got '.$count); |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | |
@@ -227,10 +227,10 @@ discard block |
||
227 | 227 | } |
228 | 228 | |
229 | 229 | } catch (StorageNotAvailableException $e) { |
230 | - throw new ServiceUnavailable("Failed to check file size: " . $e->getMessage()); |
|
230 | + throw new ServiceUnavailable("Failed to check file size: ".$e->getMessage()); |
|
231 | 231 | } |
232 | 232 | |
233 | - return '"' . $this->info->getEtag() . '"'; |
|
233 | + return '"'.$this->info->getEtag().'"'; |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | private function getPartFileBasePath($path) { |
@@ -309,9 +309,9 @@ discard block |
||
309 | 309 | return $res; |
310 | 310 | } catch (GenericEncryptionException $e) { |
311 | 311 | // returning 503 will allow retry of the operation at a later point in time |
312 | - throw new ServiceUnavailable("Encryption not ready: " . $e->getMessage()); |
|
312 | + throw new ServiceUnavailable("Encryption not ready: ".$e->getMessage()); |
|
313 | 313 | } catch (StorageNotAvailableException $e) { |
314 | - throw new ServiceUnavailable("Failed to open file: " . $e->getMessage()); |
|
314 | + throw new ServiceUnavailable("Failed to open file: ".$e->getMessage()); |
|
315 | 315 | } catch (ForbiddenException $ex) { |
316 | 316 | throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry()); |
317 | 317 | } catch (LockedException $e) { |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | throw new Forbidden(); |
337 | 337 | } |
338 | 338 | } catch (StorageNotAvailableException $e) { |
339 | - throw new ServiceUnavailable("Failed to unlink: " . $e->getMessage()); |
|
339 | + throw new ServiceUnavailable("Failed to unlink: ".$e->getMessage()); |
|
340 | 340 | } catch (ForbiddenException $ex) { |
341 | 341 | throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry()); |
342 | 342 | } catch (LockedException $e) { |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | if ($bytesWritten != $expected) { |
404 | 404 | $chunk_handler->remove($info['index']); |
405 | 405 | throw new BadRequest( |
406 | - 'expected filesize ' . $expected . ' got ' . $bytesWritten); |
|
406 | + 'expected filesize '.$expected.' got '.$bytesWritten); |
|
407 | 407 | } |
408 | 408 | } |
409 | 409 | } |
@@ -413,7 +413,7 @@ discard block |
||
413 | 413 | $needsPartFile = $this->needsPartFile($storage); |
414 | 414 | $partFile = null; |
415 | 415 | |
416 | - $targetPath = $path . '/' . $info['name']; |
|
416 | + $targetPath = $path.'/'.$info['name']; |
|
417 | 417 | /** @var \OC\Files\Storage\Storage $targetStorage */ |
418 | 418 | list($targetStorage, $targetInternalPath) = $this->fileView->resolvePath($targetPath); |
419 | 419 | |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | |
430 | 430 | if ($needsPartFile) { |
431 | 431 | // we first assembly the target file as a part file |
432 | - $partFile = $this->getPartFileBasePath($path . '/' . $info['name']) . '.ocTransferId' . $info['transferid'] . '.part'; |
|
432 | + $partFile = $this->getPartFileBasePath($path.'/'.$info['name']).'.ocTransferId'.$info['transferid'].'.part'; |
|
433 | 433 | /** @var \OC\Files\Storage\Storage $targetStorage */ |
434 | 434 | list($partStorage, $partInternalPath) = $this->fileView->resolvePath($partFile); |
435 | 435 | |
@@ -548,10 +548,10 @@ discard block |
||
548 | 548 | } |
549 | 549 | if ($e instanceof GenericEncryptionException) { |
550 | 550 | // returning 503 will allow retry of the operation at a later point in time |
551 | - throw new ServiceUnavailable('Encryption not ready: ' . $e->getMessage(), 0, $e); |
|
551 | + throw new ServiceUnavailable('Encryption not ready: '.$e->getMessage(), 0, $e); |
|
552 | 552 | } |
553 | 553 | if ($e instanceof StorageNotAvailableException) { |
554 | - throw new ServiceUnavailable('Failed to write file contents: ' . $e->getMessage(), 0, $e); |
|
554 | + throw new ServiceUnavailable('Failed to write file contents: '.$e->getMessage(), 0, $e); |
|
555 | 555 | } |
556 | 556 | |
557 | 557 | throw new \Sabre\DAV\Exception($e->getMessage(), 0, $e); |
@@ -132,7 +132,7 @@ |
||
132 | 132 | * Returns the list of members for a group-principal |
133 | 133 | * |
134 | 134 | * @param string $principal |
135 | - * @return array |
|
135 | + * @return string[] |
|
136 | 136 | */ |
137 | 137 | function getGroupMemberSet($principal) { |
138 | 138 | // TODO: for now the group principal has only one member, the user itself |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | |
119 | 119 | /** |
120 | 120 | * @param string $data |
121 | - * @return int |
|
121 | + * @return boolean |
|
122 | 122 | */ |
123 | 123 | public function stream_write($data) { |
124 | 124 | return false; |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | } |
225 | 225 | |
226 | 226 | /** |
227 | - * @param $pos |
|
227 | + * @param integer $pos |
|
228 | 228 | * @return IFile | null |
229 | 229 | */ |
230 | 230 | private function getNodeForPosition($pos) { |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | // build additional information |
75 | 75 | $this->sortedNodes = []; |
76 | 76 | $start = 0; |
77 | - foreach($this->nodes as $node) { |
|
77 | + foreach ($this->nodes as $node) { |
|
78 | 78 | $size = $node->getSize(); |
79 | 79 | $name = $node->getName(); |
80 | 80 | $this->sortedNodes[$name] = ['node' => $node, 'start' => $start, 'end' => $start + $size]; |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | if (isset($context[$name])) { |
217 | 217 | $context = $context[$name]; |
218 | 218 | } else { |
219 | - throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set'); |
|
219 | + throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set'); |
|
220 | 220 | } |
221 | 221 | if (isset($context['nodes']) and is_array($context['nodes'])) { |
222 | 222 | $this->nodes = $context['nodes']; |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | * @return IFile | null |
254 | 254 | */ |
255 | 255 | private function getNodeForPosition($pos) { |
256 | - foreach($this->sortedNodes as $node) { |
|
256 | + foreach ($this->sortedNodes as $node) { |
|
257 | 257 | if ($pos >= $node['start'] && $pos < $node['end']) { |
258 | 258 | return [$node['node'], $pos - $node['start']]; |
259 | 259 | } |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | return $data; |
272 | 272 | } |
273 | 273 | |
274 | - return fopen('data://text/plain,' . $data,'r'); |
|
274 | + return fopen('data://text/plain,'.$data, 'r'); |
|
275 | 275 | } |
276 | 276 | |
277 | 277 | } |
@@ -369,7 +369,7 @@ |
||
369 | 369 | * @param string $path path to the file which should be updated |
370 | 370 | * @param string $uid of the user who performs the operation |
371 | 371 | * @param array $accessList who has access to the file contains the key 'users' and 'public' |
372 | - * @return boolean |
|
372 | + * @return null|boolean |
|
373 | 373 | */ |
374 | 374 | public function update($path, $uid, array $accessList) { |
375 | 375 |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | $this->isWriteOperation = false; |
178 | 178 | $this->writeCache = ''; |
179 | 179 | |
180 | - if($this->session->isReady() === false) { |
|
180 | + if ($this->session->isReady() === false) { |
|
181 | 181 | // if the master key is enabled we can initialize encryption |
182 | 182 | // with a empty password and user name |
183 | 183 | if ($this->util->isMasterKeyEnabled()) { |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | // always use the version from the original file, also part files |
199 | 199 | // need to have a correct version number if they get moved over to the |
200 | 200 | // final location |
201 | - $this->version = (int)$this->keyManager->getVersion($this->stripPartFileExtension($path), new View()); |
|
201 | + $this->version = (int) $this->keyManager->getVersion($this->stripPartFileExtension($path), new View()); |
|
202 | 202 | |
203 | 203 | if ( |
204 | 204 | $mode === 'w' |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | // if we read a part file we need to increase the version by 1 |
215 | 215 | // because the version number was also increased by writing |
216 | 216 | // the part file |
217 | - if(Scanner::isPartialFile($path)) { |
|
217 | + if (Scanner::isPartialFile($path)) { |
|
218 | 218 | $this->version = $this->version + 1; |
219 | 219 | } |
220 | 220 | } |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | if ($this->writeCache) { |
301 | 301 | |
302 | 302 | // Concat writeCache to start of $data |
303 | - $data = $this->writeCache . $data; |
|
303 | + $data = $this->writeCache.$data; |
|
304 | 304 | |
305 | 305 | // Clear the write cache, ready for reuse - it has been |
306 | 306 | // flushed and its old contents processed |
@@ -402,7 +402,7 @@ discard block |
||
402 | 402 | try { |
403 | 403 | $publicKeys[$user] = $this->keyManager->getPublicKey($user); |
404 | 404 | } catch (PublicKeyMissingException $e) { |
405 | - $this->logger->warning('Could not encrypt file for ' . $user . ': ' . $e->getMessage()); |
|
405 | + $this->logger->warning('Could not encrypt file for '.$user.': '.$e->getMessage()); |
|
406 | 406 | } |
407 | 407 | } |
408 | 408 | } |
@@ -489,8 +489,8 @@ discard block |
||
489 | 489 | // error message because in this case it means that the file was |
490 | 490 | // shared with the user at a point where the user didn't had a |
491 | 491 | // valid private/public key |
492 | - $msg = 'Encryption module "' . $this->getDisplayName() . |
|
493 | - '" is not able to read ' . $path; |
|
492 | + $msg = 'Encryption module "'.$this->getDisplayName(). |
|
493 | + '" is not able to read '.$path; |
|
494 | 494 | $hint = $this->l->t('Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.'); |
495 | 495 | $this->logger->warning($msg); |
496 | 496 | throw new DecryptionFailedException($msg, $hint); |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | $realPath = $path; |
533 | 533 | $parts = explode('/', $path); |
534 | 534 | if ($parts[2] === 'files_versions') { |
535 | - $realPath = '/' . $parts[1] . '/files/' . implode('/', array_slice($parts, 3)); |
|
535 | + $realPath = '/'.$parts[1].'/files/'.implode('/', array_slice($parts, 3)); |
|
536 | 536 | $length = strrpos($realPath, '.'); |
537 | 537 | $realPath = substr($realPath, 0, $length); |
538 | 538 | } |