@@ -86,8 +86,6 @@ |
||
86 | 86 | |
87 | 87 | /** |
88 | 88 | * @codeCoverageIgnore |
89 | - * @param \Exception $ex |
|
90 | - * @param int $httpCode |
|
91 | 89 | * @return bool|string |
92 | 90 | */ |
93 | 91 | public function generateBody(\Exception $exception) { |
@@ -30,7 +30,6 @@ |
||
30 | 30 | use OC\Files\Filesystem; |
31 | 31 | use OC\Files\View; |
32 | 32 | use OCP\Encryption\IEncryptionModule; |
33 | -use OCP\Files\Storage; |
|
34 | 33 | use OCP\IConfig; |
35 | 34 | |
36 | 35 | class Util { |
@@ -308,6 +308,7 @@ discard block |
||
308 | 308 | * @param array $params the parameters of the sql query |
309 | 309 | * @param int $limit the maximum number of rows |
310 | 310 | * @param int $offset from which row we want to start |
311 | + * @param string $msg |
|
311 | 312 | * @return string formatted error message string |
312 | 313 | * @since 9.1.0 |
313 | 314 | */ |
@@ -360,7 +361,7 @@ discard block |
||
360 | 361 | * Returns an db result and throws exceptions when there are more or less |
361 | 362 | * results |
362 | 363 | * @param string $sql the sql query |
363 | - * @param array $params the parameters of the sql query |
|
364 | + * @param string[] $params the parameters of the sql query |
|
364 | 365 | * @param int $limit the maximum number of rows |
365 | 366 | * @param int $offset from which row we want to start |
366 | 367 | * @throws DoesNotExistException if the item does not exist |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | private $noEmit = false; |
61 | 61 | |
62 | 62 | /** |
63 | - * @param \Doctrine\DBAL\Connection|Connection $connection |
|
63 | + * @param Connection $connection |
|
64 | 64 | * @param ISecureRandom $random |
65 | 65 | * @param IConfig $config |
66 | 66 | * @param EventDispatcher $dispatcher |
@@ -273,6 +273,10 @@ discard block |
||
273 | 273 | return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/'; |
274 | 274 | } |
275 | 275 | |
276 | + /** |
|
277 | + * @param integer $step |
|
278 | + * @param integer $max |
|
279 | + */ |
|
276 | 280 | protected function emit($sql, $step, $max) { |
277 | 281 | if ($this->noEmit) { |
278 | 282 | return; |
@@ -283,6 +287,10 @@ discard block |
||
283 | 287 | $this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max])); |
284 | 288 | } |
285 | 289 | |
290 | + /** |
|
291 | + * @param integer $step |
|
292 | + * @param integer $max |
|
293 | + */ |
|
286 | 294 | private function emitCheckStep($tableName, $step, $max) { |
287 | 295 | if(is_null($this->dispatcher)) { |
288 | 296 | return; |
@@ -28,7 +28,6 @@ |
||
28 | 28 | use Symfony\Component\Console\Command\Command; |
29 | 29 | use Symfony\Component\Console\Helper\Table; |
30 | 30 | use Symfony\Component\Console\Input\InputInterface; |
31 | -use Symfony\Component\Console\Input\InputOption; |
|
32 | 31 | use Symfony\Component\Console\Output\OutputInterface; |
33 | 32 | |
34 | 33 | class ListCertificates extends Base { |
@@ -131,7 +131,7 @@ |
||
131 | 131 | } |
132 | 132 | |
133 | 133 | /** |
134 | - * @param $message |
|
134 | + * @param string $message |
|
135 | 135 | * @param array $additional |
136 | 136 | * @return array |
137 | 137 | */ |
@@ -97,7 +97,7 @@ |
||
97 | 97 | } |
98 | 98 | |
99 | 99 | /** |
100 | - * @param string|int $category |
|
100 | + * @param string $category |
|
101 | 101 | * @return int |
102 | 102 | */ |
103 | 103 | protected function getCategory($category) { |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * |
71 | 71 | * @NoAdminRequired |
72 | 72 | * @NoSubadminRequired |
73 | - * @return array |
|
73 | + * @return DataResponse |
|
74 | 74 | */ |
75 | 75 | public function addPersonalRootCertificate() { |
76 | 76 | return $this->addCertificate($this->userCertificateManager); |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * Add a new root certificate to a trust store |
81 | 81 | * |
82 | 82 | * @param ICertificateManager $certificateManager |
83 | - * @return array |
|
83 | + * @return DataResponse |
|
84 | 84 | */ |
85 | 85 | private function addCertificate(ICertificateManager $certificateManager) { |
86 | 86 | $headers = []; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | /** |
159 | 159 | * Add a new personal root certificate to the system's trust store |
160 | 160 | * |
161 | - * @return array |
|
161 | + * @return DataResponse |
|
162 | 162 | */ |
163 | 163 | public function addSystemRootCertificate() { |
164 | 164 | return $this->addCertificate($this->systemCertificateManager); |
@@ -268,7 +268,7 @@ |
||
268 | 268 | |
269 | 269 | /** |
270 | 270 | * @NoCSRFRequired |
271 | - * @return DataResponse |
|
271 | + * @return DataDisplayResponse |
|
272 | 272 | */ |
273 | 273 | public function getFailedIntegrityCheckFiles() { |
274 | 274 | $completeResults = $this->checker->getResults(); |