From 734c62bee0f46652285f782761317889d1ef5c7d Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Fri, 10 Apr 2020 16:56:50 +0200 Subject: [PATCH] Format code according to PSR2 Signed-off-by: Christoph Wurst --- apps/dav/lib/Connector/Sabre/Directory.php | 3 +-- apps/dav/lib/Files/FileSearchBackend.php | 1 + apps/dav/tests/unit/CardDAV/ConverterTest.php | 2 +- apps/encryption/lib/Settings/Personal.php | 2 +- apps/files_trashbin/lib/Sabre/AbstractTrashFile.php | 2 +- apps/user_ldap/lib/Connection.php | 1 + core/Command/Config/System/SetConfig.php | 1 + lib/private/AppFramework/Http/Request.php | 2 +- lib/private/Files/Cache/QuerySearchHelper.php | 1 + lib/private/Files/ObjectStore/ObjectStoreStorage.php | 1 + lib/private/Files/Storage/Flysystem.php | 1 + lib/private/Group/Database.php | 4 ++-- lib/private/L10N/LanguageIterator.php | 5 +++++ lib/private/MemoryInfo.php | 2 ++ lib/private/User/Database.php | 4 ++-- 15 files changed, 22 insertions(+), 10 deletions(-) diff --git a/apps/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php index 0e4ddd1f23..a7c319b4ee 100644 --- a/apps/dav/lib/Connector/Sabre/Directory.php +++ b/apps/dav/lib/Connector/Sabre/Directory.php @@ -50,8 +50,7 @@ use Sabre\DAV\Exception\ServiceUnavailable; use Sabre\DAV\IFile; use Sabre\DAV\INode; -class Directory extends \OCA\DAV\Connector\Sabre\Node - implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget { +class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget { /** * Cached directory content diff --git a/apps/dav/lib/Files/FileSearchBackend.php b/apps/dav/lib/Files/FileSearchBackend.php index fd95196162..a69236ffd5 100644 --- a/apps/dav/lib/Files/FileSearchBackend.php +++ b/apps/dav/lib/Files/FileSearchBackend.php @@ -428,6 +428,7 @@ class FileSearchBackend implements ISearchBackend { } else { return null; } + // no break default: return null; } diff --git a/apps/dav/tests/unit/CardDAV/ConverterTest.php b/apps/dav/tests/unit/CardDAV/ConverterTest.php index da2255a717..d502783ba4 100644 --- a/apps/dav/tests/unit/CardDAV/ConverterTest.php +++ b/apps/dav/tests/unit/CardDAV/ConverterTest.php @@ -34,7 +34,7 @@ use OCP\IUser; use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; -class ConverterTest extends TestCase { +class ConverterTest extends TestCase { /** @var AccountManager | PHPUnit_Framework_MockObject_MockObject */ private $accountManager; diff --git a/apps/encryption/lib/Settings/Personal.php b/apps/encryption/lib/Settings/Personal.php index 7ecf457e64..bd0e17f028 100644 --- a/apps/encryption/lib/Settings/Personal.php +++ b/apps/encryption/lib/Settings/Personal.php @@ -30,7 +30,7 @@ use OCP\IConfig; use OCP\IUserSession; use OCP\Settings\ISettings; -class Personal implements ISettings { +class Personal implements ISettings { /** @var IConfig */ private $config; diff --git a/apps/files_trashbin/lib/Sabre/AbstractTrashFile.php b/apps/files_trashbin/lib/Sabre/AbstractTrashFile.php index ad80711ff1..7f606bbbc6 100644 --- a/apps/files_trashbin/lib/Sabre/AbstractTrashFile.php +++ b/apps/files_trashbin/lib/Sabre/AbstractTrashFile.php @@ -29,7 +29,7 @@ namespace OCA\Files_Trashbin\Sabre; use Sabre\DAV\Exception\Forbidden; use Sabre\DAV\IFile; -abstract class AbstractTrashFile extends AbstractTrash implements IFile , ITrash { +abstract class AbstractTrashFile extends AbstractTrash implements IFile, ITrash { public function put($data) { throw new Forbidden(); } diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php index cec4866b0e..0cc93a08e6 100644 --- a/apps/user_ldap/lib/Connection.php +++ b/apps/user_ldap/lib/Connection.php @@ -348,6 +348,7 @@ class Connection extends LDAPUtility { $result[$dbkey] = implode("\n", $config[$configkey]); break; } //else follows default + // no break default: $result[$dbkey] = $config[$configkey]; } diff --git a/core/Command/Config/System/SetConfig.php b/core/Command/Config/System/SetConfig.php index 0f0d28a038..53f007a97e 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/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index c9b22dd7a1..2ef7b4a099 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -282,7 +282,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { case 'parameters': case 'params': return $this->getContent(); - default; + default: return isset($this[$name]) ? $this[$name] : null; diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php index eba4178d9b..e1ecad5073 100644 --- a/lib/private/Files/Cache/QuerySearchHelper.php +++ b/lib/private/Files/Cache/QuerySearchHelper.php @@ -110,6 +110,7 @@ class QuerySearchHelper { } else { throw new \InvalidArgumentException('Binary operators inside "not" is not supported'); } + // no break case ISearchBinaryOperator::OPERATOR_AND: return call_user_func_array([$expr, 'andX'], $this->searchOperatorArrayToDBExprArray($builder, $operator->getArguments())); case ISearchBinaryOperator::OPERATOR_OR: diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 1faa44ad88..a5112bcbba 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -304,6 +304,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { } else { return false; } + // no break case 'w': case 'wb': case 'w+': diff --git a/lib/private/Files/Storage/Flysystem.php b/lib/private/Files/Storage/Flysystem.php index 2644bfbb1d..fba64c6425 100644 --- a/lib/private/Files/Storage/Flysystem.php +++ b/lib/private/Files/Storage/Flysystem.php @@ -189,6 +189,7 @@ abstract class Flysystem extends Common { case 'wb': case 'wb+': $useExisting = false; + // no break case 'a': case 'ab': case 'r+': diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php index b75dc097c9..1202ba09b1 100644 --- a/lib/private/Group/Database.php +++ b/lib/private/Group/Database.php @@ -60,8 +60,8 @@ use OCP\IDBConnection; /** * Class for group management in a SQL Database (e.g. MySQL, SQLite) */ -class Database extends ABackend - implements IAddToGroupBackend, +class Database extends ABackend implements + IAddToGroupBackend, ICountDisabledInGroup, ICountUsersBackend, ICreateGroupBackend, diff --git a/lib/private/L10N/LanguageIterator.php b/lib/private/L10N/LanguageIterator.php index 0670ac5650..a03ec114ef 100644 --- a/lib/private/L10N/LanguageIterator.php +++ b/lib/private/L10N/LanguageIterator.php @@ -64,6 +64,7 @@ class LanguageIterator implements ILanguageIterator { } $this->next(); /** @noinspection PhpMissingBreakStatementInspection */ + // no break case 1: $forcedLang = $this->config->getSystemValue('force_language', false); if (is_string($forcedLang) @@ -73,6 +74,7 @@ class LanguageIterator implements ILanguageIterator { } $this->next(); /** @noinspection PhpMissingBreakStatementInspection */ + // no break case 2: $userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null); if (is_string($userLang)) { @@ -80,6 +82,7 @@ class LanguageIterator implements ILanguageIterator { } $this->next(); /** @noinspection PhpMissingBreakStatementInspection */ + // no break case 3: $userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null); if (is_string($userLang) @@ -88,6 +91,7 @@ class LanguageIterator implements ILanguageIterator { return $truncated; } $this->next(); + // no break case 4: return $this->config->getSystemValue('default_language', 'en'); /** @noinspection PhpMissingBreakStatementInspection */ @@ -97,6 +101,7 @@ class LanguageIterator implements ILanguageIterator { return $truncated; } $this->next(); + // no break default: return 'en'; } diff --git a/lib/private/MemoryInfo.php b/lib/private/MemoryInfo.php index 0e70b50053..88ba69aae9 100644 --- a/lib/private/MemoryInfo.php +++ b/lib/private/MemoryInfo.php @@ -72,8 +72,10 @@ class MemoryInfo { switch ($last) { case 'g': $memoryLimit *= 1024; + // no break case 'm': $memoryLimit *= 1024; + // no break case 'k': $memoryLimit *= 1024; } diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php index d5098483d6..e88549c8d8 100644 --- a/lib/private/User/Database.php +++ b/lib/private/User/Database.php @@ -76,8 +76,8 @@ use OCP\User\Backend\ISetPasswordBackend; /** * Class for user management in a SQL Database (e.g. MySQL, SQLite) */ -class Database extends ABackend - implements ICreateUserBackend, +class Database extends ABackend implements + ICreateUserBackend, ISetPasswordBackend, ISetDisplayNameBackend, IGetDisplayNameBackend,