nextcloud / server

lib/public/AppFramework/Http/FileDisplayResponse.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 		$this->file = $file;
 		$this->setStatus($statusCode);
 		$this->setHeaders(array_merge($this->getHeaders(), $headers));
-		$this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"');
+		$this->addHeader('Content-Disposition', 'inline; filename="'.rawurldecode($file->getName()).'"');
 
 		$this->setETag($file->getEtag());
 		$lastModified = new \DateTime();
@@ -65,7 +65,7 @@ 
 	 */
 	public function callback(IOutput $output) {
 		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			$output->setHeader('Content-Length: ' . $this->file->getSize());
+			$output->setHeader('Content-Length: '.$this->file->getSize());
 			$output->setOutput($this->file->getContent());
 		}
 	}

Indentation +32 added lines, -32 removed lines

@@ -31,40 +31,40 @@
  * @since 11.0.0
  */
 class FileDisplayResponse extends Response implements ICallbackResponse {
-	/** @var \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile */
-	private $file;
+    /** @var \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile */
+    private $file;
 
-	/**
-	 * FileDisplayResponse constructor.
-	 *
-	 * @param \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile $file
-	 * @param int $statusCode
-	 * @param array $headers
-	 * @since 11.0.0
-	 */
-	public function __construct($file, $statusCode = Http::STATUS_OK,
-								$headers = []) {
-		parent::__construct();
+    /**
+     * FileDisplayResponse constructor.
+     *
+     * @param \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile $file
+     * @param int $statusCode
+     * @param array $headers
+     * @since 11.0.0
+     */
+    public function __construct($file, $statusCode = Http::STATUS_OK,
+                                $headers = []) {
+        parent::__construct();
 
-		$this->file = $file;
-		$this->setStatus($statusCode);
-		$this->setHeaders(array_merge($this->getHeaders(), $headers));
-		$this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"');
+        $this->file = $file;
+        $this->setStatus($statusCode);
+        $this->setHeaders(array_merge($this->getHeaders(), $headers));
+        $this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"');
 
-		$this->setETag($file->getEtag());
-		$lastModified = new \DateTime();
-		$lastModified->setTimestamp($file->getMTime());
-		$this->setLastModified($lastModified);
-	}
+        $this->setETag($file->getEtag());
+        $lastModified = new \DateTime();
+        $lastModified->setTimestamp($file->getMTime());
+        $this->setLastModified($lastModified);
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @since 11.0.0
-	 */
-	public function callback(IOutput $output) {
-		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			$output->setHeader('Content-Length: ' . $this->file->getSize());
-			$output->setOutput($this->file->getContent());
-		}
-	}
+    /**
+     * @param IOutput $output
+     * @since 11.0.0
+     */
+    public function callback(IOutput $output) {
+        if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
+            $output->setHeader('Content-Length: ' . $this->file->getSize());
+            $output->setOutput($this->file->getContent());
+        }
+    }
 }

lib/private/App/AppStore/Version/VersionParser.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 * @return bool
 	 */
 	private function isValidVersionString($versionString) {
-		return (bool)preg_match('/^[0-9.]+$/', $versionString);
+		return (bool) preg_match('/^[0-9.]+$/', $versionString);
 	}
 
 	/**

Indentation +48 added lines, -48 removed lines

@@ -30,56 +30,56 @@
  * @package OC\App\AppStore
  */
 class VersionParser {
-	/**
-	 * @param string $versionString
-	 * @return bool
-	 */
-	private function isValidVersionString($versionString) {
-		return (bool)preg_match('/^[0-9.]+$/', $versionString);
-	}
+    /**
+     * @param string $versionString
+     * @return bool
+     */
+    private function isValidVersionString($versionString) {
+        return (bool)preg_match('/^[0-9.]+$/', $versionString);
+    }
 
-	/**
-	 * Returns the version for a version string
-	 *
-	 * @param string $versionSpec
-	 * @return Version
-	 * @throws \Exception If the version cannot be parsed
-	 */
-	public function getVersion($versionSpec) {
-		// * indicates that the version is compatible with all versions
-		if ($versionSpec === '*') {
-			return new Version('', '');
-		}
+    /**
+     * Returns the version for a version string
+     *
+     * @param string $versionSpec
+     * @return Version
+     * @throws \Exception If the version cannot be parsed
+     */
+    public function getVersion($versionSpec) {
+        // * indicates that the version is compatible with all versions
+        if ($versionSpec === '*') {
+            return new Version('', '');
+        }
 
-		// Count the amount of =, if it is one then it's either maximum or minimum
-		// version. If it is two then it is maximum and minimum.
-		$versionElements = explode(' ', $versionSpec);
-		$firstVersion = isset($versionElements[0]) ? $versionElements[0] : '';
-		$firstVersionNumber = substr($firstVersion, 2);
-		$secondVersion = isset($versionElements[1]) ? $versionElements[1] : '';
-		$secondVersionNumber = substr($secondVersion, 2);
+        // Count the amount of =, if it is one then it's either maximum or minimum
+        // version. If it is two then it is maximum and minimum.
+        $versionElements = explode(' ', $versionSpec);
+        $firstVersion = isset($versionElements[0]) ? $versionElements[0] : '';
+        $firstVersionNumber = substr($firstVersion, 2);
+        $secondVersion = isset($versionElements[1]) ? $versionElements[1] : '';
+        $secondVersionNumber = substr($secondVersion, 2);
 
-		switch (count($versionElements)) {
-			case 1:
-				if (!$this->isValidVersionString($firstVersionNumber)) {
-					break;
-				}
-				if (strpos($firstVersion, '>') === 0) {
-					return new Version($firstVersionNumber, '');
-				}
-				return new Version('', $firstVersionNumber);
-			case 2:
-				if (!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
-					break;
-				}
-				return new Version($firstVersionNumber, $secondVersionNumber);
-		}
+        switch (count($versionElements)) {
+            case 1:
+                if (!$this->isValidVersionString($firstVersionNumber)) {
+                    break;
+                }
+                if (strpos($firstVersion, '>') === 0) {
+                    return new Version($firstVersionNumber, '');
+                }
+                return new Version('', $firstVersionNumber);
+            case 2:
+                if (!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
+                    break;
+                }
+                return new Version($firstVersionNumber, $secondVersionNumber);
+        }
 
-		throw new \Exception(
-			sprintf(
-				'Version cannot be parsed: %s',
-				$versionSpec
-			)
-		);
-	}
+        throw new \Exception(
+            sprintf(
+                'Version cannot be parsed: %s',
+                $versionSpec
+            )
+        );
+    }
 }

lib/private/App/AppStore/Bundles/Bundle.php

Indentation +28 added lines, -28 removed lines

@@ -24,36 +24,36 @@
 use OCP\IL10N;
 
 abstract class Bundle {
-	/** @var IL10N */
-	protected $l10n;
+    /** @var IL10N */
+    protected $l10n;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * Get the identifier of the bundle
-	 *
-	 * @return string
-	 */
-	final public function getIdentifier() {
-		return substr(strrchr(get_class($this), '\\'), 1);
-	}
+    /**
+     * Get the identifier of the bundle
+     *
+     * @return string
+     */
+    final public function getIdentifier() {
+        return substr(strrchr(get_class($this), '\\'), 1);
+    }
 
-	/**
-	 * Get the name of the bundle
-	 *
-	 * @return string
-	 */
-	abstract public function getName();
+    /**
+     * Get the name of the bundle
+     *
+     * @return string
+     */
+    abstract public function getName();
 
-	/**
-	 * Get the list of app identifiers in the bundle
-	 *
-	 * @return array
-	 */
-	abstract public function getAppIdentifiers();
+    /**
+     * Get the list of app identifiers in the bundle
+     *
+     * @return array
+     */
+    abstract public function getAppIdentifiers();
 }

lib/private/Share20/LegacyHooks.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 		/** @var IShare[] $deletedShares */
 		$deletedShares = $e->getArgument('deletedShares');
 
-		$formattedDeletedShares = array_map(function ($share) {
+		$formattedDeletedShares = array_map(function($share) {
 			return $this->formatHookParams($share);
 		}, $deletedShares);
 

Indentation +141 added lines, -141 removed lines

@@ -33,145 +33,145 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class LegacyHooks {
-	/** @var EventDispatcherInterface */
-	private $eventDispatcher;
-
-	/**
-	 * LegacyHooks constructor.
-	 *
-	 * @param EventDispatcherInterface $eventDispatcher
-	 */
-	public function __construct(EventDispatcherInterface $eventDispatcher) {
-		$this->eventDispatcher = $eventDispatcher;
-
-		$this->eventDispatcher->addListener('OCP\Share::preUnshare', [$this, 'preUnshare']);
-		$this->eventDispatcher->addListener('OCP\Share::postUnshare', [$this, 'postUnshare']);
-		$this->eventDispatcher->addListener('OCP\Share::postUnshareFromSelf', [$this, 'postUnshareFromSelf']);
-		$this->eventDispatcher->addListener('OCP\Share::preShare', [$this, 'preShare']);
-		$this->eventDispatcher->addListener('OCP\Share::postShare', [$this, 'postShare']);
-	}
-
-	/**
-	 * @param GenericEvent $e
-	 */
-	public function preUnshare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$formatted = $this->formatHookParams($share);
-		\OC_Hook::emit(Share::class, 'pre_unshare', $formatted);
-	}
-
-	/**
-	 * @param GenericEvent $e
-	 */
-	public function postUnshare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$formatted = $this->formatHookParams($share);
-
-		/** @var IShare[] $deletedShares */
-		$deletedShares = $e->getArgument('deletedShares');
-
-		$formattedDeletedShares = array_map(function ($share) {
-			return $this->formatHookParams($share);
-		}, $deletedShares);
-
-		$formatted['deletedShares'] = $formattedDeletedShares;
-
-		\OC_Hook::emit(Share::class, 'post_unshare', $formatted);
-	}
-
-	/**
-	 * @param GenericEvent $e
-	 */
-	public function postUnshareFromSelf(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$formatted = $this->formatHookParams($share);
-		$formatted['itemTarget'] = $formatted['fileTarget'];
-		$formatted['unsharedItems'] = [$formatted];
-
-		\OC_Hook::emit(Share::class, 'post_unshareFromSelf', $formatted);
-	}
-
-	private function formatHookParams(IShare $share) {
-		// Prepare hook
-		$shareType = $share->getShareType();
-		$sharedWith = '';
-		if ($shareType === IShare::TYPE_USER ||
-			$shareType === IShare::TYPE_GROUP ||
-			$shareType === IShare::TYPE_REMOTE) {
-			$sharedWith = $share->getSharedWith();
-		}
-
-		$hookParams = [
-			'id' => $share->getId(),
-			'itemType' => $share->getNodeType(),
-			'itemSource' => $share->getNodeId(),
-			'shareType' => $shareType,
-			'shareWith' => $sharedWith,
-			'itemparent' => method_exists($share, 'getParent') ? $share->getParent() : '',
-			'uidOwner' => $share->getSharedBy(),
-			'fileSource' => $share->getNodeId(),
-			'fileTarget' => $share->getTarget()
-		];
-		return $hookParams;
-	}
-
-	public function preShare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		// Pre share hook
-		$run = true;
-		$error = '';
-		$preHookData = [
-			'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
-			'itemSource' => $share->getNode()->getId(),
-			'shareType' => $share->getShareType(),
-			'uidOwner' => $share->getSharedBy(),
-			'permissions' => $share->getPermissions(),
-			'fileSource' => $share->getNode()->getId(),
-			'expiration' => $share->getExpirationDate(),
-			'token' => $share->getToken(),
-			'itemTarget' => $share->getTarget(),
-			'shareWith' => $share->getSharedWith(),
-			'run' => &$run,
-			'error' => &$error,
-		];
-		\OC_Hook::emit(Share::class, 'pre_shared', $preHookData);
-
-		if ($run === false) {
-			$e->setArgument('error', $error);
-			$e->stopPropagation();
-		}
-
-		return $e;
-	}
-
-	public function postShare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$postHookData = [
-			'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
-			'itemSource' => $share->getNode()->getId(),
-			'shareType' => $share->getShareType(),
-			'uidOwner' => $share->getSharedBy(),
-			'permissions' => $share->getPermissions(),
-			'fileSource' => $share->getNode()->getId(),
-			'expiration' => $share->getExpirationDate(),
-			'token' => $share->getToken(),
-			'id' => $share->getId(),
-			'shareWith' => $share->getSharedWith(),
-			'itemTarget' => $share->getTarget(),
-			'fileTarget' => $share->getTarget(),
-			'path' => $share->getNode()->getPath(),
-		];
-
-		\OC_Hook::emit(Share::class, 'post_shared', $postHookData);
-	}
+    /** @var EventDispatcherInterface */
+    private $eventDispatcher;
+
+    /**
+     * LegacyHooks constructor.
+     *
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(EventDispatcherInterface $eventDispatcher) {
+        $this->eventDispatcher = $eventDispatcher;
+
+        $this->eventDispatcher->addListener('OCP\Share::preUnshare', [$this, 'preUnshare']);
+        $this->eventDispatcher->addListener('OCP\Share::postUnshare', [$this, 'postUnshare']);
+        $this->eventDispatcher->addListener('OCP\Share::postUnshareFromSelf', [$this, 'postUnshareFromSelf']);
+        $this->eventDispatcher->addListener('OCP\Share::preShare', [$this, 'preShare']);
+        $this->eventDispatcher->addListener('OCP\Share::postShare', [$this, 'postShare']);
+    }
+
+    /**
+     * @param GenericEvent $e
+     */
+    public function preUnshare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $formatted = $this->formatHookParams($share);
+        \OC_Hook::emit(Share::class, 'pre_unshare', $formatted);
+    }
+
+    /**
+     * @param GenericEvent $e
+     */
+    public function postUnshare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $formatted = $this->formatHookParams($share);
+
+        /** @var IShare[] $deletedShares */
+        $deletedShares = $e->getArgument('deletedShares');
+
+        $formattedDeletedShares = array_map(function ($share) {
+            return $this->formatHookParams($share);
+        }, $deletedShares);
+
+        $formatted['deletedShares'] = $formattedDeletedShares;
+
+        \OC_Hook::emit(Share::class, 'post_unshare', $formatted);
+    }
+
+    /**
+     * @param GenericEvent $e
+     */
+    public function postUnshareFromSelf(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $formatted = $this->formatHookParams($share);
+        $formatted['itemTarget'] = $formatted['fileTarget'];
+        $formatted['unsharedItems'] = [$formatted];
+
+        \OC_Hook::emit(Share::class, 'post_unshareFromSelf', $formatted);
+    }
+
+    private function formatHookParams(IShare $share) {
+        // Prepare hook
+        $shareType = $share->getShareType();
+        $sharedWith = '';
+        if ($shareType === IShare::TYPE_USER ||
+            $shareType === IShare::TYPE_GROUP ||
+            $shareType === IShare::TYPE_REMOTE) {
+            $sharedWith = $share->getSharedWith();
+        }
+
+        $hookParams = [
+            'id' => $share->getId(),
+            'itemType' => $share->getNodeType(),
+            'itemSource' => $share->getNodeId(),
+            'shareType' => $shareType,
+            'shareWith' => $sharedWith,
+            'itemparent' => method_exists($share, 'getParent') ? $share->getParent() : '',
+            'uidOwner' => $share->getSharedBy(),
+            'fileSource' => $share->getNodeId(),
+            'fileTarget' => $share->getTarget()
+        ];
+        return $hookParams;
+    }
+
+    public function preShare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        // Pre share hook
+        $run = true;
+        $error = '';
+        $preHookData = [
+            'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
+            'itemSource' => $share->getNode()->getId(),
+            'shareType' => $share->getShareType(),
+            'uidOwner' => $share->getSharedBy(),
+            'permissions' => $share->getPermissions(),
+            'fileSource' => $share->getNode()->getId(),
+            'expiration' => $share->getExpirationDate(),
+            'token' => $share->getToken(),
+            'itemTarget' => $share->getTarget(),
+            'shareWith' => $share->getSharedWith(),
+            'run' => &$run,
+            'error' => &$error,
+        ];
+        \OC_Hook::emit(Share::class, 'pre_shared', $preHookData);
+
+        if ($run === false) {
+            $e->setArgument('error', $error);
+            $e->stopPropagation();
+        }
+
+        return $e;
+    }
+
+    public function postShare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $postHookData = [
+            'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
+            'itemSource' => $share->getNode()->getId(),
+            'shareType' => $share->getShareType(),
+            'uidOwner' => $share->getSharedBy(),
+            'permissions' => $share->getPermissions(),
+            'fileSource' => $share->getNode()->getId(),
+            'expiration' => $share->getExpirationDate(),
+            'token' => $share->getToken(),
+            'id' => $share->getId(),
+            'shareWith' => $share->getSharedWith(),
+            'itemTarget' => $share->getTarget(),
+            'fileTarget' => $share->getTarget(),
+            'path' => $share->getNode()->getPath(),
+        ];
+
+        \OC_Hook::emit(Share::class, 'post_shared', $postHookData);
+    }
 }

lib/private/Share20/Share.php

Spacing +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
 	 */
 	public function setId($id) {
 		if (is_int($id)) {
-			$id = (string)$id;
+			$id = (string) $id;
 		}
 
 		if (!is_string($id)) {
@@ -115,7 +115,7 @@ 
 		if ($this->providerId === null || $this->id === null) {
 			throw new \UnexpectedValueException;
 		}
-		return $this->providerId . ':' . $this->id;
+		return $this->providerId.':'.$this->id;
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 
 			$nodes = $userFolder->getById($this->fileId);
 			if (empty($nodes)) {
-				throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId);
+				throw new NotFoundException('Node for share not found, fileid: '.$this->fileId);
 			}
 
 			$this->node = $nodes[0];

Indentation +579 added lines, -579 removed lines

@@ -41,583 +41,583 @@
 use OCP\Share\IShare;
 
 class Share implements IShare {
-	/** @var string */
-	private $id;
-	/** @var string */
-	private $providerId;
-	/** @var Node */
-	private $node;
-	/** @var int */
-	private $fileId;
-	/** @var string */
-	private $nodeType;
-	/** @var int */
-	private $shareType;
-	/** @var string */
-	private $sharedWith;
-	/** @var string */
-	private $sharedWithDisplayName;
-	/** @var string */
-	private $sharedWithAvatar;
-	/** @var string */
-	private $sharedBy;
-	/** @var string */
-	private $shareOwner;
-	/** @var int */
-	private $permissions;
-	/** @var IAttributes */
-	private $attributes;
-	/** @var int */
-	private $status;
-	/** @var string */
-	private $note = '';
-	/** @var \DateTime */
-	private $expireDate;
-	/** @var string */
-	private $password;
-	private ?\DateTimeInterface $passwordExpirationTime = null;
-	/** @var bool */
-	private $sendPasswordByTalk = false;
-	/** @var string */
-	private $token;
-	/** @var int */
-	private $parent;
-	/** @var string */
-	private $target;
-	/** @var \DateTime */
-	private $shareTime;
-	/** @var bool */
-	private $mailSend;
-	/** @var string */
-	private $label = '';
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ICacheEntry|null */
-	private $nodeCacheEntry;
-
-	/** @var bool */
-	private $hideDownload = false;
-
-	public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setId($id) {
-		if (is_int($id)) {
-			$id = (string)$id;
-		}
-
-		if (!is_string($id)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-
-		if ($this->id !== null) {
-			throw new IllegalIDChangeException('Not allowed to assign a new internal id to a share');
-		}
-
-		$this->id = trim($id);
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getFullId() {
-		if ($this->providerId === null || $this->id === null) {
-			throw new \UnexpectedValueException;
-		}
-		return $this->providerId . ':' . $this->id;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setProviderId($id) {
-		if (!is_string($id)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-
-		if ($this->providerId !== null) {
-			throw new IllegalIDChangeException('Not allowed to assign a new provider id to a share');
-		}
-
-		$this->providerId = trim($id);
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNode(Node $node) {
-		$this->fileId = null;
-		$this->nodeType = null;
-		$this->node = $node;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNode() {
-		if ($this->node === null) {
-			if ($this->shareOwner === null || $this->fileId === null) {
-				throw new NotFoundException();
-			}
-
-			// for federated shares the owner can be a remote user, in this
-			// case we use the initiator
-			if ($this->userManager->userExists($this->shareOwner)) {
-				$userFolder = $this->rootFolder->getUserFolder($this->shareOwner);
-			} else {
-				$userFolder = $this->rootFolder->getUserFolder($this->sharedBy);
-			}
-
-			$nodes = $userFolder->getById($this->fileId);
-			if (empty($nodes)) {
-				throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId);
-			}
-
-			$this->node = $nodes[0];
-		}
-
-		return $this->node;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNodeId($fileId) {
-		$this->node = null;
-		$this->fileId = $fileId;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNodeId() {
-		if ($this->fileId === null) {
-			$this->fileId = $this->getNode()->getId();
-		}
-
-		return $this->fileId;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNodeType($type) {
-		if ($type !== 'file' && $type !== 'folder') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->nodeType = $type;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNodeType() {
-		if ($this->nodeType === null) {
-			if ($this->getNodeCacheEntry()) {
-				$info = $this->getNodeCacheEntry();
-				$this->nodeType = $info->getMimeType() === FileInfo::MIMETYPE_FOLDER ? 'folder' : 'file';
-			} else {
-				$node = $this->getNode();
-				$this->nodeType = $node instanceof File ? 'file' : 'folder';
-			}
-		}
-
-		return $this->nodeType;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setShareType($shareType) {
-		$this->shareType = $shareType;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareType() {
-		return $this->shareType;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedWith($sharedWith) {
-		if (!is_string($sharedWith)) {
-			throw new \InvalidArgumentException();
-		}
-		$this->sharedWith = $sharedWith;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith() {
-		return $this->sharedWith;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedWithDisplayName($displayName) {
-		if (!is_string($displayName)) {
-			throw new \InvalidArgumentException();
-		}
-		$this->sharedWithDisplayName = $displayName;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWithDisplayName() {
-		return $this->sharedWithDisplayName;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedWithAvatar($src) {
-		if (!is_string($src)) {
-			throw new \InvalidArgumentException();
-		}
-		$this->sharedWithAvatar = $src;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWithAvatar() {
-		return $this->sharedWithAvatar;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setPermissions($permissions) {
-		//TODO checks
-
-		$this->permissions = $permissions;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPermissions() {
-		return $this->permissions;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function newAttributes(): IAttributes {
-		return new ShareAttributes();
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setAttributes(?IAttributes $attributes) {
-		$this->attributes = $attributes;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAttributes(): ?IAttributes {
-		return $this->attributes;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setStatus(int $status): IShare {
-		$this->status = $status;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getStatus(): int {
-		return $this->status;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNote($note) {
-		$this->note = $note;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNote() {
-		if (is_string($this->note)) {
-			return $this->note;
-		}
-		return '';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setLabel($label) {
-		$this->label = $label;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getLabel() {
-		return $this->label;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setExpirationDate($expireDate) {
-		//TODO checks
-
-		$this->expireDate = $expireDate;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getExpirationDate() {
-		return $this->expireDate;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function isExpired() {
-		return $this->getExpirationDate() !== null &&
-			$this->getExpirationDate() <= new \DateTime();
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedBy($sharedBy) {
-		if (!is_string($sharedBy)) {
-			throw new \InvalidArgumentException();
-		}
-		//TODO checks
-		$this->sharedBy = $sharedBy;
-
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedBy() {
-		//TODO check if set
-		return $this->sharedBy;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setShareOwner($shareOwner) {
-		if (!is_string($shareOwner)) {
-			throw new \InvalidArgumentException();
-		}
-		//TODO checks
-
-		$this->shareOwner = $shareOwner;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareOwner() {
-		//TODO check if set
-		return $this->shareOwner;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setPassword($password) {
-		$this->password = $password;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPassword() {
-		return $this->password;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setPasswordExpirationTime(?\DateTimeInterface $passwordExpirationTime = null): IShare {
-		$this->passwordExpirationTime = $passwordExpirationTime;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPasswordExpirationTime(): ?\DateTimeInterface {
-		return $this->passwordExpirationTime;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSendPasswordByTalk(bool $sendPasswordByTalk) {
-		$this->sendPasswordByTalk = $sendPasswordByTalk;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSendPasswordByTalk(): bool {
-		return $this->sendPasswordByTalk;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setToken($token) {
-		$this->token = $token;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getToken() {
-		return $this->token;
-	}
-
-	/**
-	 * Set the parent of this share
-	 *
-	 * @param int parent
-	 * @return IShare
-	 * @deprecated The new shares do not have parents. This is just here for legacy reasons.
-	 */
-	public function setParent($parent) {
-		$this->parent = $parent;
-		return $this;
-	}
-
-	/**
-	 * Get the parent of this share.
-	 *
-	 * @return int
-	 * @deprecated The new shares do not have parents. This is just here for legacy reasons.
-	 */
-	public function getParent() {
-		return $this->parent;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setTarget($target) {
-		$this->target = $target;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getTarget() {
-		return $this->target;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setShareTime(\DateTime $shareTime) {
-		$this->shareTime = $shareTime;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareTime() {
-		return $this->shareTime;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setMailSend($mailSend) {
-		$this->mailSend = $mailSend;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getMailSend() {
-		return $this->mailSend;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNodeCacheEntry(ICacheEntry $entry) {
-		$this->nodeCacheEntry = $entry;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNodeCacheEntry() {
-		return $this->nodeCacheEntry;
-	}
-
-	public function setHideDownload(bool $hide): IShare {
-		$this->hideDownload = $hide;
-		return $this;
-	}
-
-	public function getHideDownload(): bool {
-		return $this->hideDownload;
-	}
+    /** @var string */
+    private $id;
+    /** @var string */
+    private $providerId;
+    /** @var Node */
+    private $node;
+    /** @var int */
+    private $fileId;
+    /** @var string */
+    private $nodeType;
+    /** @var int */
+    private $shareType;
+    /** @var string */
+    private $sharedWith;
+    /** @var string */
+    private $sharedWithDisplayName;
+    /** @var string */
+    private $sharedWithAvatar;
+    /** @var string */
+    private $sharedBy;
+    /** @var string */
+    private $shareOwner;
+    /** @var int */
+    private $permissions;
+    /** @var IAttributes */
+    private $attributes;
+    /** @var int */
+    private $status;
+    /** @var string */
+    private $note = '';
+    /** @var \DateTime */
+    private $expireDate;
+    /** @var string */
+    private $password;
+    private ?\DateTimeInterface $passwordExpirationTime = null;
+    /** @var bool */
+    private $sendPasswordByTalk = false;
+    /** @var string */
+    private $token;
+    /** @var int */
+    private $parent;
+    /** @var string */
+    private $target;
+    /** @var \DateTime */
+    private $shareTime;
+    /** @var bool */
+    private $mailSend;
+    /** @var string */
+    private $label = '';
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ICacheEntry|null */
+    private $nodeCacheEntry;
+
+    /** @var bool */
+    private $hideDownload = false;
+
+    public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
+        $this->rootFolder = $rootFolder;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setId($id) {
+        if (is_int($id)) {
+            $id = (string)$id;
+        }
+
+        if (!is_string($id)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+
+        if ($this->id !== null) {
+            throw new IllegalIDChangeException('Not allowed to assign a new internal id to a share');
+        }
+
+        $this->id = trim($id);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFullId() {
+        if ($this->providerId === null || $this->id === null) {
+            throw new \UnexpectedValueException;
+        }
+        return $this->providerId . ':' . $this->id;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setProviderId($id) {
+        if (!is_string($id)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+
+        if ($this->providerId !== null) {
+            throw new IllegalIDChangeException('Not allowed to assign a new provider id to a share');
+        }
+
+        $this->providerId = trim($id);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNode(Node $node) {
+        $this->fileId = null;
+        $this->nodeType = null;
+        $this->node = $node;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNode() {
+        if ($this->node === null) {
+            if ($this->shareOwner === null || $this->fileId === null) {
+                throw new NotFoundException();
+            }
+
+            // for federated shares the owner can be a remote user, in this
+            // case we use the initiator
+            if ($this->userManager->userExists($this->shareOwner)) {
+                $userFolder = $this->rootFolder->getUserFolder($this->shareOwner);
+            } else {
+                $userFolder = $this->rootFolder->getUserFolder($this->sharedBy);
+            }
+
+            $nodes = $userFolder->getById($this->fileId);
+            if (empty($nodes)) {
+                throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId);
+            }
+
+            $this->node = $nodes[0];
+        }
+
+        return $this->node;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNodeId($fileId) {
+        $this->node = null;
+        $this->fileId = $fileId;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNodeId() {
+        if ($this->fileId === null) {
+            $this->fileId = $this->getNode()->getId();
+        }
+
+        return $this->fileId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNodeType($type) {
+        if ($type !== 'file' && $type !== 'folder') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->nodeType = $type;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNodeType() {
+        if ($this->nodeType === null) {
+            if ($this->getNodeCacheEntry()) {
+                $info = $this->getNodeCacheEntry();
+                $this->nodeType = $info->getMimeType() === FileInfo::MIMETYPE_FOLDER ? 'folder' : 'file';
+            } else {
+                $node = $this->getNode();
+                $this->nodeType = $node instanceof File ? 'file' : 'folder';
+            }
+        }
+
+        return $this->nodeType;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setShareType($shareType) {
+        $this->shareType = $shareType;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareType() {
+        return $this->shareType;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedWith($sharedWith) {
+        if (!is_string($sharedWith)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->sharedWith = $sharedWith;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith() {
+        return $this->sharedWith;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedWithDisplayName($displayName) {
+        if (!is_string($displayName)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->sharedWithDisplayName = $displayName;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWithDisplayName() {
+        return $this->sharedWithDisplayName;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedWithAvatar($src) {
+        if (!is_string($src)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->sharedWithAvatar = $src;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWithAvatar() {
+        return $this->sharedWithAvatar;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setPermissions($permissions) {
+        //TODO checks
+
+        $this->permissions = $permissions;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPermissions() {
+        return $this->permissions;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function newAttributes(): IAttributes {
+        return new ShareAttributes();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setAttributes(?IAttributes $attributes) {
+        $this->attributes = $attributes;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributes(): ?IAttributes {
+        return $this->attributes;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setStatus(int $status): IShare {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getStatus(): int {
+        return $this->status;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNote($note) {
+        $this->note = $note;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNote() {
+        if (is_string($this->note)) {
+            return $this->note;
+        }
+        return '';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setLabel($label) {
+        $this->label = $label;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getLabel() {
+        return $this->label;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setExpirationDate($expireDate) {
+        //TODO checks
+
+        $this->expireDate = $expireDate;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getExpirationDate() {
+        return $this->expireDate;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isExpired() {
+        return $this->getExpirationDate() !== null &&
+            $this->getExpirationDate() <= new \DateTime();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedBy($sharedBy) {
+        if (!is_string($sharedBy)) {
+            throw new \InvalidArgumentException();
+        }
+        //TODO checks
+        $this->sharedBy = $sharedBy;
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedBy() {
+        //TODO check if set
+        return $this->sharedBy;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setShareOwner($shareOwner) {
+        if (!is_string($shareOwner)) {
+            throw new \InvalidArgumentException();
+        }
+        //TODO checks
+
+        $this->shareOwner = $shareOwner;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareOwner() {
+        //TODO check if set
+        return $this->shareOwner;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setPassword($password) {
+        $this->password = $password;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPassword() {
+        return $this->password;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setPasswordExpirationTime(?\DateTimeInterface $passwordExpirationTime = null): IShare {
+        $this->passwordExpirationTime = $passwordExpirationTime;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPasswordExpirationTime(): ?\DateTimeInterface {
+        return $this->passwordExpirationTime;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSendPasswordByTalk(bool $sendPasswordByTalk) {
+        $this->sendPasswordByTalk = $sendPasswordByTalk;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSendPasswordByTalk(): bool {
+        return $this->sendPasswordByTalk;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setToken($token) {
+        $this->token = $token;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getToken() {
+        return $this->token;
+    }
+
+    /**
+     * Set the parent of this share
+     *
+     * @param int parent
+     * @return IShare
+     * @deprecated The new shares do not have parents. This is just here for legacy reasons.
+     */
+    public function setParent($parent) {
+        $this->parent = $parent;
+        return $this;
+    }
+
+    /**
+     * Get the parent of this share.
+     *
+     * @return int
+     * @deprecated The new shares do not have parents. This is just here for legacy reasons.
+     */
+    public function getParent() {
+        return $this->parent;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setTarget($target) {
+        $this->target = $target;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTarget() {
+        return $this->target;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setShareTime(\DateTime $shareTime) {
+        $this->shareTime = $shareTime;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareTime() {
+        return $this->shareTime;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setMailSend($mailSend) {
+        $this->mailSend = $mailSend;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMailSend() {
+        return $this->mailSend;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNodeCacheEntry(ICacheEntry $entry) {
+        $this->nodeCacheEntry = $entry;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNodeCacheEntry() {
+        return $this->nodeCacheEntry;
+    }
+
+    public function setHideDownload(bool $hide): IShare {
+        $this->hideDownload = $hide;
+        return $this;
+    }
+
+    public function getHideDownload(): bool {
+        return $this->hideDownload;
+    }
 }

lib/private/CapabilitiesManager.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 					$capabilities = array_replace_recursive($capabilities, $c->getCapabilities());
 				}
 			} else {
-				throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface');
+				throw new \InvalidArgumentException('The given Capability ('.get_class($c).') does not implement the ICapability interface');
 			}
 		}
 

Indentation +51 added lines, -51 removed lines

@@ -35,61 +35,61 @@
 use Psr\Log\LoggerInterface;
 
 class CapabilitiesManager {
-	/** @var \Closure[] */
-	private $capabilities = [];
+    /** @var \Closure[] */
+    private $capabilities = [];
 
-	/** @var LoggerInterface */
-	private $logger;
+    /** @var LoggerInterface */
+    private $logger;
 
-	public function __construct(LoggerInterface $logger) {
-		$this->logger = $logger;
-	}
+    public function __construct(LoggerInterface $logger) {
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Get an array of al the capabilities that are registered at this manager
-	 *
-	 * @param bool $public get public capabilities only
-	 * @throws \InvalidArgumentException
-	 * @return array
-	 */
-	public function getCapabilities(bool $public = false, bool $initialState = false) : array {
-		$capabilities = [];
-		foreach ($this->capabilities as $capability) {
-			try {
-				$c = $capability();
-			} catch (QueryException $e) {
-				$this->logger->error('CapabilitiesManager', [
-					'exception' => $e,
-				]);
-				continue;
-			}
+    /**
+     * Get an array of al the capabilities that are registered at this manager
+     *
+     * @param bool $public get public capabilities only
+     * @throws \InvalidArgumentException
+     * @return array
+     */
+    public function getCapabilities(bool $public = false, bool $initialState = false) : array {
+        $capabilities = [];
+        foreach ($this->capabilities as $capability) {
+            try {
+                $c = $capability();
+            } catch (QueryException $e) {
+                $this->logger->error('CapabilitiesManager', [
+                    'exception' => $e,
+                ]);
+                continue;
+            }
 
-			if ($c instanceof ICapability) {
-				if (!$public || $c instanceof IPublicCapability) {
-					if ($initialState && ($c instanceof IInitialStateExcludedCapability)) {
-						// Remove less important capabilities information that are expensive to query
-						// that we would otherwise inject to every page load
-						continue;
-					}
-					$capabilities = array_replace_recursive($capabilities, $c->getCapabilities());
-				}
-			} else {
-				throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface');
-			}
-		}
+            if ($c instanceof ICapability) {
+                if (!$public || $c instanceof IPublicCapability) {
+                    if ($initialState && ($c instanceof IInitialStateExcludedCapability)) {
+                        // Remove less important capabilities information that are expensive to query
+                        // that we would otherwise inject to every page load
+                        continue;
+                    }
+                    $capabilities = array_replace_recursive($capabilities, $c->getCapabilities());
+                }
+            } else {
+                throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface');
+            }
+        }
 
-		return $capabilities;
-	}
+        return $capabilities;
+    }
 
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * capabilities are actually requested
-	 *
-	 * $callable has to return an instance of OCP\Capabilities\ICapability
-	 *
-	 * @param \Closure $callable
-	 */
-	public function registerCapability(\Closure $callable) {
-		$this->capabilities[] = $callable;
-	}
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * capabilities are actually requested
+     *
+     * $callable has to return an instance of OCP\Capabilities\ICapability
+     *
+     * @param \Closure $callable
+     */
+    public function registerCapability(\Closure $callable) {
+        $this->capabilities[] = $callable;
+    }
 }

lib/private/OCS/Result.php

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 	 * @return $this
 	 */
 	public function addHeader($name, $value) {
-		$name = trim($name);  // always remove leading and trailing whitespace
+		$name = trim($name); // always remove leading and trailing whitespace
 		// to be able to reliably check for security
 		// headers
 

Indentation +123 added lines, -123 removed lines

@@ -31,127 +31,127 @@
 namespace OC\OCS;
 
 class Result {
-	/** @var array  */
-	protected $data;
-
-	/** @var null|string */
-	protected $message;
-
-	/** @var int */
-	protected $statusCode;
-
-	/** @var integer */
-	protected $items;
-
-	/** @var integer */
-	protected $perPage;
-
-	/** @var array */
-	private $headers = [];
-
-	/**
-	 * create the OCS_Result object
-	 * @param mixed $data the data to return
-	 * @param int $code
-	 * @param null|string $message
-	 * @param array $headers
-	 */
-	public function __construct($data = null, $code = 100, $message = null, $headers = []) {
-		if ($data === null) {
-			$this->data = [];
-		} elseif (!is_array($data)) {
-			$this->data = [$this->data];
-		} else {
-			$this->data = $data;
-		}
-		$this->statusCode = $code;
-		$this->message = $message;
-		$this->headers = $headers;
-	}
-
-	/**
-	 * optionally set the total number of items available
-	 * @param int $items
-	 */
-	public function setTotalItems($items) {
-		$this->items = $items;
-	}
-
-	/**
-	 * optionally set the the number of items per page
-	 * @param int $items
-	 */
-	public function setItemsPerPage($items) {
-		$this->perPage = $items;
-	}
-
-	/**
-	 * get the status code
-	 * @return int
-	 */
-	public function getStatusCode() {
-		return $this->statusCode;
-	}
-
-	/**
-	 * get the meta data for the result
-	 * @return array
-	 */
-	public function getMeta() {
-		$meta = [];
-		$meta['status'] = $this->succeeded() ? 'ok' : 'failure';
-		$meta['statuscode'] = $this->statusCode;
-		$meta['message'] = $this->message;
-		if ($this->items !== null) {
-			$meta['totalitems'] = $this->items;
-		}
-		if ($this->perPage !== null) {
-			$meta['itemsperpage'] = $this->perPage;
-		}
-		return $meta;
-	}
-
-	/**
-	 * get the result data
-	 * @return array
-	 */
-	public function getData() {
-		return $this->data;
-	}
-
-	/**
-	 * return bool Whether the method succeeded
-	 * @return bool
-	 */
-	public function succeeded() {
-		return ($this->statusCode == 100);
-	}
-
-	/**
-	 * Adds a new header to the response
-	 * @param string $name The name of the HTTP header
-	 * @param string $value The value, null will delete it
-	 * @return $this
-	 */
-	public function addHeader($name, $value) {
-		$name = trim($name);  // always remove leading and trailing whitespace
-		// to be able to reliably check for security
-		// headers
-
-		if (is_null($value)) {
-			unset($this->headers[$name]);
-		} else {
-			$this->headers[$name] = $value;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Returns the set headers
-	 * @return array the headers
-	 */
-	public function getHeaders() {
-		return $this->headers;
-	}
+    /** @var array  */
+    protected $data;
+
+    /** @var null|string */
+    protected $message;
+
+    /** @var int */
+    protected $statusCode;
+
+    /** @var integer */
+    protected $items;
+
+    /** @var integer */
+    protected $perPage;
+
+    /** @var array */
+    private $headers = [];
+
+    /**
+     * create the OCS_Result object
+     * @param mixed $data the data to return
+     * @param int $code
+     * @param null|string $message
+     * @param array $headers
+     */
+    public function __construct($data = null, $code = 100, $message = null, $headers = []) {
+        if ($data === null) {
+            $this->data = [];
+        } elseif (!is_array($data)) {
+            $this->data = [$this->data];
+        } else {
+            $this->data = $data;
+        }
+        $this->statusCode = $code;
+        $this->message = $message;
+        $this->headers = $headers;
+    }
+
+    /**
+     * optionally set the total number of items available
+     * @param int $items
+     */
+    public function setTotalItems($items) {
+        $this->items = $items;
+    }
+
+    /**
+     * optionally set the the number of items per page
+     * @param int $items
+     */
+    public function setItemsPerPage($items) {
+        $this->perPage = $items;
+    }
+
+    /**
+     * get the status code
+     * @return int
+     */
+    public function getStatusCode() {
+        return $this->statusCode;
+    }
+
+    /**
+     * get the meta data for the result
+     * @return array
+     */
+    public function getMeta() {
+        $meta = [];
+        $meta['status'] = $this->succeeded() ? 'ok' : 'failure';
+        $meta['statuscode'] = $this->statusCode;
+        $meta['message'] = $this->message;
+        if ($this->items !== null) {
+            $meta['totalitems'] = $this->items;
+        }
+        if ($this->perPage !== null) {
+            $meta['itemsperpage'] = $this->perPage;
+        }
+        return $meta;
+    }
+
+    /**
+     * get the result data
+     * @return array
+     */
+    public function getData() {
+        return $this->data;
+    }
+
+    /**
+     * return bool Whether the method succeeded
+     * @return bool
+     */
+    public function succeeded() {
+        return ($this->statusCode == 100);
+    }
+
+    /**
+     * Adds a new header to the response
+     * @param string $name The name of the HTTP header
+     * @param string $value The value, null will delete it
+     * @return $this
+     */
+    public function addHeader($name, $value) {
+        $name = trim($name);  // always remove leading and trailing whitespace
+        // to be able to reliably check for security
+        // headers
+
+        if (is_null($value)) {
+            unset($this->headers[$name]);
+        } else {
+            $this->headers[$name] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the set headers
+     * @return array the headers
+     */
+    public function getHeaders() {
+        return $this->headers;
+    }
 }

lib/private/Files/Storage/CommonTest.php

Indentation +47 added lines, -47 removed lines

@@ -33,53 +33,53 @@
 namespace OC\Files\Storage;
 
 class CommonTest extends \OC\Files\Storage\Common {
-	/**
-	 * underlying local storage used for missing functions
-	 * @var \OC\Files\Storage\Local
-	 */
-	private $storage;
+    /**
+     * underlying local storage used for missing functions
+     * @var \OC\Files\Storage\Local
+     */
+    private $storage;
 
-	public function __construct($params) {
-		$this->storage = new \OC\Files\Storage\Local($params);
-	}
+    public function __construct($params) {
+        $this->storage = new \OC\Files\Storage\Local($params);
+    }
 
-	public function getId() {
-		return 'test::'.$this->storage->getId();
-	}
-	public function mkdir($path) {
-		return $this->storage->mkdir($path);
-	}
-	public function rmdir($path) {
-		return $this->storage->rmdir($path);
-	}
-	public function opendir($path) {
-		return $this->storage->opendir($path);
-	}
-	public function stat($path) {
-		return $this->storage->stat($path);
-	}
-	public function filetype($path) {
-		return @$this->storage->filetype($path);
-	}
-	public function isReadable($path) {
-		return $this->storage->isReadable($path);
-	}
-	public function isUpdatable($path) {
-		return $this->storage->isUpdatable($path);
-	}
-	public function file_exists($path) {
-		return $this->storage->file_exists($path);
-	}
-	public function unlink($path) {
-		return $this->storage->unlink($path);
-	}
-	public function fopen($path, $mode) {
-		return $this->storage->fopen($path, $mode);
-	}
-	public function free_space($path) {
-		return $this->storage->free_space($path);
-	}
-	public function touch($path, $mtime = null) {
-		return $this->storage->touch($path, $mtime);
-	}
+    public function getId() {
+        return 'test::'.$this->storage->getId();
+    }
+    public function mkdir($path) {
+        return $this->storage->mkdir($path);
+    }
+    public function rmdir($path) {
+        return $this->storage->rmdir($path);
+    }
+    public function opendir($path) {
+        return $this->storage->opendir($path);
+    }
+    public function stat($path) {
+        return $this->storage->stat($path);
+    }
+    public function filetype($path) {
+        return @$this->storage->filetype($path);
+    }
+    public function isReadable($path) {
+        return $this->storage->isReadable($path);
+    }
+    public function isUpdatable($path) {
+        return $this->storage->isUpdatable($path);
+    }
+    public function file_exists($path) {
+        return $this->storage->file_exists($path);
+    }
+    public function unlink($path) {
+        return $this->storage->unlink($path);
+    }
+    public function fopen($path, $mode) {
+        return $this->storage->fopen($path, $mode);
+    }
+    public function free_space($path) {
+        return $this->storage->free_space($path);
+    }
+    public function touch($path, $mtime = null) {
+        return $this->storage->touch($path, $mtime);
+    }
 }

lib/private/Files/Storage/Temporary.php

Indentation +13 added lines, -13 removed lines

@@ -29,20 +29,20 @@
  * local storage backend in temporary folder for testing purpose
  */
 class Temporary extends Local {
-	public function __construct($arguments = null) {
-		parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]);
-	}
+    public function __construct($arguments = null) {
+        parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]);
+    }
 
-	public function cleanUp() {
-		\OC_Helper::rmdirr($this->datadir);
-	}
+    public function cleanUp() {
+        \OC_Helper::rmdirr($this->datadir);
+    }
 
-	public function __destruct() {
-		parent::__destruct();
-		$this->cleanUp();
-	}
+    public function __destruct() {
+        parent::__destruct();
+        $this->cleanUp();
+    }
 
-	public function getDataDir() {
-		return $this->datadir;
-	}
+    public function getDataDir() {
+        return $this->datadir;
+    }
 }