diff --git a/lib/private/Remote/Api/ApiBase.php b/lib/private/Remote/Api/ApiBase.php
index 64153a9311f81d38ba0499f3794ce9aefe74bee1..70292a977f4d14a8f7cb13fe7fd72e9625072135 100644
--- a/lib/private/Remote/Api/ApiBase.php
+++ b/lib/private/Remote/Api/ApiBase.php
@@ -57,6 +57,7 @@ class ApiBase {
 	 * @param array $query
 	 * @param array $headers
 	 * @return resource|string
+	 * @throws \InvalidArgumentException
 	 */
 	protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
 		$fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url;
diff --git a/lib/private/Remote/Api/ApiCollection.php b/lib/private/Remote/Api/ApiCollection.php
index 41b1bac0e08572c967361ec95d6a804667a77b8b..5ce97621dbb6dbb2880fcefe2e0c5552fd4a2318 100644
--- a/lib/private/Remote/Api/ApiCollection.php
+++ b/lib/private/Remote/Api/ApiCollection.php
@@ -28,8 +28,11 @@ use OCP\Remote\ICredentials;
 use OCP\Remote\IInstance;
 
 class ApiCollection implements IApiCollection {
+	/** @var IInstance */
 	private $instance;
+	/** @var ICredentials */
 	private $credentials;
+	/** @var IClientService */
 	private $clientService;
 
 	public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
diff --git a/lib/private/Remote/Api/ApiFactory.php b/lib/private/Remote/Api/ApiFactory.php
index ea084c188f1bfd3a6626ef978059ac4e70f8e529..19b8e8eb50cd3b6fc0354414ed8f8e5b8279a469 100644
--- a/lib/private/Remote/Api/ApiFactory.php
+++ b/lib/private/Remote/Api/ApiFactory.php
@@ -28,6 +28,7 @@ use OCP\Remote\ICredentials;
 use OCP\Remote\IInstance;
 
 class ApiFactory implements IApiFactory {
+	/** @var IClientService */
 	private $clientService;
 
 	public function __construct(IClientService $clientService) {
diff --git a/lib/private/Remote/Instance.php b/lib/private/Remote/Instance.php
index ab0081d86cfcd4fba47850a05d22af9cc450d668..0ed301ae868eb4cc9fadbe6e3dd9b6e99f760757 100644
--- a/lib/private/Remote/Instance.php
+++ b/lib/private/Remote/Instance.php
@@ -39,6 +39,7 @@ class Instance implements IInstance {
 	/** @var IClientService */
 	private $clientService;
 
+	/** @var array|null */
 	private $status;
 
 	/**
@@ -93,6 +94,10 @@ class Instance implements IInstance {
 		return $status['installed'] && !$status['maintenance'];
 	}
 
+	/**
+	 * @return array
+	 * @throws NotFoundException
+	 */
 	private function getStatus() {
 		if ($this->status) {
 			return $this->status;
@@ -120,6 +125,10 @@ class Instance implements IInstance {
 		return $status;
 	}
 
+	/**
+	 * @param string $url
+	 * @return bool|string
+	 */
 	private function downloadStatus($url) {
 		try {
 			$request = $this->clientService->newClient()->get($url);
diff --git a/lib/private/Remote/InstanceFactory.php b/lib/private/Remote/InstanceFactory.php
index 3b99bc61825b26c80f4d9aecdda645bb2bb26608..72baa433615e03d3de8df0b47725805cbe59a601 100644
--- a/lib/private/Remote/InstanceFactory.php
+++ b/lib/private/Remote/InstanceFactory.php
@@ -27,7 +27,9 @@ use OCP\ICache;
 use OCP\Remote\IInstanceFactory;
 
 class InstanceFactory implements IInstanceFactory {
+	/** @var ICache */
 	private $cache;
+	/** @var IClientService */
 	private $clientService;
 
 	public function __construct(ICache $cache, IClientService $clientService) {
diff --git a/lib/public/Remote/IInstanceFactory.php b/lib/public/Remote/IInstanceFactory.php
index 22ac85563f35ac30223501efedad5674150d6371..6aae463a89761ea2e6096fa65f3a24ac0c5ccde4 100644
--- a/lib/public/Remote/IInstanceFactory.php
+++ b/lib/public/Remote/IInstanceFactory.php
@@ -26,7 +26,7 @@ namespace OCP\Remote;
  */
 interface IInstanceFactory {
 	/**
-	 * @param $url
+	 * @param string $url
 	 * @return IInstance
 	 *
 	 * @since 13.0.0