summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2020-04-08 22:24:54 +0200
committerChristoph Wurst <christoph@winzerhof-wurst.at>2020-04-08 22:24:54 +0200
commit85e369cddb7b347cccd597ab2f65fc201632091d (patch)
tree862221861771a6fdb0394312f8af8a0b4d8c7abc /apps
parentbbba7bc45acdbfb7d69edf7998db2cd8871682bd (diff)
downloadnextcloud-server-85e369cddb7b347cccd597ab2f65fc201632091d.tar.gz
nextcloud-server-85e369cddb7b347cccd597ab2f65fc201632091d.zip
Fix multiline comments
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/Connector/Sabre/FilesPlugin.php8
-rw-r--r--apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php4
-rw-r--r--apps/files_external/lib/Command/Notify.php6
-rw-r--r--apps/files_external/lib/Lib/Storage/SFTP.php6
-rw-r--r--apps/files_sharing/lib/Controller/ShareController.php2
-rw-r--r--apps/files_sharing/lib/Exceptions/BrokenPath.php2
-rw-r--r--apps/files_sharing/tests/ApiTest.php2
-rw-r--r--apps/files_versions/lib/Expiration.php6
-rw-r--r--apps/settings/lib/Controller/CheckSetupController.php6
-rw-r--r--apps/theming/templates/settings-admin.php2
-rw-r--r--apps/user_ldap/lib/Access.php14
-rw-r--r--apps/user_ldap/lib/Group_LDAP.php14
-rw-r--r--apps/user_ldap/lib/Mapping/AbstractMapping.php6
-rw-r--r--apps/user_ldap/lib/Mapping/GroupMapping.php12
-rw-r--r--apps/user_ldap/lib/Mapping/UserMapping.php6
-rw-r--r--apps/user_ldap/lib/User_LDAP.php24
16 files changed, 60 insertions, 60 deletions
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
index fd432a21377..82f3c3b6ccd 100644
--- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -299,10 +299,10 @@ class FilesPlugin extends ServerPlugin {
* so users were unable to navigate into folders where one subitem
* is blocked by the files_accesscontrol app, see:
* https://github.com/nextcloud/files_accesscontrol/issues/65
- if (!$node->getFileInfo()->isReadable()) {
- // avoid detecting files through this means
- throw new NotFound();
- }
+ * if (!$node->getFileInfo()->isReadable()) {
+ * // avoid detecting files through this means
+ * throw new NotFound();
+ * }
*/
$propFind->handle(self::FILEID_PROPERTYNAME, function() use ($node) {
diff --git a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
index 0f990cd8ca6..ebe5beb7275 100644
--- a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
@@ -221,8 +221,8 @@ class IMipPluginTest extends TestCase {
}
/**
- * @dataProvider dataIncludeResponseButtons
- */
+ * @dataProvider dataIncludeResponseButtons
+ */
public function testIncludeResponseButtons(string $config_setting, string $recipient, bool $has_buttons ) {
$message = $this->_testMessage([],$recipient);
diff --git a/apps/files_external/lib/Command/Notify.php b/apps/files_external/lib/Command/Notify.php
index 8c0ed41005a..84966b4ee7b 100644
--- a/apps/files_external/lib/Command/Notify.php
+++ b/apps/files_external/lib/Command/Notify.php
@@ -208,7 +208,7 @@ class Notify extends Base {
/**
* @param int $mountId
* @return array
- */
+ */
private function getStorageIds($mountId) {
$qb = $this->connection->getQueryBuilder();
return $qb
@@ -223,7 +223,7 @@ class Notify extends Base {
* @param array $storageIds
* @param string $parent
* @return int
- */
+ */
private function updateParent($storageIds, $parent) {
$pathHash = md5(trim(\OC_Util::normalizeUnicode($parent), '/'));
$qb = $this->connection->getQueryBuilder();
@@ -237,7 +237,7 @@ class Notify extends Base {
/**
* @return \OCP\IDBConnection
- */
+ */
private function reconnectToDatabase(IDBConnection $connection, OutputInterface $output) {
try {
$connection->close();
diff --git a/apps/files_external/lib/Lib/Storage/SFTP.php b/apps/files_external/lib/Lib/Storage/SFTP.php
index 180458b2b33..3e6c8ddbde0 100644
--- a/apps/files_external/lib/Lib/Storage/SFTP.php
+++ b/apps/files_external/lib/Lib/Storage/SFTP.php
@@ -41,9 +41,9 @@ use Icewind\Streams\RetryWrapper;
use phpseclib\Net\SFTP\Stream;
/**
-* Uses phpseclib's Net\SFTP class and the Net\SFTP\Stream stream wrapper to
-* provide access to SFTP servers.
-*/
+ * Uses phpseclib's Net\SFTP class and the Net\SFTP\Stream stream wrapper to
+ * provide access to SFTP servers.
+ */
class SFTP extends \OC\Files\Storage\Common {
private $host;
private $user;
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index 616b9754634..1cf798c9750 100644
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -300,7 +300,7 @@ class ShareController extends AuthPublicShareController {
* @PublicPage
* @NoCSRFRequired
*
-
+ *
* @param string $path
* @return TemplateResponse
* @throws NotFoundException
diff --git a/apps/files_sharing/lib/Exceptions/BrokenPath.php b/apps/files_sharing/lib/Exceptions/BrokenPath.php
index 33fb242a36a..37db10bcb31 100644
--- a/apps/files_sharing/lib/Exceptions/BrokenPath.php
+++ b/apps/files_sharing/lib/Exceptions/BrokenPath.php
@@ -27,7 +27,7 @@ namespace OCA\Files_Sharing\Exceptions;
* Expected path with a different root
* Possible Error Codes:
* 10 - Path not relative to data/ and point to the users file directory
-
+ *
*/
class BrokenPath extends \Exception {
}
diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php
index 789902bdcd6..654ca3b450b 100644
--- a/apps/files_sharing/tests/ApiTest.php
+++ b/apps/files_sharing/tests/ApiTest.php
@@ -305,7 +305,7 @@ class ApiTest extends TestCase {
/**
* @medium
- */
+ */
function testSharePermissions() {
// sharing file to a user should work if shareapi_exclude_groups is set
// to no
diff --git a/apps/files_versions/lib/Expiration.php b/apps/files_versions/lib/Expiration.php
index 9f3f524ec12..6959de6a943 100644
--- a/apps/files_versions/lib/Expiration.php
+++ b/apps/files_versions/lib/Expiration.php
@@ -129,9 +129,9 @@ class Expiration {
}
/**
- * Read versions_retention_obligation, validate it
- * and set private members accordingly
- */
+ * Read versions_retention_obligation, validate it
+ * and set private members accordingly
+ */
private function parseRetentionObligation(){
$splitValues = explode(',', $this->retentionObligation);
if (!isset($splitValues[0])) {
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
index 6f3bb539eff..e386f29a94e 100644
--- a/apps/settings/lib/Controller/CheckSetupController.php
+++ b/apps/settings/lib/Controller/CheckSetupController.php
@@ -146,9 +146,9 @@ class CheckSetupController extends Controller {
}
/**
- * Checks if the Nextcloud server can connect to a specific URL using both HTTPS and HTTP
- * @return bool
- */
+ * Checks if the Nextcloud server can connect to a specific URL using both HTTPS and HTTP
+ * @return bool
+ */
private function isSiteReachable($sitename) {
$httpSiteName = 'http://' . $sitename . '/';
$httpsSiteName = 'https://' . $sitename . '/';
diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php
index d7de5b75053..d6bbd77dc3b 100644
--- a/apps/theming/templates/settings-admin.php
+++ b/apps/theming/templates/settings-admin.php
@@ -1,6 +1,6 @@
<?php
/**
-
+ *
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Jan-Christoph Borchardt <hey@jancborchardt.net>
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index fecc3b4d4de..e23aa6b4549 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -90,8 +90,8 @@ class Access extends LDAPUtility {
protected $userMapper;
/**
- * @var AbstractMapping $userMapper
- */
+ * @var AbstractMapping $userMapper
+ */
protected $groupMapper;
/**
@@ -1453,11 +1453,11 @@ class Access extends LDAPUtility {
}
/**
- * escapes (user provided) parts for LDAP filter
- * @param string $input, the provided value
- * @param bool $allowAsterisk whether in * at the beginning should be preserved
- * @return string the escaped string
- */
+ * escapes (user provided) parts for LDAP filter
+ * @param string $input, the provided value
+ * @param bool $allowAsterisk whether in * at the beginning should be preserved
+ * @return string the escaped string
+ */
public function escapeFilterPart($input, $allowAsterisk = false) {
$asterisk = '';
if($allowAsterisk && strlen($input) > 0 && $input[0] === '*') {
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php
index f119780f2c6..11fd0b462d9 100644
--- a/apps/user_ldap/lib/Group_LDAP.php
+++ b/apps/user_ldap/lib/Group_LDAP.php
@@ -1129,13 +1129,13 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface, IGroupLD
}
/**
- * Check if backend implements actions
- * @param int $actions bitwise-or'ed actions
- * @return boolean
- *
- * Returns the supported actions as int to be
- * compared with GroupInterface::CREATE_GROUP etc.
- */
+ * Check if backend implements actions
+ * @param int $actions bitwise-or'ed actions
+ * @return boolean
+ *
+ * Returns the supported actions as int to be
+ * compared with GroupInterface::CREATE_GROUP etc.
+ */
public function implementsActions($actions) {
return (bool)((GroupInterface::COUNT_USERS |
$this->groupPluginManager->getImplementedActions()) & $actions);
diff --git a/apps/user_ldap/lib/Mapping/AbstractMapping.php b/apps/user_ldap/lib/Mapping/AbstractMapping.php
index e16829e09d9..14075da5c0e 100644
--- a/apps/user_ldap/lib/Mapping/AbstractMapping.php
+++ b/apps/user_ldap/lib/Mapping/AbstractMapping.php
@@ -27,9 +27,9 @@
namespace OCA\User_LDAP\Mapping;
/**
-* Class AbstractMapping
-* @package OCA\User_LDAP\Mapping
-*/
+ * Class AbstractMapping
+ * @package OCA\User_LDAP\Mapping
+ */
abstract class AbstractMapping {
/**
* @var \OCP\IDBConnection $dbc
diff --git a/apps/user_ldap/lib/Mapping/GroupMapping.php b/apps/user_ldap/lib/Mapping/GroupMapping.php
index 6922a010533..cc779817f1a 100644
--- a/apps/user_ldap/lib/Mapping/GroupMapping.php
+++ b/apps/user_ldap/lib/Mapping/GroupMapping.php
@@ -24,15 +24,15 @@
namespace OCA\User_LDAP\Mapping;
/**
-* Class UserMapping
-* @package OCA\User_LDAP\Mapping
-*/
+ * Class UserMapping
+ * @package OCA\User_LDAP\Mapping
+ */
class GroupMapping extends AbstractMapping {
/**
- * returns the DB table name which holds the mappings
- * @return string
- */
+ * returns the DB table name which holds the mappings
+ * @return string
+ */
protected function getTableName() {
return '*PREFIX*ldap_group_mapping';
}
diff --git a/apps/user_ldap/lib/Mapping/UserMapping.php b/apps/user_ldap/lib/Mapping/UserMapping.php
index 9fde960959f..31ac8a05326 100644
--- a/apps/user_ldap/lib/Mapping/UserMapping.php
+++ b/apps/user_ldap/lib/Mapping/UserMapping.php
@@ -24,9 +24,9 @@
namespace OCA\User_LDAP\Mapping;
/**
-* Class UserMapping
-* @package OCA\User_LDAP\Mapping
-*/
+ * Class UserMapping
+ * @package OCA\User_LDAP\Mapping
+ */
class UserMapping extends AbstractMapping {
/**
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index b4ceb8f1f40..917a2aaf84c 100644
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -365,11 +365,11 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
}
/**
- * returns whether a user was deleted in LDAP
- *
- * @param string $uid The username of the user to delete
- * @return bool
- */
+ * returns whether a user was deleted in LDAP
+ *
+ * @param string $uid The username of the user to delete
+ * @return bool
+ */
public function deleteUser($uid) {
if ($this->userPluginManager->canDeleteUser()) {
$status = $this->userPluginManager->deleteUser($uid);
@@ -522,13 +522,13 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
}
/**
- * Check if backend implements actions
- * @param int $actions bitwise-or'ed actions
- * @return boolean
- *
- * Returns the supported actions as int to be
- * compared with \OC\User\Backend::CREATE_USER etc.
- */
+ * Check if backend implements actions
+ * @param int $actions bitwise-or'ed actions
+ * @return boolean
+ *
+ * Returns the supported actions as int to be
+ * compared with \OC\User\Backend::CREATE_USER etc.
+ */
public function implementsActions($actions) {
return (bool)((Backend::CHECK_PASSWORD
| Backend::GET_HOME