mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use public interfaces for type hinting

This commit is contained in:
Joas Schilling 2015-04-24 13:06:03 +02:00
parent 24128d1384
commit 1592be117a
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/private/files/storage/wrapper/encryption.php
View File

@ -23,15 +23,15 @@
namespace OC\Files\Storage\Wrapper; namespace OC\Files\Storage\Wrapper;
use OC\Encryption\Exceptions\ModuleDoesNotExistsException; use OC\Encryption\Exceptions\ModuleDoesNotExistsException;
use OC\Encryption\File;
use OC\Encryption\Manager;
use OC\Encryption\Update; use OC\Encryption\Update;
use OC\Encryption\Util; use OC\Encryption\Util;
use OC\Files\Filesystem; use OC\Files\Filesystem;
use OC\Files\Storage\LocalTempFileTrait; use OC\Files\Storage\LocalTempFileTrait;
use OC\Log; use OCP\Encryption\IFile;
use OCP\Encryption\IManager;
use OCP\Encryption\Keys\IStorage; use OCP\Encryption\Keys\IStorage;
use OCP\Files\Mount\IMountPoint; use OCP\Files\Mount\IMountPoint;
use OCP\ILogger;
class Encryption extends Wrapper { class Encryption extends Wrapper {
@ -43,10 +43,10 @@ class Encryption extends Wrapper {
/** @var \OC\Encryption\Util */ /** @var \OC\Encryption\Util */
private $util; private $util;
/** @var \OC\Encryption\Manager */ /** @var \OCP\Encryption\IManager */
private $encryptionManager; private $encryptionManager;
/** @var \OC\Log */ /** @var \OCP\ILogger */
private $logger; private $logger;
/** @var string */ /** @var string */
@ -55,7 +55,7 @@ class Encryption extends Wrapper {
/** @var array */ /** @var array */
private $unencryptedSize; private $unencryptedSize;
/** @var File */ /** @var \OCP\Encryption\IFile */
private $fileHelper; private $fileHelper;
/** @var IMountPoint */ /** @var IMountPoint */
@ -69,20 +69,20 @@ class Encryption extends Wrapper {
/** /**
* @param array $parameters * @param array $parameters
* @param \OC\Encryption\Manager $encryptionManager * @param \OCP\Encryption\IManager $encryptionManager
* @param \OC\Encryption\Util $util * @param \OC\Encryption\Util $util
* @param \OC\Log $logger * @param \OCP\ILogger $logger
* @param File $fileHelper * @param \OCP\Encryption\IFile $fileHelper
* @param string $uid user who perform the read/write operation (null for public access) * @param string $uid user who perform the read/write operation (null for public access)
* @param IStorage $keyStorage * @param IStorage $keyStorage
* @param Update $update * @param Update $update
*/ */
public function __construct( public function __construct(
$parameters, $parameters,
Manager $encryptionManager = null, IManager $encryptionManager = null,
Util $util = null, Util $util = null,
Log $logger = null, ILogger $logger = null,
File $fileHelper = null, IFile $fileHelper = null,
$uid = null, $uid = null,
IStorage $keyStorage = null, IStorage $keyStorage = null,
Update $update = null Update $update = null

2
lib/public/encryption/keys/istorage.php
View File

@ -163,7 +163,7 @@ interface IStorage {
* *
* @param string $source * @param string $source
* @param string $target * @param string $target
* @retrun boolean * @return boolean
* @since 8.1.0 * @since 8.1.0
*/ */
public function copyKeys($source, $target); public function copyKeys($source, $target);