Merge pull request #5847 from nextcloud/make-phan-config-more-strict-2

Phan fixes

12 files changed, 18 insertions, 26 deletions

diff --git a/lib/public/Files/ForbiddenException.php b/lib/public/Files/ForbiddenException.php
index 5492b8538b4..7a7c011691b 100644
--- a/lib/public/Files/ForbiddenException.php
+++ b/lib/public/Files/ForbiddenException.php
@@ -38,7 +38,7 @@ class ForbiddenException extends \Exception {
 	/**
 	 * @param string $message
 	 * @param bool $retry
-	 * @param \Exception $previous previous exception for cascading
+	 * @param \Exception|null $previous previous exception for cascading
 	 * @since 9.0.0
 	 */
 	public function __construct($message, $retry, \Exception $previous = null) {
diff --git a/lib/public/Files/IAppData.php b/lib/public/Files/IAppData.php
index bf612996c53..fd0d0649810 100644
--- a/lib/public/Files/IAppData.php
+++ b/lib/public/Files/IAppData.php
@@ -29,7 +29,6 @@ use OCP\Files\SimpleFS\ISimpleRoot;
  *
  * @package OCP\Files
  * @since 11.0.0
- * @internal This interface is experimental and might change for NC12
  */
 interface IAppData extends ISimpleRoot  {
 	
diff --git a/lib/public/Files/SimpleFS/ISimpleFile.php b/lib/public/Files/SimpleFS/ISimpleFile.php
index 660580ae464..e9182377cb5 100644
--- a/lib/public/Files/SimpleFS/ISimpleFile.php
+++ b/lib/public/Files/SimpleFS/ISimpleFile.php
@@ -29,7 +29,6 @@ use OCP\Files\NotPermittedException;
  *
  * @package OCP\Files\SimpleFS
  * @since 11.0.0
- * @internal This interface is experimental and might change for NC12
  */
 interface ISimpleFile {
 
diff --git a/lib/public/Files/SimpleFS/ISimpleFolder.php b/lib/public/Files/SimpleFS/ISimpleFolder.php
index 66f80816216..54fbd466e46 100644
--- a/lib/public/Files/SimpleFS/ISimpleFolder.php
+++ b/lib/public/Files/SimpleFS/ISimpleFolder.php
@@ -30,7 +30,6 @@ use OCP\Files\NotPermittedException;
  *
  * @package OCP\Files\SimpleFS
  * @since 11.0.0
- * @internal This interface is experimental and might change for NC12
  */
 interface ISimpleFolder {
 	/**
diff --git a/lib/public/Files/SimpleFS/ISimpleRoot.php b/lib/public/Files/SimpleFS/ISimpleRoot.php
index 3bfea656965..35b97f665a7 100644
--- a/lib/public/Files/SimpleFS/ISimpleRoot.php
+++ b/lib/public/Files/SimpleFS/ISimpleRoot.php
@@ -30,7 +30,6 @@ use OCP\Files\NotPermittedException;
  *
  * @package OCP\Files\SimpleFS
  * @since 11.0.0
- * @internal This interface is experimental and might change for NC12
  */
 interface ISimpleRoot {
 	/**
diff --git a/lib/public/Files/Storage.php b/lib/public/Files/Storage.php
index 213bbc0e549..ee89b9fd205 100644
--- a/lib/public/Files/Storage.php
+++ b/lib/public/Files/Storage.php
@@ -395,22 +395,22 @@ interface Storage extends IStorage {
 	public function verifyPath($path, $fileName);
 
 	/**
-	 * @param \OCP\Files\Storage $sourceStorage
+	 * @param IStorage $sourceStorage
 	 * @param string $sourceInternalPath
 	 * @param string $targetInternalPath
 	 * @return bool
 	 * @since 8.1.0
 	 */
-	public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath);
+	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath);
 
 	/**
-	 * @param \OCP\Files\Storage $sourceStorage
+	 * @param IStorage $sourceStorage
 	 * @param string $sourceInternalPath
 	 * @param string $targetInternalPath
 	 * @return bool
 	 * @since 8.1.0
 	 */
-	public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath);
+	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath);
 
 	/**
 	 * @param string $path The path of the file to acquire the lock for
diff --git a/lib/public/Files/Storage/IStorage.php b/lib/public/Files/Storage/IStorage.php
index 27b8f1d0697..d5176aab463 100644
--- a/lib/public/Files/Storage/IStorage.php
+++ b/lib/public/Files/Storage/IStorage.php
@@ -383,22 +383,22 @@ interface IStorage {
 	public function verifyPath($path, $fileName);
 
 	/**
-	 * @param \OCP\Files\Storage|\OCP\Files\Storage\IStorage $sourceStorage
+	 * @param IStorage $sourceStorage
 	 * @param string $sourceInternalPath
 	 * @param string $targetInternalPath
 	 * @return bool
 	 * @since 9.0.0
 	 */
-	public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath);
+	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath);
 
 	/**
-	 * @param \OCP\Files\Storage|\OCP\Files\Storage\IStorage $sourceStorage
+	 * @param IStorage $sourceStorage
 	 * @param string $sourceInternalPath
 	 * @param string $targetInternalPath
 	 * @return bool
 	 * @since 9.0.0
 	 */
-	public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath);
+	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath);
 
 	/**
 	 * Test a storage for availability
diff --git a/lib/public/Files/StorageAuthException.php b/lib/public/Files/StorageAuthException.php
index f73915df9d9..8a04a2c70f4 100644
--- a/lib/public/Files/StorageAuthException.php
+++ b/lib/public/Files/StorageAuthException.php
@@ -31,12 +31,11 @@ class StorageAuthException extends StorageNotAvailableException {
 	 * StorageAuthException constructor.
 	 *
 	 * @param string $message
-	 * @param int $code
-	 * @param \Exception $previous
+	 * @param \Exception|null $previous
 	 * @since 9.0.0
 	 */
 	public function __construct($message = '', \Exception $previous = null) {
 		$l = \OC::$server->getL10N('core');
-		parent::__construct($l->t('Storage unauthorized. %s', $message), self::STATUS_UNAUTHORIZED, $previous);
+		parent::__construct($l->t('Storage unauthorized. %s', [$message]), self::STATUS_UNAUTHORIZED, $previous);
 	}
 }
diff --git a/lib/public/Files/StorageBadConfigException.php b/lib/public/Files/StorageBadConfigException.php
index a3a96a80dc1..d6ee6a267e7 100644
--- a/lib/public/Files/StorageBadConfigException.php
+++ b/lib/public/Files/StorageBadConfigException.php
@@ -31,13 +31,12 @@ class StorageBadConfigException extends StorageNotAvailableException {
 	 * ExtStorageBadConfigException constructor.
 	 *
 	 * @param string $message
-	 * @param int $code
-	 * @param \Exception $previous
+	 * @param \Exception|null $previous
 	 * @since 9.0.0
 	 */
 	public function __construct($message = '', \Exception $previous = null) {
 		$l = \OC::$server->getL10N('core');
-		parent::__construct($l->t('Storage incomplete configuration. %s', $message), self::STATUS_INCOMPLETE_CONF, $previous);
+		parent::__construct($l->t('Storage incomplete configuration. %s', [$message]), self::STATUS_INCOMPLETE_CONF, $previous);
 	}
 
 }
diff --git a/lib/public/Files/StorageConnectionException.php b/lib/public/Files/StorageConnectionException.php
index 7a5381aef73..f12c84653b7 100644
--- a/lib/public/Files/StorageConnectionException.php
+++ b/lib/public/Files/StorageConnectionException.php
@@ -31,12 +31,11 @@ class StorageConnectionException extends StorageNotAvailableException {
 	 * StorageConnectionException constructor.
 	 *
 	 * @param string $message
-	 * @param int $code
-	 * @param \Exception $previous
+	 * @param \Exception|null $previous
 	 * @since 9.0.0
 	 */
 	public function __construct($message = '', \Exception $previous = null) {
 		$l = \OC::$server->getL10N('core');
-		parent::__construct($l->t('Storage connection error. %s', $message), self::STATUS_NETWORK_ERROR, $previous);
+		parent::__construct($l->t('Storage connection error. %s', [$message]), self::STATUS_NETWORK_ERROR, $previous);
 	}
 }
diff --git a/lib/public/Files/StorageNotAvailableException.php b/lib/public/Files/StorageNotAvailableException.php
index b6a5a70718a..b3f6e1a6b76 100644
--- a/lib/public/Files/StorageNotAvailableException.php
+++ b/lib/public/Files/StorageNotAvailableException.php
@@ -53,7 +53,7 @@ class StorageNotAvailableException extends HintException {
 	 *
 	 * @param string $message
 	 * @param int $code
-	 * @param \Exception $previous
+	 * @param \Exception|null $previous
 	 * @since 6.0.0
 	 */
 	public function __construct($message = '', $code = self::STATUS_ERROR, \Exception $previous = null) {
diff --git a/lib/public/Files/StorageTimeoutException.php b/lib/public/Files/StorageTimeoutException.php
index 16675710dff..b5566ada9b5 100644
--- a/lib/public/Files/StorageTimeoutException.php
+++ b/lib/public/Files/StorageTimeoutException.php
@@ -31,12 +31,11 @@ class StorageTimeoutException extends StorageNotAvailableException {
 	 * StorageTimeoutException constructor.
 	 *
 	 * @param string $message
-	 * @param int $code
-	 * @param \Exception $previous
+	 * @param \Exception|null $previous
 	 * @since 9.0.0
 	 */
 	public function __construct($message = '', \Exception $previous = null) {
 		$l = \OC::$server->getL10N('core');
-		parent::__construct($l->t('Storage connection timeout. %s', $message), self::STATUS_TIMEOUT, $previous);
+		parent::__construct($l->t('Storage connection timeout. %s', [$message]), self::STATUS_TIMEOUT, $previous);
 	}
 }