diff options
author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2020-04-11 08:21:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-11 08:21:35 +0200 |
commit | b5a30d5cd6b53831c0d6d2fd074dc0000fa811de (patch) | |
tree | 386f3cb5df4630a1e87dae706667772e590596b8 /core | |
parent | 97de425a171adf9194dae75eede74cf9f3356cc8 (diff) | |
parent | eea282ccc0d9dfae2d321efddce99cdb18158338 (diff) | |
download | nextcloud-server-b5a30d5cd6b53831c0d6d2fd074dc0000fa811de.tar.gz nextcloud-server-b5a30d5cd6b53831c0d6d2fd074dc0000fa811de.zip |
Merge pull request #20426 from nextcloud/techdebt/psr2
It is done
Diffstat (limited to 'core')
-rw-r--r-- | core/Command/Base.php | 6 | ||||
-rw-r--r-- | core/Command/Config/System/SetConfig.php | 1 | ||||
-rw-r--r-- | core/Command/Log/Manage.php | 6 | ||||
-rw-r--r-- | core/Command/Maintenance/Mimetype/UpdateDB.php | 2 | ||||
-rw-r--r-- | core/Command/Upgrade.php | 12 | ||||
-rw-r--r-- | core/Controller/ClientFlowLoginController.php | 2 | ||||
-rw-r--r-- | core/Controller/LoginController.php | 4 | ||||
-rw-r--r-- | core/Controller/SetupController.php | 2 | ||||
-rw-r--r-- | core/Controller/WalledGardenController.php | 2 |
9 files changed, 19 insertions, 18 deletions
diff --git a/core/Command/Base.php b/core/Command/Base.php index 9c20e049311..385642a7313 100644 --- a/core/Command/Base.php +++ b/core/Command/Base.php @@ -34,9 +34,9 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class Base extends Command implements CompletionAwareInterface { - const OUTPUT_FORMAT_PLAIN = 'plain'; - const OUTPUT_FORMAT_JSON = 'json'; - const OUTPUT_FORMAT_JSON_PRETTY = 'json_pretty'; + public const OUTPUT_FORMAT_PLAIN = 'plain'; + public const OUTPUT_FORMAT_JSON = 'json'; + public const OUTPUT_FORMAT_JSON_PRETTY = 'json_pretty'; protected $defaultOutputFormat = self::OUTPUT_FORMAT_PLAIN; diff --git a/core/Command/Config/System/SetConfig.php b/core/Command/Config/System/SetConfig.php index 0f0d28a038d..53f007a97e2 100644 --- a/core/Command/Config/System/SetConfig.php +++ b/core/Command/Config/System/SetConfig.php @@ -150,6 +150,7 @@ class SetConfig extends Base { throw new \InvalidArgumentException('Unable to parse value as boolean'); } + // no break case 'null': return [ 'value' => null, diff --git a/core/Command/Log/Manage.php b/core/Command/Log/Manage.php index 2d7eaf9e2e6..0318e1c8d2d 100644 --- a/core/Command/Log/Manage.php +++ b/core/Command/Log/Manage.php @@ -36,9 +36,9 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class Manage extends Command implements CompletionAwareInterface { - const DEFAULT_BACKEND = 'file'; - const DEFAULT_LOG_LEVEL = 2; - const DEFAULT_TIMEZONE = 'UTC'; + public const DEFAULT_BACKEND = 'file'; + public const DEFAULT_LOG_LEVEL = 2; + public const DEFAULT_TIMEZONE = 'UTC'; /** @var IConfig */ protected $config; diff --git a/core/Command/Maintenance/Mimetype/UpdateDB.php b/core/Command/Maintenance/Mimetype/UpdateDB.php index 47b0b600777..eb81ad4991a 100644 --- a/core/Command/Maintenance/Mimetype/UpdateDB.php +++ b/core/Command/Maintenance/Mimetype/UpdateDB.php @@ -32,7 +32,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class UpdateDB extends Command { - const DEFAULT_MIMETYPE = 'application/octet-stream'; + public const DEFAULT_MIMETYPE = 'application/octet-stream'; /** @var IMimeTypeDetector */ protected $mimetypeDetector; diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index 461884fabe4..f00945a29d0 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -47,12 +47,12 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\EventDispatcher\GenericEvent; class Upgrade extends Command { - const ERROR_SUCCESS = 0; - const ERROR_NOT_INSTALLED = 1; - const ERROR_MAINTENANCE_MODE = 2; - const ERROR_UP_TO_DATE = 0; - const ERROR_INVALID_ARGUMENTS = 4; - const ERROR_FAILURE = 5; + public const ERROR_SUCCESS = 0; + public const ERROR_NOT_INSTALLED = 1; + public const ERROR_MAINTENANCE_MODE = 2; + public const ERROR_UP_TO_DATE = 0; + public const ERROR_INVALID_ARGUMENTS = 4; + public const ERROR_FAILURE = 5; /** @var IConfig */ private $config; diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php index dad43fc837a..748a4cf50d2 100644 --- a/core/Controller/ClientFlowLoginController.php +++ b/core/Controller/ClientFlowLoginController.php @@ -77,7 +77,7 @@ class ClientFlowLoginController extends Controller { /** @var EventDispatcherInterface */ private $eventDispatcher; - const stateName = 'client.flow.state.token'; + public const stateName = 'client.flow.state.token'; /** * @param string $appName diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 4813f15f1c5..0fcadd21c8a 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -57,8 +57,8 @@ use OCP\IUserSession; use OCP\Util; class LoginController extends Controller { - const LOGIN_MSG_INVALIDPASSWORD = 'invalidpassword'; - const LOGIN_MSG_USERDISABLED = 'userdisabled'; + public const LOGIN_MSG_INVALIDPASSWORD = 'invalidpassword'; + public const LOGIN_MSG_USERDISABLED = 'userdisabled'; /** @var IUserManager */ private $userManager; diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php index b57b991884c..dd7e4eefc81 100644 --- a/core/Controller/SetupController.php +++ b/core/Controller/SetupController.php @@ -44,7 +44,7 @@ class SetupController { /** * @param Setup $setupHelper */ - function __construct(Setup $setupHelper) { + public function __construct(Setup $setupHelper) { $this->autoConfigFile = \OC::$configDir.'autoconfig.php'; $this->setupHelper = $setupHelper; } diff --git a/core/Controller/WalledGardenController.php b/core/Controller/WalledGardenController.php index 5bd66225076..fd2b3cbf902 100644 --- a/core/Controller/WalledGardenController.php +++ b/core/Controller/WalledGardenController.php @@ -35,7 +35,7 @@ class WalledGardenController extends Controller { * * @return Response */ - function get() { + public function get() { $resp = new Response(); $resp->setStatus(Http::STATUS_NO_CONTENT); return $resp; |