aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorCôme Chilliet <come.chilliet@nextcloud.com>2023-01-20 11:45:08 +0100
committerCôme Chilliet <come.chilliet@nextcloud.com>2023-01-20 11:45:08 +0100
commitf5c361cf44739058b79f322576a1bad2d8c142d9 (patch)
treea22217c6995751023112832d191d213e494e2fbc /core
parent37bb33c5799b834dfef3fb73936bd0e5a4773fb8 (diff)
downloadnextcloud-server-f5c361cf44739058b79f322576a1bad2d8c142d9.tar.gz
nextcloud-server-f5c361cf44739058b79f322576a1bad2d8c142d9.zip
composer run cs:fix
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'core')
-rw-r--r--core/Command/App/ListApps.php4
-rw-r--r--core/Command/Config/ListConfigs.php4
-rw-r--r--core/Command/Maintenance/Install.php1
-rw-r--r--core/Command/Upgrade.php8
-rw-r--r--core/Controller/AvatarController.php16
-rw-r--r--core/Controller/WalledGardenController.php1
-rw-r--r--core/Controller/WellKnownController.php1
-rw-r--r--core/Controller/WhatsNewController.php1
-rw-r--r--core/Controller/WipeController.php1
-rw-r--r--core/Data/LoginFlowV2Tokens.php1
-rw-r--r--core/Db/ProfileConfig.php1
-rw-r--r--core/Middleware/TwoFactorMiddleware.php1
-rw-r--r--core/Migrations/Version13000Date20170718121200.php1
-rw-r--r--core/Migrations/Version13000Date20170814074715.php1
-rw-r--r--core/Migrations/Version13000Date20170919121250.php1
-rw-r--r--core/Migrations/Version13000Date20170926101637.php1
-rw-r--r--core/Migrations/Version14000Date20180404140050.php1
-rw-r--r--core/Migrations/Version14000Date20180516101403.php1
-rw-r--r--core/Migrations/Version14000Date20180712153140.php1
-rw-r--r--core/Migrations/Version15000Date20180926101451.php1
-rw-r--r--core/Migrations/Version15000Date20181015062942.php1
-rw-r--r--core/Migrations/Version15000Date20181029084625.php1
-rw-r--r--core/Migrations/Version16000Date20190207141427.php2
-rw-r--r--core/Migrations/Version16000Date20190427105638.php1
-rw-r--r--core/Migrations/Version16000Date20190428150708.php1
-rw-r--r--core/Migrations/Version17000Date20190514105811.php1
-rw-r--r--core/Migrations/Version18000Date20190920085628.php1
-rw-r--r--core/Migrations/Version18000Date20191014105105.php1
-rw-r--r--core/Migrations/Version18000Date20191204114856.php1
-rw-r--r--core/Migrations/Version20000Date20201109081918.php1
-rw-r--r--core/Migrations/Version20000Date20201109081919.php1
-rw-r--r--core/Migrations/Version23000Date20210721100600.php1
-rw-r--r--core/Migrations/Version23000Date20211213203940.php1
-rw-r--r--core/Migrations/Version24000Date20211210141942.php1
-rw-r--r--core/Migrations/Version25000Date20220602190540.php1
-rw-r--r--core/Migrations/Version25000Date20220905140840.php1
-rw-r--r--core/ajax/update.php8
-rw-r--r--core/register_command.php38
-rw-r--r--core/templates/403.php4
-rw-r--r--core/templates/layout.guest.php4
-rw-r--r--core/templates/layout.noscript.warning.php8
-rw-r--r--core/templates/layout.public.php22
-rw-r--r--core/templates/layout.user.php26
-rw-r--r--core/templates/publicshareauth.php2
-rw-r--r--core/templates/twofactorselectchallenge.php12
-rw-r--r--core/templates/twofactorsetupselection.php10
-rw-r--r--core/templates/update.use-cli.php10
47 files changed, 88 insertions, 121 deletions
diff --git a/core/Command/App/ListApps.php b/core/Command/App/ListApps.php
index 6405afc2f68..365ac48e080 100644
--- a/core/Command/App/ListApps.php
+++ b/core/Command/App/ListApps.php
@@ -107,11 +107,11 @@ class ListApps extends Base {
$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
index a0fa9a84ea8..dd8fad72d7c 100644
--- a/core/Command/Config/ListConfigs.php
+++ b/core/Command/Config/ListConfigs.php
@@ -77,7 +77,7 @@ class ListConfigs extends Base {
$configs = [
'system' => $this->getSystemConfigs($noSensitiveValues),
];
- break;
+ break;
case 'all':
$apps = $this->appConfig->getApps();
@@ -88,7 +88,7 @@ class ListConfigs extends Base {
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
index d53cd867b06..fa93a661906 100644
--- a/core/Command/Maintenance/Install.php
+++ b/core/Command/Maintenance/Install.php
@@ -74,7 +74,6 @@ class Install extends Command {
}
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
index d476b91d6bf..e929dc22bc8 100644
--- a/core/Command/Upgrade.php
+++ b/core/Command/Upgrade.php
@@ -95,10 +95,10 @@ class Upgrade extends Command {
$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
index 673ed1be05b..c6567b33209 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -308,16 +308,16 @@ class AvatarController extends Controller {
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,12 +331,12 @@ class AvatarController extends Controller {
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');
@@ -344,7 +344,7 @@ class AvatarController extends Controller {
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 @@ class AvatarController extends Controller {
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
index 584c264aaf9..0079cc5a69a 100644
--- a/core/Controller/WalledGardenController.php
+++ b/core/Controller/WalledGardenController.php
@@ -28,7 +28,6 @@ use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Response;
class WalledGardenController extends Controller {
-
/**
* @PublicPage
* @NoCSRFRequired
diff --git a/core/Controller/WellKnownController.php b/core/Controller/WellKnownController.php
index 12384b6f9ad..01ae5e4fae8 100644
--- a/core/Controller/WellKnownController.php
+++ b/core/Controller/WellKnownController.php
@@ -33,7 +33,6 @@ use OCP\AppFramework\Http\Response;
use OCP\IRequest;
class WellKnownController extends Controller {
-
/** @var RequestManager */
private $requestManager;
diff --git a/core/Controller/WhatsNewController.php b/core/Controller/WhatsNewController.php
index 12024dec030..0dae0f97322 100644
--- a/core/Controller/WhatsNewController.php
+++ b/core/Controller/WhatsNewController.php
@@ -37,7 +37,6 @@ use OCP\IUserSession;
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
index 5eef03b129f..44ec5fc598a 100644
--- a/core/Controller/WipeController.php
+++ b/core/Controller/WipeController.php
@@ -33,7 +33,6 @@ use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;
class WipeController extends Controller {
-
/** @var RemoteWipe */
private $remoteWipe;
diff --git a/core/Data/LoginFlowV2Tokens.php b/core/Data/LoginFlowV2Tokens.php
index 0e932d49ed6..c247a49fe0a 100644
--- a/core/Data/LoginFlowV2Tokens.php
+++ b/core/Data/LoginFlowV2Tokens.php
@@ -26,7 +26,6 @@ declare(strict_types=1);
namespace OC\Core\Data;
class LoginFlowV2Tokens {
-
/** @var string */
private $loginToken;
/** @var string */
diff --git a/core/Db/ProfileConfig.php b/core/Db/ProfileConfig.php
index eb50da37a64..3ebfe02ca79 100644
--- a/core/Db/ProfileConfig.php
+++ b/core/Db/ProfileConfig.php
@@ -40,7 +40,6 @@ use OCP\Profile\ParameterDoesNotExistException;
* @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
index 45c165d1ba5..0ea21ce78de 100644
--- a/core/Middleware/TwoFactorMiddleware.php
+++ b/core/Middleware/TwoFactorMiddleware.php
@@ -46,7 +46,6 @@ use OCP\IURLGenerator;
use OCP\IUser;
class TwoFactorMiddleware extends Middleware {
-
/** @var Manager */
private $twoFactorManager;
diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php
index 3e14b4af47a..5439998fce3 100644
--- a/core/Migrations/Version13000Date20170718121200.php
+++ b/core/Migrations/Version13000Date20170718121200.php
@@ -39,7 +39,6 @@ use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version13000Date20170718121200 extends SimpleMigrationStep {
-
/** @var IDBConnection */
private $connection;
diff --git a/core/Migrations/Version13000Date20170814074715.php b/core/Migrations/Version13000Date20170814074715.php
index 6882662dc53..c05c0324aeb 100644
--- a/core/Migrations/Version13000Date20170814074715.php
+++ b/core/Migrations/Version13000Date20170814074715.php
@@ -28,7 +28,6 @@ use OCP\Migration\IOutput;
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
index 65d52829373..8aabaf23587 100644
--- a/core/Migrations/Version13000Date20170919121250.php
+++ b/core/Migrations/Version13000Date20170919121250.php
@@ -33,7 +33,6 @@ use OCP\Migration\SimpleMigrationStep;
* 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
index 0961c15be71..b86535b005a 100644
--- a/core/Migrations/Version13000Date20170926101637.php
+++ b/core/Migrations/Version13000Date20170926101637.php
@@ -29,7 +29,6 @@ use OCP\Migration\BigIntMigration;
* 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
index d7b7ce1fce2..e670fe525da 100644
--- a/core/Migrations/Version14000Date20180404140050.php
+++ b/core/Migrations/Version14000Date20180404140050.php
@@ -35,7 +35,6 @@ use OCP\Migration\SimpleMigrationStep;
* 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
index cd2df5b10ab..1cddcf74bac 100644
--- a/core/Migrations/Version14000Date20180516101403.php
+++ b/core/Migrations/Version14000Date20180516101403.php
@@ -27,7 +27,6 @@ use OCP\Migration\IOutput;
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
index 444cad072a0..2f2ecdfcc0d 100644
--- a/core/Migrations/Version14000Date20180712153140.php
+++ b/core/Migrations/Version14000Date20180712153140.php
@@ -32,7 +32,6 @@ use OCP\Migration\SimpleMigrationStep;
*/
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
index f70a786bbcd..c73501c4fe0 100644
--- a/core/Migrations/Version15000Date20180926101451.php
+++ b/core/Migrations/Version15000Date20180926101451.php
@@ -32,7 +32,6 @@ use OCP\Migration\IOutput;
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
index deb64f32142..42729c02545 100644
--- a/core/Migrations/Version15000Date20181015062942.php
+++ b/core/Migrations/Version15000Date20181015062942.php
@@ -32,7 +32,6 @@ use OCP\Migration\IOutput;
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
index c3022148b0a..28d3f5b5ca7 100644
--- a/core/Migrations/Version15000Date20181029084625.php
+++ b/core/Migrations/Version15000Date20181029084625.php
@@ -32,7 +32,6 @@ use OCP\Migration\IOutput;
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
index 837715a6838..6dc5a5b1773 100644
--- a/core/Migrations/Version16000Date20190207141427.php
+++ b/core/Migrations/Version16000Date20190207141427.php
@@ -35,8 +35,6 @@ use OCP\Migration\IOutput;
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
index dbad19d9b54..4df64a59250 100644
--- a/core/Migrations/Version16000Date20190427105638.php
+++ b/core/Migrations/Version16000Date20190427105638.php
@@ -33,7 +33,6 @@ use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version16000Date20190427105638 extends SimpleMigrationStep {
-
/** @var IDBConnection */
private $connection;
diff --git a/core/Migrations/Version16000Date20190428150708.php b/core/Migrations/Version16000Date20190428150708.php
index 14645925d3d..61d5ee0d2fa 100644
--- a/core/Migrations/Version16000Date20190428150708.php
+++ b/core/Migrations/Version16000Date20190428150708.php
@@ -35,7 +35,6 @@ use OCP\Migration\IOutput;
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
index 53c4cd67647..6e081f7214d 100644
--- a/core/Migrations/Version17000Date20190514105811.php
+++ b/core/Migrations/Version17000Date20190514105811.php
@@ -36,7 +36,6 @@ use OCP\Migration\IOutput;
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
index 9384abeed30..d7b1727aa59 100644
--- a/core/Migrations/Version18000Date20190920085628.php
+++ b/core/Migrations/Version18000Date20190920085628.php
@@ -36,7 +36,6 @@ use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version18000Date20190920085628 extends SimpleMigrationStep {
-
/** @var IDBConnection */
protected $connection;
diff --git a/core/Migrations/Version18000Date20191014105105.php b/core/Migrations/Version18000Date20191014105105.php
index 740a03ba5d1..340c9b3d729 100644
--- a/core/Migrations/Version18000Date20191014105105.php
+++ b/core/Migrations/Version18000Date20191014105105.php
@@ -36,7 +36,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version18000Date20191014105105 extends SimpleMigrationStep {
-
/** @var IDBConnection */
protected $connection;
diff --git a/core/Migrations/Version18000Date20191204114856.php b/core/Migrations/Version18000Date20191204114856.php
index 9fec994ba44..d7f4dbafe87 100644
--- a/core/Migrations/Version18000Date20191204114856.php
+++ b/core/Migrations/Version18000Date20191204114856.php
@@ -32,7 +32,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version18000Date20191204114856 extends SimpleMigrationStep {
-
/** @var IDBConnection */
protected $connection;
diff --git a/core/Migrations/Version20000Date20201109081918.php b/core/Migrations/Version20000Date20201109081918.php
index 9ebdd40aaf2..aae89465d75 100644
--- a/core/Migrations/Version20000Date20201109081918.php
+++ b/core/Migrations/Version20000Date20201109081918.php
@@ -35,7 +35,6 @@ use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version20000Date20201109081918 extends SimpleMigrationStep {
-
/** @var IDBConnection */
protected $connection;
diff --git a/core/Migrations/Version20000Date20201109081919.php b/core/Migrations/Version20000Date20201109081919.php
index 4c78dd901bd..0556e84a7b4 100644
--- a/core/Migrations/Version20000Date20201109081919.php
+++ b/core/Migrations/Version20000Date20201109081919.php
@@ -31,7 +31,6 @@ use OCP\Migration\IOutput;
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
index d247811f8b9..99353819f60 100644
--- a/core/Migrations/Version23000Date20210721100600.php
+++ b/core/Migrations/Version23000Date20210721100600.php
@@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version23000Date20210721100600 extends SimpleMigrationStep {
-
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
diff --git a/core/Migrations/Version23000Date20211213203940.php b/core/Migrations/Version23000Date20211213203940.php
index 943edbbd300..2a10acdafcf 100644
--- a/core/Migrations/Version23000Date20211213203940.php
+++ b/core/Migrations/Version23000Date20211213203940.php
@@ -29,7 +29,6 @@ namespace OC\Core\Migrations;
use OCP\Migration\BigIntMigration;
class Version23000Date20211213203940 extends BigIntMigration {
-
/**
* @return array Returns an array with the following structure
* ['table1' => ['column1', 'column2'], ...]
diff --git a/core/Migrations/Version24000Date20211210141942.php b/core/Migrations/Version24000Date20211210141942.php
index ea85e331d55..47a4b11ce4f 100644
--- a/core/Migrations/Version24000Date20211210141942.php
+++ b/core/Migrations/Version24000Date20211210141942.php
@@ -37,7 +37,6 @@ use OCP\Migration\SimpleMigrationStep;
*
*/
class Version24000Date20211210141942 extends SimpleMigrationStep {
-
/** @var IDBConnection */
protected $connection;
diff --git a/core/Migrations/Version25000Date20220602190540.php b/core/Migrations/Version25000Date20220602190540.php
index 3a00423570a..ba5345f2ae7 100644
--- a/core/Migrations/Version25000Date20220602190540.php
+++ b/core/Migrations/Version25000Date20220602190540.php
@@ -33,7 +33,6 @@ use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version25000Date20220602190540 extends SimpleMigrationStep {
-
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
diff --git a/core/Migrations/Version25000Date20220905140840.php b/core/Migrations/Version25000Date20220905140840.php
index 6cda6132a7f..ab7857cb63c 100644
--- a/core/Migrations/Version25000Date20220905140840.php
+++ b/core/Migrations/Version25000Date20220905140840.php
@@ -33,7 +33,6 @@ use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version25000Date20220905140840 extends SimpleMigrationStep {
-
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 56dffef409c..74907fa56b9 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -112,10 +112,10 @@ if (\OCP\Util::needUpgrade()) {
$logger = \OC::$server->get(\Psr\Log\LoggerInterface::class);
$config = \OC::$server->getConfig();
$updater = new \OC\Updater(
- $config,
- \OC::$server->getIntegrityCodeChecker(),
- $logger,
- \OC::$server->query(\OC\Installer::class)
+ $config,
+ \OC::$server->getIntegrityCodeChecker(),
+ $logger,
+ \OC::$server->query(\OC\Installer::class)
);
$incompatibleApps = [];
diff --git a/core/register_command.php b/core/register_command.php
index b6da0a6d44d..df008402076 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -55,19 +55,19 @@ $application->add(new OC\Core\Command\Status(\OC::$server->get(\OCP\IConfig::cla
$application->add(new OC\Core\Command\Check(\OC::$server->getSystemConfig()));
$application->add(new OC\Core\Command\L10n\CreateJs());
$application->add(new \OC\Core\Command\Integrity\SignApp(
- \OC::$server->getIntegrityCodeChecker(),
- new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
- \OC::$server->getURLGenerator()
+ \OC::$server->getIntegrityCodeChecker(),
+ new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
+ \OC::$server->getURLGenerator()
));
$application->add(new \OC\Core\Command\Integrity\SignCore(
- \OC::$server->getIntegrityCodeChecker(),
- new \OC\IntegrityCheck\Helpers\FileAccessHelper()
+ \OC::$server->getIntegrityCodeChecker(),
+ new \OC\IntegrityCheck\Helpers\FileAccessHelper()
));
$application->add(new \OC\Core\Command\Integrity\CheckApp(
- \OC::$server->getIntegrityCodeChecker()
+ \OC::$server->getIntegrityCodeChecker()
));
$application->add(new \OC\Core\Command\Integrity\CheckCore(
- \OC::$server->getIntegrityCodeChecker()
+ \OC::$server->getIntegrityCodeChecker()
));
@@ -142,21 +142,21 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
\OC::$server->getConfig()
);
$application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
- $view,
- \OC::$server->getUserManager(),
- \OC::$server->getConfig(),
- $util,
- new \Symfony\Component\Console\Helper\QuestionHelper()
- )
+ $view,
+ \OC::$server->getUserManager(),
+ \OC::$server->getConfig(),
+ $util,
+ new \Symfony\Component\Console\Helper\QuestionHelper()
+ )
);
$application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
$application->add(new OC\Core\Command\Encryption\MigrateKeyStorage(
- $view,
- \OC::$server->getUserManager(),
- \OC::$server->getConfig(),
- $util,
- \OC::$server->getCrypto()
- )
+ $view,
+ \OC::$server->getUserManager(),
+ \OC::$server->getConfig(),
+ $util,
+ \OC::$server->getCrypto()
+ )
);
$application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
diff --git a/core/templates/403.php b/core/templates/403.php
index d41d6cd3083..bdb5737f23d 100644
--- a/core/templates/403.php
+++ b/core/templates/403.php
@@ -12,6 +12,6 @@ if (!isset($_)) {//standalone page is not supported anymore - redirect to /
<div class="guest-box">
<h2><?php p($l->t('Access forbidden')); ?></h2>
<p class='hint'><?php if (isset($_['message'])) {
- p($_['message']);
-}?></p>
+ p($_['message']);
+ }?></p>
</ul>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index b32d163cd69..69acb6be375 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -9,8 +9,8 @@
<title>
<?php
p(!empty($_['pageTitle']) ? $_['pageTitle'] . ' – ' : '');
- p($theme->getTitle());
- ?>
+p($theme->getTitle());
+?>
</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<?php if ($theme->getiTunesAppId() !== '') { ?>
diff --git a/core/templates/layout.noscript.warning.php b/core/templates/layout.noscript.warning.php
index 7d7a32bfbf4..311394592d1 100644
--- a/core/templates/layout.noscript.warning.php
+++ b/core/templates/layout.noscript.warning.php
@@ -2,10 +2,10 @@
<div id="nojavascript">
<div>
<?php print_unescaped(str_replace(
- ['{linkstart}', '{linkend}'],
- ['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'],
- $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.')
- )); ?>
+ ['{linkstart}', '{linkend}'],
+ ['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'],
+ $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.')
+ )); ?>
</div>
</div>
</noscript>
diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
index 65110fb84f5..e5329716cc7 100644
--- a/core/templates/layout.public.php
+++ b/core/templates/layout.public.php
@@ -5,8 +5,8 @@
<title>
<?php
p(!empty($_['application'])?$_['application'].' - ':'');
- p($theme->getTitle());
- ?>
+p($theme->getTitle());
+?>
</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<?php if ($theme->getiTunesAppId() !== '') { ?>
@@ -55,10 +55,10 @@
<div class="header-right">
<?php
- /** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
- if (isset($template) && $template->getActionCount() !== 0) {
- $primary = $template->getPrimaryAction();
- $others = $template->getOtherActions(); ?>
+/** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
+if (isset($template) && $template->getActionCount() !== 0) {
+ $primary = $template->getPrimaryAction();
+ $others = $template->getOtherActions(); ?>
<span id="header-primary-action" class="<?php if ($template->getActionCount() === 1) {
p($primary->getIcon());
} ?>">
@@ -76,13 +76,13 @@
foreach ($others as $action) {
print_unescaped($action->render());
}
- ?>
+ ?>
</ul>
</div>
</div>
<?php } ?>
<?php
- } ?>
+} ?>
</div>
</header>
<main id="content" class="app-<?php p($_['appid']) ?>">
@@ -99,15 +99,15 @@
<footer>
<p><?php print_unescaped($theme->getLongFooter()); ?></p>
<?php
- if ($_['showSimpleSignUpLink']) {
- ?>
+if ($_['showSimpleSignUpLink']) {
+ ?>
<p>
<a href="https://nextcloud.com/signup/" target="_blank" rel="noreferrer noopener">
<?php p($l->t('Get your own free account')); ?>
</a>
</p>
<?php
- }
+}
?>
</footer>
<?php } ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index b2eed70c299..951f0dabe21 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -19,9 +19,9 @@ $getUserAvatar = static function (int $size) use ($_): string {
<title>
<?php
p(!empty($_['pageTitle'])?$_['pageTitle'].' - ':'');
- p(!empty($_['application'])?$_['application'].' - ':'');
- p($theme->getTitle());
- ?>
+p(!empty($_['application'])?$_['application'].' - ':'');
+p($theme->getTitle());
+?>
</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -43,8 +43,8 @@ $getUserAvatar = static function (int $size) use ($_): string {
<?php print_unescaped($_['headers']); ?>
</head>
<body id="<?php p($_['bodyid']);?>" <?php foreach ($_['enabledThemes'] as $themeId) {
- p("data-theme-$themeId ");
- }?> data-themes=<?php p(join(',', $_['enabledThemes'])) ?>>
+ p("data-theme-$themeId ");
+ }?> data-themes=<?php p(join(',', $_['enabledThemes'])) ?>>
<?php include 'layout.noscript.warning.php'; ?>
<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
@@ -75,19 +75,19 @@ $getUserAvatar = static function (int $size) use ($_): string {
aria-label="<?php p($l->t('Open settings menu'));?>"
aria-haspopup="true" aria-controls="expanddiv" aria-expanded="false">
<div id="avatardiv-menu" class="avatardiv<?php if ($_['userAvatarSet']) {
- print_unescaped(' avatardiv-shown');
- } else {
- print_unescaped('" style="display: none');
- } ?>"
+ print_unescaped(' avatardiv-shown');
+ } else {
+ print_unescaped('" style="display: none');
+ } ?>"
data-user="<?php p($_['user_uid']); ?>"
data-displayname="<?php p($_['user_displayname']); ?>"
<?php
- if ($_['userAvatarSet']) {
- $avatar32 = $getUserAvatar(32); ?> data-avatar="<?php p($avatar32); ?>"
+ if ($_['userAvatarSet']) {
+ $avatar32 = $getUserAvatar(32); ?> data-avatar="<?php p($avatar32); ?>"
<?php
- } ?>>
+ } ?>>
<?php
- if ($_['userAvatarSet']) {?>
+ if ($_['userAvatarSet']) {?>
<img alt="" width="32" height="32"
src="<?php p($avatar32);?>"
srcset="<?php p($getUserAvatar(64));?> 2x, <?php p($getUserAvatar(128));?> 4x"
diff --git a/core/templates/publicshareauth.php b/core/templates/publicshareauth.php
index 4af292b2dc5..516795852b2 100644
--- a/core/templates/publicshareauth.php
+++ b/core/templates/publicshareauth.php
@@ -4,7 +4,7 @@
\OCP\Util::addStyle('core', 'guest');
\OCP\Util::addStyle('core', 'publicshareauth');
\OCP\Util::addScript('core', 'publicshareauth');
-?>
+ ?>
<div class="guest-box">
<!-- password prompt form. It should be hidden when we show the email prompt form -->
diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php
index e815fa16631..d81ce7c4a67 100644
--- a/core/templates/twofactorselectchallenge.php
+++ b/core/templates/twofactorselectchallenge.php
@@ -37,18 +37,18 @@ $noProviders = empty($_['providers']);
<li>
<a class="two-factor-provider"
href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
- [
- 'challengeProviderId' => $provider->getId(),
- 'redirect_url' => $_['redirect_url'],
- ]
- )) ?>">
+ [
+ 'challengeProviderId' => $provider->getId(),
+ 'redirect_url' => $_['redirect_url'],
+ ]
+ )) ?>">
<?php
if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
$icon = $provider->getLightIcon();
} else {
$icon = image_path('core', 'actions/password-white.svg');
}
- ?>
+ ?>
<img src="<?php p($icon) ?>" alt="" />
<div>
<h3><?php p($provider->getDisplayName()) ?></h3>
diff --git a/core/templates/twofactorsetupselection.php b/core/templates/twofactorsetupselection.php
index 9e7946a4def..4ef19d86349 100644
--- a/core/templates/twofactorsetupselection.php
+++ b/core/templates/twofactorsetupselection.php
@@ -31,17 +31,17 @@ declare(strict_types=1);
<li>
<a class="two-factor-provider"
href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.setupProvider',
- [
- 'providerId' => $provider->getId(),
- ]
- )) ?>">
+ [
+ 'providerId' => $provider->getId(),
+ ]
+ )) ?>">
<?php
if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
$icon = $provider->getLightIcon();
} else {
$icon = image_path('core', 'actions/password-white.svg');
}
- ?>
+ ?>
<img src="<?php p($icon) ?>" alt="" />
<div>
<h3><?php p($provider->getDisplayName()) ?></h3>
diff --git a/core/templates/update.use-cli.php b/core/templates/update.use-cli.php
index 66cce4e521f..403de7feadc 100644
--- a/core/templates/update.use-cli.php
+++ b/core/templates/update.use-cli.php
@@ -3,12 +3,12 @@
<h2 class="title"><?php p($l->t('Update needed')) ?></h2>
<div class="text-left">
<?php if ($_['tooBig']) {
- p($l->t('Please use the command line updater because you have a big instance with more than 50 users.'));
-} else {
- p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
-} ?><br><br>
+ p($l->t('Please use the command line updater because you have a big instance with more than 50 users.'));
+ } else {
+ p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
+ } ?><br><br>
<?php
- print_unescaped($l->t('For help, see the <a target="_blank" rel="noreferrer noopener" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?>
+ print_unescaped($l->t('For help, see the <a target="_blank" rel="noreferrer noopener" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?>
</div>
</div>