Merge pull request #31918 from owncloud/stable10-code-typos-01

[stable10] AppManager text typo and PHPdoc return tags
owncloud · Jul 18, 2018 · 7e0d290 · 7e0d290
2 parents 6f720ed + b0d230f
commit 7e0d290
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 7 deletions.
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -896,7 +896,7 @@ public function getCardUri($id) {
 	 *
 	 * @param int $addressBookId
 	 * @param string $uri
-	 * @returns array
+	 * @return array
 	 */
 	public function getContact($addressBookId, $uri) {
 		$result = [];

diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
@@ -191,9 +191,9 @@ private function checkAppForUser($enabled, $user) {
 
 			$groupIds = json_decode($enabled);
 
-			if (!is_array($groupIds)) {
-				$jsonError = json_last_error();
-				\OC::$server->getLogger()->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']);
+			if (!\is_array($groupIds)) {
+				$jsonError = \json_last_error();
+				\OC::$server->getLogger()->warning('AppManager::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']);
 				return false;
 			}
 

diff --git a/lib/private/App/DependencyAnalyzer.php b/lib/private/App/DependencyAnalyzer.php
@@ -48,7 +48,7 @@ function __construct(Platform $platform, IL10N $l) {
 
 	/**
 	 * @param array $app
-	 * @returns array of missing dependencies
+	 * @return array of missing dependencies
 	 */
 	public function analyze(array $app) {
 		$this->appInfo = $app;

diff --git a/lib/private/App/PlatformRepository.php b/lib/private/App/PlatformRepository.php
@@ -208,6 +208,7 @@ public function normalizeVersion($version, $fullVersion = null) {
 
 	/**
 	 * @param string $stability
+	 * @return string
 	 */
 	private function expandStability($stability) {
 		$stability = strtolower($stability);

diff --git a/lib/private/Encryption/Manager.php b/lib/private/Encryption/Manager.php
@@ -119,6 +119,7 @@ public function isReady() {
 
 	/**
 	 * @param string $user
+	 * @return bool
 	 */
 	public function isReadyForUser($user) {
 		if (!$this->isReady()) {

diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
@@ -802,6 +802,7 @@ static public function search($query) {
 
 	/**
 	 * @param string $query
+	 * @return FileInfo[] array of file info
 	 */
 	static public function searchByMime($query) {
 		return self::$defaultInstance->searchByMime($query);
@@ -810,7 +811,7 @@ static public function searchByMime($query) {
 	/**
 	 * @param string|int $tag name or tag id
 	 * @param string $userId owner of the tags
-	 * @return FileInfo[] array or file info
+	 * @return FileInfo[] array of file info
 	 */
 	static public function searchByTag($tag, $userId) {
 		return self::$defaultInstance->searchByTag($tag, $userId);

diff --git a/lib/private/Installer.php b/lib/private/Installer.php
@@ -176,7 +176,7 @@ public static function installApp( $data = []) {
 	/**
 	 * @brief checks whether or not an app is installed
 	 * @param string $app app
-	 * @returns bool
+	 * @return bool
 	 *
 	 * Checks whether or not an app is installed, i.e. registered in apps table.
 	 */

diff --git a/lib/private/Share/Helper.php b/lib/private/Share/Helper.php
@@ -79,6 +79,7 @@ public static function generateTarget($itemType, $itemSource, $shareType, $share
 	 * @param string $uidOwner The user that the parent was shared with (optional)
 	 * @param int $newParent new parent for the childrens
 	 * @param bool $excludeGroupChildren exclude group children elements
+	 * @return array of deleted items
 	 */
 	public static function delete($parent, $excludeParent = false, $uidOwner = null, $newParent = null, $excludeGroupChildren = false) {
 		$ids = [$parent];

diff --git a/lib/private/legacy/defaults.php b/lib/private/legacy/defaults.php
@@ -91,6 +91,7 @@ public function __construct() {
 
 	/**
 	 * @param string $method
+	 * @return bool
 	 */
 	private function themeExist($method) {
 		if (isset($this->theme) && method_exists($this->theme, $method)) {

diff --git a/lib/private/legacy/template/functions.php b/lib/private/legacy/template/functions.php
@@ -190,6 +190,8 @@ function preview_icon( $path ) {
 
 /**
  * @param string $path
+ * @param string $token
+ * @return string link to the public preview
  */
 function publicPreview_icon ( $path, $token ) {
 	return \OC::$server->getURLGenerator()->linkToRoute('core_ajax_public_preview', ['x' => 32, 'y' => 32, 'file' => $path, 't' => $token]);