diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-22 22:52:10 +0300 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-22 22:52:10 +0300 |
commit | 68748d4f85dd23238aaafb787b1c341f0f2f0419 (patch) | |
tree | 7aab3a925dda8dcd6ef4e8c6fe04063abbadd6af /lib/private/Files | |
parent | 21119633041d5ccae19975a58b0ae50ef5a8e33a (diff) |
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/Files')
27 files changed, 37 insertions, 34 deletions
diff --git a/lib/private/Files/AppData/AppData.php b/lib/private/Files/AppData/AppData.php index 7ce29bd0e00..4f526bf04cf 100644 --- a/lib/private/Files/AppData/AppData.php +++ b/lib/private/Files/AppData/AppData.php @@ -26,10 +26,10 @@ namespace OC\Files\AppData; use OC\Cache\CappedMemoryCache; use OC\Files\SimpleFS\SimpleFolder; +use OC\SystemConfig; +use OCP\Files\Folder; use OCP\Files\IAppData; use OCP\Files\IRootFolder; -use OCP\Files\Folder; -use OC\SystemConfig; use OCP\Files\Node; use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; diff --git a/lib/private/Files/AppData/Factory.php b/lib/private/Files/AppData/Factory.php index 5c7d554ba5b..3a880d5e29b 100644 --- a/lib/private/Files/AppData/Factory.php +++ b/lib/private/Files/AppData/Factory.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Files\AppData; use OC\SystemConfig; diff --git a/lib/private/Files/Cache/AbstractCacheEvent.php b/lib/private/Files/Cache/AbstractCacheEvent.php index db1e7a1cf32..d4990f17743 100644 --- a/lib/private/Files/Cache/AbstractCacheEvent.php +++ b/lib/private/Files/Cache/AbstractCacheEvent.php @@ -21,9 +21,9 @@ namespace OC\Files\Cache; +use OCP\EventDispatcher\Event; use OCP\Files\Cache\ICacheEvent; use OCP\Files\Storage\IStorage; -use OCP\EventDispatcher\Event; class AbstractCacheEvent extends Event implements ICacheEvent { protected $storage; diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index f1d2c64e8fd..a90617f5c53 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -38,15 +38,15 @@ namespace OC\Files\Cache; +use Doctrine\DBAL\Driver\Statement; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use OCP\DB\QueryBuilder\IQueryBuilder; -use Doctrine\DBAL\Driver\Statement; use OCP\Files\Cache\CacheInsertEvent; use OCP\Files\Cache\CacheUpdateEvent; use OCP\Files\Cache\ICache; use OCP\Files\Cache\ICacheEntry; use OCP\Files\FileInfo; -use \OCP\Files\IMimeTypeLoader; +use OCP\Files\IMimeTypeLoader; use OCP\Files\Search\ISearchQuery; use OCP\Files\Storage\IStorage; use OCP\IDBConnection; diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php index 6d7f1876e29..157bb083b73 100644 --- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php +++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php @@ -28,8 +28,8 @@ namespace OC\Files\Cache\Wrapper; use OC\Files\Cache\Cache; -use OCP\Files\Cache\ICacheEntry; use OCP\Files\Cache\ICache; +use OCP\Files\Cache\ICacheEntry; use OCP\Files\Search\ISearchQuery; class CacheWrapper extends Cache { diff --git a/lib/private/Files/Config/CachedMountFileInfo.php b/lib/private/Files/Config/CachedMountFileInfo.php index e315493a693..331e28d3d5e 100644 --- a/lib/private/Files/Config/CachedMountFileInfo.php +++ b/lib/private/Files/Config/CachedMountFileInfo.php @@ -45,4 +45,4 @@ class CachedMountFileInfo extends CachedMountInfo implements ICachedMountFileInf public function getPath() { return $this->getMountPoint() . $this->getInternalPath(); } -}
\ No newline at end of file +} diff --git a/lib/private/Files/Config/MountProviderCollection.php b/lib/private/Files/Config/MountProviderCollection.php index a3c88dd6b4b..fbb455c5063 100644 --- a/lib/private/Files/Config/MountProviderCollection.php +++ b/lib/private/Files/Config/MountProviderCollection.php @@ -26,8 +26,8 @@ namespace OC\Files\Config; use OC\Hooks\Emitter; use OC\Hooks\EmitterTrait; use OCP\Files\Config\IHomeMountProvider; -use OCP\Files\Config\IMountProviderCollection; use OCP\Files\Config\IMountProvider; +use OCP\Files\Config\IMountProviderCollection; use OCP\Files\Config\IUserMountCache; use OCP\Files\Mount\IMountManager; use OCP\Files\Mount\IMountPoint; diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php index 63abdf5fdeb..53bd52a2e6c 100644 --- a/lib/private/Files/Config/UserMountCache.php +++ b/lib/private/Files/Config/UserMountCache.php @@ -25,6 +25,7 @@ namespace OC\Files\Config; +use OC\Cache\CappedMemoryCache; use OCA\Files_Sharing\SharedMount; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\Files\Config\ICachedMountFileInfo; @@ -37,7 +38,6 @@ use OCP\IDBConnection; use OCP\ILogger; use OCP\IUser; use OCP\IUserManager; -use OC\Cache\CappedMemoryCache; /** * Cache mounts points per user in the cache so we can easilly look them up diff --git a/lib/private/Files/Mount/MountPoint.php b/lib/private/Files/Mount/MountPoint.php index 36e10bfb45a..1e67eecb9dc 100644 --- a/lib/private/Files/Mount/MountPoint.php +++ b/lib/private/Files/Mount/MountPoint.php @@ -29,9 +29,9 @@ namespace OC\Files\Mount; -use \OC\Files\Filesystem; -use OC\Files\Storage\StorageFactory; +use OC\Files\Filesystem; use OC\Files\Storage\Storage; +use OC\Files\Storage\StorageFactory; use OCP\Files\Mount\IMountPoint; use OCP\ILogger; diff --git a/lib/private/Files/Node/HookConnector.php b/lib/private/Files/Node/HookConnector.php index 4783a71b07b..b792b584077 100644 --- a/lib/private/Files/Node/HookConnector.php +++ b/lib/private/Files/Node/HookConnector.php @@ -22,9 +22,9 @@ namespace OC\Files\Node; -use OCP\Files\FileInfo; use OC\Files\Filesystem; use OC\Files\View; +use OCP\Files\FileInfo; use OCP\Util; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; diff --git a/lib/private/Files/Node/LazyRoot.php b/lib/private/Files/Node/LazyRoot.php index f5d8cdc91a9..acf288860d9 100644 --- a/lib/private/Files/Node/LazyRoot.php +++ b/lib/private/Files/Node/LazyRoot.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Files\Node; use OCP\Files\IRootFolder; diff --git a/lib/private/Files/Node/Root.php b/lib/private/Files/Node/Root.php index 390d29edb31..ad0935ebaf7 100644 --- a/lib/private/Files/Node/Root.php +++ b/lib/private/Files/Node/Root.php @@ -33,11 +33,11 @@ namespace OC\Files\Node; use OC\Cache\CappedMemoryCache; use OC\Files\Mount\Manager; use OC\Files\Mount\MountPoint; +use OC\Hooks\PublicEmitter; use OCP\Files\Config\IUserMountCache; +use OCP\Files\IRootFolder; use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; -use OC\Hooks\PublicEmitter; -use OCP\Files\IRootFolder; use OCP\ILogger; use OCP\IUserManager; diff --git a/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php index fb5e8d83ab1..fd6c9a2ebc1 100644 --- a/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php @@ -66,4 +66,4 @@ class HomeObjectStoreStorage extends ObjectStoreStorage implements \OCP\Files\IH } -}
\ No newline at end of file +} diff --git a/lib/private/Files/ObjectStore/Mapper.php b/lib/private/Files/ObjectStore/Mapper.php index 2b5cf6ea4ab..c4b5e5d7778 100644 --- a/lib/private/Files/ObjectStore/Mapper.php +++ b/lib/private/Files/ObjectStore/Mapper.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Files\ObjectStore; use OCP\IUser; diff --git a/lib/private/Files/ObjectStore/NoopScanner.php b/lib/private/Files/ObjectStore/NoopScanner.php index a3a396651a2..1ee868c49d4 100644 --- a/lib/private/Files/ObjectStore/NoopScanner.php +++ b/lib/private/Files/ObjectStore/NoopScanner.php @@ -24,8 +24,8 @@ */ namespace OC\Files\ObjectStore; -use \OC\Files\Cache\Scanner; -use \OC\Files\Storage\Storage; +use OC\Files\Cache\Scanner; +use OC\Files\Storage\Storage; class NoopScanner extends Scanner { diff --git a/lib/private/Files/ObjectStore/SwiftFactory.php b/lib/private/Files/ObjectStore/SwiftFactory.php index f6270d36e7a..430d628d3ce 100644 --- a/lib/private/Files/ObjectStore/SwiftFactory.php +++ b/lib/private/Files/ObjectStore/SwiftFactory.php @@ -31,15 +31,15 @@ use OCP\Files\StorageAuthException; use OCP\Files\StorageNotAvailableException; use OCP\ICache; use OCP\ILogger; -use OpenStack\Common\Error\BadResponseError; use OpenStack\Common\Auth\Token; +use OpenStack\Common\Error\BadResponseError; +use OpenStack\Common\Transport\Utils as TransportUtils; use OpenStack\Identity\v2\Models\Catalog; use OpenStack\Identity\v2\Service as IdentityV2Service; use OpenStack\Identity\v3\Service as IdentityV3Service; +use OpenStack\ObjectStore\v1\Models\Container; use OpenStack\OpenStack; -use OpenStack\Common\Transport\Utils as TransportUtils; use Psr\Http\Message\RequestInterface; -use OpenStack\ObjectStore\v1\Models\Container; class SwiftFactory { private $cache; diff --git a/lib/private/Files/SimpleFS/SimpleFile.php b/lib/private/Files/SimpleFS/SimpleFile.php index 9c9ca10650c..85a1a64a854 100644 --- a/lib/private/Files/SimpleFS/SimpleFile.php +++ b/lib/private/Files/SimpleFS/SimpleFile.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Files\SimpleFS; use OCP\Files\File; diff --git a/lib/private/Files/SimpleFS/SimpleFolder.php b/lib/private/Files/SimpleFS/SimpleFolder.php index 5b55fe0f157..9375a3c5545 100644 --- a/lib/private/Files/SimpleFS/SimpleFolder.php +++ b/lib/private/Files/SimpleFS/SimpleFolder.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Files\SimpleFS; use OCP\Files\File; 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 { diff --git a/lib/private/Files/Type/Loader.php b/lib/private/Files/Type/Loader.php index d1419dca4dc..46588a74d0d 100644 --- a/lib/private/Files/Type/Loader.php +++ b/lib/private/Files/Type/Loader.php @@ -25,9 +25,9 @@ namespace OC\Files\Type; +use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use OCP\Files\IMimeTypeLoader; use OCP\IDBConnection; -use Doctrine\DBAL\Exception\UniqueConstraintViolationException; /** * Mimetype database loader diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php index 28921973fcf..8dee7bf7423 100644 --- a/lib/private/Files/Utils/Scanner.php +++ b/lib/private/Files/Utils/Scanner.php @@ -30,6 +30,7 @@ namespace OC\Files\Utils; use OC\Files\Cache\Cache; use OC\Files\Filesystem; +use OC\Files\Storage\FailedStorage; use OC\ForbiddenException; use OC\Hooks\PublicEmitter; use OC\Lock\DBLockingProvider; @@ -38,7 +39,6 @@ use OCP\Files\NotFoundException; use OCP\Files\Storage\IStorage; use OCP\Files\StorageNotAvailableException; use OCP\ILogger; -use OC\Files\Storage\FailedStorage; /** * Class Scanner @@ -279,4 +279,3 @@ class Scanner extends PublicEmitter { } } } - diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 8322576c5c2..4f4c4b90f2c 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -42,7 +42,6 @@ * */ - namespace OC\Files; use Icewind\Streams\CallbackWrapper; |