Passed
Push — master ( 2ac01c...f7152c )
by Roeland
13:31 queued 10s
created
lib/private/Files/Storage/Wrapper/Availability.php 1 patch
Indentation   +435 added lines, -435 removed lines patch added patch discarded remove patch
@@ -30,439 +30,439 @@
 block discarded – undo
30 30
  * Throws a StorageNotAvailableException for storages with known failures
31 31
  */
32 32
 class Availability extends Wrapper {
33
-	const RECHECK_TTL_SEC = 600; // 10 minutes
34
-
35
-	public static function shouldRecheck($availability) {
36
-		if (!$availability['available']) {
37
-			// trigger a recheck if TTL reached
38
-			if ((time() - $availability['last_checked']) > self::RECHECK_TTL_SEC) {
39
-				return true;
40
-			}
41
-		}
42
-		return false;
43
-	}
44
-
45
-	/**
46
-	 * Only called if availability === false
47
-	 *
48
-	 * @return bool
49
-	 */
50
-	private function updateAvailability() {
51
-		// reset availability to false so that multiple requests don't recheck concurrently
52
-		$this->setAvailability(false);
53
-		try {
54
-			$result = $this->test();
55
-		} catch (\Exception $e) {
56
-			$result = false;
57
-		}
58
-		$this->setAvailability($result);
59
-		return $result;
60
-	}
61
-
62
-	/**
63
-	 * @return bool
64
-	 */
65
-	private function isAvailable() {
66
-		$availability = $this->getAvailability();
67
-		if (self::shouldRecheck($availability)) {
68
-			return $this->updateAvailability();
69
-		}
70
-		return $availability['available'];
71
-	}
72
-
73
-	/**
74
-	 * @throws \OCP\Files\StorageNotAvailableException
75
-	 */
76
-	private function checkAvailability() {
77
-		if (!$this->isAvailable()) {
78
-			throw new \OCP\Files\StorageNotAvailableException();
79
-		}
80
-	}
81
-
82
-	/** {@inheritdoc} */
83
-	public function mkdir($path) {
84
-		$this->checkAvailability();
85
-		try {
86
-			return parent::mkdir($path);
87
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
88
-			$this->setAvailability(false);
89
-			throw $e;
90
-		}
91
-	}
92
-
93
-	/** {@inheritdoc} */
94
-	public function rmdir($path) {
95
-		$this->checkAvailability();
96
-		try {
97
-			return parent::rmdir($path);
98
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
99
-			$this->setAvailability(false);
100
-			throw $e;
101
-		}
102
-	}
103
-
104
-	/** {@inheritdoc} */
105
-	public function opendir($path) {
106
-		$this->checkAvailability();
107
-		try {
108
-			return parent::opendir($path);
109
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
110
-			$this->setAvailability(false);
111
-			throw $e;
112
-		}
113
-	}
114
-
115
-	/** {@inheritdoc} */
116
-	public function is_dir($path) {
117
-		$this->checkAvailability();
118
-		try {
119
-			return parent::is_dir($path);
120
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
121
-			$this->setAvailability(false);
122
-			throw $e;
123
-		}
124
-	}
125
-
126
-	/** {@inheritdoc} */
127
-	public function is_file($path) {
128
-		$this->checkAvailability();
129
-		try {
130
-			return parent::is_file($path);
131
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
132
-			$this->setAvailability(false);
133
-			throw $e;
134
-		}
135
-	}
136
-
137
-	/** {@inheritdoc} */
138
-	public function stat($path) {
139
-		$this->checkAvailability();
140
-		try {
141
-			return parent::stat($path);
142
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
143
-			$this->setAvailability(false);
144
-			throw $e;
145
-		}
146
-	}
147
-
148
-	/** {@inheritdoc} */
149
-	public function filetype($path) {
150
-		$this->checkAvailability();
151
-		try {
152
-			return parent::filetype($path);
153
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
154
-			$this->setAvailability(false);
155
-			throw $e;
156
-		}
157
-	}
158
-
159
-	/** {@inheritdoc} */
160
-	public function filesize($path) {
161
-		$this->checkAvailability();
162
-		try {
163
-			return parent::filesize($path);
164
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
165
-			$this->setAvailability(false);
166
-			throw $e;
167
-		}
168
-	}
169
-
170
-	/** {@inheritdoc} */
171
-	public function isCreatable($path) {
172
-		$this->checkAvailability();
173
-		try {
174
-			return parent::isCreatable($path);
175
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
176
-			$this->setAvailability(false);
177
-			throw $e;
178
-		}
179
-	}
180
-
181
-	/** {@inheritdoc} */
182
-	public function isReadable($path) {
183
-		$this->checkAvailability();
184
-		try {
185
-			return parent::isReadable($path);
186
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
187
-			$this->setAvailability(false);
188
-			throw $e;
189
-		}
190
-	}
191
-
192
-	/** {@inheritdoc} */
193
-	public function isUpdatable($path) {
194
-		$this->checkAvailability();
195
-		try {
196
-			return parent::isUpdatable($path);
197
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
198
-			$this->setAvailability(false);
199
-			throw $e;
200
-		}
201
-	}
202
-
203
-	/** {@inheritdoc} */
204
-	public function isDeletable($path) {
205
-		$this->checkAvailability();
206
-		try {
207
-			return parent::isDeletable($path);
208
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
209
-			$this->setAvailability(false);
210
-			throw $e;
211
-		}
212
-	}
213
-
214
-	/** {@inheritdoc} */
215
-	public function isSharable($path) {
216
-		$this->checkAvailability();
217
-		try {
218
-			return parent::isSharable($path);
219
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
220
-			$this->setAvailability(false);
221
-			throw $e;
222
-		}
223
-	}
224
-
225
-	/** {@inheritdoc} */
226
-	public function getPermissions($path) {
227
-		$this->checkAvailability();
228
-		try {
229
-			return parent::getPermissions($path);
230
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
231
-			$this->setAvailability(false);
232
-			throw $e;
233
-		}
234
-	}
235
-
236
-	/** {@inheritdoc} */
237
-	public function file_exists($path) {
238
-		if ($path === '') {
239
-			return true;
240
-		}
241
-		$this->checkAvailability();
242
-		try {
243
-			return parent::file_exists($path);
244
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
245
-			$this->setAvailability(false);
246
-			throw $e;
247
-		}
248
-	}
249
-
250
-	/** {@inheritdoc} */
251
-	public function filemtime($path) {
252
-		$this->checkAvailability();
253
-		try {
254
-			return parent::filemtime($path);
255
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
256
-			$this->setAvailability(false);
257
-			throw $e;
258
-		}
259
-	}
260
-
261
-	/** {@inheritdoc} */
262
-	public function file_get_contents($path) {
263
-		$this->checkAvailability();
264
-		try {
265
-			return parent::file_get_contents($path);
266
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
267
-			$this->setAvailability(false);
268
-			throw $e;
269
-		}
270
-	}
271
-
272
-	/** {@inheritdoc} */
273
-	public function file_put_contents($path, $data) {
274
-		$this->checkAvailability();
275
-		try {
276
-			return parent::file_put_contents($path, $data);
277
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
278
-			$this->setAvailability(false);
279
-			throw $e;
280
-		}
281
-	}
282
-
283
-	/** {@inheritdoc} */
284
-	public function unlink($path) {
285
-		$this->checkAvailability();
286
-		try {
287
-			return parent::unlink($path);
288
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
289
-			$this->setAvailability(false);
290
-			throw $e;
291
-		}
292
-	}
293
-
294
-	/** {@inheritdoc} */
295
-	public function rename($path1, $path2) {
296
-		$this->checkAvailability();
297
-		try {
298
-			return parent::rename($path1, $path2);
299
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
300
-			$this->setAvailability(false);
301
-			throw $e;
302
-		}
303
-	}
304
-
305
-	/** {@inheritdoc} */
306
-	public function copy($path1, $path2) {
307
-		$this->checkAvailability();
308
-		try {
309
-			return parent::copy($path1, $path2);
310
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
311
-			$this->setAvailability(false);
312
-			throw $e;
313
-		}
314
-	}
315
-
316
-	/** {@inheritdoc} */
317
-	public function fopen($path, $mode) {
318
-		$this->checkAvailability();
319
-		try {
320
-			return parent::fopen($path, $mode);
321
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
322
-			$this->setAvailability(false);
323
-			throw $e;
324
-		}
325
-	}
326
-
327
-	/** {@inheritdoc} */
328
-	public function getMimeType($path) {
329
-		$this->checkAvailability();
330
-		try {
331
-			return parent::getMimeType($path);
332
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
333
-			$this->setAvailability(false);
334
-			throw $e;
335
-		}
336
-	}
337
-
338
-	/** {@inheritdoc} */
339
-	public function hash($type, $path, $raw = false) {
340
-		$this->checkAvailability();
341
-		try {
342
-			return parent::hash($type, $path, $raw);
343
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
344
-			$this->setAvailability(false);
345
-			throw $e;
346
-		}
347
-	}
348
-
349
-	/** {@inheritdoc} */
350
-	public function free_space($path) {
351
-		$this->checkAvailability();
352
-		try {
353
-			return parent::free_space($path);
354
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
355
-			$this->setAvailability(false);
356
-			throw $e;
357
-		}
358
-	}
359
-
360
-	/** {@inheritdoc} */
361
-	public function search($query) {
362
-		$this->checkAvailability();
363
-		try {
364
-			return parent::search($query);
365
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
366
-			$this->setAvailability(false);
367
-			throw $e;
368
-		}
369
-	}
370
-
371
-	/** {@inheritdoc} */
372
-	public function touch($path, $mtime = null) {
373
-		$this->checkAvailability();
374
-		try {
375
-			return parent::touch($path, $mtime);
376
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
377
-			$this->setAvailability(false);
378
-			throw $e;
379
-		}
380
-	}
381
-
382
-	/** {@inheritdoc} */
383
-	public function getLocalFile($path) {
384
-		$this->checkAvailability();
385
-		try {
386
-			return parent::getLocalFile($path);
387
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
388
-			$this->setAvailability(false);
389
-			throw $e;
390
-		}
391
-	}
392
-
393
-	/** {@inheritdoc} */
394
-	public function hasUpdated($path, $time) {
395
-		$this->checkAvailability();
396
-		try {
397
-			return parent::hasUpdated($path, $time);
398
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
399
-			$this->setAvailability(false);
400
-			throw $e;
401
-		}
402
-	}
403
-
404
-	/** {@inheritdoc} */
405
-	public function getOwner($path) {
406
-		try {
407
-			return parent::getOwner($path);
408
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
409
-			$this->setAvailability(false);
410
-			throw $e;
411
-		}
412
-	}
413
-
414
-	/** {@inheritdoc} */
415
-	public function getETag($path) {
416
-		$this->checkAvailability();
417
-		try {
418
-			return parent::getETag($path);
419
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
420
-			$this->setAvailability(false);
421
-			throw $e;
422
-		}
423
-	}
424
-
425
-	/** {@inheritdoc} */
426
-	public function getDirectDownload($path) {
427
-		$this->checkAvailability();
428
-		try {
429
-			return parent::getDirectDownload($path);
430
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
431
-			$this->setAvailability(false);
432
-			throw $e;
433
-		}
434
-	}
435
-
436
-	/** {@inheritdoc} */
437
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
438
-		$this->checkAvailability();
439
-		try {
440
-			return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
441
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
442
-			$this->setAvailability(false);
443
-			throw $e;
444
-		}
445
-	}
446
-
447
-	/** {@inheritdoc} */
448
-	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
449
-		$this->checkAvailability();
450
-		try {
451
-			return parent::moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
452
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
453
-			$this->setAvailability(false);
454
-			throw $e;
455
-		}
456
-	}
457
-
458
-	/** {@inheritdoc} */
459
-	public function getMetaData($path) {
460
-		$this->checkAvailability();
461
-		try {
462
-			return parent::getMetaData($path);
463
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
464
-			$this->setAvailability(false);
465
-			throw $e;
466
-		}
467
-	}
33
+    const RECHECK_TTL_SEC = 600; // 10 minutes
34
+
35
+    public static function shouldRecheck($availability) {
36
+        if (!$availability['available']) {
37
+            // trigger a recheck if TTL reached
38
+            if ((time() - $availability['last_checked']) > self::RECHECK_TTL_SEC) {
39
+                return true;
40
+            }
41
+        }
42
+        return false;
43
+    }
44
+
45
+    /**
46
+     * Only called if availability === false
47
+     *
48
+     * @return bool
49
+     */
50
+    private function updateAvailability() {
51
+        // reset availability to false so that multiple requests don't recheck concurrently
52
+        $this->setAvailability(false);
53
+        try {
54
+            $result = $this->test();
55
+        } catch (\Exception $e) {
56
+            $result = false;
57
+        }
58
+        $this->setAvailability($result);
59
+        return $result;
60
+    }
61
+
62
+    /**
63
+     * @return bool
64
+     */
65
+    private function isAvailable() {
66
+        $availability = $this->getAvailability();
67
+        if (self::shouldRecheck($availability)) {
68
+            return $this->updateAvailability();
69
+        }
70
+        return $availability['available'];
71
+    }
72
+
73
+    /**
74
+     * @throws \OCP\Files\StorageNotAvailableException
75
+     */
76
+    private function checkAvailability() {
77
+        if (!$this->isAvailable()) {
78
+            throw new \OCP\Files\StorageNotAvailableException();
79
+        }
80
+    }
81
+
82
+    /** {@inheritdoc} */
83
+    public function mkdir($path) {
84
+        $this->checkAvailability();
85
+        try {
86
+            return parent::mkdir($path);
87
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
88
+            $this->setAvailability(false);
89
+            throw $e;
90
+        }
91
+    }
92
+
93
+    /** {@inheritdoc} */
94
+    public function rmdir($path) {
95
+        $this->checkAvailability();
96
+        try {
97
+            return parent::rmdir($path);
98
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
99
+            $this->setAvailability(false);
100
+            throw $e;
101
+        }
102
+    }
103
+
104
+    /** {@inheritdoc} */
105
+    public function opendir($path) {
106
+        $this->checkAvailability();
107
+        try {
108
+            return parent::opendir($path);
109
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
110
+            $this->setAvailability(false);
111
+            throw $e;
112
+        }
113
+    }
114
+
115
+    /** {@inheritdoc} */
116
+    public function is_dir($path) {
117
+        $this->checkAvailability();
118
+        try {
119
+            return parent::is_dir($path);
120
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
121
+            $this->setAvailability(false);
122
+            throw $e;
123
+        }
124
+    }
125
+
126
+    /** {@inheritdoc} */
127
+    public function is_file($path) {
128
+        $this->checkAvailability();
129
+        try {
130
+            return parent::is_file($path);
131
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
132
+            $this->setAvailability(false);
133
+            throw $e;
134
+        }
135
+    }
136
+
137
+    /** {@inheritdoc} */
138
+    public function stat($path) {
139
+        $this->checkAvailability();
140
+        try {
141
+            return parent::stat($path);
142
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
143
+            $this->setAvailability(false);
144
+            throw $e;
145
+        }
146
+    }
147
+
148
+    /** {@inheritdoc} */
149
+    public function filetype($path) {
150
+        $this->checkAvailability();
151
+        try {
152
+            return parent::filetype($path);
153
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
154
+            $this->setAvailability(false);
155
+            throw $e;
156
+        }
157
+    }
158
+
159
+    /** {@inheritdoc} */
160
+    public function filesize($path) {
161
+        $this->checkAvailability();
162
+        try {
163
+            return parent::filesize($path);
164
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
165
+            $this->setAvailability(false);
166
+            throw $e;
167
+        }
168
+    }
169
+
170
+    /** {@inheritdoc} */
171
+    public function isCreatable($path) {
172
+        $this->checkAvailability();
173
+        try {
174
+            return parent::isCreatable($path);
175
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
176
+            $this->setAvailability(false);
177
+            throw $e;
178
+        }
179
+    }
180
+
181
+    /** {@inheritdoc} */
182
+    public function isReadable($path) {
183
+        $this->checkAvailability();
184
+        try {
185
+            return parent::isReadable($path);
186
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
187
+            $this->setAvailability(false);
188
+            throw $e;
189
+        }
190
+    }
191
+
192
+    /** {@inheritdoc} */
193
+    public function isUpdatable($path) {
194
+        $this->checkAvailability();
195
+        try {
196
+            return parent::isUpdatable($path);
197
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
198
+            $this->setAvailability(false);
199
+            throw $e;
200
+        }
201
+    }
202
+
203
+    /** {@inheritdoc} */
204
+    public function isDeletable($path) {
205
+        $this->checkAvailability();
206
+        try {
207
+            return parent::isDeletable($path);
208
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
209
+            $this->setAvailability(false);
210
+            throw $e;
211
+        }
212
+    }
213
+
214
+    /** {@inheritdoc} */
215
+    public function isSharable($path) {
216
+        $this->checkAvailability();
217
+        try {
218
+            return parent::isSharable($path);
219
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
220
+            $this->setAvailability(false);
221
+            throw $e;
222
+        }
223
+    }
224
+
225
+    /** {@inheritdoc} */
226
+    public function getPermissions($path) {
227
+        $this->checkAvailability();
228
+        try {
229
+            return parent::getPermissions($path);
230
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
231
+            $this->setAvailability(false);
232
+            throw $e;
233
+        }
234
+    }
235
+
236
+    /** {@inheritdoc} */
237
+    public function file_exists($path) {
238
+        if ($path === '') {
239
+            return true;
240
+        }
241
+        $this->checkAvailability();
242
+        try {
243
+            return parent::file_exists($path);
244
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
245
+            $this->setAvailability(false);
246
+            throw $e;
247
+        }
248
+    }
249
+
250
+    /** {@inheritdoc} */
251
+    public function filemtime($path) {
252
+        $this->checkAvailability();
253
+        try {
254
+            return parent::filemtime($path);
255
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
256
+            $this->setAvailability(false);
257
+            throw $e;
258
+        }
259
+    }
260
+
261
+    /** {@inheritdoc} */
262
+    public function file_get_contents($path) {
263
+        $this->checkAvailability();
264
+        try {
265
+            return parent::file_get_contents($path);
266
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
267
+            $this->setAvailability(false);
268
+            throw $e;
269
+        }
270
+    }
271
+
272
+    /** {@inheritdoc} */
273
+    public function file_put_contents($path, $data) {
274
+        $this->checkAvailability();
275
+        try {
276
+            return parent::file_put_contents($path, $data);
277
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
278
+            $this->setAvailability(false);
279
+            throw $e;
280
+        }
281
+    }
282
+
283
+    /** {@inheritdoc} */
284
+    public function unlink($path) {
285
+        $this->checkAvailability();
286
+        try {
287
+            return parent::unlink($path);
288
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
289
+            $this->setAvailability(false);
290
+            throw $e;
291
+        }
292
+    }
293
+
294
+    /** {@inheritdoc} */
295
+    public function rename($path1, $path2) {
296
+        $this->checkAvailability();
297
+        try {
298
+            return parent::rename($path1, $path2);
299
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
300
+            $this->setAvailability(false);
301
+            throw $e;
302
+        }
303
+    }
304
+
305
+    /** {@inheritdoc} */
306
+    public function copy($path1, $path2) {
307
+        $this->checkAvailability();
308
+        try {
309
+            return parent::copy($path1, $path2);
310
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
311
+            $this->setAvailability(false);
312
+            throw $e;
313
+        }
314
+    }
315
+
316
+    /** {@inheritdoc} */
317
+    public function fopen($path, $mode) {
318
+        $this->checkAvailability();
319
+        try {
320
+            return parent::fopen($path, $mode);
321
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
322
+            $this->setAvailability(false);
323
+            throw $e;
324
+        }
325
+    }
326
+
327
+    /** {@inheritdoc} */
328
+    public function getMimeType($path) {
329
+        $this->checkAvailability();
330
+        try {
331
+            return parent::getMimeType($path);
332
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
333
+            $this->setAvailability(false);
334
+            throw $e;
335
+        }
336
+    }
337
+
338
+    /** {@inheritdoc} */
339
+    public function hash($type, $path, $raw = false) {
340
+        $this->checkAvailability();
341
+        try {
342
+            return parent::hash($type, $path, $raw);
343
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
344
+            $this->setAvailability(false);
345
+            throw $e;
346
+        }
347
+    }
348
+
349
+    /** {@inheritdoc} */
350
+    public function free_space($path) {
351
+        $this->checkAvailability();
352
+        try {
353
+            return parent::free_space($path);
354
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
355
+            $this->setAvailability(false);
356
+            throw $e;
357
+        }
358
+    }
359
+
360
+    /** {@inheritdoc} */
361
+    public function search($query) {
362
+        $this->checkAvailability();
363
+        try {
364
+            return parent::search($query);
365
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
366
+            $this->setAvailability(false);
367
+            throw $e;
368
+        }
369
+    }
370
+
371
+    /** {@inheritdoc} */
372
+    public function touch($path, $mtime = null) {
373
+        $this->checkAvailability();
374
+        try {
375
+            return parent::touch($path, $mtime);
376
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
377
+            $this->setAvailability(false);
378
+            throw $e;
379
+        }
380
+    }
381
+
382
+    /** {@inheritdoc} */
383
+    public function getLocalFile($path) {
384
+        $this->checkAvailability();
385
+        try {
386
+            return parent::getLocalFile($path);
387
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
388
+            $this->setAvailability(false);
389
+            throw $e;
390
+        }
391
+    }
392
+
393
+    /** {@inheritdoc} */
394
+    public function hasUpdated($path, $time) {
395
+        $this->checkAvailability();
396
+        try {
397
+            return parent::hasUpdated($path, $time);
398
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
399
+            $this->setAvailability(false);
400
+            throw $e;
401
+        }
402
+    }
403
+
404
+    /** {@inheritdoc} */
405
+    public function getOwner($path) {
406
+        try {
407
+            return parent::getOwner($path);
408
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
409
+            $this->setAvailability(false);
410
+            throw $e;
411
+        }
412
+    }
413
+
414
+    /** {@inheritdoc} */
415
+    public function getETag($path) {
416
+        $this->checkAvailability();
417
+        try {
418
+            return parent::getETag($path);
419
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
420
+            $this->setAvailability(false);
421
+            throw $e;
422
+        }
423
+    }
424
+
425
+    /** {@inheritdoc} */
426
+    public function getDirectDownload($path) {
427
+        $this->checkAvailability();
428
+        try {
429
+            return parent::getDirectDownload($path);
430
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
431
+            $this->setAvailability(false);
432
+            throw $e;
433
+        }
434
+    }
435
+
436
+    /** {@inheritdoc} */
437
+    public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
438
+        $this->checkAvailability();
439
+        try {
440
+            return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
441
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
442
+            $this->setAvailability(false);
443
+            throw $e;
444
+        }
445
+    }
446
+
447
+    /** {@inheritdoc} */
448
+    public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
449
+        $this->checkAvailability();
450
+        try {
451
+            return parent::moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
452
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
453
+            $this->setAvailability(false);
454
+            throw $e;
455
+        }
456
+    }
457
+
458
+    /** {@inheritdoc} */
459
+    public function getMetaData($path) {
460
+        $this->checkAvailability();
461
+        try {
462
+            return parent::getMetaData($path);
463
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
464
+            $this->setAvailability(false);
465
+            throw $e;
466
+        }
467
+    }
468 468
 }
Please login to merge, or discard this patch.
lib/private/Session/CryptoWrapper.php 1 patch
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -48,58 +48,58 @@
 block discarded – undo
48 48
  * @package OC\Session
49 49
  */
50 50
 class CryptoWrapper {
51
-	const COOKIE_NAME = 'oc_sessionPassphrase';
51
+    const COOKIE_NAME = 'oc_sessionPassphrase';
52 52
 
53
-	/** @var IConfig */
54
-	protected $config;
55
-	/** @var ISession */
56
-	protected $session;
57
-	/** @var ICrypto */
58
-	protected $crypto;
59
-	/** @var ISecureRandom */
60
-	protected $random;
61
-	/** @var string */
62
-	protected $passphrase;
53
+    /** @var IConfig */
54
+    protected $config;
55
+    /** @var ISession */
56
+    protected $session;
57
+    /** @var ICrypto */
58
+    protected $crypto;
59
+    /** @var ISecureRandom */
60
+    protected $random;
61
+    /** @var string */
62
+    protected $passphrase;
63 63
 
64
-	/**
65
-	 * @param IConfig $config
66
-	 * @param ICrypto $crypto
67
-	 * @param ISecureRandom $random
68
-	 * @param IRequest $request
69
-	 */
70
-	public function __construct(IConfig $config,
71
-								ICrypto $crypto,
72
-								ISecureRandom $random,
73
-								IRequest $request) {
74
-		$this->crypto = $crypto;
75
-		$this->config = $config;
76
-		$this->random = $random;
64
+    /**
65
+     * @param IConfig $config
66
+     * @param ICrypto $crypto
67
+     * @param ISecureRandom $random
68
+     * @param IRequest $request
69
+     */
70
+    public function __construct(IConfig $config,
71
+                                ICrypto $crypto,
72
+                                ISecureRandom $random,
73
+                                IRequest $request) {
74
+        $this->crypto = $crypto;
75
+        $this->config = $config;
76
+        $this->random = $random;
77 77
 
78
-		if (!is_null($request->getCookie(self::COOKIE_NAME))) {
79
-			$this->passphrase = $request->getCookie(self::COOKIE_NAME);
80
-		} else {
81
-			$this->passphrase = $this->random->generate(128);
82
-			$secureCookie = $request->getServerProtocol() === 'https';
83
-			// FIXME: Required for CI
84
-			if (!defined('PHPUNIT_RUN')) {
85
-				$webRoot = \OC::$WEBROOT;
86
-				if($webRoot === '') {
87
-					$webRoot = '/';
88
-				}
89
-				setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true);
90
-			}
91
-		}
92
-	}
78
+        if (!is_null($request->getCookie(self::COOKIE_NAME))) {
79
+            $this->passphrase = $request->getCookie(self::COOKIE_NAME);
80
+        } else {
81
+            $this->passphrase = $this->random->generate(128);
82
+            $secureCookie = $request->getServerProtocol() === 'https';
83
+            // FIXME: Required for CI
84
+            if (!defined('PHPUNIT_RUN')) {
85
+                $webRoot = \OC::$WEBROOT;
86
+                if($webRoot === '') {
87
+                    $webRoot = '/';
88
+                }
89
+                setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true);
90
+            }
91
+        }
92
+    }
93 93
 
94
-	/**
95
-	 * @param ISession $session
96
-	 * @return ISession
97
-	 */
98
-	public function wrapSession(ISession $session) {
99
-		if (!($session instanceof CryptoSessionData)) {
100
-			return new CryptoSessionData($session, $this->crypto, $this->passphrase);
101
-		}
94
+    /**
95
+     * @param ISession $session
96
+     * @return ISession
97
+     */
98
+    public function wrapSession(ISession $session) {
99
+        if (!($session instanceof CryptoSessionData)) {
100
+            return new CryptoSessionData($session, $this->crypto, $this->passphrase);
101
+        }
102 102
 
103
-		return $session;
104
-	}
103
+        return $session;
104
+    }
105 105
 }
Please login to merge, or discard this patch.
lib/public/IDateTimeFormatter.php 1 patch
Indentation   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -30,114 +30,114 @@
 block discarded – undo
30 30
  * @since 8.0.0
31 31
  */
32 32
 interface IDateTimeFormatter {
33
-	/**
34
-	 * Formats the date of the given timestamp
35
-	 *
36
-	 * @param int|\DateTime		$timestamp
37
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
38
-	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
39
-	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
40
-	 * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
41
-	 * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
42
-	 * 				The exact format is dependent on the language
43
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
44
-	 * @param \OCP\IL10N|null	$l			The locale to use
45
-	 * @return string Formatted date string
46
-	 * @since 8.0.0
47
-	 */
48
-	public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
33
+    /**
34
+     * Formats the date of the given timestamp
35
+     *
36
+     * @param int|\DateTime		$timestamp
37
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
38
+     * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
39
+     * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
40
+     * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
41
+     * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
42
+     * 				The exact format is dependent on the language
43
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
44
+     * @param \OCP\IL10N|null	$l			The locale to use
45
+     * @return string Formatted date string
46
+     * @since 8.0.0
47
+     */
48
+    public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
49 49
 
50
-	/**
51
-	 * Formats the date of the given timestamp
52
-	 *
53
-	 * @param int|\DateTime		$timestamp
54
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
55
-	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
56
-	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
57
-	 * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
58
-	 * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
59
-	 * 				The exact format is dependent on the language
60
-	 * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
61
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
62
-	 * @param \OCP\IL10N|null	$l			The locale to use
63
-	 * @return string Formatted relative date string
64
-	 * @since 8.0.0
65
-	 */
66
-	public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
50
+    /**
51
+     * Formats the date of the given timestamp
52
+     *
53
+     * @param int|\DateTime		$timestamp
54
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
55
+     * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
56
+     * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
57
+     * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
58
+     * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
59
+     * 				The exact format is dependent on the language
60
+     * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
61
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
62
+     * @param \OCP\IL10N|null	$l			The locale to use
63
+     * @return string Formatted relative date string
64
+     * @since 8.0.0
65
+     */
66
+    public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
67 67
 
68
-	/**
69
-	 * Gives the relative date of the timestamp
70
-	 * Only works for past dates
71
-	 *
72
-	 * @param int|\DateTime	$timestamp
73
-	 * @param int|\DateTime|null	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
74
-	 * @param \OCP\IL10N|null		$l			The locale to use
75
-	 * @return string	Dates returned are:
76
-	 * 				<  1 month	=> Today, Yesterday, n days ago
77
-	 * 				< 13 month	=> last month, n months ago
78
-	 * 				>= 13 month	=> last year, n years ago
79
-	 * @since 8.0.0
80
-	 */
81
-	public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null);
68
+    /**
69
+     * Gives the relative date of the timestamp
70
+     * Only works for past dates
71
+     *
72
+     * @param int|\DateTime	$timestamp
73
+     * @param int|\DateTime|null	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
74
+     * @param \OCP\IL10N|null		$l			The locale to use
75
+     * @return string	Dates returned are:
76
+     * 				<  1 month	=> Today, Yesterday, n days ago
77
+     * 				< 13 month	=> last month, n months ago
78
+     * 				>= 13 month	=> last year, n years ago
79
+     * @since 8.0.0
80
+     */
81
+    public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null);
82 82
 
83
-	/**
84
-	 * Formats the time of the given timestamp
85
-	 *
86
-	 * @param int|\DateTime $timestamp
87
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
88
-	 * 				full:	e.g. 'h:mm:ss a zzzz'	=> '11:42:13 AM GMT+0:00'
89
-	 * 				long:	e.g. 'h:mm:ss a z'		=> '11:42:13 AM GMT'
90
-	 * 				medium:	e.g. 'h:mm:ss a'		=> '11:42:13 AM'
91
-	 * 				short:	e.g. 'h:mm a'			=> '11:42 AM'
92
-	 * 				The exact format is dependent on the language
93
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
94
-	 * @param \OCP\IL10N|null		$l			The locale to use
95
-	 * @return string Formatted time string
96
-	 * @since 8.0.0
97
-	 */
98
-	public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
83
+    /**
84
+     * Formats the time of the given timestamp
85
+     *
86
+     * @param int|\DateTime $timestamp
87
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
88
+     * 				full:	e.g. 'h:mm:ss a zzzz'	=> '11:42:13 AM GMT+0:00'
89
+     * 				long:	e.g. 'h:mm:ss a z'		=> '11:42:13 AM GMT'
90
+     * 				medium:	e.g. 'h:mm:ss a'		=> '11:42:13 AM'
91
+     * 				short:	e.g. 'h:mm a'			=> '11:42 AM'
92
+     * 				The exact format is dependent on the language
93
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
94
+     * @param \OCP\IL10N|null		$l			The locale to use
95
+     * @return string Formatted time string
96
+     * @since 8.0.0
97
+     */
98
+    public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
99 99
 
100
-	/**
101
-	 * Gives the relative past time of the timestamp
102
-	 *
103
-	 * @param int|\DateTime	$timestamp
104
-	 * @param int|\DateTime|null	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
105
-	 * @param \OCP\IL10N|null		$l			The locale to use
106
-	 * @return string	Dates returned are:
107
-	 * 				< 60 sec	=> seconds ago
108
-	 * 				<  1 hour	=> n minutes ago
109
-	 * 				<  1 day	=> n hours ago
110
-	 * 				<  1 month	=> Yesterday, n days ago
111
-	 * 				< 13 month	=> last month, n months ago
112
-	 * 				>= 13 month	=> last year, n years ago
113
-	 * @since 8.0.0
114
-	 */
115
-	public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null);
100
+    /**
101
+     * Gives the relative past time of the timestamp
102
+     *
103
+     * @param int|\DateTime	$timestamp
104
+     * @param int|\DateTime|null	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
105
+     * @param \OCP\IL10N|null		$l			The locale to use
106
+     * @return string	Dates returned are:
107
+     * 				< 60 sec	=> seconds ago
108
+     * 				<  1 hour	=> n minutes ago
109
+     * 				<  1 day	=> n hours ago
110
+     * 				<  1 month	=> Yesterday, n days ago
111
+     * 				< 13 month	=> last month, n months ago
112
+     * 				>= 13 month	=> last year, n years ago
113
+     * @since 8.0.0
114
+     */
115
+    public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null);
116 116
 
117
-	/**
118
-	 * Formats the date and time of the given timestamp
119
-	 *
120
-	 * @param int|\DateTime $timestamp
121
-	 * @param string	$formatDate		See formatDate() for description
122
-	 * @param string	$formatTime		See formatTime() for description
123
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
124
-	 * @param \OCP\IL10N|null		$l			The locale to use
125
-	 * @return string Formatted date and time string
126
-	 * @since 8.0.0
127
-	 */
128
-	public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
117
+    /**
118
+     * Formats the date and time of the given timestamp
119
+     *
120
+     * @param int|\DateTime $timestamp
121
+     * @param string	$formatDate		See formatDate() for description
122
+     * @param string	$formatTime		See formatTime() for description
123
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
124
+     * @param \OCP\IL10N|null		$l			The locale to use
125
+     * @return string Formatted date and time string
126
+     * @since 8.0.0
127
+     */
128
+    public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
129 129
 
130
-	/**
131
-	 * Formats the date and time of the given timestamp
132
-	 *
133
-	 * @param int|\DateTime $timestamp
134
-	 * @param string	$formatDate		See formatDate() for description
135
-	 * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
136
-	 * @param string	$formatTime		See formatTime() for description
137
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
138
-	 * @param \OCP\IL10N|null		$l			The locale to use
139
-	 * @return string Formatted relative date and time string
140
-	 * @since 8.0.0
141
-	 */
142
-	public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
130
+    /**
131
+     * Formats the date and time of the given timestamp
132
+     *
133
+     * @param int|\DateTime $timestamp
134
+     * @param string	$formatDate		See formatDate() for description
135
+     * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
136
+     * @param string	$formatTime		See formatTime() for description
137
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
138
+     * @param \OCP\IL10N|null		$l			The locale to use
139
+     * @return string Formatted relative date and time string
140
+     * @since 8.0.0
141
+     */
142
+    public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
143 143
 }
Please login to merge, or discard this patch.
lib/public/App/ManagerEvent.php 1 patch
Indentation   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -32,61 +32,61 @@
 block discarded – undo
32 32
  */
33 33
 class ManagerEvent extends Event {
34 34
 
35
-	const EVENT_APP_ENABLE = 'OCP\App\IAppManager::enableApp';
36
-	const EVENT_APP_ENABLE_FOR_GROUPS = 'OCP\App\IAppManager::enableAppForGroups';
37
-	const EVENT_APP_DISABLE = 'OCP\App\IAppManager::disableApp';
35
+    const EVENT_APP_ENABLE = 'OCP\App\IAppManager::enableApp';
36
+    const EVENT_APP_ENABLE_FOR_GROUPS = 'OCP\App\IAppManager::enableAppForGroups';
37
+    const EVENT_APP_DISABLE = 'OCP\App\IAppManager::disableApp';
38 38
 
39
-	/**
40
-	 * @since 9.1.0
41
-	 */
42
-	const EVENT_APP_UPDATE = 'OCP\App\IAppManager::updateApp';
39
+    /**
40
+     * @since 9.1.0
41
+     */
42
+    const EVENT_APP_UPDATE = 'OCP\App\IAppManager::updateApp';
43 43
 
44
-	/** @var string */
45
-	protected $event;
46
-	/** @var string */
47
-	protected $appID;
48
-	/** @var \OCP\IGroup[]|null */
49
-	protected $groups;
44
+    /** @var string */
45
+    protected $event;
46
+    /** @var string */
47
+    protected $appID;
48
+    /** @var \OCP\IGroup[]|null */
49
+    protected $groups;
50 50
 
51
-	/**
52
-	 * DispatcherEvent constructor.
53
-	 *
54
-	 * @param string $event
55
-	 * @param $appID
56
-	 * @param \OCP\IGroup[]|null $groups
57
-	 * @since 9.0.0
58
-	 */
59
-	public function __construct($event, $appID, array $groups = null) {
60
-		$this->event = $event;
61
-		$this->appID = $appID;
62
-		$this->groups = $groups;
63
-	}
51
+    /**
52
+     * DispatcherEvent constructor.
53
+     *
54
+     * @param string $event
55
+     * @param $appID
56
+     * @param \OCP\IGroup[]|null $groups
57
+     * @since 9.0.0
58
+     */
59
+    public function __construct($event, $appID, array $groups = null) {
60
+        $this->event = $event;
61
+        $this->appID = $appID;
62
+        $this->groups = $groups;
63
+    }
64 64
 
65
-	/**
66
-	 * @return string
67
-	 * @since 9.0.0
68
-	 */
69
-	public function getEvent() {
70
-		return $this->event;
71
-	}
65
+    /**
66
+     * @return string
67
+     * @since 9.0.0
68
+     */
69
+    public function getEvent() {
70
+        return $this->event;
71
+    }
72 72
 
73
-	/**
74
-	 * @return string
75
-	 * @since 9.0.0
76
-	 */
77
-	public function getAppID() {
78
-		return $this->appID;
79
-	}
73
+    /**
74
+     * @return string
75
+     * @since 9.0.0
76
+     */
77
+    public function getAppID() {
78
+        return $this->appID;
79
+    }
80 80
 
81
-	/**
82
-	 * returns the group Ids
83
-	 * @return string[]
84
-	 * @since 9.0.0
85
-	 */
86
-	public function getGroups() {
87
-		return array_map(function ($group) {
88
-			/** @var \OCP\IGroup $group */
89
-			return $group->getGID();
90
-		}, $this->groups);
91
-	}
81
+    /**
82
+     * returns the group Ids
83
+     * @return string[]
84
+     * @since 9.0.0
85
+     */
86
+    public function getGroups() {
87
+        return array_map(function ($group) {
88
+            /** @var \OCP\IGroup $group */
89
+            return $group->getGID();
90
+        }, $this->groups);
91
+    }
92 92
 }
Please login to merge, or discard this patch.
lib/public/Search/PagedProvider.php 1 patch
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -30,39 +30,39 @@
 block discarded – undo
30 30
  */
31 31
 abstract class PagedProvider extends Provider {
32 32
 
33
-	/**
34
-	 * show all results
35
-	 * @since 8.0.0
36
-	 */
37
-	const SIZE_ALL = 0;
33
+    /**
34
+     * show all results
35
+     * @since 8.0.0
36
+     */
37
+    const SIZE_ALL = 0;
38 38
 
39
-	/**
40
-	 * Constructor
41
-	 * @param array $options
42
-	 * @since 8.0.0
43
-	 */
44
-	public function __construct($options) {
45
-		parent::__construct($options);
46
-	}
39
+    /**
40
+     * Constructor
41
+     * @param array $options
42
+     * @since 8.0.0
43
+     */
44
+    public function __construct($options) {
45
+        parent::__construct($options);
46
+    }
47 47
 
48
-	/**
49
-	 * Search for $query
50
-	 * @param string $query
51
-	 * @return array An array of OCP\Search\Result's
52
-	 * @since 8.0.0
53
-	 */
54
-	public function search($query) {
55
-		// old apps might assume they get all results, so we use SIZE_ALL
56
-		return $this->searchPaged($query, 1, self::SIZE_ALL);
57
-	}
48
+    /**
49
+     * Search for $query
50
+     * @param string $query
51
+     * @return array An array of OCP\Search\Result's
52
+     * @since 8.0.0
53
+     */
54
+    public function search($query) {
55
+        // old apps might assume they get all results, so we use SIZE_ALL
56
+        return $this->searchPaged($query, 1, self::SIZE_ALL);
57
+    }
58 58
 
59
-	/**
60
-	 * Search for $query
61
-	 * @param string $query
62
-	 * @param int $page pages start at page 1
63
-	 * @param int $size 0 = SIZE_ALL
64
-	 * @return array An array of OCP\Search\Result's
65
-	 * @since 8.0.0
66
-	 */
67
-	abstract public function searchPaged($query, $page, $size);
59
+    /**
60
+     * Search for $query
61
+     * @param string $query
62
+     * @param int $page pages start at page 1
63
+     * @param int $size 0 = SIZE_ALL
64
+     * @return array An array of OCP\Search\Result's
65
+     * @since 8.0.0
66
+     */
67
+    abstract public function searchPaged($query, $page, $size);
68 68
 }
Please login to merge, or discard this patch.
lib/public/Share/Exceptions/GenericShareException.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -31,18 +31,18 @@
 block discarded – undo
31 31
  */
32 32
 class GenericShareException extends HintException {
33 33
 
34
-	/**
35
-	 * @param string $message
36
-	 * @param string $hint
37
-	 * @param int $code
38
-	 * @param \Exception|null $previous
39
-	 * @since 9.0.0
40
-	 */
41
-	public function __construct($message = '', $hint = '', $code = 0, \Exception $previous = null) {
42
-		if (empty($message)) {
43
-			$message = 'There was an error retrieving the share. Maybe the link is wrong, it was unshared, or it was deleted.';
44
-		}
45
-		parent::__construct($message, $hint, $code, $previous);
46
-	}
34
+    /**
35
+     * @param string $message
36
+     * @param string $hint
37
+     * @param int $code
38
+     * @param \Exception|null $previous
39
+     * @since 9.0.0
40
+     */
41
+    public function __construct($message = '', $hint = '', $code = 0, \Exception $previous = null) {
42
+        if (empty($message)) {
43
+            $message = 'There was an error retrieving the share. Maybe the link is wrong, it was unshared, or it was deleted.';
44
+        }
45
+        parent::__construct($message, $hint, $code, $previous);
46
+    }
47 47
 
48 48
 }
Please login to merge, or discard this patch.
lib/public/BackgroundJob/IJob.php 1 patch
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -32,56 +32,56 @@
 block discarded – undo
32 32
  * @since 7.0.0
33 33
  */
34 34
 interface IJob {
35
-	/**
36
-	 * Run the background job with the registered argument
37
-	 *
38
-	 * @param \OCP\BackgroundJob\IJobList $jobList The job list that manages the state of this job
39
-	 * @param ILogger|null $logger
40
-	 * @since 7.0.0
41
-	 */
42
-	public function execute($jobList, ILogger $logger = null);
35
+    /**
36
+     * Run the background job with the registered argument
37
+     *
38
+     * @param \OCP\BackgroundJob\IJobList $jobList The job list that manages the state of this job
39
+     * @param ILogger|null $logger
40
+     * @since 7.0.0
41
+     */
42
+    public function execute($jobList, ILogger $logger = null);
43 43
 
44
-	/**
45
-	 * @param int $id
46
-	 * @since 7.0.0
47
-	 */
48
-	public function setId($id);
44
+    /**
45
+     * @param int $id
46
+     * @since 7.0.0
47
+     */
48
+    public function setId($id);
49 49
 
50
-	/**
51
-	 * @param int $lastRun
52
-	 * @since 7.0.0
53
-	 */
54
-	public function setLastRun($lastRun);
50
+    /**
51
+     * @param int $lastRun
52
+     * @since 7.0.0
53
+     */
54
+    public function setLastRun($lastRun);
55 55
 
56
-	/**
57
-	 * @param mixed $argument
58
-	 * @since 7.0.0
59
-	 */
60
-	public function setArgument($argument);
56
+    /**
57
+     * @param mixed $argument
58
+     * @since 7.0.0
59
+     */
60
+    public function setArgument($argument);
61 61
 
62
-	/**
63
-	 * Get the id of the background job
64
-	 * This id is determined by the job list when a job is added to the list
65
-	 *
66
-	 * @return int
67
-	 * @since 7.0.0
68
-	 */
69
-	public function getId();
62
+    /**
63
+     * Get the id of the background job
64
+     * This id is determined by the job list when a job is added to the list
65
+     *
66
+     * @return int
67
+     * @since 7.0.0
68
+     */
69
+    public function getId();
70 70
 
71
-	/**
72
-	 * Get the last time this job was run as unix timestamp
73
-	 *
74
-	 * @return int
75
-	 * @since 7.0.0
76
-	 */
77
-	public function getLastRun();
71
+    /**
72
+     * Get the last time this job was run as unix timestamp
73
+     *
74
+     * @return int
75
+     * @since 7.0.0
76
+     */
77
+    public function getLastRun();
78 78
 
79
-	/**
80
-	 * Get the argument associated with the background job
81
-	 * This is the argument that will be passed to the background job
82
-	 *
83
-	 * @return mixed
84
-	 * @since 7.0.0
85
-	 */
86
-	public function getArgument();
79
+    /**
80
+     * Get the argument associated with the background job
81
+     * This is the argument that will be passed to the background job
82
+     *
83
+     * @return mixed
84
+     * @since 7.0.0
85
+     */
86
+    public function getArgument();
87 87
 }
Please login to merge, or discard this patch.
lib/public/Encryption/Exceptions/GenericEncryptionException.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -35,18 +35,18 @@
 block discarded – undo
35 35
  */
36 36
 class GenericEncryptionException extends HintException {
37 37
 
38
-	/**
39
-	 * @param string $message
40
-	 * @param string $hint
41
-	 * @param int $code
42
-	 * @param \Exception|null $previous
43
-	 * @since 8.1.0
44
-	 */
45
-	public function __construct($message = '', $hint = '', $code = 0, \Exception $previous = null) {
46
-		if (empty($message)) {
47
-			$message = 'Unspecified encryption exception';
48
-		}
49
-		parent::__construct($message, $hint, $code, $previous);
50
-	}
38
+    /**
39
+     * @param string $message
40
+     * @param string $hint
41
+     * @param int $code
42
+     * @param \Exception|null $previous
43
+     * @since 8.1.0
44
+     */
45
+    public function __construct($message = '', $hint = '', $code = 0, \Exception $previous = null) {
46
+        if (empty($message)) {
47
+            $message = 'Unspecified encryption exception';
48
+        }
49
+        parent::__construct($message, $hint, $code, $previous);
50
+    }
51 51
 
52 52
 }
Please login to merge, or discard this patch.
lib/public/Diagnostics/IQueryLogger.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -33,43 +33,43 @@
 block discarded – undo
33 33
  * @since 8.0.0
34 34
  */
35 35
 interface IQueryLogger extends SQLLogger {
36
-	/**
37
-	 * Mark the start of a query providing query SQL statement, its parameters and types. 
38
-	 * This method should be called as close to the DB as possible and after 
39
-	 * query is finished finalized with stopQuery() method. 
40
-	 * 
41
-	 * @param string $sql
42
-	 * @param array|null $params
43
-	 * @param array|null $types
44
-	 * @since 8.0.0
45
-	 */
46
-	public function startQuery($sql, array $params = null, array $types = null);
36
+    /**
37
+     * Mark the start of a query providing query SQL statement, its parameters and types. 
38
+     * This method should be called as close to the DB as possible and after 
39
+     * query is finished finalized with stopQuery() method. 
40
+     * 
41
+     * @param string $sql
42
+     * @param array|null $params
43
+     * @param array|null $types
44
+     * @since 8.0.0
45
+     */
46
+    public function startQuery($sql, array $params = null, array $types = null);
47 47
 
48
-	/**
49
-	 * Mark the end of the current active query. Ending query should store \OCP\Diagnostics\IQuery to
50
-	 * be returned with getQueries() method.
51
-	 * 
52
-	 * @return mixed
53
-	 * @since 8.0.0
54
-	 */
55
-	public function stopQuery();
48
+    /**
49
+     * Mark the end of the current active query. Ending query should store \OCP\Diagnostics\IQuery to
50
+     * be returned with getQueries() method.
51
+     * 
52
+     * @return mixed
53
+     * @since 8.0.0
54
+     */
55
+    public function stopQuery();
56 56
 
57
-	/**
58
-	 * This method should return all \OCP\Diagnostics\IQuery objects stored using
59
-	 * startQuery()/stopQuery() methods.
60
-	 * 
61
-	 * @return \OCP\Diagnostics\IQuery[]
62
-	 * @since 8.0.0
63
-	 */
64
-	public function getQueries();
57
+    /**
58
+     * This method should return all \OCP\Diagnostics\IQuery objects stored using
59
+     * startQuery()/stopQuery() methods.
60
+     * 
61
+     * @return \OCP\Diagnostics\IQuery[]
62
+     * @since 8.0.0
63
+     */
64
+    public function getQueries();
65 65
 
66
-	/**
67
-	 * Activate the module for the duration of the request. Deactivated module
68
-	 * does not create and store \OCP\Diagnostics\IQuery objects.
69
-	 * Only activated module should create and store objects to be 
70
-	 * returned with getQueries() call. 
71
-	 *
72
-	 * @since 12.0.0
73
-	 */
74
-	public function activate();
66
+    /**
67
+     * Activate the module for the duration of the request. Deactivated module
68
+     * does not create and store \OCP\Diagnostics\IQuery objects.
69
+     * Only activated module should create and store objects to be 
70
+     * returned with getQueries() call. 
71
+     *
72
+     * @since 12.0.0
73
+     */
74
+    public function activate();
75 75
 }
Please login to merge, or discard this patch.