aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Encryption
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-11-22 20:52:10 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2019-11-22 20:52:10 +0100
commit68748d4f85dd23238aaafb787b1c341f0f2f0419 (patch)
tree7aab3a925dda8dcd6ef4e8c6fe04063abbadd6af /lib/private/Encryption
parent21119633041d5ccae19975a58b0ae50ef5a8e33a (diff)
downloadnextcloud-server-68748d4f85dd23238aaafb787b1c341f0f2f0419.tar.gz
nextcloud-server-68748d4f85dd23238aaafb787b1c341f0f2f0419.zip
Some php-cs fixes
* Order the imports * No leading slash on imports * Empty line before namespace * One line per import * Empty after imports * Emmpty line at bottom of file Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'lib/private/Encryption')
-rw-r--r--lib/private/Encryption/DecryptAll.php3
-rw-r--r--lib/private/Encryption/EncryptionWrapper.php5
-rw-r--r--lib/private/Encryption/Exceptions/DecryptionFailedException.php1
-rw-r--r--lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php1
-rw-r--r--lib/private/Encryption/Exceptions/EncryptionFailedException.php1
-rw-r--r--lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php1
-rw-r--r--lib/private/Encryption/Exceptions/UnknownCipherException.php1
-rw-r--r--lib/private/Encryption/Keys/Storage.php2
-rw-r--r--lib/private/Encryption/Update.php4
9 files changed, 6 insertions, 13 deletions
diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php
index d95a8660762..86164f072d2 100644
--- a/lib/private/Encryption/DecryptAll.php
+++ b/lib/private/Encryption/DecryptAll.php
@@ -24,12 +24,11 @@
*
*/
-
namespace OC\Encryption;
use OC\Encryption\Exceptions\DecryptionFailedException;
use OC\Files\View;
-use \OCP\Encryption\IEncryptionModule;
+use OCP\Encryption\IEncryptionModule;
use OCP\IUserManager;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Input\InputInterface;
diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php
index c4650d39ee3..30fee808097 100644
--- a/lib/private/Encryption/EncryptionWrapper.php
+++ b/lib/private/Encryption/EncryptionWrapper.php
@@ -21,15 +21,14 @@
*
*/
-
namespace OC\Encryption;
-use OC\Memcache\ArrayCache;
use OC\Files\Filesystem;
use OC\Files\Storage\Wrapper\Encryption;
-use OCP\Files\Mount\IMountPoint;
use OC\Files\View;
+use OC\Memcache\ArrayCache;
+use OCP\Files\Mount\IMountPoint;
use OCP\Files\Storage;
use OCP\ILogger;
diff --git a/lib/private/Encryption/Exceptions/DecryptionFailedException.php b/lib/private/Encryption/Exceptions/DecryptionFailedException.php
index de13536b0c5..946bd47b2c4 100644
--- a/lib/private/Encryption/Exceptions/DecryptionFailedException.php
+++ b/lib/private/Encryption/Exceptions/DecryptionFailedException.php
@@ -21,7 +21,6 @@
*
*/
-
namespace OC\Encryption\Exceptions;
use OCP\Encryption\Exceptions\GenericEncryptionException;
diff --git a/lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php b/lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php
index 3e93e633ce1..73c02ac8d4c 100644
--- a/lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php
+++ b/lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php
@@ -21,7 +21,6 @@
*
*/
-
namespace OC\Encryption\Exceptions;
use OCP\Encryption\Exceptions\GenericEncryptionException;
diff --git a/lib/private/Encryption/Exceptions/EncryptionFailedException.php b/lib/private/Encryption/Exceptions/EncryptionFailedException.php
index fefd8d4f0ba..d351476ffcd 100644
--- a/lib/private/Encryption/Exceptions/EncryptionFailedException.php
+++ b/lib/private/Encryption/Exceptions/EncryptionFailedException.php
@@ -21,7 +21,6 @@
*
*/
-
namespace OC\Encryption\Exceptions;
use OCP\Encryption\Exceptions\GenericEncryptionException;
diff --git a/lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php b/lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php
index 00bb0cf4262..b06087f0829 100644
--- a/lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php
+++ b/lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php
@@ -21,7 +21,6 @@
*
*/
-
namespace OC\Encryption\Exceptions;
use OCP\Encryption\Exceptions\GenericEncryptionException;
diff --git a/lib/private/Encryption/Exceptions/UnknownCipherException.php b/lib/private/Encryption/Exceptions/UnknownCipherException.php
index d2c2eb6289c..21dc6639f0d 100644
--- a/lib/private/Encryption/Exceptions/UnknownCipherException.php
+++ b/lib/private/Encryption/Exceptions/UnknownCipherException.php
@@ -21,7 +21,6 @@
*
*/
-
namespace OC\Encryption\Exceptions;
use OCP\Encryption\Exceptions\GenericEncryptionException;
diff --git a/lib/private/Encryption/Keys/Storage.php b/lib/private/Encryption/Keys/Storage.php
index 223b959e661..77284be1b9d 100644
--- a/lib/private/Encryption/Keys/Storage.php
+++ b/lib/private/Encryption/Keys/Storage.php
@@ -29,8 +29,8 @@ namespace OC\Encryption\Keys;
use OC\Encryption\Util;
use OC\Files\Filesystem;
use OC\Files\View;
-use OCP\Encryption\Keys\IStorage;
use OC\User\NoUserException;
+use OCP\Encryption\Keys\IStorage;
class Storage implements IStorage {
diff --git a/lib/private/Encryption/Update.php b/lib/private/Encryption/Update.php
index 9d9f5e4d954..65788424906 100644
--- a/lib/private/Encryption/Update.php
+++ b/lib/private/Encryption/Update.php
@@ -25,8 +25,8 @@
namespace OC\Encryption;
use OC\Files\Filesystem;
-use \OC\Files\Mount;
-use \OC\Files\View;
+use OC\Files\Mount;
+use OC\Files\View;
/**
* update encrypted files, e.g. because a file was shared