Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2020-04-09 17:09:23 +0300
committerChristoph Wurst <christoph@winzerhof-wurst.at>2020-04-09 17:09:23 +0300
commita8a06a82d2b93c17b3014f0d468f23239100ca10 (patch)
tree07a13880071bc15ddec3810c21327af5f4f09ff4
parent44577e4345066952622feca9ef69c24fc23d08ab (diff)
Remove trailing whitespaces from comments
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
-rw-r--r--apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php2
-rw-r--r--apps/files_external/templates/settings.php2
-rw-r--r--apps/files_versions/lib/Expiration.php2
-rw-r--r--apps/user_ldap/lib/Configuration.php4
-rw-r--r--apps/user_ldap/lib/LDAPProvider.php4
-rw-r--r--apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php2
-rw-r--r--core/templates/installation.php2
-rw-r--r--lib/private/ContactsManager.php4
-rw-r--r--lib/private/DateTimeZone.php2
-rw-r--r--lib/private/Search/Result/Audio.php2
-rw-r--r--lib/private/Search/Result/File.php6
-rw-r--r--lib/private/Search/Result/Folder.php2
-rw-r--r--lib/private/Search/Result/Image.php2
-rw-r--r--lib/public/Authentication/TwoFactorAuth/IRegistry.php2
-rw-r--r--lib/public/Contacts/IManager.php6
-rw-r--r--lib/public/Diagnostics/IQueryLogger.php16
-rw-r--r--lib/public/LDAP/ILDAPProvider.php2
-rw-r--r--lib/public/Search/Result.php2
-rw-r--r--lib/public/Security/ISecureRandom.php2
-rw-r--r--tests/acceptance/features/bootstrap/AppNavigationContext.php4
-rw-r--r--tests/acceptance/features/bootstrap/AppSettingsContext.php4
-rw-r--r--tests/acceptance/features/bootstrap/DialogContext.php2
-rw-r--r--tests/acceptance/features/bootstrap/SettingsMenuContext.php2
23 files changed, 39 insertions, 39 deletions
diff --git a/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php
index 712a18d5dbc..bb74884419a 100644
--- a/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php
+++ b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php
@@ -189,7 +189,7 @@ class SystemTagsObjectMappingCollection implements ICollection {
}
/**
- * Create a sabre node for the mapping of the
+ * Create a sabre node for the mapping of the
* given system tag to the collection's object
*
* @param ISystemTag $tag
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 04c33f73b8b..5ec70031214 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -142,7 +142,7 @@
});
?>
<?php foreach ($sortedBackends as $backend): ?>
- <?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
+ <?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends?>
<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
<?php endforeach; ?>
</select>
diff --git a/apps/files_versions/lib/Expiration.php b/apps/files_versions/lib/Expiration.php
index d57bc20dc81..a56042e76b8 100644
--- a/apps/files_versions/lib/Expiration.php
+++ b/apps/files_versions/lib/Expiration.php
@@ -129,7 +129,7 @@ class Expiration {
}
/**
- * Read versions_retention_obligation, validate it
+ * Read versions_retention_obligation, validate it
* and set private members accordingly
*/
private function parseRetentionObligation() {
diff --git a/apps/user_ldap/lib/Configuration.php b/apps/user_ldap/lib/Configuration.php
index a04ea638d09..3c6693b151e 100644
--- a/apps/user_ldap/lib/Configuration.php
+++ b/apps/user_ldap/lib/Configuration.php
@@ -311,7 +311,7 @@ class Configuration {
/**
* Sets multi-line values as arrays
- *
+ *
* @param string $varName name of config-key
* @param array|string $value to set
*/
@@ -387,7 +387,7 @@ class Configuration {
/**
* Sets a scalar value.
- *
+ *
* @param string $varName name of config key
* @param mixed $value to set
*/
diff --git a/apps/user_ldap/lib/LDAPProvider.php b/apps/user_ldap/lib/LDAPProvider.php
index 3119bcb0132..75267165cdf 100644
--- a/apps/user_ldap/lib/LDAPProvider.php
+++ b/apps/user_ldap/lib/LDAPProvider.php
@@ -114,7 +114,7 @@ class LDAPProvider implements ILDAPProvider, IDeletionFlagSupport {
}
/**
- * Translate a LDAP DN to an internal user name. If there is no mapping between
+ * Translate a LDAP DN to an internal user name. If there is no mapping between
* the DN and the user name, a new one will be created.
* @param string $dn LDAP DN
* @return string with the internal user name
@@ -147,7 +147,7 @@ class LDAPProvider implements ILDAPProvider, IDeletionFlagSupport {
}
/**
- * Return a new LDAP connection resource for the specified user.
+ * Return a new LDAP connection resource for the specified user.
* The connection must be closed manually.
* @param string $uid user id
* @return resource of the LDAP connection
diff --git a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php
index 50c45b49048..33eb1c70d6f 100644
--- a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php
+++ b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php
@@ -36,7 +36,7 @@ use OCA\User_LDAP\LDAP;
*
* LDAP must be available via toxiproxy.
*
- * This test must be run manually.
+ * This test must be run manually.
*
*/
class ExceptionOnLostConnection {
diff --git a/core/templates/installation.php b/core/templates/installation.php
index d5eec7f3092..2919884a0ef 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -75,7 +75,7 @@ script('core', [
<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
<fieldset id='databaseBackend'>
<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
- $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
+ $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite?>
<legend><?php p($l->t('Configure the database')); ?></legend>
<div id="selectDbType">
<?php foreach($_['databases'] as $type => $label): ?>
diff --git a/lib/private/ContactsManager.php b/lib/private/ContactsManager.php
index 2913e2b5864..314304c7a8b 100644
--- a/lib/private/ContactsManager.php
+++ b/lib/private/ContactsManager.php
@@ -125,7 +125,7 @@ namespace OC {
/**
* Return a list of the user's addressbooks display names
* ! The addressBook displayName are not unique, please use getUserAddressBooks
- *
+ *
* @return array
* @since 6.0.0
* @deprecated 16.0.0 - Use `$this->getUserAddressBooks()` instead
@@ -142,7 +142,7 @@ namespace OC {
/**
* Return a list of the user's addressbooks
- *
+ *
* @return IAddressBook[]
* @since 16.0.0
*/
diff --git a/lib/private/DateTimeZone.php b/lib/private/DateTimeZone.php
index d12dbdf2a37..971a1a97334 100644
--- a/lib/private/DateTimeZone.php
+++ b/lib/private/DateTimeZone.php
@@ -119,7 +119,7 @@ class DateTimeZone implements IDateTimeZone {
* Get the default timezone of the server
*
* Falls back to UTC if it is not yet set.
- *
+ *
* @return string
*/
protected function getDefaultTimeZone() {
diff --git a/lib/private/Search/Result/Audio.php b/lib/private/Search/Result/Audio.php
index a035f51b38b..67a6add04bf 100644
--- a/lib/private/Search/Result/Audio.php
+++ b/lib/private/Search/Result/Audio.php
@@ -31,7 +31,7 @@ class Audio extends File {
/**
* Type name; translated in templates
- * @var string
+ * @var string
*/
public $type = 'audio';
diff --git a/lib/private/Search/Result/File.php b/lib/private/Search/Result/File.php
index 0b7e11f2fcb..cd605c49821 100644
--- a/lib/private/Search/Result/File.php
+++ b/lib/private/Search/Result/File.php
@@ -35,7 +35,7 @@ class File extends \OCP\Search\Result {
/**
* Type name; translated in templates
- * @var string
+ * @var string
*/
public $type = 'file';
@@ -47,7 +47,7 @@ class File extends \OCP\Search\Result {
/**
* Size, in bytes
- * @var int
+ * @var int
*/
public $size;
@@ -65,7 +65,7 @@ class File extends \OCP\Search\Result {
/**
* File permissions:
- *
+ *
* @var string
*/
public $permissions;
diff --git a/lib/private/Search/Result/Folder.php b/lib/private/Search/Result/Folder.php
index 1626f9d67d2..0a746221ee0 100644
--- a/lib/private/Search/Result/Folder.php
+++ b/lib/private/Search/Result/Folder.php
@@ -31,7 +31,7 @@ class Folder extends File {
/**
* Type name; translated in templates
- * @var string
+ * @var string
*/
public $type = 'folder';
diff --git a/lib/private/Search/Result/Image.php b/lib/private/Search/Result/Image.php
index 02973855efb..21123a4de13 100644
--- a/lib/private/Search/Result/Image.php
+++ b/lib/private/Search/Result/Image.php
@@ -31,7 +31,7 @@ class Image extends File {
/**
* Type name; translated in templates
- * @var string
+ * @var string
*/
public $type = 'image';
diff --git a/lib/public/Authentication/TwoFactorAuth/IRegistry.php b/lib/public/Authentication/TwoFactorAuth/IRegistry.php
index 9c10e86b5f8..70026ca1dad 100644
--- a/lib/public/Authentication/TwoFactorAuth/IRegistry.php
+++ b/lib/public/Authentication/TwoFactorAuth/IRegistry.php
@@ -31,7 +31,7 @@ use OCP\IUser;
/**
* Nextcloud 2FA provider registry for stateful 2FA providers
- *
+ *
* This service keeps track of which providers are currently active for a specific
* user. Stateful 2FA providers (IStatefulProvider) must use this service to save
* their enabled/disabled state.
diff --git a/lib/public/Contacts/IManager.php b/lib/public/Contacts/IManager.php
index 45baa127eee..dcb4c7ddbb3 100644
--- a/lib/public/Contacts/IManager.php
+++ b/lib/public/Contacts/IManager.php
@@ -160,7 +160,7 @@ interface IManager {
/**
* Return a list of the user's addressbooks display names
- *
+ *
* @return array
* @since 6.0.0
* @deprecated 16.0.0 - Use `$this->getUserAddressBooks()` instead
@@ -169,7 +169,7 @@ interface IManager {
/**
* Return a list of the user's addressbooks
- *
+ *
* @return IAddressBook[]
* @since 16.0.0
*/
@@ -177,7 +177,7 @@ interface IManager {
/**
* removes all registered address book instances
- *
+ *
* @return void
* @since 6.0.0
*/
diff --git a/lib/public/Diagnostics/IQueryLogger.php b/lib/public/Diagnostics/IQueryLogger.php
index 14628c5688f..5a5656a6bca 100644
--- a/lib/public/Diagnostics/IQueryLogger.php
+++ b/lib/public/Diagnostics/IQueryLogger.php
@@ -35,10 +35,10 @@ use Doctrine\DBAL\Logging\SQLLogger;
*/
interface IQueryLogger extends SQLLogger {
/**
- * Mark the start of a query providing query SQL statement, its parameters and types.
- * This method should be called as close to the DB as possible and after
- * query is finished finalized with stopQuery() method.
- *
+ * Mark the start of a query providing query SQL statement, its parameters and types.
+ * This method should be called as close to the DB as possible and after
+ * query is finished finalized with stopQuery() method.
+ *
* @param string $sql
* @param array|null $params
* @param array|null $types
@@ -49,7 +49,7 @@ interface IQueryLogger extends SQLLogger {
/**
* Mark the end of the current active query. Ending query should store \OCP\Diagnostics\IQuery to
* be returned with getQueries() method.
- *
+ *
* @return mixed
* @since 8.0.0
*/
@@ -58,7 +58,7 @@ interface IQueryLogger extends SQLLogger {
/**
* This method should return all \OCP\Diagnostics\IQuery objects stored using
* startQuery()/stopQuery() methods.
- *
+ *
* @return \OCP\Diagnostics\IQuery[]
* @since 8.0.0
*/
@@ -67,8 +67,8 @@ interface IQueryLogger extends SQLLogger {
/**
* Activate the module for the duration of the request. Deactivated module
* does not create and store \OCP\Diagnostics\IQuery objects.
- * Only activated module should create and store objects to be
- * returned with getQueries() call.
+ * Only activated module should create and store objects to be
+ * returned with getQueries() call.
*
* @since 12.0.0
*/
diff --git a/lib/public/LDAP/ILDAPProvider.php b/lib/public/LDAP/ILDAPProvider.php
index 25127987eef..491906e5556 100644
--- a/lib/public/LDAP/ILDAPProvider.php
+++ b/lib/public/LDAP/ILDAPProvider.php
@@ -76,7 +76,7 @@ interface ILDAPProvider {
public function sanitizeDN($dn);
/**
- * Return a new LDAP connection resource for the specified user.
+ * Return a new LDAP connection resource for the specified user.
* @param string $uid user id
* @return resource of the LDAP connection
* @since 11.0.0
diff --git a/lib/public/Search/Result.php b/lib/public/Search/Result.php
index 0cbeb114af6..8d9a4e5d237 100644
--- a/lib/public/Search/Result.php
+++ b/lib/public/Search/Result.php
@@ -56,7 +56,7 @@ class Result {
/**
* The type of search result returned; for consistency, name this the same
- * as the class name (e.g. \OC\Search\File -> 'file') in lowercase.
+ * as the class name (e.g. \OC\Search\File -> 'file') in lowercase.
* @var string
* @since 7.0.0
*/
diff --git a/lib/public/Security/ISecureRandom.php b/lib/public/Security/ISecureRandom.php
index c2d149feaf8..3fbc6c8ee10 100644
--- a/lib/public/Security/ISecureRandom.php
+++ b/lib/public/Security/ISecureRandom.php
@@ -51,7 +51,7 @@ interface ISecureRandom {
/**
* Characters that can be used for <code>generate($length, $characters)</code>, to
- * generate human readable random strings. Lower- and upper-case characters and digits
+ * generate human readable random strings. Lower- and upper-case characters and digits
* are included. Characters which are ambiguous are excluded, such as I, l, and 1 and so on.
*/
const CHAR_HUMAN_READABLE = 'abcdefgijkmnopqrstwxyzABCDEFGHJKLMNPQRSTWXYZ23456789';
diff --git a/tests/acceptance/features/bootstrap/AppNavigationContext.php b/tests/acceptance/features/bootstrap/AppNavigationContext.php
index 02a8b1c0152..0fd9e92e9e4 100644
--- a/tests/acceptance/features/bootstrap/AppNavigationContext.php
+++ b/tests/acceptance/features/bootstrap/AppNavigationContext.php
@@ -1,10 +1,10 @@
<?php
/**
- *
+ *
* @copyright Copyright (c) 2017, Daniel Calviño Sánchez (danxuliu@gmail.com)
* @copyright Copyright (c) 2018, John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
- *
+ *
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
diff --git a/tests/acceptance/features/bootstrap/AppSettingsContext.php b/tests/acceptance/features/bootstrap/AppSettingsContext.php
index 5b51e55e118..a75cce29936 100644
--- a/tests/acceptance/features/bootstrap/AppSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/AppSettingsContext.php
@@ -1,10 +1,10 @@
<?php
/**
- *
+ *
* @copyright Copyright (c) 2017, Daniel Calviño Sánchez (danxuliu@gmail.com)
* @copyright Copyright (c) 2018, John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
- *
+ *
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
diff --git a/tests/acceptance/features/bootstrap/DialogContext.php b/tests/acceptance/features/bootstrap/DialogContext.php
index 8f387992b5f..0558123ad9d 100644
--- a/tests/acceptance/features/bootstrap/DialogContext.php
+++ b/tests/acceptance/features/bootstrap/DialogContext.php
@@ -1,7 +1,7 @@
<?php
/**
- *
+ *
* @copyright Copyright (c) 2018, John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
diff --git a/tests/acceptance/features/bootstrap/SettingsMenuContext.php b/tests/acceptance/features/bootstrap/SettingsMenuContext.php
index e4e20997fc2..a740e98756b 100644
--- a/tests/acceptance/features/bootstrap/SettingsMenuContext.php
+++ b/tests/acceptance/features/bootstrap/SettingsMenuContext.php
@@ -103,7 +103,7 @@ class SettingsMenuContext implements Context, ActorAwareInterface {
}
/**
- * @return array
+ * @return array
*/
public function menuItems() {
return $this->actor->find(self::settingsMenu(), 10)