aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Files/Storage
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-11-25 14:07:00 +0100
committerGitHub <noreply@github.com>2019-11-25 14:07:00 +0100
commitc7d5b8fc493520ab40076ddade3632152dbfef00 (patch)
tree4de0070d04b69b5ba6ef478b241359260aa57113 /lib/private/Files/Storage
parent20ec763337428f3a0e7c9e34e0246c1f5fb3a838 (diff)
parent68748d4f85dd23238aaafb787b1c341f0f2f0419 (diff)
downloadnextcloud-server-c7d5b8fc493520ab40076ddade3632152dbfef00.tar.gz
nextcloud-server-c7d5b8fc493520ab40076ddade3632152dbfef00.zip
Merge pull request #18079 from nextcloud/fixes/phpcs
Some php-cs fixes
Diffstat (limited to 'lib/private/Files/Storage')
-rw-r--r--lib/private/Files/Storage/Common.php2
-rw-r--r--lib/private/Files/Storage/DAV.php9
-rw-r--r--lib/private/Files/Storage/FailedStorage.php4
-rw-r--r--lib/private/Files/Storage/Wrapper/Availability.php1
-rw-r--r--lib/private/Files/Storage/Wrapper/Encoding.php2
-rw-r--r--lib/private/Files/Storage/Wrapper/Encryption.php2
6 files changed, 10 insertions, 10 deletions
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index 2dbaf619c05..3bc14d35cd0 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -44,8 +44,8 @@ use OC\Files\Cache\Cache;
use OC\Files\Cache\Propagator;
use OC\Files\Cache\Scanner;
use OC\Files\Cache\Updater;
-use OC\Files\Filesystem;
use OC\Files\Cache\Watcher;
+use OC\Files\Filesystem;
use OC\Files\Storage\Wrapper\Jail;
use OC\Files\Storage\Wrapper\Wrapper;
use OCP\Files\EmptyFileNameException;
diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php
index 2367c1aab3c..69e6f309c31 100644
--- a/lib/private/Files/Storage/DAV.php
+++ b/lib/private/Files/Storage/DAV.php
@@ -35,19 +35,19 @@ namespace OC\Files\Storage;
use Exception;
use GuzzleHttp\Exception\RequestException;
-use OCP\Files\ForbiddenException;
-use OCP\ILogger;
-use Psr\Http\Message\ResponseInterface;
use Icewind\Streams\CallbackWrapper;
-use OC\Files\Filesystem;
use Icewind\Streams\IteratorDirectory;
+use OC\Files\Filesystem;
use OC\MemCache\ArrayCache;
use OCP\AppFramework\Http;
use OCP\Constants;
use OCP\Files\FileInfo;
+use OCP\Files\ForbiddenException;
use OCP\Files\StorageInvalidException;
use OCP\Files\StorageNotAvailableException;
+use OCP\ILogger;
use OCP\Util;
+use Psr\Http\Message\ResponseInterface;
use Sabre\DAV\Client;
use Sabre\DAV\Xml\Property\ResourceType;
use Sabre\HTTP\ClientException;
@@ -864,4 +864,3 @@ class DAV extends Common {
// TODO: only log for now, but in the future need to wrap/rethrow exception
}
}
-
diff --git a/lib/private/Files/Storage/FailedStorage.php b/lib/private/Files/Storage/FailedStorage.php
index 9ed09e82e7d..4ee9b21694a 100644
--- a/lib/private/Files/Storage/FailedStorage.php
+++ b/lib/private/Files/Storage/FailedStorage.php
@@ -27,8 +27,8 @@ namespace OC\Files\Storage;
use OC\Files\Cache\FailedCache;
use OCP\Files\Storage\IStorage;
-use \OCP\Lock\ILockingProvider;
-use \OCP\Files\StorageNotAvailableException;
+use OCP\Files\StorageNotAvailableException;
+use OCP\Lock\ILockingProvider;
/**
* Storage placeholder to represent a missing precondition, storage unavailable
diff --git a/lib/private/Files/Storage/Wrapper/Availability.php b/lib/private/Files/Storage/Wrapper/Availability.php
index 77a23d26fb7..0c01595d306 100644
--- a/lib/private/Files/Storage/Wrapper/Availability.php
+++ b/lib/private/Files/Storage/Wrapper/Availability.php
@@ -21,6 +21,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
+
namespace OC\Files\Storage\Wrapper;
use OCP\Files\Storage\IStorage;
diff --git a/lib/private/Files/Storage/Wrapper/Encoding.php b/lib/private/Files/Storage/Wrapper/Encoding.php
index bc8519bf42c..f143c8b8c92 100644
--- a/lib/private/Files/Storage/Wrapper/Encoding.php
+++ b/lib/private/Files/Storage/Wrapper/Encoding.php
@@ -23,9 +23,9 @@
namespace OC\Files\Storage\Wrapper;
+use OC\Cache\CappedMemoryCache;
use OCP\Files\Storage\IStorage;
use OCP\ICache;
-use OC\Cache\CappedMemoryCache;
/**
* Encoding wrapper that deals with file names that use unsupported encodings like NFD.
diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php
index 5485b80985b..7741f820c63 100644
--- a/lib/private/Files/Storage/Wrapper/Encryption.php
+++ b/lib/private/Files/Storage/Wrapper/Encryption.php
@@ -41,10 +41,10 @@ use OCP\Encryption\Exceptions\GenericEncryptionException;
use OCP\Encryption\IFile;
use OCP\Encryption\IManager;
use OCP\Encryption\Keys\IStorage;
+use OCP\Files\Cache\ICacheEntry;
use OCP\Files\Mount\IMountPoint;
use OCP\Files\Storage;
use OCP\ILogger;
-use OCP\Files\Cache\ICacheEntry;
class Encryption extends Wrapper {