Merge pull request #36271 from nextcloud/fix/fix-codestyle

Fix codestyle using codesniffer
nextcloud · Jan 20, 2023 · 3f231d6 · 3f231d6
2 parents 473c546 + f5c361c
commit 3f231d6
Show file tree

Hide file tree

Showing 887 changed files with 430 additions and 1,320 deletions.
diff --git a/build/OCPSinceChecker.php b/build/OCPSinceChecker.php
@@ -28,7 +28,6 @@
  * this class checks all methods for the presence of the @since tag
  */
 class SinceTagCheckVisitor extends \PhpParser\NodeVisitorAbstract {
-
 	/** @var string */
 	protected $namespace = '';
 	/** @var string */

diff --git a/build/integration/features/bootstrap/Avatar.php b/build/integration/features/bootstrap/Avatar.php
@@ -26,7 +26,6 @@
 require __DIR__ . '/../../vendor/autoload.php';
 
 trait Avatar {
-
 	/** @var string **/
 	private $lastAvatar;
 

diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
@@ -73,7 +73,6 @@ trait BasicStructure {
 	protected $remoteBaseUrl;
 
 	public function __construct($baseUrl, $admin, $regular_user_password) {
-
 		// Initialize your context here
 		$this->baseUrl = $baseUrl;
 		$this->adminUser = $admin;

diff --git a/build/integration/features/bootstrap/ContactsMenu.php b/build/integration/features/bootstrap/ContactsMenu.php
@@ -23,7 +23,6 @@
 use PHPUnit\Framework\Assert;
 
 trait ContactsMenu {
-
 	// BasicStructure trait is expected to be used in the class that uses this
 	// trait.
 

diff --git a/build/integration/features/bootstrap/Download.php b/build/integration/features/bootstrap/Download.php
@@ -26,7 +26,6 @@
 require __DIR__ . '/../../vendor/autoload.php';
 
 trait Download {
-
 	/** @var string **/
 	private $downloadedFile;
 

diff --git a/build/integration/features/bootstrap/Mail.php b/build/integration/features/bootstrap/Mail.php
@@ -21,7 +21,6 @@
  *
  */
 trait Mail {
-
 	// CommandLine trait is expected to be used in the class that uses this
 	// trait.
 

diff --git a/build/integration/features/bootstrap/Search.php b/build/integration/features/bootstrap/Search.php
@@ -24,7 +24,6 @@
 use PHPUnit\Framework\Assert;
 
 trait Search {
-
 	// BasicStructure trait is expected to be used in the class that uses this
 	// trait.
 

diff --git a/build/integration/features/bootstrap/TalkContext.php b/build/integration/features/bootstrap/TalkContext.php
@@ -23,7 +23,6 @@
 use Behat\Behat\Context\Context;
 
 class TalkContext implements Context {
-
 	/**
 	 * @BeforeFeature @Talk
 	 * @BeforeScenario @Talk

diff --git a/build/integration/features/bootstrap/Trashbin.php b/build/integration/features/bootstrap/Trashbin.php
@@ -31,7 +31,6 @@
  * Trashbin functions
  */
 trait Trashbin {
-
 	// WebDav trait is expected to be used in the class that uses this trait.
 
 	/**

diff --git a/core/Command/App/ListApps.php b/core/Command/App/ListApps.php
@@ -107,11 +107,11 @@ protected function writeAppList(InputInterface $input, OutputInterface $output,
 
 				$output->writeln('Disabled:');
 				parent::writeArrayInOutputFormat($input, $output, $items['disabled']);
-			break;
+				break;
 
 			default:
 				parent::writeArrayInOutputFormat($input, $output, $items);
-			break;
+				break;
 		}
 	}
 

diff --git a/core/Command/Config/ListConfigs.php b/core/Command/Config/ListConfigs.php
@@ -77,7 +77,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$configs = [
 					'system' => $this->getSystemConfigs($noSensitiveValues),
 				];
-			break;
+				break;
 
 			case 'all':
 				$apps = $this->appConfig->getApps();
@@ -88,7 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				foreach ($apps as $appName) {
 					$configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues);
 				}
-			break;
+				break;
 
 			default:
 				$configs = [

diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
@@ -74,7 +74,6 @@ protected function configure() {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-
 		// validate the environment
 		$server = \OC::$server;
 		$setupHelper = new Setup(

diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php
@@ -95,10 +95,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 			$self = $this;
 			$updater = new Updater(
-					$this->config,
-					\OC::$server->getIntegrityCodeChecker(),
-					$this->logger,
-					$this->installer
+				$this->config,
+				\OC::$server->getIntegrityCodeChecker(),
+				$this->logger,
+				$this->installer
 			);
 
 			/** @var IEventDispatcher $dispatcher */

diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
@@ -308,16 +308,16 @@ public function getTmpAvatar() {
 			return new JSONResponse(['data' => [
 				'message' => $this->l->t("No temporary profile picture available, try again")
 			]],
-									Http::STATUS_NOT_FOUND);
+				Http::STATUS_NOT_FOUND);
 		}
 
 		$image = new \OCP\Image();
 		$image->loadFromData($tmpAvatar);
 
 		$resp = new DataDisplayResponse(
-				$image->data() ?? '',
-				Http::STATUS_OK,
-				['Content-Type' => $image->mimeType()]);
+			$image->data() ?? '',
+			Http::STATUS_OK,
+			['Content-Type' => $image->mimeType()]);
 
 		$resp->setETag((string)crc32($image->data() ?? ''));
 		$resp->cacheFor(0);
@@ -331,20 +331,20 @@ public function getTmpAvatar() {
 	public function postCroppedAvatar(?array $crop = null): JSONResponse {
 		if (is_null($crop)) {
 			return new JSONResponse(['data' => ['message' => $this->l->t("No crop data provided")]],
-									Http::STATUS_BAD_REQUEST);
+				Http::STATUS_BAD_REQUEST);
 		}
 
 		if (!isset($crop['x'], $crop['y'], $crop['w'], $crop['h'])) {
 			return new JSONResponse(['data' => ['message' => $this->l->t("No valid crop data provided")]],
-									Http::STATUS_BAD_REQUEST);
+				Http::STATUS_BAD_REQUEST);
 		}
 
 		$tmpAvatar = $this->cache->get('tmpAvatar');
 		if (is_null($tmpAvatar)) {
 			return new JSONResponse(['data' => [
 				'message' => $this->l->t("No temporary profile picture available, try again")
 			]],
-									Http::STATUS_BAD_REQUEST);
+				Http::STATUS_BAD_REQUEST);
 		}
 
 		$image = new \OCP\Image();
@@ -358,7 +358,7 @@ public function postCroppedAvatar(?array $crop = null): JSONResponse {
 			return new JSONResponse(['status' => 'success']);
 		} catch (\OC\NotSquareException $e) {
 			return new JSONResponse(['data' => ['message' => $this->l->t('Crop is not square')]],
-									Http::STATUS_BAD_REQUEST);
+				Http::STATUS_BAD_REQUEST);
 		} catch (\Exception $e) {
 			$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
 			return new JSONResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);

diff --git a/core/Controller/WalledGardenController.php b/core/Controller/WalledGardenController.php
@@ -28,7 +28,6 @@
 use OCP\AppFramework\Http\Response;
 
 class WalledGardenController extends Controller {
-
 	/**
 	 * @PublicPage
 	 * @NoCSRFRequired

diff --git a/core/Controller/WellKnownController.php b/core/Controller/WellKnownController.php
@@ -33,7 +33,6 @@
 use OCP\IRequest;
 
 class WellKnownController extends Controller {
-
 	/** @var RequestManager */
 	private $requestManager;
 

diff --git a/core/Controller/WhatsNewController.php b/core/Controller/WhatsNewController.php
@@ -37,7 +37,6 @@
 use OCP\L10N\IFactory;
 
 class WhatsNewController extends OCSController {
-
 	/** @var IConfig */
 	protected $config;
 	/** @var IUserSession */

diff --git a/core/Controller/WipeController.php b/core/Controller/WipeController.php
@@ -33,7 +33,6 @@
 use OCP\IRequest;
 
 class WipeController extends Controller {
-
 	/** @var RemoteWipe */
 	private $remoteWipe;
 

diff --git a/core/Data/LoginFlowV2Tokens.php b/core/Data/LoginFlowV2Tokens.php
@@ -26,7 +26,6 @@
 namespace OC\Core\Data;
 
 class LoginFlowV2Tokens {
-
 	/** @var string */
 	private $loginToken;
 	/** @var string */

diff --git a/core/Db/ProfileConfig.php b/core/Db/ProfileConfig.php
@@ -40,7 +40,6 @@
  * @method void setConfig(string $config)
  */
 class ProfileConfig extends Entity implements JsonSerializable {
-
 	/**
 	 * Visible to users, guests, and public access
 	 *

diff --git a/core/Middleware/TwoFactorMiddleware.php b/core/Middleware/TwoFactorMiddleware.php
@@ -46,7 +46,6 @@
 use OCP\IUser;
 
 class TwoFactorMiddleware extends Middleware {
-
 	/** @var Manager */
 	private $twoFactorManager;
 

diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php
@@ -39,7 +39,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version13000Date20170718121200 extends SimpleMigrationStep {
-
 	/** @var IDBConnection */
 	private $connection;
 

diff --git a/core/Migrations/Version13000Date20170814074715.php b/core/Migrations/Version13000Date20170814074715.php
@@ -28,7 +28,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version13000Date20170814074715 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

diff --git a/core/Migrations/Version13000Date20170919121250.php b/core/Migrations/Version13000Date20170919121250.php
@@ -33,7 +33,6 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version13000Date20170919121250 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

diff --git a/core/Migrations/Version13000Date20170926101637.php b/core/Migrations/Version13000Date20170926101637.php
@@ -29,7 +29,6 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version13000Date20170926101637 extends BigIntMigration {
-
 	/**
 	 * @return array Returns an array with the following structure
 	 * ['table1' => ['column1', 'column2'], ...]

diff --git a/core/Migrations/Version14000Date20180404140050.php b/core/Migrations/Version14000Date20180404140050.php
@@ -35,7 +35,6 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version14000Date20180404140050 extends SimpleMigrationStep {
-
 	/** @var IDBConnection */
 	private $connection;
 

diff --git a/core/Migrations/Version14000Date20180516101403.php b/core/Migrations/Version14000Date20180516101403.php
@@ -27,7 +27,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180516101403 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

diff --git a/core/Migrations/Version14000Date20180712153140.php b/core/Migrations/Version14000Date20180712153140.php
@@ -32,7 +32,6 @@
  */
 class Version14000Date20180712153140 extends SimpleMigrationStep {
 	public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
-
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 

diff --git a/core/Migrations/Version15000Date20180926101451.php b/core/Migrations/Version15000Date20180926101451.php
@@ -32,7 +32,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version15000Date20180926101451 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

diff --git a/core/Migrations/Version15000Date20181015062942.php b/core/Migrations/Version15000Date20181015062942.php
@@ -32,7 +32,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version15000Date20181015062942 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

diff --git a/core/Migrations/Version15000Date20181029084625.php b/core/Migrations/Version15000Date20181029084625.php
@@ -32,7 +32,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version15000Date20181029084625 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

diff --git a/core/Migrations/Version16000Date20190207141427.php b/core/Migrations/Version16000Date20190207141427.php
@@ -35,8 +35,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version16000Date20190207141427 extends SimpleMigrationStep {
-
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

diff --git a/core/Migrations/Version16000Date20190427105638.php b/core/Migrations/Version16000Date20190427105638.php
@@ -33,7 +33,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version16000Date20190427105638 extends SimpleMigrationStep {
-
 	/** @var IDBConnection */
 	private $connection;
 

diff --git a/core/Migrations/Version16000Date20190428150708.php b/core/Migrations/Version16000Date20190428150708.php
@@ -35,7 +35,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version16000Date20190428150708 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

diff --git a/core/Migrations/Version17000Date20190514105811.php b/core/Migrations/Version17000Date20190514105811.php
@@ -36,7 +36,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version17000Date20190514105811 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

diff --git a/core/Migrations/Version18000Date20190920085628.php b/core/Migrations/Version18000Date20190920085628.php
@@ -36,7 +36,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version18000Date20190920085628 extends SimpleMigrationStep {
-
 	/** @var IDBConnection */
 	protected $connection;
 

diff --git a/core/Migrations/Version18000Date20191014105105.php b/core/Migrations/Version18000Date20191014105105.php
@@ -36,7 +36,6 @@
 use OCP\Migration\IOutput;
 
 class Version18000Date20191014105105 extends SimpleMigrationStep {
-
 	/** @var IDBConnection */
 	protected $connection;
 

diff --git a/core/Migrations/Version18000Date20191204114856.php b/core/Migrations/Version18000Date20191204114856.php
@@ -32,7 +32,6 @@
 use OCP\Migration\IOutput;
 
 class Version18000Date20191204114856 extends SimpleMigrationStep {
-
 	/** @var IDBConnection */
 	protected $connection;
 

diff --git a/core/Migrations/Version20000Date20201109081918.php b/core/Migrations/Version20000Date20201109081918.php
@@ -35,7 +35,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version20000Date20201109081918 extends SimpleMigrationStep {
-
 	/** @var IDBConnection */
 	protected $connection;
 

diff --git a/core/Migrations/Version20000Date20201109081919.php b/core/Migrations/Version20000Date20201109081919.php
@@ -31,7 +31,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version20000Date20201109081919 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

diff --git a/core/Migrations/Version23000Date20210721100600.php b/core/Migrations/Version23000Date20210721100600.php
@@ -30,7 +30,6 @@
 use OCP\Migration\IOutput;
 
 class Version23000Date20210721100600 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`