some small fixes

diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php
index 9469e0aa48d15c4460c8931ae9d79d5788817e8b..1717a4bd636564dbeb88524a31244f3412789f20 100644 (file)
--- a/apps/files_sharing/lib/sharedmount.php
+++ b/apps/files_sharing/lib/sharedmount.php
@@ -58,7 +58,7 @@ class SharedMount extends Mount implements MoveableMount {
         * update fileTarget in the database if the mount point changed
         * @param string $newPath
         * @param array $share reference to the share which should be modified
-        * @return type
+        * @return bool
         */
        private static function updateFileTarget($newPath, &$share) {
                // if the user renames a mount point from a group share we need to create a new db entry
@@ -152,9 +152,7 @@ class SharedMount extends Mount implements MoveableMount {
         */
        public function removeMount() {
                $mountManager = \OC\Files\Filesystem::getMountManager();
-               /**
-                * @var \OC\Files\Storage\Shared
-                */
+               /** @var \OC\Files\Storage\Shared */
                $storage = $this->getStorage();
                $result = $storage->unshareStorage();
                $mountManager->removeMount($this->mountPoint);

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index a6799ddd369f171cae10d016d279b77def60f882..a2b485a2ca11388a074ccb141294ff7f2e708151 100644 (file)
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -534,6 +534,8 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 
        /**
         * unshare complete storage, also the grouped shares
+        *
+        * @return bool
         */
        public function unshareStorage() {
                $result = true;

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 6b903c003d35612f04182641bc87767a050efe6f..d681f35b03ac6dc220e2c75f632f013ee0abcd1f 100644 (file)
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -340,7 +340,7 @@ class Share extends \OC\Share\Constants {
         * @param mixed $parameters
         * @param boolean $includeCollections
         * @param string $shareWith (optional) define against which user should be checked, default: current user
-        * @return mixed Return depends on format
+        * @return array
         */
        public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE,
                $parameters = null, $includeCollections = false, $shareWith = null) {
@@ -1576,11 +1576,6 @@ class Share extends \OC\Share\Constants {
 
                $queriesToExecute = array();
 
-               $fileShare = false;
-               if ($itemType === 'file' || $itemType === 'folder') {
-                       $fileShare = true;
-               }
-
                $result = self::checkReshare($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $itemSourceName, $expirationDate);
                if(!empty($result)) {
                        $parent = $result['parent'];

diff --git a/lib/public/share.php b/lib/public/share.php
index a0b34a7899b79099dd4d63260a5bc3bd623a3e08..449d1fa211ef745af8428a9858aa06475f17edea 100644 (file)
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -139,7 +139,7 @@ class Share extends \OC\Share\Constants {
         * @param int $format (optional) Format type must be defined by the backend
         * @param mixed $parameters
         * @param bool $includeCollections
-        * @return mixed Return depends on format
+        * @return array
         */
        public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE,
                $parameters = null, $includeCollections = false) {