summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-01-19 12:17:25 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-01-19 12:17:25 +0100
commitf0f308dfbf54c8e44ae290e63e3d8afeebb68204 (patch)
tree61d0d4e71b29f0000d5e9c1fb6272aa9d4963425 /lib
parent7ba90eda87d7e66b9c0ad7ec025371f623bf1857 (diff)
parent83a8e756143bf5e1727b497f89d8d18888df2fbd (diff)
downloadnextcloud-server-f0f308dfbf54c8e44ae290e63e3d8afeebb68204.tar.gz
nextcloud-server-f0f308dfbf54c8e44ae290e63e3d8afeebb68204.zip
Merge pull request #21744 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
Diffstat (limited to 'lib')
-rw-r--r--lib/private/app/dependencyanalyzer.php2
-rw-r--r--lib/private/app/platformrepository.php3
-rw-r--r--lib/private/db/migrator.php2
-rw-r--r--lib/private/defaults.php3
4 files changed, 8 insertions, 2 deletions
diff --git a/lib/private/app/dependencyanalyzer.php b/lib/private/app/dependencyanalyzer.php
index ba2479ae7aa..0cf4bc72161 100644
--- a/lib/private/app/dependencyanalyzer.php
+++ b/lib/private/app/dependencyanalyzer.php
@@ -73,7 +73,7 @@ class DependencyAnalyzer {
* 5.2.6.5 and 5.1 will be turned into 5.2 and 5.1
* @param string $first
* @param string $second
- * @return array first element is the first version, second element is the
+ * @return string[] first element is the first version, second element is the
* second version
*/
private function normalizeVersions($first, $second) {
diff --git a/lib/private/app/platformrepository.php b/lib/private/app/platformrepository.php
index 730c67f45ee..7363b2a44b1 100644
--- a/lib/private/app/platformrepository.php
+++ b/lib/private/app/platformrepository.php
@@ -206,6 +206,9 @@ class PlatformRepository {
throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage);
}
+ /**
+ * @param string $stability
+ */
private function expandStability($stability) {
$stability = strtolower($stability);
switch ($stability) {
diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php
index cd310bb75a5..7ca3f981358 100644
--- a/lib/private/db/migrator.php
+++ b/lib/private/db/migrator.php
@@ -52,7 +52,7 @@ class Migrator {
protected $config;
/**
- * @param \Doctrine\DBAL\Connection $connection
+ * @param Connection $connection
* @param ISecureRandom $random
* @param IConfig $config
*/
diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index 1fa8352edc1..43e8c8082cc 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -261,6 +261,9 @@ class OC_Defaults {
return $footer;
}
+ /**
+ * @param string $key
+ */
public function buildDocLinkToKey($key) {
if ($this->themeExist('buildDocLinkToKey')) {
return $this->theme->buildDocLinkToKey($key);