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>

30 files changed, 40 insertions, 39 deletions

diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php
index 530c1d30ec0..82d15fae4fb 100644
--- a/core/Command/App/CheckCode.php
+++ b/core/Command/App/CheckCode.php
@@ -27,9 +27,12 @@ namespace OC\Core\Command\App;
 
 use OC\App\CodeChecker\CodeChecker;
 use OC\App\CodeChecker\DatabaseSchemaChecker;
+use OC\App\CodeChecker\DeprecationCheck;
 use OC\App\CodeChecker\EmptyCheck;
 use OC\App\CodeChecker\InfoChecker;
 use OC\App\CodeChecker\LanguageParseChecker;
+use OC\App\CodeChecker\PrivateCheck;
+use OC\App\CodeChecker\StrongComparisonCheck;
 use OC\App\InfoParser;
 use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
@@ -38,9 +41,6 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use OC\App\CodeChecker\StrongComparisonCheck;
-use OC\App\CodeChecker\DeprecationCheck;
-use OC\App\CodeChecker\PrivateCheck;
 
 class CheckCode extends Command implements CompletionAwareInterface  {
 
diff --git a/core/Command/App/Install.php b/core/Command/App/Install.php
index 525b0095f04..cfddaed34da 100644
--- a/core/Command/App/Install.php
+++ b/core/Command/App/Install.php
@@ -25,8 +25,8 @@ namespace OC\Core\Command\App;
 use OC\Installer;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Install extends Command {
diff --git a/core/Command/App/Remove.php b/core/Command/App/Remove.php
index 71d5cef229c..e3777c8be41 100644
--- a/core/Command/App/Remove.php
+++ b/core/Command/App/Remove.php
@@ -22,7 +22,6 @@
 
 namespace OC\Core\Command\App;
 
-use Throwable;
 use OC\Installer;
 use OCP\App\IAppManager;
 use OCP\ILogger;
@@ -30,9 +29,10 @@ use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareI
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Throwable;
 
 class Remove extends Command implements CompletionAwareInterface {
 
diff --git a/core/Command/App/Update.php b/core/Command/App/Update.php
index c571a9a1624..881ad1fcf1e 100644
--- a/core/Command/App/Update.php
+++ b/core/Command/App/Update.php
@@ -21,13 +21,13 @@
 
 namespace OC\Core\Command\App;
 
-use OCP\App\IAppManager;
 use OC\Installer;
+use OCP\App\IAppManager;
 use OCP\ILogger;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Update extends Command {
@@ -122,4 +122,3 @@ class Update extends Command {
 		return $return;
 	}
 }
-
diff --git a/core/Command/Background/Base.php b/core/Command/Background/Base.php
index 48fee818d0a..32d22d64cb9 100644
--- a/core/Command/Background/Base.php
+++ b/core/Command/Background/Base.php
@@ -25,7 +25,7 @@
 
 namespace OC\Core\Command\Background;
 
-use \OCP\IConfig;
+use OCP\IConfig;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/core/Command/Check.php b/core/Command/Check.php
index 16176a171a2..e6274082ea0 100644
--- a/core/Command/Check.php
+++ b/core/Command/Check.php
@@ -21,6 +21,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OC\Core\Command;
 
 use OC\SystemConfig;
diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php
index 527a2cd7b19..4de1d0f12f4 100644
--- a/core/Command/Db/AddMissingIndices.php
+++ b/core/Command/Db/AddMissingIndices.php
@@ -20,7 +20,6 @@ declare(strict_types=1);
  *
  */
 
-
 namespace OC\Core\Command\Db;
 
 use OC\DB\SchemaWrapper;
diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php
index bd26c5e5154..ca3c779199e 100644
--- a/core/Command/Db/ConvertType.php
+++ b/core/Command/Db/ConvertType.php
@@ -33,11 +33,11 @@ namespace OC\Core\Command\Db;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Type;
-use OC\DB\MigrationService;
-use OCP\DB\QueryBuilder\IQueryBuilder;
-use \OCP\IConfig;
 use OC\DB\Connection;
 use OC\DB\ConnectionFactory;
+use OC\DB\MigrationService;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IConfig;
 use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Symfony\Component\Console\Command\Command;
diff --git a/core/Command/Encryption/ChangeKeyStorageRoot.php b/core/Command/Encryption/ChangeKeyStorageRoot.php
index 15e88326973..f89a66873b0 100644
--- a/core/Command/Encryption/ChangeKeyStorageRoot.php
+++ b/core/Command/Encryption/ChangeKeyStorageRoot.php
@@ -20,7 +20,6 @@
  *
  */
 
-
 namespace OC\Core\Command\Encryption;
 
 use OC\Encryption\Keys\Storage;
diff --git a/core/Command/Encryption/ShowKeyStorageRoot.php b/core/Command/Encryption/ShowKeyStorageRoot.php
index 4270ee9f57f..09331f04b6e 100644
--- a/core/Command/Encryption/ShowKeyStorageRoot.php
+++ b/core/Command/Encryption/ShowKeyStorageRoot.php
@@ -20,7 +20,6 @@
  *
  */
 
-
 namespace OC\Core\Command\Encryption;
 
 use OC\Encryption\Util;
diff --git a/core/Command/Integrity/CheckApp.php b/core/Command/Integrity/CheckApp.php
index 1c71286195a..c19d03649b8 100644
--- a/core/Command/Integrity/CheckApp.php
+++ b/core/Command/Integrity/CheckApp.php
@@ -20,12 +20,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OC\Core\Command\Integrity;
 
-use OC\IntegrityCheck\Checker;
 use OC\Core\Command\Base;
-use Symfony\Component\Console\Input\InputInterface;
+use OC\IntegrityCheck\Checker;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
diff --git a/core/Command/Integrity/CheckCore.php b/core/Command/Integrity/CheckCore.php
index a3426ce9345..3d087247aa7 100644
--- a/core/Command/Integrity/CheckCore.php
+++ b/core/Command/Integrity/CheckCore.php
@@ -23,8 +23,8 @@
 
 namespace OC\Core\Command\Integrity;
 
-use OC\IntegrityCheck\Checker;
 use OC\Core\Command\Base;
+use OC\IntegrityCheck\Checker;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
diff --git a/core/Command/InterruptedException.php b/core/Command/InterruptedException.php
index 4470ea82d2b..3747c4a7f17 100644
--- a/core/Command/InterruptedException.php
+++ b/core/Command/InterruptedException.php
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OC\Core\Command;
 
 /**
diff --git a/core/Command/Log/File.php b/core/Command/Log/File.php
index 8be01d2b6ef..877e0a592e9 100644
--- a/core/Command/Log/File.php
+++ b/core/Command/Log/File.php
@@ -24,7 +24,7 @@
 
 namespace OC\Core\Command\Log;
 
-use \OCP\IConfig;
+use OCP\IConfig;
 
 use Stecman\Component\Symfony\Console\BashCompletion\Completion;
 use Stecman\Component\Symfony\Console\BashCompletion\Completion\ShellPathCompletion;
diff --git a/core/Command/Maintenance/DataFingerprint.php b/core/Command/Maintenance/DataFingerprint.php
index 37e8de24552..479e5f17536 100644
--- a/core/Command/Maintenance/DataFingerprint.php
+++ b/core/Command/Maintenance/DataFingerprint.php
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OC\Core\Command\Maintenance;
 
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -27,7 +28,6 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-
 class DataFingerprint extends Command {
 
 	/** @var IConfig */
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
index 39692e036ba..4197234ae7e 100644
--- a/core/Command/Maintenance/Install.php
+++ b/core/Command/Maintenance/Install.php
@@ -27,6 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OC\Core\Command\Maintenance;
 
 use InvalidArgumentException;
diff --git a/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php b/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php
index 2eef5e9faaa..302f6b91342 100644
--- a/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php
+++ b/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php
@@ -102,4 +102,4 @@ OC.MimeTypeList={
 ';
 	}
 
-}
\ No newline at end of file
+}
diff --git a/core/Command/Maintenance/Mimetype/UpdateDB.php b/core/Command/Maintenance/Mimetype/UpdateDB.php
index 1c8d651b9c0..7a7d9c11e55 100644
--- a/core/Command/Maintenance/Mimetype/UpdateDB.php
+++ b/core/Command/Maintenance/Mimetype/UpdateDB.php
@@ -22,13 +22,13 @@
 
 namespace OC\Core\Command\Maintenance\Mimetype;
 
+use OCP\Files\IMimeTypeDetector;
+use OCP\Files\IMimeTypeLoader;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputOption;
 
-use OCP\Files\IMimeTypeDetector;
-use OCP\Files\IMimeTypeLoader;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class UpdateDB extends Command {
 
diff --git a/core/Command/Maintenance/Mimetype/UpdateJS.php b/core/Command/Maintenance/Mimetype/UpdateJS.php
index 0606e210c3f..230d0fac6a6 100644
--- a/core/Command/Maintenance/Mimetype/UpdateJS.php
+++ b/core/Command/Maintenance/Mimetype/UpdateJS.php
@@ -25,11 +25,11 @@
 
 namespace OC\Core\Command\Maintenance\Mimetype;
 
+use OCP\Files\IMimeTypeDetector;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 
-use OCP\Files\IMimeTypeDetector;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class UpdateJS extends Command {
 
diff --git a/core/Command/Maintenance/Mode.php b/core/Command/Maintenance/Mode.php
index 1692eb08d87..8b13175f0bb 100644
--- a/core/Command/Maintenance/Mode.php
+++ b/core/Command/Maintenance/Mode.php
@@ -23,7 +23,7 @@
 
 namespace OC\Core\Command\Maintenance;
 
-use \OCP\IConfig;
+use OCP\IConfig;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/core/Command/Maintenance/UpdateHtaccess.php b/core/Command/Maintenance/UpdateHtaccess.php
index 04c870f07a4..d67d2d32edf 100644
--- a/core/Command/Maintenance/UpdateHtaccess.php
+++ b/core/Command/Maintenance/UpdateHtaccess.php
@@ -20,6 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OC\Core\Command\Maintenance;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/core/Command/Maintenance/UpdateTheme.php b/core/Command/Maintenance/UpdateTheme.php
index 2ab66a4ce75..825cfc0da88 100644
--- a/core/Command/Maintenance/UpdateTheme.php
+++ b/core/Command/Maintenance/UpdateTheme.php
@@ -24,11 +24,11 @@
 namespace OC\Core\Command\Maintenance;
 
 use OC\Core\Command\Maintenance\Mimetype\UpdateJS;
+use OCP\Files\IMimeTypeDetector;
 use OCP\ICacheFactory;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 
-use OCP\Files\IMimeTypeDetector;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class UpdateTheme extends UpdateJS {
 
diff --git a/core/Command/TwoFactorAuth/Base.php b/core/Command/TwoFactorAuth/Base.php
index aa4f40fc771..3a9b4224eb9 100644
--- a/core/Command/TwoFactorAuth/Base.php
+++ b/core/Command/TwoFactorAuth/Base.php
@@ -23,8 +23,8 @@
 
 namespace OC\Core\Command\TwoFactorAuth;
 
-use OCP\IUserManager;
 use OCP\IUser;
+use OCP\IUserManager;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 
 class Base extends \OC\Core\Command\Base {
diff --git a/core/Command/User/Add.php b/core/Command/User/Add.php
index cc53f1c78c0..047881fc37f 100644
--- a/core/Command/User/Add.php
+++ b/core/Command/User/Add.php
@@ -30,10 +30,10 @@ use OCP\IUser;
 use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Question\Question;
 
 class Add extends Command {
diff --git a/core/Command/User/Delete.php b/core/Command/User/Delete.php
index 495c0903bba..6406d4823ee 100644
--- a/core/Command/User/Delete.php
+++ b/core/Command/User/Delete.php
@@ -27,9 +27,9 @@ namespace OC\Core\Command\User;
 
 use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 
 class Delete extends Command {
 	/** @var IUserManager */
diff --git a/core/Command/User/Disable.php b/core/Command/User/Disable.php
index 7c6e8315702..63e23b05700 100644
--- a/core/Command/User/Disable.php
+++ b/core/Command/User/Disable.php
@@ -24,9 +24,9 @@ namespace OC\Core\Command\User;
 
 use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 
 class Disable extends Command {
 	/** @var IUserManager */
diff --git a/core/Command/User/Enable.php b/core/Command/User/Enable.php
index 164027d809a..48bf4785164 100644
--- a/core/Command/User/Enable.php
+++ b/core/Command/User/Enable.php
@@ -24,9 +24,9 @@ namespace OC\Core\Command\User;
 
 use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 
 class Enable extends Command {
 	/** @var IUserManager */
diff --git a/core/Command/User/LastSeen.php b/core/Command/User/LastSeen.php
index 58592e05150..d2b168d63c9 100644
--- a/core/Command/User/LastSeen.php
+++ b/core/Command/User/LastSeen.php
@@ -27,9 +27,9 @@ namespace OC\Core\Command\User;
 
 use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 
 class LastSeen extends Command {
 	/** @var IUserManager */
diff --git a/core/Command/User/ResetPassword.php b/core/Command/User/ResetPassword.php
index 9e69626c38d..4f2173c155e 100644
--- a/core/Command/User/ResetPassword.php
+++ b/core/Command/User/ResetPassword.php
@@ -32,8 +32,8 @@ namespace OC\Core\Command\User;
 use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
diff --git a/core/Command/User/Setting.php b/core/Command/User/Setting.php
index d7bb436783f..3883d57b043 100644
--- a/core/Command/User/Setting.php
+++ b/core/Command/User/Setting.php
@@ -27,10 +27,10 @@ use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IUser;
 use OCP\IUserManager;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 
 class Setting extends Base {
 	/** @var IUserManager */