From 44577e4345066952622feca9ef69c24fc23d08ab Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Thu, 9 Apr 2020 16:07:47 +0200 Subject: Remove trailing and in between spaces Signed-off-by: Christoph Wurst --- apps/files_external/lib/Lib/Storage/FTP.php | 2 +- apps/files_external/lib/Lib/Storage/SFTP.php | 2 +- apps/files_external/templates/list.php | 2 +- apps/files_external/tests/Service/GlobalStoragesServiceTest.php | 2 +- apps/files_external/tests/Storage/Amazons3Test.php | 2 +- apps/files_external/tests/Storage/FtpTest.php | 2 +- apps/files_external/tests/Storage/OwncloudTest.php | 2 +- apps/files_external/tests/Storage/SFTP_KeyTest.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'apps/files_external') diff --git a/apps/files_external/lib/Lib/Storage/FTP.php b/apps/files_external/lib/Lib/Storage/FTP.php index de4d001fc4a..0015f3008ef 100644 --- a/apps/files_external/lib/Lib/Storage/FTP.php +++ b/apps/files_external/lib/Lib/Storage/FTP.php @@ -56,7 +56,7 @@ class FTP extends StreamWrapper{ $this->secure = false; } $this->root=isset($params['root'])?$params['root']:'/'; - if ( ! $this->root || $this->root[0]!=='/') { + if (! $this->root || $this->root[0]!=='/') { $this->root='/'.$this->root; } if (substr($this->root, -1) !== '/') { diff --git a/apps/files_external/lib/Lib/Storage/SFTP.php b/apps/files_external/lib/Lib/Storage/SFTP.php index acc4042f21b..ee848889c39 100644 --- a/apps/files_external/lib/Lib/Storage/SFTP.php +++ b/apps/files_external/lib/Lib/Storage/SFTP.php @@ -371,7 +371,7 @@ class SFTP extends \OC\Files\Storage\Common { switch($mode) { case 'r': case 'rb': - if ( !$this->file_exists($path)) { + if (!$this->file_exists($path)) { return false; } SFTPReadStream::register(); diff --git a/apps/files_external/templates/list.php b/apps/files_external/templates/list.php index 04b7159cfe1..e1b666c14c1 100644 --- a/apps/files_external/templates/list.php +++ b/apps/files_external/templates/list.php @@ -16,7 +16,7 @@ diff --git a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php index 947e1fd60ee..bc831b1e95c 100644 --- a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php +++ b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php @@ -267,7 +267,7 @@ class GlobalStoragesServiceTest extends StoragesServiceTest { ], ], ], - // mixed groups and users + // mixed groups and users [ ['user1', 'user2'], ['group1', 'group2'], diff --git a/apps/files_external/tests/Storage/Amazons3Test.php b/apps/files_external/tests/Storage/Amazons3Test.php index 0137ff919f2..0e9ec3dbaa6 100644 --- a/apps/files_external/tests/Storage/Amazons3Test.php +++ b/apps/files_external/tests/Storage/Amazons3Test.php @@ -45,7 +45,7 @@ class Amazons3Test extends \Test\Files\Storage\Storage { parent::setUp(); $this->config = include('files_external/tests/config.amazons3.php'); - if ( ! is_array($this->config) or ! $this->config['run']) { + if (! is_array($this->config) or ! $this->config['run']) { $this->markTestSkipped('AmazonS3 backend not configured'); } $this->instance = new AmazonS3($this->config); diff --git a/apps/files_external/tests/Storage/FtpTest.php b/apps/files_external/tests/Storage/FtpTest.php index c4c947d6080..904b46c283a 100644 --- a/apps/files_external/tests/Storage/FtpTest.php +++ b/apps/files_external/tests/Storage/FtpTest.php @@ -47,7 +47,7 @@ class FtpTest extends \Test\Files\Storage\Storage { $id = $this->getUniqueID(); $this->config = include('files_external/tests/config.ftp.php'); - if ( ! is_array($this->config) or ! $this->config['run']) { + if (! is_array($this->config) or ! $this->config['run']) { $this->markTestSkipped('FTP backend not configured'); } $this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in diff --git a/apps/files_external/tests/Storage/OwncloudTest.php b/apps/files_external/tests/Storage/OwncloudTest.php index 80c5425dd35..0f63709614d 100644 --- a/apps/files_external/tests/Storage/OwncloudTest.php +++ b/apps/files_external/tests/Storage/OwncloudTest.php @@ -45,7 +45,7 @@ class OwncloudTest extends \Test\Files\Storage\Storage { $id = $this->getUniqueID(); $this->config = include('files_external/tests/config.php'); - if ( ! is_array($this->config) or ! isset($this->config['owncloud']) or ! $this->config['owncloud']['run']) { + if (! is_array($this->config) or ! isset($this->config['owncloud']) or ! $this->config['owncloud']['run']) { $this->markTestSkipped('Nextcloud backend not configured'); } $this->config['owncloud']['root'] .= '/' . $id; //make sure we have an new empty folder to work in diff --git a/apps/files_external/tests/Storage/SFTP_KeyTest.php b/apps/files_external/tests/Storage/SFTP_KeyTest.php index b1ae0fc2a8e..b60e0f8ec59 100644 --- a/apps/files_external/tests/Storage/SFTP_KeyTest.php +++ b/apps/files_external/tests/Storage/SFTP_KeyTest.php @@ -44,7 +44,7 @@ class SFTP_KeyTest extends \Test\Files\Storage\Storage { $id = $this->getUniqueID(); $this->config = include('files_external/tests/config.php'); - if ( ! is_array($this->config) or ! isset($this->config['sftp_key']) or ! $this->config['sftp_key']['run']) { + if (! is_array($this->config) or ! isset($this->config['sftp_key']) or ! $this->config['sftp_key']['run']) { $this->markTestSkipped('SFTP with key backend not configured'); } // Make sure we have an new empty folder to work in -- cgit v1.2.3 From a8a06a82d2b93c17b3014f0d468f23239100ca10 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Thu, 9 Apr 2020 16:09:23 +0200 Subject: Remove trailing whitespaces from comments Signed-off-by: Christoph Wurst --- .../lib/SystemTag/SystemTagsObjectMappingCollection.php | 2 +- apps/files_external/templates/settings.php | 2 +- apps/files_versions/lib/Expiration.php | 2 +- apps/user_ldap/lib/Configuration.php | 4 ++-- apps/user_ldap/lib/LDAPProvider.php | 4 ++-- .../tests/Integration/ExceptionOnLostConnection.php | 2 +- core/templates/installation.php | 2 +- lib/private/ContactsManager.php | 4 ++-- lib/private/DateTimeZone.php | 2 +- lib/private/Search/Result/Audio.php | 2 +- lib/private/Search/Result/File.php | 6 +++--- lib/private/Search/Result/Folder.php | 2 +- lib/private/Search/Result/Image.php | 2 +- lib/public/Authentication/TwoFactorAuth/IRegistry.php | 2 +- lib/public/Contacts/IManager.php | 6 +++--- lib/public/Diagnostics/IQueryLogger.php | 16 ++++++++-------- lib/public/LDAP/ILDAPProvider.php | 2 +- lib/public/Search/Result.php | 2 +- lib/public/Security/ISecureRandom.php | 2 +- .../features/bootstrap/AppNavigationContext.php | 4 ++-- .../acceptance/features/bootstrap/AppSettingsContext.php | 4 ++-- tests/acceptance/features/bootstrap/DialogContext.php | 2 +- .../features/bootstrap/SettingsMenuContext.php | 2 +- 23 files changed, 39 insertions(+), 39 deletions(-) (limited to 'apps/files_external') 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 @@ }); ?> - getDeprecateTo()) continue; // ignore deprecated backends ?> + getDeprecateTo()) continue; // ignore deprecated backends?> 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', [ 0): ?>
+ $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite?> t('Configure the database')); ?>
$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 generate($length, $characters), 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 @@ - * + * * @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 @@ - * + * * @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 @@ * * @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) -- cgit v1.2.3 From bcd13296def0ac8b8fb48067472f1019d5715895 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Thu, 9 Apr 2020 16:11:50 +0200 Subject: Make sure every file ends with an empty newline Signed-off-by: Christoph Wurst --- apps/files/list.php | 1 - apps/files/simplelist.php | 1 - apps/files_external/lib/Lib/Storage/SFTPWriteStream.php | 1 - apps/files_sharing/lib/Exceptions/SharingRightsException.php | 1 - apps/files_versions/appinfo/app.php | 1 - apps/files_versions/appinfo/routes.php | 1 - apps/systemtags/appinfo/app.php | 1 - apps/testing/appinfo/app.php | 1 - apps/theming/appinfo/app.php | 2 +- apps/theming/appinfo/routes.php | 1 - build/integration/features/bootstrap/Sharing.php | 1 - build/integration/features/bootstrap/Trashbin.php | 1 - build/signed-off-checker.php | 1 - lib/public/DirectEditing/IManager.php | 1 - ocm-provider/index.php | 1 - 15 files changed, 1 insertion(+), 15 deletions(-) (limited to 'apps/files_external') diff --git a/apps/files/list.php b/apps/files/list.php index 7d7fc7f105e..e4713ae2960 100644 --- a/apps/files/list.php +++ b/apps/files/list.php @@ -37,4 +37,3 @@ $tmpl = new OCP\Template('files', 'list', ''); $tmpl->assign('showgridview', $showgridview && !$isIE); $tmpl->assign('publicUploadEnabled', $publicUploadEnabled); $tmpl->printPage(); - diff --git a/apps/files/simplelist.php b/apps/files/simplelist.php index 7bb6fb34558..eebb5beb51f 100644 --- a/apps/files/simplelist.php +++ b/apps/files/simplelist.php @@ -35,4 +35,3 @@ $tmpl = new OCP\Template('files', 'simplelist', ''); // gridview not available for ie $tmpl->assign('showgridview', $showgridview && !$isIE); $tmpl->printPage(); - diff --git a/apps/files_external/lib/Lib/Storage/SFTPWriteStream.php b/apps/files_external/lib/Lib/Storage/SFTPWriteStream.php index cb693f82f71..b5bc3ab667d 100644 --- a/apps/files_external/lib/Lib/Storage/SFTPWriteStream.php +++ b/apps/files_external/lib/Lib/Storage/SFTPWriteStream.php @@ -180,4 +180,3 @@ class SFTPWriteStream implements File { } } - diff --git a/apps/files_sharing/lib/Exceptions/SharingRightsException.php b/apps/files_sharing/lib/Exceptions/SharingRightsException.php index 868ead81e7f..3df5754e0a1 100644 --- a/apps/files_sharing/lib/Exceptions/SharingRightsException.php +++ b/apps/files_sharing/lib/Exceptions/SharingRightsException.php @@ -36,4 +36,3 @@ use Exception; class SharingRightsException extends Exception { } - diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index 09650858392..917b8831c06 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -22,4 +22,3 @@ */ \OC::$server->query(\OCA\Files_Versions\AppInfo\Application::class); - diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php index 0149c0d3b0e..7252ddcd22b 100644 --- a/apps/files_versions/appinfo/routes.php +++ b/apps/files_versions/appinfo/routes.php @@ -46,4 +46,3 @@ $this->create('files_versions_ajax_getVersions', 'ajax/getVersions.php') ->actionInclude('files_versions/ajax/getVersions.php'); $this->create('files_versions_ajax_rollbackVersion', 'ajax/rollbackVersion.php') ->actionInclude('files_versions/ajax/rollbackVersion.php'); - diff --git a/apps/systemtags/appinfo/app.php b/apps/systemtags/appinfo/app.php index 3764ff4a88f..e4bf9b91fa4 100644 --- a/apps/systemtags/appinfo/app.php +++ b/apps/systemtags/appinfo/app.php @@ -69,4 +69,3 @@ $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener); 'name' => $l->t('Tags'), ]; }); - diff --git a/apps/testing/appinfo/app.php b/apps/testing/appinfo/app.php index ae8f9841b43..48d8da8c20b 100644 --- a/apps/testing/appinfo/app.php +++ b/apps/testing/appinfo/app.php @@ -22,4 +22,3 @@ */ $app = new \OCA\Testing\AppInfo\Application(); - diff --git a/apps/theming/appinfo/app.php b/apps/theming/appinfo/app.php index 114ff60ba53..c942a85bc75 100644 --- a/apps/theming/appinfo/app.php +++ b/apps/theming/appinfo/app.php @@ -57,4 +57,4 @@ $linkToJs = \OC::$server->getURLGenerator()->linkToRoute( 'src' => $linkToJs, 'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce() ], '' -); \ No newline at end of file +); diff --git a/apps/theming/appinfo/routes.php b/apps/theming/appinfo/routes.php index fe7a5a94659..13196662eb0 100644 --- a/apps/theming/appinfo/routes.php +++ b/apps/theming/appinfo/routes.php @@ -84,4 +84,3 @@ return ['routes' => [ 'requirements' => ['image' => '.+'] ], ]]; - diff --git a/build/integration/features/bootstrap/Sharing.php b/build/integration/features/bootstrap/Sharing.php index 590e0c4663c..762e0dcb045 100644 --- a/build/integration/features/bootstrap/Sharing.php +++ b/build/integration/features/bootstrap/Sharing.php @@ -742,4 +742,3 @@ trait Sharing { return $sharees; } } - diff --git a/build/integration/features/bootstrap/Trashbin.php b/build/integration/features/bootstrap/Trashbin.php index c7bef76e954..b68048e7cc9 100644 --- a/build/integration/features/bootstrap/Trashbin.php +++ b/build/integration/features/bootstrap/Trashbin.php @@ -167,4 +167,3 @@ trait Trashbin { return; } } - diff --git a/build/signed-off-checker.php b/build/signed-off-checker.php index 32deceb47b7..43cf4529476 100644 --- a/build/signed-off-checker.php +++ b/build/signed-off-checker.php @@ -127,4 +127,3 @@ if($notSignedCommits !== []) { } else { exit(0); } - diff --git a/lib/public/DirectEditing/IManager.php b/lib/public/DirectEditing/IManager.php index 33d4716fc60..e9548a91e7a 100644 --- a/lib/public/DirectEditing/IManager.php +++ b/lib/public/DirectEditing/IManager.php @@ -87,4 +87,3 @@ interface IManager { public function cleanup(): int; } - diff --git a/ocm-provider/index.php b/ocm-provider/index.php index 079ef790faa..e1aa7f2b03b 100644 --- a/ocm-provider/index.php +++ b/ocm-provider/index.php @@ -36,4 +36,3 @@ if ($isEnabled) { header($_SERVER["SERVER_PROTOCOL"]." 501 Not Implemented", true, 501); exit("501 Not Implemented"); } - -- cgit v1.2.3 From f4c09f299d989b117ebdf769632dcc6d4582791c Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Thu, 9 Apr 2020 16:14:31 +0200 Subject: Make sure there is exactly one newline after imports Signed-off-by: Christoph Wurst --- apps/files_external/templates/settings.php | 8 ++++---- apps/files_sharing/lib/Exceptions/SharingRightsException.php | 1 - apps/settings/tests/Settings/Admin/ServerTest.php | 1 - lib/private/Mail/Mailer.php | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) (limited to 'apps/files_external') diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 5ec70031214..0142b206b3e 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -1,10 +1,10 @@ t("Enable encryption"); $l->t("Enable previews"); diff --git a/apps/files_sharing/lib/Exceptions/SharingRightsException.php b/apps/files_sharing/lib/Exceptions/SharingRightsException.php index 3df5754e0a1..02d197d4034 100644 --- a/apps/files_sharing/lib/Exceptions/SharingRightsException.php +++ b/apps/files_sharing/lib/Exceptions/SharingRightsException.php @@ -25,7 +25,6 @@ namespace OCA\Files_Sharing\Exceptions; use Exception; - /** * Sharing and Resharing rights. * diff --git a/apps/settings/tests/Settings/Admin/ServerTest.php b/apps/settings/tests/Settings/Admin/ServerTest.php index 3758d8635de..d066f5c2f49 100644 --- a/apps/settings/tests/Settings/Admin/ServerTest.php +++ b/apps/settings/tests/Settings/Admin/ServerTest.php @@ -40,7 +40,6 @@ use OCP\IDBConnection; use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; - /** * @group DB */ diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index f8af68faad3..c07556b6a62 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -47,7 +47,6 @@ use OCP\Mail\IMailer; use OCP\Mail\IMessage; use OCP\Mail\Events\BeforeMessageSent; - /** * Class Mailer provides some basic functions to create a mail message that can be used in combination with * \OC\Mail\Message. -- cgit v1.2.3