diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-10-23 14:52:07 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-23 14:52:07 -0700 |
commit | 3aa3e92281785be8026747da8730ea969b65bca8 (patch) | |
tree | a18661dda0a0c55030a7158e481c2ba95fc9cd19 /lib | |
parent | 8062547e669f548e80befef9cd9f77d090978404 (diff) | |
parent | b3c025fd089e0cba5897c6c42ab36cbf10b6537f (diff) | |
download | nextcloud-server-3aa3e92281785be8026747da8730ea969b65bca8.tar.gz nextcloud-server-3aa3e92281785be8026747da8730ea969b65bca8.zip |
Merge pull request #6864 from nextcloud/phpdoc-fix-issues
Fix some issues in phpDoc comments
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/AppFramework/Http.php | 2 | ||||
-rw-r--r-- | lib/private/Command/QueueBus.php | 2 | ||||
-rw-r--r-- | lib/private/Files/FileInfo.php | 2 | ||||
-rw-r--r-- | lib/private/Share20/Manager.php | 2 | ||||
-rw-r--r-- | lib/private/Tags.php | 2 | ||||
-rw-r--r-- | lib/private/legacy/image.php | 2 | ||||
-rw-r--r-- | lib/private/legacy/template/functions.php | 2 | ||||
-rw-r--r-- | lib/public/AppFramework/Http/DataDisplayResponse.php | 2 | ||||
-rw-r--r-- | lib/public/Files/FileInfo.php | 2 | ||||
-rw-r--r-- | lib/public/Util.php | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/lib/private/AppFramework/Http.php b/lib/private/AppFramework/Http.php index 526509a4583..be1e178a05f 100644 --- a/lib/private/AppFramework/Http.php +++ b/lib/private/AppFramework/Http.php @@ -111,7 +111,7 @@ class Http extends BaseHttp { /** * Gets the correct header - * @param Http::CONSTANT $status the constant from the Http class + * @param int Http::CONSTANT $status the constant from the Http class * @param \DateTime $lastModified formatted last modified date * @param string $ETag the etag * @return string diff --git a/lib/private/Command/QueueBus.php b/lib/private/Command/QueueBus.php index 7f2fc88a703..30cdd7740a9 100644 --- a/lib/private/Command/QueueBus.php +++ b/lib/private/Command/QueueBus.php @@ -27,7 +27,7 @@ use OCP\Command\ICommand; class QueueBus implements IBus { /** - * @var (ICommand|callable)[] + * @var ICommand[]|callable[] */ private $queue = []; diff --git a/lib/private/Files/FileInfo.php b/lib/private/Files/FileInfo.php index f5a44ba02ea..7ac0c6e49d5 100644 --- a/lib/private/Files/FileInfo.php +++ b/lib/private/Files/FileInfo.php @@ -232,7 +232,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { } /** - * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER + * @return string \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER */ public function getType() { if (!isset($this->data['type'])) { diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 42f2170122e..bcef85bd17a 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -1395,7 +1395,7 @@ class Manager implements IManager { /** * Create a new share - * @return \OCP\Share\IShare; + * @return \OCP\Share\IShare */ public function newShare() { return new \OC\Share20\Share($this->rootFolder, $this->userManager); diff --git a/lib/private/Tags.php b/lib/private/Tags.php index b63435ff838..1947f0c07e6 100644 --- a/lib/private/Tags.php +++ b/lib/private/Tags.php @@ -140,7 +140,7 @@ class Tags implements \OCP\ITags { /** * Check if any tags are saved for this type and user. * - * @return boolean. + * @return boolean */ public function isEmpty() { return count($this->tags) === 0; diff --git a/lib/private/legacy/image.php b/lib/private/legacy/image.php index 120b19d1cff..cd5ca7bb5ce 100644 --- a/lib/private/legacy/image.php +++ b/lib/private/legacy/image.php @@ -431,7 +431,7 @@ class OC_Image implements \OCP\IImage { * (I'm open for suggestions on better method name ;) * Fixes orientation based on EXIF data. * - * @return bool. + * @return bool */ public function fixOrientation() { $o = $this->getOrientation(); diff --git a/lib/private/legacy/template/functions.php b/lib/private/legacy/template/functions.php index bca16b48c1a..1ef3541e880 100644 --- a/lib/private/legacy/template/functions.php +++ b/lib/private/legacy/template/functions.php @@ -278,7 +278,7 @@ function human_file_size( $bytes ) { /** * Strips the timestamp of its time value * @param int $timestamp UNIX timestamp to strip - * @return $timestamp without time value + * @return int timestamp without time value */ function strip_time($timestamp){ $date = new \DateTime("@{$timestamp}"); diff --git a/lib/public/AppFramework/Http/DataDisplayResponse.php b/lib/public/AppFramework/Http/DataDisplayResponse.php index 820e00ff963..cfc4bd494f2 100644 --- a/lib/public/AppFramework/Http/DataDisplayResponse.php +++ b/lib/public/AppFramework/Http/DataDisplayResponse.php @@ -35,7 +35,7 @@ class DataDisplayResponse extends Response { /** * response data - * @var string; + * @var string */ protected $data; diff --git a/lib/public/Files/FileInfo.php b/lib/public/Files/FileInfo.php index f0f21087bbe..0b90fb8fbf2 100644 --- a/lib/public/Files/FileInfo.php +++ b/lib/public/Files/FileInfo.php @@ -174,7 +174,7 @@ interface FileInfo { /** * Check whether this is a file or a folder * - * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER + * @return string \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER * @since 7.0.0 */ public function getType(); diff --git a/lib/public/Util.php b/lib/public/Util.php index e4ebdb5bfa7..04cdfe216d0 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -670,7 +670,7 @@ class Util { * Compare two strings to provide a natural sort * @param string $a first string to compare * @param string $b second string to compare - * @return -1 if $b comes before $a, 1 if $a comes before $b + * @return int -1 if $b comes before $a, 1 if $a comes before $b * or 0 if the strings are identical * @since 7.0.0 */ |