@@ -109,7 +115,9 @@ $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN ||
| t('External storage')); ?> |
t('Authentication')); ?> |
t('Configuration')); ?> |
- '.$l->t('Available for').''); ?>
+ '.$l->t('Available for').'');
+} ?>
|
|
|
@@ -142,7 +150,9 @@ $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN ||
});
?>
- getDeprecateTo()) continue; // ignore deprecated backends?>
+ getDeprecateTo()) {
+ continue;
+ } // ignore deprecated backends?>
@@ -167,7 +177,9 @@ $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN ||
/>
+ value="1" />
class="hidden">
@@ -180,7 +192,9 @@ $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN ||
getDeprecateTo()): ?>
- isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
+ isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
+ print_unescaped(' checked="checked"');
+ } ?> />
diff --git a/apps/files_external/tests/Auth/AuthMechanismTest.php b/apps/files_external/tests/Auth/AuthMechanismTest.php
index dcdc8d42ae..8a4321466c 100644
--- a/apps/files_external/tests/Auth/AuthMechanismTest.php
+++ b/apps/files_external/tests/Auth/AuthMechanismTest.php
@@ -28,7 +28,6 @@ use OCA\Files_External\Lib\Backend\Backend;
use OCA\Files_External\Lib\StorageConfig;
class AuthMechanismTest extends \Test\TestCase {
-
public function testJsonSerialization() {
$mechanism = $this->getMockBuilder(AuthMechanism::class)
->setMethods(['jsonSerializeDefinition'])
@@ -82,5 +81,4 @@ class AuthMechanismTest extends \Test\TestCase {
$this->assertEquals($expectedSuccess, $mechanism->validateStorage($storageConfig));
}
-
}
diff --git a/apps/files_external/tests/Auth/Password/GlobalAuth.php b/apps/files_external/tests/Auth/Password/GlobalAuth.php
index f6e6b0b55a..8edf7358ed 100644
--- a/apps/files_external/tests/Auth/Password/GlobalAuth.php
+++ b/apps/files_external/tests/Auth/Password/GlobalAuth.php
@@ -118,5 +118,4 @@ class GlobalAuthTest extends TestCase {
$this->instance->manipulateStorageConfig($storage);
$this->assertEquals([], $storage->getBackendOptions());
}
-
}
diff --git a/apps/files_external/tests/Backend/BackendTest.php b/apps/files_external/tests/Backend/BackendTest.php
index 10853d9197..ca7cc7d7b2 100644
--- a/apps/files_external/tests/Backend/BackendTest.php
+++ b/apps/files_external/tests/Backend/BackendTest.php
@@ -28,7 +28,6 @@ use OCA\Files_External\Lib\Backend\Backend;
use OCA\Files_External\Lib\StorageConfig;
class BackendTest extends \Test\TestCase {
-
public function testJsonSerialization() {
$backend = $this->getMockBuilder(Backend::class)
->setMethods(['jsonSerializeDefinition'])
@@ -89,5 +88,4 @@ class BackendTest extends \Test\TestCase {
$this->assertEquals('foobar', $backend->getLegacyAuthMechanism(['other' => true]));
$this->assertEquals('foobar', $backend->getLegacyAuthMechanism());
}
-
}
diff --git a/apps/files_external/tests/Backend/LegacyBackendTest.php b/apps/files_external/tests/Backend/LegacyBackendTest.php
index 71957466c7..c929058c2b 100644
--- a/apps/files_external/tests/Backend/LegacyBackendTest.php
+++ b/apps/files_external/tests/Backend/LegacyBackendTest.php
@@ -111,5 +111,4 @@ class LegacyBackendTest extends \Test\TestCase {
$dependencies = $backend->checkDependencies();
$this->assertCount(0, $dependencies);
}
-
}
diff --git a/apps/files_external/tests/Config/UserPlaceholderHandlerTest.php b/apps/files_external/tests/Config/UserPlaceholderHandlerTest.php
index 443a13ecce..5fc03cad9e 100644
--- a/apps/files_external/tests/Config/UserPlaceholderHandlerTest.php
+++ b/apps/files_external/tests/Config/UserPlaceholderHandlerTest.php
@@ -98,5 +98,4 @@ class UserPlaceholderHandlerTest extends \Test\TestCase {
->willThrowException(new ShareNotFound());
$this->assertSame($option, $this->handler->handle($option));
}
-
}
diff --git a/apps/files_external/tests/Controller/StoragesControllerTest.php b/apps/files_external/tests/Controller/StoragesControllerTest.php
index 4e07751fb3..40d0154d99 100644
--- a/apps/files_external/tests/Controller/StoragesControllerTest.php
+++ b/apps/files_external/tests/Controller/StoragesControllerTest.php
@@ -403,5 +403,4 @@ abstract class StoragesControllerTest extends \Test\TestCase {
$this->assertEquals(Http::STATUS_UNPROCESSABLE_ENTITY, $response->getStatus());
}
}
-
}
diff --git a/apps/files_external/tests/Controller/UserStoragesControllerTest.php b/apps/files_external/tests/Controller/UserStoragesControllerTest.php
index 2c3da44b3b..109a033514 100644
--- a/apps/files_external/tests/Controller/UserStoragesControllerTest.php
+++ b/apps/files_external/tests/Controller/UserStoragesControllerTest.php
@@ -110,5 +110,4 @@ class UserStoragesControllerTest extends StoragesControllerTest {
$this->assertEquals(Http::STATUS_UNPROCESSABLE_ENTITY, $response->getStatus());
}
-
}
diff --git a/apps/files_external/tests/DefinitionParameterTest.php b/apps/files_external/tests/DefinitionParameterTest.php
index 862d3deb55..b0a48509d6 100644
--- a/apps/files_external/tests/DefinitionParameterTest.php
+++ b/apps/files_external/tests/DefinitionParameterTest.php
@@ -27,7 +27,6 @@ namespace OCA\Files_External\Tests;
use OCA\Files_External\Lib\DefinitionParameter as Param;
class DefinitionParameterTest extends \Test\TestCase {
-
public function testJsonSerialization() {
$param = new Param('foo', 'bar');
$this->assertEquals([
diff --git a/apps/files_external/tests/FrontendDefinitionTraitTest.php b/apps/files_external/tests/FrontendDefinitionTraitTest.php
index ad5cb90321..c4eab6f012 100644
--- a/apps/files_external/tests/FrontendDefinitionTraitTest.php
+++ b/apps/files_external/tests/FrontendDefinitionTraitTest.php
@@ -29,7 +29,6 @@ use OCA\Files_External\Lib\DefinitionParameter;
use OCA\Files_External\Lib\StorageConfig;
class FrontendDefinitionTraitTest extends \Test\TestCase {
-
public function testJsonSerialization() {
$param = $this->getMockBuilder(DefinitionParameter::class)
->disableOriginalConstructor()
diff --git a/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php b/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php
index b5c8ae3b2c..b873a18694 100644
--- a/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php
+++ b/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php
@@ -50,5 +50,4 @@ class LegacyDependencyCheckPolyfillTest extends \Test\TestCase {
$this->assertEquals('program', $dependencies[1]->getDependency());
$this->assertEquals('cannot find program', $dependencies[1]->getMessage());
}
-
}
diff --git a/apps/files_external/tests/OwnCloudFunctionsTest.php b/apps/files_external/tests/OwnCloudFunctionsTest.php
index 35c3637ecf..7ce72ce62d 100644
--- a/apps/files_external/tests/OwnCloudFunctionsTest.php
+++ b/apps/files_external/tests/OwnCloudFunctionsTest.php
@@ -35,7 +35,6 @@ namespace OCA\Files_External\Tests;
* @package OCA\Files_External\Tests
*/
class OwnCloudFunctionsTest extends \Test\TestCase {
-
function configUrlProvider() {
return [
[
diff --git a/apps/files_external/tests/Service/BackendServiceTest.php b/apps/files_external/tests/Service/BackendServiceTest.php
index 2c4587923d..0964f48572 100644
--- a/apps/files_external/tests/Service/BackendServiceTest.php
+++ b/apps/files_external/tests/Service/BackendServiceTest.php
@@ -242,7 +242,9 @@ class BackendServiceTest extends \Test\TestCase {
$service = new BackendService($this->config);
$mock = $this->createMock(IConfigHandler::class);
- $cb = function () use ($mock) { return $mock; };
+ $cb = function () use ($mock) {
+ return $mock;
+ };
foreach ($placeholders as $placeholder) {
$service->registerConfigHandler($placeholder, $cb);
}
@@ -253,7 +255,9 @@ class BackendServiceTest extends \Test\TestCase {
$mock = $this->createMock(IConfigHandler::class);
$mock->expects($this->exactly(3))
->method('handle');
- $cb = function () use ($mock) { return $mock; };
+ $cb = function () use ($mock) {
+ return $mock;
+ };
$service->registerConfigHandler('one', $cb);
$service->registerConfigHandler('2', $cb);
$service->registerConfigHandler('Three', $cb);
@@ -265,5 +269,4 @@ class BackendServiceTest extends \Test\TestCase {
$handler->handle('Something');
}
}
-
}
diff --git a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php
index bc831b1e95..b977a4b3eb 100644
--- a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php
+++ b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php
@@ -445,7 +445,6 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
$updatedApplicableUsers,
$updatedApplicableGroups,
$expectedCalls) {
-
$storage = $this->makeTestStorageData();
$storage->setApplicableUsers($sourceApplicableUsers);
$storage->setApplicableGroups($sourceApplicableGroups);
@@ -603,7 +602,6 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
$sourceApplicableUsers,
$sourceApplicableGroups,
$expectedCalls) {
-
$storage = $this->makeTestStorageData();
$storage->setApplicableUsers($sourceApplicableUsers);
$storage->setApplicableGroups($sourceApplicableGroups);
@@ -626,5 +624,4 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
);
}
}
-
}
diff --git a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
index 633399197f..c23d741b23 100644
--- a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
+++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
@@ -153,10 +153,8 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
$this->service->getStorage($newStorage->getId());
$this->fail('Failed asserting that storage can\'t be accessed by id');
} catch (NotFoundException $e) {
-
}
}
-
}
diff --git a/apps/files_external/tests/Storage/Amazons3Test.php b/apps/files_external/tests/Storage/Amazons3Test.php
index 0e9ec3dbaa..2aaeede47c 100644
--- a/apps/files_external/tests/Storage/Amazons3Test.php
+++ b/apps/files_external/tests/Storage/Amazons3Test.php
@@ -38,7 +38,6 @@ use OCA\Files_External\Lib\Storage\AmazonS3;
* @package OCA\Files_External\Tests\Storage
*/
class Amazons3Test extends \Test\Files\Storage\Storage {
-
private $config;
protected function setUp(): void {
diff --git a/apps/files_external/tests/Storage/OwncloudTest.php b/apps/files_external/tests/Storage/OwncloudTest.php
index 0f63709614..6a07bcf498 100644
--- a/apps/files_external/tests/Storage/OwncloudTest.php
+++ b/apps/files_external/tests/Storage/OwncloudTest.php
@@ -37,7 +37,6 @@ use OCA\Files_External\Lib\Storage\OwnCloud;
* @package OCA\Files_External\Tests\Storage
*/
class OwncloudTest extends \Test\Files\Storage\Storage {
-
private $config;
protected function setUp(): void {
diff --git a/apps/files_external/tests/Storage/SwiftTest.php b/apps/files_external/tests/Storage/SwiftTest.php
index 1300aa0303..d90608a288 100644
--- a/apps/files_external/tests/Storage/SwiftTest.php
+++ b/apps/files_external/tests/Storage/SwiftTest.php
@@ -39,7 +39,6 @@ use OCA\Files_External\Lib\Storage\Swift;
* @package OCA\Files_External\Tests\Storage
*/
class SwiftTest extends \Test\Files\Storage\Storage {
-
private $config;
/**
diff --git a/apps/files_external/tests/Storage/WebdavTest.php b/apps/files_external/tests/Storage/WebdavTest.php
index 88e2d4a018..03b1d41eae 100644
--- a/apps/files_external/tests/Storage/WebdavTest.php
+++ b/apps/files_external/tests/Storage/WebdavTest.php
@@ -39,7 +39,6 @@ use OC\Files\Type\Detection;
* @package OCA\Files_External\Tests\Storage
*/
class WebdavTest extends \Test\Files\Storage\Storage {
-
protected function setUp(): void {
parent::setUp();
diff --git a/apps/files_external/tests/StorageConfigTest.php b/apps/files_external/tests/StorageConfigTest.php
index 01dab4d95a..2f0a8fdba5 100644
--- a/apps/files_external/tests/StorageConfigTest.php
+++ b/apps/files_external/tests/StorageConfigTest.php
@@ -32,7 +32,6 @@ use OCA\Files_External\Lib\DefinitionParameter;
use OCA\Files_External\Lib\StorageConfig;
class StorageConfigTest extends \Test\TestCase {
-
public function testJsonSerialization() {
$backend = $this->getMockBuilder(Backend::class)
->disableOriginalConstructor()
@@ -81,5 +80,4 @@ class StorageConfigTest extends \Test\TestCase {
$this->assertSame(['group1', 'group2'], $json['applicableGroups']);
$this->assertSame(['preview' => false], $json['mountOptions']);
}
-
}
diff --git a/apps/files_sharing/lib/Activity/Providers/Downloads.php b/apps/files_sharing/lib/Activity/Providers/Downloads.php
index 91ad8322e6..23c55e08a2 100644
--- a/apps/files_sharing/lib/Activity/Providers/Downloads.php
+++ b/apps/files_sharing/lib/Activity/Providers/Downloads.php
@@ -26,8 +26,6 @@ namespace OCA\Files_Sharing\Activity\Providers;
use OCP\Activity\IEvent;
class Downloads extends Base {
-
-
const SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED = 'public_shared_file_downloaded';
const SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED = 'public_shared_folder_downloaded';
diff --git a/apps/files_sharing/lib/Activity/Providers/Groups.php b/apps/files_sharing/lib/Activity/Providers/Groups.php
index 70e3c177e6..c6115a8dba 100644
--- a/apps/files_sharing/lib/Activity/Providers/Groups.php
+++ b/apps/files_sharing/lib/Activity/Providers/Groups.php
@@ -35,7 +35,6 @@ use OCP\IUserManager;
use OCP\L10N\IFactory;
class Groups extends Base {
-
const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self';
const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by';
diff --git a/apps/files_sharing/lib/Activity/Providers/PublicLinks.php b/apps/files_sharing/lib/Activity/Providers/PublicLinks.php
index 97fc66eaf6..0ebe6cdec0 100644
--- a/apps/files_sharing/lib/Activity/Providers/PublicLinks.php
+++ b/apps/files_sharing/lib/Activity/Providers/PublicLinks.php
@@ -26,7 +26,6 @@ namespace OCA\Files_Sharing\Activity\Providers;
use OCP\Activity\IEvent;
class PublicLinks extends Base {
-
const SUBJECT_SHARED_LINK_SELF = 'shared_link_self';
const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self';
@@ -55,7 +54,6 @@ class PublicLinks extends Base {
$subject = $this->l->t('{actor} removed public link');
} elseif ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
$subject = $this->l->t('Public link of {actor} expired');
-
} else {
throw new \InvalidArgumentException();
}
@@ -91,7 +89,6 @@ class PublicLinks extends Base {
$subject = $this->l->t('{actor} removed public link for {file}');
} elseif ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
$subject = $this->l->t('Public link of {actor} for {file} expired');
-
} else {
throw new \InvalidArgumentException();
}
@@ -127,5 +124,4 @@ class PublicLinks extends Base {
}
return [];
}
-
}
diff --git a/apps/files_sharing/lib/Activity/Providers/RemoteShares.php b/apps/files_sharing/lib/Activity/Providers/RemoteShares.php
index b56100b6be..2604288d44 100644
--- a/apps/files_sharing/lib/Activity/Providers/RemoteShares.php
+++ b/apps/files_sharing/lib/Activity/Providers/RemoteShares.php
@@ -33,7 +33,6 @@ use OCP\IUserManager;
use OCP\L10N\IFactory;
class RemoteShares extends Base {
-
const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted';
const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined';
const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received';
diff --git a/apps/files_sharing/lib/Activity/Providers/Users.php b/apps/files_sharing/lib/Activity/Providers/Users.php
index 4274e55189..aff5feddc0 100644
--- a/apps/files_sharing/lib/Activity/Providers/Users.php
+++ b/apps/files_sharing/lib/Activity/Providers/Users.php
@@ -28,8 +28,6 @@ namespace OCA\Files_Sharing\Activity\Providers;
use OCP\Activity\IEvent;
class Users extends Base {
-
-
const SUBJECT_SHARED_USER_SELF = 'shared_user_self';
const SUBJECT_RESHARED_USER_BY = 'reshared_user_by';
const SUBJECT_UNSHARED_USER_SELF = 'unshared_user_self';
@@ -115,7 +113,6 @@ class Users extends Base {
$subject = $this->l->t('Share for file {file} with {user} expired');
} elseif ($event->getSubject() === self::SUBJECT_EXPIRED) {
$subject = $this->l->t('Share for file {file} expired');
-
} else {
throw new \InvalidArgumentException();
}
diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php
index 2539b43659..2902b820af 100644
--- a/apps/files_sharing/lib/AppInfo/Application.php
+++ b/apps/files_sharing/lib/AppInfo/Application.php
@@ -65,7 +65,6 @@ use OCP\Util;
use Symfony\Component\EventDispatcher\GenericEvent;
class Application extends App {
-
const APP_ID = 'files_sharing';
public function __construct(array $urlParams = []) {
diff --git a/apps/files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob.php b/apps/files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob.php
index 30530f15a5..41f1d36ccf 100644
--- a/apps/files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob.php
+++ b/apps/files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob.php
@@ -51,7 +51,7 @@ class FederatedSharesDiscoverJob extends TimedJob {
->from('share_external');
$result = $qb->execute();
- while($row = $result->fetch()) {
+ while ($row = $result->fetch()) {
$this->discoveryService->discover($row['remote'], 'FEDERATED_SHARING', true);
}
$result->closeCursor();
diff --git a/apps/files_sharing/lib/Collaboration/ShareRecipientSorter.php b/apps/files_sharing/lib/Collaboration/ShareRecipientSorter.php
index 6dc0e06d6c..f5eff5be0c 100644
--- a/apps/files_sharing/lib/Collaboration/ShareRecipientSorter.php
+++ b/apps/files_sharing/lib/Collaboration/ShareRecipientSorter.php
@@ -51,23 +51,23 @@ class ShareRecipientSorter implements ISorter {
public function sort(array &$sortArray, array $context) {
// let's be tolerant. Comments uses "files" by default, other usages are often singular
- if($context['itemType'] !== 'files' && $context['itemType'] !== 'file') {
+ if ($context['itemType'] !== 'files' && $context['itemType'] !== 'file') {
return;
}
$user = $this->userSession->getUser();
- if($user === null) {
+ if ($user === null) {
return;
}
$userFolder = $this->rootFolder->getUserFolder($user->getUID());
/** @var Node[] $nodes */
$nodes = $userFolder->getById((int)$context['itemId']);
- if(count($nodes) === 0) {
+ if (count($nodes) === 0) {
return;
}
$al = $this->shareManager->getAccessList($nodes[0]);
foreach ($sortArray as $type => &$byType) {
- if(!isset($al[$type]) || !is_array($al[$type])) {
+ if (!isset($al[$type]) || !is_array($al[$type])) {
continue;
}
@@ -80,7 +80,7 @@ class ShareRecipientSorter implements ISorter {
usort($workArray, function ($a, $b) use ($al, $type) {
$result = $this->compare($a[1], $b[1], $al[$type]);
- if($result === 0) {
+ if ($result === 0) {
$result = $a[0] - $b[0];
}
return $result;
diff --git a/apps/files_sharing/lib/Command/CleanupRemoteStorages.php b/apps/files_sharing/lib/Command/CleanupRemoteStorages.php
index 309f882e65..2eb79f8776 100644
--- a/apps/files_sharing/lib/Command/CleanupRemoteStorages.php
+++ b/apps/files_sharing/lib/Command/CleanupRemoteStorages.php
@@ -60,7 +60,6 @@ class CleanupRemoteStorages extends Command {
}
public function execute(InputInterface $input, OutputInterface $output) {
-
$remoteStorages = $this->getRemoteStorages();
$output->writeln(count($remoteStorages) . ' remote storage(s) need(s) to be checked');
@@ -138,7 +137,6 @@ class CleanupRemoteStorages extends Command {
}
public function getRemoteStorages() {
-
$queryBuilder = $this->connection->getQueryBuilder();
$queryBuilder->select(['id', 'numeric_id'])
->from('storages')
@@ -166,7 +164,6 @@ class CleanupRemoteStorages extends Command {
}
public function getRemoteShareIds() {
-
$queryBuilder = $this->connection->getQueryBuilder();
$queryBuilder->select(['id', 'share_token', 'remote'])
->from('share_external');
diff --git a/apps/files_sharing/lib/Command/ExiprationNotification.php b/apps/files_sharing/lib/Command/ExiprationNotification.php
index e228975a9b..6fd04bcdcc 100644
--- a/apps/files_sharing/lib/Command/ExiprationNotification.php
+++ b/apps/files_sharing/lib/Command/ExiprationNotification.php
@@ -95,6 +95,4 @@ class ExiprationNotification extends Command {
$this->notificationManager->notify($notification);
}
}
-
-
}
diff --git a/apps/files_sharing/lib/Controller/DeletedShareAPIController.php b/apps/files_sharing/lib/Controller/DeletedShareAPIController.php
index fc58b5d120..89a5e0e02a 100644
--- a/apps/files_sharing/lib/Controller/DeletedShareAPIController.php
+++ b/apps/files_sharing/lib/Controller/DeletedShareAPIController.php
@@ -93,7 +93,6 @@ class DeletedShareAPIController extends OCSController {
* @suppress PhanUndeclaredClassMethod
*/
private function formatShare(IShare $share): array {
-
$result = [
'id' => $share->getFullId(),
'share_type' => $share->getShareType(),
@@ -154,7 +153,6 @@ class DeletedShareAPIController extends OCSController {
}
return $result;
-
}
/**
diff --git a/apps/files_sharing/lib/Controller/ExternalSharesController.php b/apps/files_sharing/lib/Controller/ExternalSharesController.php
index 0a26f8f9f5..c5dd21cda3 100644
--- a/apps/files_sharing/lib/Controller/ExternalSharesController.php
+++ b/apps/files_sharing/lib/Controller/ExternalSharesController.php
@@ -151,5 +151,4 @@ class ExternalSharesController extends Controller {
return new DataResponse(false);
}
}
-
}
diff --git a/apps/files_sharing/lib/Controller/PublicPreviewController.php b/apps/files_sharing/lib/Controller/PublicPreviewController.php
index d0c2296f0d..0e58057351 100644
--- a/apps/files_sharing/lib/Controller/PublicPreviewController.php
+++ b/apps/files_sharing/lib/Controller/PublicPreviewController.php
@@ -96,7 +96,6 @@ class PublicPreviewController extends PublicShareController {
int $y = 32,
$a = false
) {
-
if ($token === '' || $x === 0 || $y === 0) {
return new DataResponse([], Http::STATUS_BAD_REQUEST);
}
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
index 40a9a387dd..37dc76faaa 100644
--- a/apps/files_sharing/lib/Controller/ShareAPIController.php
+++ b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -270,7 +270,8 @@ class ShareAPIController extends OCSController {
try {
$result = array_merge($result, $this->getRoomShareHelper()->formatShare($share));
- } catch (QueryException $e) {}
+ } catch (QueryException $e) {
+ }
}
@@ -594,7 +595,6 @@ class ShareAPIController extends OCSController {
* @return array
*/
private function getSharedWithMe($node, bool $includeTags): array {
-
$userShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $node, -1, 0);
$groupShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $node, -1, 0);
$circleShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_CIRCLE, $node, -1, 0);
@@ -709,7 +709,6 @@ class ShareAPIController extends OCSController {
string $path = '',
string $include_tags = 'false'
): DataResponse {
-
$node = null;
if ($path !== '') {
$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
@@ -754,7 +753,6 @@ class ShareAPIController extends OCSController {
string $viewer, $node = null, bool $sharedWithMe = false, bool $reShares = false,
bool $subFiles = false, bool $includeTags = false
): array {
-
if ($sharedWithMe) {
return $this->getSharedWithMe($node, $includeTags);
}
@@ -1463,7 +1461,6 @@ class ShareAPIController extends OCSController {
* @return IShare[]
*/
private function getSharesFromNode(string $viewer, $node, bool $reShares): array {
-
$providers = [
Share::SHARE_TYPE_USER,
Share::SHARE_TYPE_GROUP,
@@ -1580,7 +1577,6 @@ class ShareAPIController extends OCSController {
if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE && \OC::$server->getAppManager()->isEnabledForUser('circles')
&& class_exists('\OCA\Circles\Api\v1\Circles')) {
-
$hasCircleId = (substr($share->getSharedWith(), -1) === ']');
$shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
$shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
@@ -1655,5 +1651,4 @@ class ShareAPIController extends OCSController {
}
}
}
-
}
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index 48914e2777..2ea57068f2 100644
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -250,7 +250,7 @@ class ShareController extends AuthPublicShareController {
$itemType = $itemSource = $uidOwner = '';
$token = $share;
$exception = null;
- if($share instanceof \OCP\Share\IShare) {
+ if ($share instanceof \OCP\Share\IShare) {
try {
$token = $share->getToken();
$uidOwner = $share->getSharedBy();
@@ -269,7 +269,7 @@ class ShareController extends AuthPublicShareController {
'errorCode' => $errorCode,
'errorMessage' => $errorMessage,
]);
- if(!is_null($exception)) {
+ if (!is_null($exception)) {
throw $exception;
}
}
@@ -366,7 +366,6 @@ class ShareController extends AuthPublicShareController {
$hideFileList = false;
if ($shareNode instanceof \OCP\Files\Folder) {
-
$shareIsFolder = true;
try {
@@ -553,7 +552,7 @@ class ShareController extends AuthPublicShareController {
$share = $this->shareManager->getShareByToken($token);
- if(!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
+ if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
return new \OCP\AppFramework\Http\DataResponse('Share is read-only');
}
@@ -676,7 +675,6 @@ class ShareController extends AuthPublicShareController {
$subNode = $node->get($file);
$this->singleFileDownloaded($share, $subNode);
}
-
}
/**
@@ -738,7 +736,6 @@ class ShareController extends AuthPublicShareController {
$affectedUser,
$fileId,
$filePath) {
-
$event = $this->activityManager->generateEvent();
$event->setApp('files_sharing')
->setType('public_links')
@@ -747,6 +744,4 @@ class ShareController extends AuthPublicShareController {
->setObject('files', $fileId, $filePath);
$this->activityManager->publish($event);
}
-
-
}
diff --git a/apps/files_sharing/lib/Controller/ShareInfoController.php b/apps/files_sharing/lib/Controller/ShareInfoController.php
index 31f98f91c0..315a562abe 100644
--- a/apps/files_sharing/lib/Controller/ShareInfoController.php
+++ b/apps/files_sharing/lib/Controller/ShareInfoController.php
@@ -88,7 +88,6 @@ class ShareInfoController extends ApiController {
try {
$node = $node->get($dir);
} catch (NotFoundException $e) {
-
}
}
diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php
index a8cd219662..557a92d0fc 100644
--- a/apps/files_sharing/lib/Controller/ShareesAPIController.php
+++ b/apps/files_sharing/lib/Controller/ShareesAPIController.php
@@ -212,7 +212,7 @@ class ShareesAPIController extends OCSController {
list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
// extra treatment for 'exact' subarray, with a single merge expected keys might be lost
- if(isset($result['exact'])) {
+ if (isset($result['exact'])) {
$result['exact'] = array_merge($this->result['exact'], $result['exact']);
}
$this->result = array_merge($this->result, $result);
diff --git a/apps/files_sharing/lib/DeleteOrphanedSharesJob.php b/apps/files_sharing/lib/DeleteOrphanedSharesJob.php
index 33267a94c4..8438b6ac4f 100644
--- a/apps/files_sharing/lib/DeleteOrphanedSharesJob.php
+++ b/apps/files_sharing/lib/DeleteOrphanedSharesJob.php
@@ -62,5 +62,4 @@ class DeleteOrphanedSharesJob extends TimedJob {
$deletedEntries = $connection->executeUpdate($sql);
$logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
}
-
}
diff --git a/apps/files_sharing/lib/Exceptions/SharingRightsException.php b/apps/files_sharing/lib/Exceptions/SharingRightsException.php
index 02d197d403..db346774bd 100644
--- a/apps/files_sharing/lib/Exceptions/SharingRightsException.php
+++ b/apps/files_sharing/lib/Exceptions/SharingRightsException.php
@@ -33,5 +33,4 @@ use Exception;
* @package OCA\Files_Sharing\Exceptions
*/
class SharingRightsException extends Exception {
-
}
diff --git a/apps/files_sharing/lib/ExpireSharesJob.php b/apps/files_sharing/lib/ExpireSharesJob.php
index ef90a04dba..19684ec896 100644
--- a/apps/files_sharing/lib/ExpireSharesJob.php
+++ b/apps/files_sharing/lib/ExpireSharesJob.php
@@ -68,10 +68,9 @@ class ExpireSharesJob extends TimedJob {
);
$shares = $qb->execute();
- while($share = $shares->fetch()) {
+ while ($share = $shares->fetch()) {
\OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
}
$shares->closeCursor();
}
-
}
diff --git a/apps/files_sharing/lib/External/Manager.php b/apps/files_sharing/lib/External/Manager.php
index ee547ce911..3923fdf09d 100644
--- a/apps/files_sharing/lib/External/Manager.php
+++ b/apps/files_sharing/lib/External/Manager.php
@@ -151,12 +151,11 @@ class Manager {
* @throws \Doctrine\DBAL\DBALException
*/
public function addShare($remote, $token, $password, $name, $owner, $shareType, $accepted=false, $user = null, $remoteId = -1, $parent = -1) {
-
$user = $user ? $user : $this->uid;
$accepted = $accepted ? IShare::STATUS_ACCEPTED : IShare::STATUS_PENDING;
$name = Filesystem::normalizePath('/' . $name);
- if ($accepted !== IShare::STATUS_ACCEPTED) {
+ if ($accepted !== IShare::STATUS_ACCEPTED) {
// To avoid conflicts with the mount point generation later,
// we only use a temporary mount point name here. The real
// mount point name will be generated when accepting the share,
@@ -258,7 +257,6 @@ class Manager {
}
return false;
-
}
/**
@@ -268,7 +266,6 @@ class Manager {
* @return bool True if the share could be accepted, false otherwise
*/
public function acceptShare($id) {
-
$share = $this->getShare($id);
$result = false;
@@ -280,7 +277,7 @@ class Manager {
$hash = md5($mountPoint);
$userShareAccepted = false;
- if((int)$share['share_type'] === Share::SHARE_TYPE_USER) {
+ if ((int)$share['share_type'] === Share::SHARE_TYPE_USER) {
$acceptShare = $this->connection->prepare('
UPDATE `*PREFIX*share_external`
SET `accepted` = ?,
@@ -321,7 +318,6 @@ class Manager {
* @return bool True if the share could be declined, false otherwise
*/
public function declineShare($id) {
-
$share = $this->getShare($id);
$result = false;
@@ -374,10 +370,9 @@ class Manager {
* @return boolean
*/
private function sendFeedbackToRemote($remote, $token, $remoteId, $feedback) {
-
$result = $this->tryOCMEndPoint($remote, $token, $remoteId, $feedback);
- if($result === true) {
+ if ($result === true) {
return true;
}
@@ -446,7 +441,6 @@ class Manager {
}
return false;
-
}
@@ -509,7 +503,6 @@ class Manager {
}
public function removeShare($mountPoint) {
-
$mountPointObj = $this->mountManager->find($mountPoint);
$id = $mountPointObj->getStorage()->getCache()->getId('');
@@ -545,7 +538,7 @@ class Manager {
$result = (bool)$query->execute([0, (int)$share['id']]);
}
- if($result) {
+ if ($result) {
$this->removeReShares($id);
}
@@ -590,7 +583,7 @@ class Manager {
if ($result) {
$shares = $getShare->fetchAll();
- foreach($shares as $share) {
+ foreach ($shares as $share) {
$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
}
}
diff --git a/apps/files_sharing/lib/External/Scanner.php b/apps/files_sharing/lib/External/Scanner.php
index afa8687d28..8962bb68c0 100644
--- a/apps/files_sharing/lib/External/Scanner.php
+++ b/apps/files_sharing/lib/External/Scanner.php
@@ -37,7 +37,7 @@ class Scanner extends \OC\Files\Cache\Scanner {
/** {@inheritDoc} */
public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
- if(!$this->storage->remoteIsOwnCloud()) {
+ if (!$this->storage->remoteIsOwnCloud()) {
return parent::scan($path, $recursive, $recursive, $lock);
}
diff --git a/apps/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php
index 1390c0a4f5..0d5f620ddf 100644
--- a/apps/files_sharing/lib/External/Storage.php
+++ b/apps/files_sharing/lib/External/Storage.php
@@ -266,7 +266,7 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage {
*/
private function testRemoteUrl($url) {
$cache = $this->memcacheFactory->createDistributed('files_sharing_remote_url');
- if($cache->hasKey($url)) {
+ if ($cache->hasKey($url)) {
return (bool)$cache->get($url);
}
@@ -297,7 +297,7 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage {
* @return bool
*/
public function remoteIsOwnCloud() {
- if(defined('PHPUNIT_RUN') || !$this->testRemoteUrl($this->getRemote() . '/status.php')) {
+ if (defined('PHPUNIT_RUN') || !$this->testRemoteUrl($this->getRemote() . '/status.php')) {
return false;
}
return true;
@@ -315,7 +315,7 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage {
$password = $this->getPassword();
// If remote is not an ownCloud do not try to get any share info
- if(!$this->remoteIsOwnCloud()) {
+ if (!$this->remoteIsOwnCloud()) {
return ['status' => 'unsupported'];
}
@@ -387,7 +387,7 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage {
try {
$ocmPermissions = json_decode($ocmPermissions);
$ncPermissions = 0;
- foreach($ocmPermissions as $permission) {
+ foreach ($ocmPermissions as $permission) {
switch (strtolower($permission)) {
case 'read':
$ncPermissions += Constants::PERMISSION_READ;
diff --git a/apps/files_sharing/lib/Helper.php b/apps/files_sharing/lib/Helper.php
index 3efb4e25ee..d3c6deeec2 100644
--- a/apps/files_sharing/lib/Helper.php
+++ b/apps/files_sharing/lib/Helper.php
@@ -31,7 +31,6 @@ use OC\Files\Filesystem;
use OC\Files\View;
class Helper {
-
public static function registerHooks() {
\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
@@ -86,7 +85,6 @@ class Helper {
}
return $shareFolder;
-
}
/**
@@ -97,5 +95,4 @@ class Helper {
public static function setShareFolder($shareFolder) {
\OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder);
}
-
}
diff --git a/apps/files_sharing/lib/Hooks.php b/apps/files_sharing/lib/Hooks.php
index 9b547ea295..a37a497f2b 100644
--- a/apps/files_sharing/lib/Hooks.php
+++ b/apps/files_sharing/lib/Hooks.php
@@ -30,7 +30,6 @@ namespace OCA\Files_Sharing;
use OC\Files\Filesystem;
class Hooks {
-
public static function deleteUser($params) {
$manager = new External\Manager(
\OC::$server->getDatabaseConnection(),
diff --git a/apps/files_sharing/lib/ISharedStorage.php b/apps/files_sharing/lib/ISharedStorage.php
index 2f0888589c..0b7444deb0 100644
--- a/apps/files_sharing/lib/ISharedStorage.php
+++ b/apps/files_sharing/lib/ISharedStorage.php
@@ -23,6 +23,5 @@
namespace OCA\Files_Sharing;
-interface ISharedStorage{
-
+interface ISharedStorage {
}
diff --git a/apps/files_sharing/lib/Listener/LoadSidebarListener.php b/apps/files_sharing/lib/Listener/LoadSidebarListener.php
index ba2ce54eeb..636a8c7757 100644
--- a/apps/files_sharing/lib/Listener/LoadSidebarListener.php
+++ b/apps/files_sharing/lib/Listener/LoadSidebarListener.php
@@ -40,5 +40,4 @@ class LoadSidebarListener implements IEventListener {
Util::addScript(Application::APP_ID, 'dist/files_sharing_tab');
}
-
}
diff --git a/apps/files_sharing/lib/Listener/ShareInteractionListener.php b/apps/files_sharing/lib/Listener/ShareInteractionListener.php
index 0e409773e5..e698d16d82 100644
--- a/apps/files_sharing/lib/Listener/ShareInteractionListener.php
+++ b/apps/files_sharing/lib/Listener/ShareInteractionListener.php
@@ -37,7 +37,6 @@ use OCP\Share\IShare;
use function in_array;
class ShareInteractionListener implements IEventListener {
-
private const SUPPORTED_SHARE_TYPES = [
IShare::TYPE_USER,
IShare::TYPE_EMAIL,
@@ -92,5 +91,4 @@ class ShareInteractionListener implements IEventListener {
$this->dispatcher->dispatchTyped($interactionEvent);
}
-
}
diff --git a/apps/files_sharing/lib/Listener/UserAddedToGroupListener.php b/apps/files_sharing/lib/Listener/UserAddedToGroupListener.php
index a1a20ad5f4..623591da31 100644
--- a/apps/files_sharing/lib/Listener/UserAddedToGroupListener.php
+++ b/apps/files_sharing/lib/Listener/UserAddedToGroupListener.php
@@ -80,5 +80,4 @@ class UserAddedToGroupListener implements IEventListener {
$acceptDefault = $this->config->getUserValue($userId, Application::APP_ID, 'default_accept', $defaultAcceptSystemConfig) === 'yes';
return (!$this->config->getSystemValueBool('sharing.force_share_accept', false) && $acceptDefault);
}
-
}
diff --git a/apps/files_sharing/lib/Listener/UserShareAcceptanceListener.php b/apps/files_sharing/lib/Listener/UserShareAcceptanceListener.php
index 758138bb7f..ec7bc5b86f 100644
--- a/apps/files_sharing/lib/Listener/UserShareAcceptanceListener.php
+++ b/apps/files_sharing/lib/Listener/UserShareAcceptanceListener.php
@@ -72,7 +72,6 @@ class UserShareAcceptanceListener implements IEventListener {
$this->handleAutoAccept($share, $user->getUID());
}
}
-
}
private function handleAutoAccept(IShare $share, string $userId) {
@@ -82,5 +81,4 @@ class UserShareAcceptanceListener implements IEventListener {
$this->shareManager->acceptShare($share, $userId);
}
}
-
}
diff --git a/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php b/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php
index 63a67bb5b4..24f1899a31 100644
--- a/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php
+++ b/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php
@@ -93,7 +93,7 @@ class SharingCheckMiddleware extends Middleware {
* @throws ShareNotFound
*/
public function beforeController($controller, $methodName) {
- if(!$this->isSharingEnabled()) {
+ if (!$this->isSharingEnabled()) {
throw new NotFoundException('Sharing is disabled.');
}
@@ -113,7 +113,7 @@ class SharingCheckMiddleware extends Middleware {
* @throws \Exception
*/
public function afterException($controller, $methodName, \Exception $exception) {
- if(is_a($exception, NotFoundException::class)) {
+ if (is_a($exception, NotFoundException::class)) {
return new NotFoundResponse();
}
@@ -129,7 +129,6 @@ class SharingCheckMiddleware extends Middleware {
* @return bool
*/
private function externalSharesChecks() {
-
if (!$this->reflector->hasAnnotation('NoIncomingFederatedSharingRequired') &&
$this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') !== 'yes') {
return false;
@@ -150,13 +149,10 @@ class SharingCheckMiddleware extends Middleware {
private function isSharingEnabled() {
// FIXME: This check is done here since the route is globally defined and not inside the files_sharing app
// Check whether the sharing application is enabled
- if(!$this->appManager->isEnabledForUser($this->appName)) {
+ if (!$this->appManager->isEnabledForUser($this->appName)) {
return false;
}
return true;
}
-
-
-
}
diff --git a/apps/files_sharing/lib/Migration/OwncloudGuestShareType.php b/apps/files_sharing/lib/Migration/OwncloudGuestShareType.php
index 9b0fee38ba..237c6aca24 100644
--- a/apps/files_sharing/lib/Migration/OwncloudGuestShareType.php
+++ b/apps/files_sharing/lib/Migration/OwncloudGuestShareType.php
@@ -79,5 +79,4 @@ class OwncloudGuestShareType implements IRepairStep {
return $appVersion === '0.10.0' ||
$this->config->getAppValue('core', 'vendor', '') === 'owncloud';
}
-
}
diff --git a/apps/files_sharing/lib/Migration/SetAcceptedStatus.php b/apps/files_sharing/lib/Migration/SetAcceptedStatus.php
index a48ca8fa6a..386f7299d4 100644
--- a/apps/files_sharing/lib/Migration/SetAcceptedStatus.php
+++ b/apps/files_sharing/lib/Migration/SetAcceptedStatus.php
@@ -77,5 +77,4 @@ class SetAcceptedStatus implements IRepairStep {
$appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
return version_compare($appVersion, '1.10.1', '<');
}
-
}
diff --git a/apps/files_sharing/lib/Migration/SetPasswordColumn.php b/apps/files_sharing/lib/Migration/SetPasswordColumn.php
index a666aa4dd3..5580bd46a5 100644
--- a/apps/files_sharing/lib/Migration/SetPasswordColumn.php
+++ b/apps/files_sharing/lib/Migration/SetPasswordColumn.php
@@ -86,12 +86,10 @@ class SetPasswordColumn implements IRepairStep {
->where($clearQuery->expr()->eq('share_type', $clearQuery->createNamedParameter(Share::SHARE_TYPE_LINK)));
$clearQuery->execute();
-
}
protected function shouldRun() {
$appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
return version_compare($appVersion, '1.4.0', '<');
}
-
}
diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php
index dd880d1330..c318d18ed8 100644
--- a/apps/files_sharing/lib/MountProvider.php
+++ b/apps/files_sharing/lib/MountProvider.php
@@ -74,7 +74,6 @@ class MountProvider implements IMountProvider {
* @return \OCP\Files\Mount\IMountPoint[]
*/
public function getMountsForUser(IUser $user, IStorageFactory $storageFactory) {
-
$shares = $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_USER, null, -1);
$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_GROUP, null, -1));
$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_CIRCLE, null, -1));
diff --git a/apps/files_sharing/lib/Notification/Notifier.php b/apps/files_sharing/lib/Notification/Notifier.php
index 07c4188291..6db19d3bd5 100644
--- a/apps/files_sharing/lib/Notification/Notifier.php
+++ b/apps/files_sharing/lib/Notification/Notifier.php
@@ -149,7 +149,6 @@ class Notifier implements INotifier {
}
protected function parseShareInvitation(IShare $share, INotification $notification, IL10N $l): INotification {
-
if ($share->getShareType() === IShare::TYPE_USER) {
if ($share->getStatus() !== IShare::STATUS_PENDING) {
throw new AlreadyProcessedException();
diff --git a/apps/files_sharing/lib/Settings/Personal.php b/apps/files_sharing/lib/Settings/Personal.php
index 3e83869a58..bfca0b46e0 100644
--- a/apps/files_sharing/lib/Settings/Personal.php
+++ b/apps/files_sharing/lib/Settings/Personal.php
@@ -64,5 +64,4 @@ class Personal implements ISettings {
public function getPriority(): int {
return 90;
}
-
}
diff --git a/apps/files_sharing/lib/ShareBackend/File.php b/apps/files_sharing/lib/ShareBackend/File.php
index fdbd0da96a..2db6c374c8 100644
--- a/apps/files_sharing/lib/ShareBackend/File.php
+++ b/apps/files_sharing/lib/ShareBackend/File.php
@@ -37,7 +37,6 @@ namespace OCA\Files_Sharing\ShareBackend;
use OCA\FederatedFileSharing\FederatedShareProvider;
class File implements \OCP\Share_Backend_File_Dependent {
-
const FORMAT_SHARED_STORAGE = 0;
const FORMAT_GET_FOLDER_CONTENTS = 1;
const FORMAT_FILE_APP_ROOT = 2;
diff --git a/apps/files_sharing/lib/ShareBackend/Folder.php b/apps/files_sharing/lib/ShareBackend/Folder.php
index 7713c8b6b1..c51740cd6d 100644
--- a/apps/files_sharing/lib/ShareBackend/Folder.php
+++ b/apps/files_sharing/lib/ShareBackend/Folder.php
@@ -109,7 +109,6 @@ class Folder extends File implements \OCP\Share_Backend_Collection {
$mimetype = -1;
}
while (!empty($parents)) {
-
$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
$parents = array_map(function ($parent) use ($qb) {
@@ -136,5 +135,4 @@ class Folder extends File implements \OCP\Share_Backend_Collection {
}
return $children;
}
-
}
diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php
index 91f3c39ba0..487011584c 100644
--- a/apps/files_sharing/lib/SharedMount.php
+++ b/apps/files_sharing/lib/SharedMount.php
@@ -89,7 +89,6 @@ class SharedMount extends MountPoint implements MoveableMount {
* @return string
*/
private function verifyMountPoint(\OCP\Share\IShare $share, array $mountpoints, CappedMemoryCache $folderExistCache) {
-
$mountPoint = basename($share->getTarget());
$parent = dirname($share->getTarget());
@@ -193,7 +192,6 @@ class SharedMount extends MountPoint implements MoveableMount {
* @return bool
*/
public function moveMount($target) {
-
$relTargetPath = $this->stripUserFilesPath($target);
$share = $this->storage->getShare();
diff --git a/apps/files_sharing/lib/Updater.php b/apps/files_sharing/lib/Updater.php
index 652ff17188..828453be76 100644
--- a/apps/files_sharing/lib/Updater.php
+++ b/apps/files_sharing/lib/Updater.php
@@ -91,7 +91,6 @@ class Updater {
* @param string $newPath new path relative to data/user/files
*/
static private function renameChildren($oldPath, $newPath) {
-
$absNewPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath);
$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath);
@@ -105,5 +104,4 @@ class Updater {
}
}
}
-
}
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 5c462b51aa..751303e810 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -50,7 +50,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
checked="checked" />
+ checked="checked" />
diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php
index b8d5a21a73..2d262a0104 100644
--- a/apps/files_sharing/tests/ApiTest.php
+++ b/apps/files_sharing/tests/ApiTest.php
@@ -53,7 +53,6 @@ use OCP\Share\IShare;
* TODO: convert to real intergration tests
*/
class ApiTest extends TestCase {
-
const TEST_FOLDER_NAME = '/folder_share_api_test';
const APP_NAME = 'files_sharing';
@@ -91,7 +90,7 @@ class ApiTest extends TestCase {
}
protected function tearDown(): void {
- if($this->view instanceof \OC\Files\View) {
+ if ($this->view instanceof \OC\Files\View) {
$this->view->unlink($this->filename);
$this->view->deleteAll($this->folder);
}
@@ -163,7 +162,6 @@ class ApiTest extends TestCase {
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1);
$ocs->deleteShare($data['id']);
$ocs->cleanup();
-
}
@@ -197,7 +195,6 @@ class ApiTest extends TestCase {
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1);
$ocs->deleteShare($data['id']);
$ocs->cleanup();
-
}
public function testCreateShareLink() {
@@ -249,7 +246,6 @@ class ApiTest extends TestCase {
}
function testEnforceLinkPassword() {
-
$password = md5(time());
$config = \OC::$server->getConfig();
$config->setAppValue('core', 'shareapi_enforce_links_password', 'yes');
@@ -259,7 +255,6 @@ class ApiTest extends TestCase {
$ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK);
$this->fail();
} catch (OCSForbiddenException $e) {
-
}
$ocs->cleanup();
@@ -268,7 +263,6 @@ class ApiTest extends TestCase {
$ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK, null, 'false', '');
$this->fail();
} catch (OCSForbiddenException $e) {
-
}
$ocs->cleanup();
@@ -290,7 +284,6 @@ class ApiTest extends TestCase {
$ocs->updateShare($data['id']);
$this->fail();
} catch (OCSBadRequestException $e) {
-
}
$ocs->cleanup();
@@ -933,7 +926,6 @@ class ApiTest extends TestCase {
* @depends testCreateShareLink
*/
function testUpdateShare() {
-
$password = md5(time());
$node1 = $this->userFolder->get($this->filename);
@@ -1054,7 +1046,6 @@ class ApiTest extends TestCase {
$ocs->updateShare($share1->getId());
$this->fail();
} catch (OCSBadRequestException $e) {
-
}
$ocs->cleanup();
@@ -1069,7 +1060,6 @@ class ApiTest extends TestCase {
$ocs->updateShare($share1->getId());
$this->fail();
} catch (OCSBadRequestException $e) {
-
}
$ocs->cleanup();
@@ -1372,7 +1362,7 @@ class ApiTest extends TestCase {
try {
$ocs->createShare($this->filename, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK, null, 'false', '', null, $date->format('Y-m-d'));
$this->fail();
- } catch(OCSException $e) {
+ } catch (OCSException $e) {
$this->assertEquals(404, $e->getCode());
$this->assertEquals('Expiration date is in the past', $e->getMessage());
}
diff --git a/apps/files_sharing/tests/CacheTest.php b/apps/files_sharing/tests/CacheTest.php
index 94e5504aec..355a1a8bb1 100644
--- a/apps/files_sharing/tests/CacheTest.php
+++ b/apps/files_sharing/tests/CacheTest.php
@@ -129,7 +129,7 @@ class CacheTest extends TestCase {
}
protected function tearDown(): void {
- if($this->sharedCache) {
+ if ($this->sharedCache) {
$this->sharedCache->clear();
}
@@ -219,7 +219,6 @@ class CacheTest extends TestCase {
$this->verifyFiles($expectedFiles, $results);
}
-
}
/**
* Test searching by mime type
diff --git a/apps/files_sharing/tests/CapabilitiesTest.php b/apps/files_sharing/tests/CapabilitiesTest.php
index e4c1588763..a49074cb60 100644
--- a/apps/files_sharing/tests/CapabilitiesTest.php
+++ b/apps/files_sharing/tests/CapabilitiesTest.php
@@ -285,5 +285,4 @@ class CapabilitiesTest extends \Test\TestCase {
$this->assertArrayHasKey('federation', $result);
$this->assertFalse($result['federation']['outgoing']);
}
-
}
diff --git a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
index 9be1141f35..dd03ffc666 100644
--- a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
+++ b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
@@ -191,6 +191,5 @@ class CleanupRemoteStoragesTest extends TestCase {
$this->assertFalse($this->doesStorageExist($this->storages[3]['numeric_id']));
$this->assertTrue($this->doesStorageExist($this->storages[4]['numeric_id']));
$this->assertFalse($this->doesStorageExist($this->storages[5]['numeric_id']));
-
}
}
diff --git a/apps/files_sharing/tests/Controller/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php
index a43c050634..2f1df959af 100644
--- a/apps/files_sharing/tests/Controller/ShareControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php
@@ -162,7 +162,9 @@ class ShareControllerTest extends \Test\TestCase {
\OC_User::setUserId('');
Filesystem::tearDown();
$user = \OC::$server->getUserManager()->get($this->user);
- if ($user !== null) { $user->delete(); }
+ if ($user !== null) {
+ $user->delete();
+ }
\OC_User::setIncognitoMode(false);
\OC::$server->getSession()->set('public_link_authenticated', '');
@@ -208,7 +210,6 @@ class ShareControllerTest extends \Test\TestCase {
public function testShowShare() {
-
$note = 'personal note';
$this->shareController->setToken('token');
@@ -356,7 +357,6 @@ class ShareControllerTest extends \Test\TestCase {
}
public function testShowShareWithPrivateName() {
-
$note = 'personal note';
$this->shareController->setToken('token');
diff --git a/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php b/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php
index 0ed98f27cd..a885750a56 100644
--- a/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php
+++ b/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php
@@ -100,11 +100,11 @@ class DeleteOrphanedSharesJobTest extends \Test\TestCase {
$userManager = \OC::$server->getUserManager();
$user1 = $userManager->get($this->user1);
- if($user1) {
+ if ($user1) {
$user1->delete();
}
$user2 = $userManager->get($this->user2);
- if($user2) {
+ if ($user2) {
$user2->delete();
}
diff --git a/apps/files_sharing/tests/EncryptedSizePropagationTest.php b/apps/files_sharing/tests/EncryptedSizePropagationTest.php
index 23f552260d..9a8ff29d70 100644
--- a/apps/files_sharing/tests/EncryptedSizePropagationTest.php
+++ b/apps/files_sharing/tests/EncryptedSizePropagationTest.php
@@ -42,5 +42,4 @@ class EncryptedSizePropagationTest extends SizePropagationTest {
$this->loginWithEncryption($name);
return new View('/' . $name . '/files');
}
-
}
diff --git a/apps/files_sharing/tests/ExpireSharesJobTest.php b/apps/files_sharing/tests/ExpireSharesJobTest.php
index 4fe1ccc771..f8bf900cb7 100644
--- a/apps/files_sharing/tests/ExpireSharesJobTest.php
+++ b/apps/files_sharing/tests/ExpireSharesJobTest.php
@@ -78,11 +78,11 @@ class ExpireSharesJobTest extends \Test\TestCase {
$userManager = \OC::$server->getUserManager();
$user1 = $userManager->get($this->user1);
- if($user1) {
+ if ($user1) {
$user1->delete();
}
$user2 = $userManager->get($this->user2);
- if($user2) {
+ if ($user2) {
$user2->delete();
}
@@ -213,5 +213,4 @@ class ExpireSharesJobTest extends \Test\TestCase {
$shares = $this->getShares();
$this->assertCount(1, $shares);
}
-
}
diff --git a/apps/files_sharing/tests/External/CacheTest.php b/apps/files_sharing/tests/External/CacheTest.php
index 466806e09c..be8911961d 100644
--- a/apps/files_sharing/tests/External/CacheTest.php
+++ b/apps/files_sharing/tests/External/CacheTest.php
@@ -130,5 +130,4 @@ class CacheTest extends TestCase {
$results[0]['displayname_owner']
);
}
-
}
diff --git a/apps/files_sharing/tests/External/ManagerTest.php b/apps/files_sharing/tests/External/ManagerTest.php
index 5a1e8ad14e..9c84cb668e 100644
--- a/apps/files_sharing/tests/External/ManagerTest.php
+++ b/apps/files_sharing/tests/External/ManagerTest.php
@@ -123,7 +123,6 @@ class ManagerTest extends TestCase {
}
public function testAddShare() {
-
$shareData1 = [
'remote' => 'http://localhost',
'token' => 'token1',
diff --git a/apps/files_sharing/tests/ExternalStorageTest.php b/apps/files_sharing/tests/ExternalStorageTest.php
index f2bf5738f3..fa8df930a4 100644
--- a/apps/files_sharing/tests/ExternalStorageTest.php
+++ b/apps/files_sharing/tests/ExternalStorageTest.php
@@ -39,7 +39,6 @@ use OCP\Http\Client\IResponse;
* @group DB
*/
class ExternalStorageTest extends \Test\TestCase {
-
function optionsProvider() {
return [
[
@@ -125,7 +124,6 @@ class ExternalStorageTest extends \Test\TestCase {
* Dummy subclass to make it possible to access private members
*/
class TestSharingExternalStorage extends \OCA\Files_Sharing\External\Storage {
-
public function getBaseUri() {
return $this->createBaseUri();
}
diff --git a/apps/files_sharing/tests/HelperTest.php b/apps/files_sharing/tests/HelperTest.php
index 4a27ca4afe..a4311f908b 100644
--- a/apps/files_sharing/tests/HelperTest.php
+++ b/apps/files_sharing/tests/HelperTest.php
@@ -47,7 +47,5 @@ class HelperTest extends TestCase {
// cleanup
\OC::$server->getConfig()->deleteSystemValue('share_folder');
-
}
-
}
diff --git a/apps/files_sharing/tests/LockingTest.php b/apps/files_sharing/tests/LockingTest.php
index bb50cc5bd3..c6a799f64a 100644
--- a/apps/files_sharing/tests/LockingTest.php
+++ b/apps/files_sharing/tests/LockingTest.php
@@ -104,7 +104,6 @@ class LockingTest extends TestCase {
}
public function testChangeLock() {
-
Filesystem::initMountPoints($this->recipientUid);
$recipientView = new View('/' . $this->recipientUid . '/files');
$recipientView->lockFile('bar.txt', ILockingProvider::LOCK_SHARED);
diff --git a/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php b/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php
index 08d8e6e148..c290183d04 100644
--- a/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php
+++ b/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php
@@ -154,5 +154,4 @@ class ShareInfoMiddlewareTest extends TestCase {
}
class ShareInfoMiddlewareTestController extends Controller {
-
}
diff --git a/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php b/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php
index 29dafb5762..2c33f5617b 100644
--- a/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php
+++ b/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php
@@ -101,14 +101,12 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
}
public function externalSharesChecksDataProvider() {
-
$data = [];
foreach ([false, true] as $annIn) {
foreach ([false, true] as $annOut) {
foreach ([false, true] as $confIn) {
foreach ([false, true] as $confOut) {
-
$res = true;
if (!$annIn && !$confIn) {
$res = false;
@@ -186,7 +184,6 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
}
public function testBeforeControllerWithShareControllerWithSharingEnabled() {
-
$share = $this->createMock(IShare::class);
$this->appManager
@@ -229,6 +226,4 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
public function testAfterExceptionWithS2SException() {
$this->assertEquals(new JSONResponse('My Exception message', 405), $this->sharingCheckMiddleware->afterException($this->controllerMock, 'myMethod', new S2SException('My Exception message')));
}
-
-
}
diff --git a/apps/files_sharing/tests/ShareTest.php b/apps/files_sharing/tests/ShareTest.php
index 63c2f2d19e..313c8d8ac5 100644
--- a/apps/files_sharing/tests/ShareTest.php
+++ b/apps/files_sharing/tests/ShareTest.php
@@ -34,7 +34,6 @@ namespace OCA\Files_Sharing\Tests;
* @group DB
*/
class ShareTest extends TestCase {
-
const TEST_FOLDER_NAME = '/folder_share_api_test';
private static $tempStorage;
@@ -128,7 +127,6 @@ class ShareTest extends TestCase {
}
public function testShareWithDifferentShareFolder() {
-
$fileinfo = $this->view->getFileInfo($this->filename);
$folderinfo = $this->view->getFileInfo($this->folder);
@@ -203,7 +201,6 @@ class ShareTest extends TestCase {
* @dataProvider dataProviderTestFileSharePermissions
*/
public function testFileSharePermissions($permission, $expectedvalid) {
-
$pass = true;
try {
$this->share(
@@ -237,7 +234,6 @@ class ShareTest extends TestCase {
}
public function testFileOwner() {
-
$this->share(
\OCP\Share::SHARE_TYPE_USER,
$this->filename,
diff --git a/apps/files_sharing/tests/SharedMountTest.php b/apps/files_sharing/tests/SharedMountTest.php
index f3fe96d2c3..59c0e3b76a 100644
--- a/apps/files_sharing/tests/SharedMountTest.php
+++ b/apps/files_sharing/tests/SharedMountTest.php
@@ -287,7 +287,9 @@ class SharedMountTest extends TestCase {
foreach ($allPermissions as $before) {
foreach ($allPermissions as $after) {
- if ($before === $after) { continue; }
+ if ($before === $after) {
+ continue;
+ }
$data[] = [
'file',
@@ -309,7 +311,9 @@ class SharedMountTest extends TestCase {
foreach ($allPermissions as $before) {
foreach ($allPermissions as $after) {
- if ($before === $after) { continue; }
+ if ($before === $after) {
+ continue;
+ }
$data[] = [
'folder',
@@ -331,7 +335,6 @@ class SharedMountTest extends TestCase {
* @dataProvider dataPermissionMovedGroupShare
*/
public function testPermissionMovedGroupShare($type, $beforePerm, $afterPerm) {
-
if ($type === 'file') {
$path = $this->filename;
} elseif ($type === 'folder') {
@@ -456,7 +459,6 @@ class SharedMountTest extends TestCase {
$testGroup->removeUser($user2);
$testGroup->removeUser($user3);
}
-
}
class DummyTestClassSharedMount extends \OCA\Files_Sharing\SharedMount {
diff --git a/apps/files_sharing/tests/SharedStorageTest.php b/apps/files_sharing/tests/SharedStorageTest.php
index 936295f45b..7d20d98585 100644
--- a/apps/files_sharing/tests/SharedStorageTest.php
+++ b/apps/files_sharing/tests/SharedStorageTest.php
@@ -40,7 +40,6 @@ use OCP\Share\IShare;
* @group DB
*/
class SharedStorageTest extends TestCase {
-
protected function setUp(): void {
parent::setUp();
\OCA\Files_Trashbin\Trashbin::registerHooks();
@@ -565,7 +564,6 @@ class SharedStorageTest extends TestCase {
$this->view->unlink($this->folder);
$this->shareManager->deleteShare($share);
-
}
public function testInitWithNonExistingUser() {
diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php
index c9f024cd67..323fc06f32 100644
--- a/apps/files_sharing/tests/TestCase.php
+++ b/apps/files_sharing/tests/TestCase.php
@@ -130,11 +130,17 @@ abstract class TestCase extends \Test\TestCase {
public static function tearDownAfterClass(): void {
// cleanup users
$user = \OC::$server->getUserManager()->get(self::TEST_FILES_SHARING_API_USER1);
- if ($user !== null) { $user->delete(); }
+ if ($user !== null) {
+ $user->delete();
+ }
$user = \OC::$server->getUserManager()->get(self::TEST_FILES_SHARING_API_USER2);
- if ($user !== null) { $user->delete(); }
+ if ($user !== null) {
+ $user->delete();
+ }
$user = \OC::$server->getUserManager()->get(self::TEST_FILES_SHARING_API_USER3);
- if ($user !== null) { $user->delete(); }
+ if ($user !== null) {
+ $user->delete();
+ }
// delete group
$group = \OC::$server->getGroupManager()->get(self::TEST_FILES_SHARING_API_GROUP1);
@@ -161,7 +167,6 @@ abstract class TestCase extends \Test\TestCase {
* @param bool $password
*/
protected static function loginHelper($user, $create = false, $password = false) {
-
if ($password === false) {
$password = $user;
}
@@ -218,7 +223,6 @@ abstract class TestCase extends \Test\TestCase {
$result->closeCursor();
return $share;
-
}
/**
diff --git a/apps/files_sharing/tests/UnshareChildrenTest.php b/apps/files_sharing/tests/UnshareChildrenTest.php
index d12bda4006..56fdeb44a3 100644
--- a/apps/files_sharing/tests/UnshareChildrenTest.php
+++ b/apps/files_sharing/tests/UnshareChildrenTest.php
@@ -35,7 +35,6 @@ namespace OCA\Files_Sharing\Tests;
* @package OCA\Files_Sharing\Tests
*/
class UnshareChildrenTest extends TestCase {
-
protected $subsubfolder;
const TEST_FOLDER_NAME = '/folder_share_api_test';
@@ -75,7 +74,6 @@ class UnshareChildrenTest extends TestCase {
* @medium
*/
public function testUnshareChildren() {
-
$fileInfo2 = \OC\Files\Filesystem::getFileInfo($this->folder);
$this->share(
diff --git a/apps/files_sharing/tests/UpdaterTest.php b/apps/files_sharing/tests/UpdaterTest.php
index 7ca883c78f..0abc76df43 100644
--- a/apps/files_sharing/tests/UpdaterTest.php
+++ b/apps/files_sharing/tests/UpdaterTest.php
@@ -36,7 +36,6 @@ namespace OCA\Files_Sharing\Tests;
* @group DB
*/
class UpdaterTest extends TestCase {
-
const TEST_FOLDER_NAME = '/folder_share_updater_test';
public static function setUpBeforeClass(): void {
@@ -199,7 +198,6 @@ class UpdaterTest extends TestCase {
* if a folder gets renamed all children mount points should be renamed too
*/
public function testRename() {
-
$fileinfo = \OC\Files\Filesystem::getFileInfo($this->folder);
$share = $this->share(
@@ -234,5 +232,4 @@ class UpdaterTest extends TestCase {
// cleanup
$this->shareManager->deleteShare($share);
}
-
}
diff --git a/apps/files_trashbin/lib/AppInfo/Application.php b/apps/files_trashbin/lib/AppInfo/Application.php
index 6a810e9218..e86a401d2f 100644
--- a/apps/files_trashbin/lib/AppInfo/Application.php
+++ b/apps/files_trashbin/lib/AppInfo/Application.php
@@ -78,11 +78,11 @@ class Application extends App {
$appManager = $server->getAppManager();
/** @var ITrashManager $trashManager */
$trashManager = $this->getContainer()->getServer()->query(ITrashManager::class);
- foreach($appManager->getInstalledApps() as $app) {
+ foreach ($appManager->getInstalledApps() as $app) {
$appInfo = $appManager->getAppInfo($app);
if (isset($appInfo['trash'])) {
$backends = $appInfo['trash'];
- foreach($backends as $backend) {
+ foreach ($backends as $backend) {
$class = $backend['@value'];
$for = $backend['@attributes']['for'];
diff --git a/apps/files_trashbin/lib/Capabilities.php b/apps/files_trashbin/lib/Capabilities.php
index 0051df5c4e..988c4ec815 100644
--- a/apps/files_trashbin/lib/Capabilities.php
+++ b/apps/files_trashbin/lib/Capabilities.php
@@ -45,5 +45,4 @@ class Capabilities implements ICapability {
]
];
}
-
}
diff --git a/apps/files_trashbin/lib/Command/CleanUp.php b/apps/files_trashbin/lib/Command/CleanUp.php
index b4e04f56fb..59acbdcd00 100644
--- a/apps/files_trashbin/lib/Command/CleanUp.php
+++ b/apps/files_trashbin/lib/Command/CleanUp.php
@@ -130,5 +130,4 @@ class CleanUp extends Command {
$query->execute();
}
}
-
}
diff --git a/apps/files_trashbin/lib/Command/ExpireTrash.php b/apps/files_trashbin/lib/Command/ExpireTrash.php
index 46d2de46e3..fdf7f89b2c 100644
--- a/apps/files_trashbin/lib/Command/ExpireTrash.php
+++ b/apps/files_trashbin/lib/Command/ExpireTrash.php
@@ -71,7 +71,6 @@ class ExpireTrash extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
-
$maxAge = $this->expiration->getMaxAgeAsTimestamp();
if (!$maxAge) {
$output->writeln("No expiry configured.");
diff --git a/apps/files_trashbin/lib/Controller/PreviewController.php b/apps/files_trashbin/lib/Controller/PreviewController.php
index f06265ec37..4195d584c8 100644
--- a/apps/files_trashbin/lib/Controller/PreviewController.php
+++ b/apps/files_trashbin/lib/Controller/PreviewController.php
@@ -93,7 +93,6 @@ class PreviewController extends Controller {
int $x = 128,
int $y = 128
) {
-
if ($fileId === -1 || $x === 0 || $y === 0) {
return new DataResponse([], Http::STATUS_BAD_REQUEST);
}
diff --git a/apps/files_trashbin/lib/Helper.php b/apps/files_trashbin/lib/Helper.php
index 2e47abbae7..31ebdfa265 100644
--- a/apps/files_trashbin/lib/Helper.php
+++ b/apps/files_trashbin/lib/Helper.php
@@ -70,7 +70,6 @@ class Helper {
$pathparts = pathinfo($entryName);
$timestamp = substr($pathparts['extension'], 1);
$name = $pathparts['filename'];
-
} elseif ($timestamp === null) {
// for subfolders we need to calculate the timestamp only once
$parts = explode('/', ltrim($dir, '/'));
diff --git a/apps/files_trashbin/lib/Sabre/AbstractTrashFile.php b/apps/files_trashbin/lib/Sabre/AbstractTrashFile.php
index b21579e9e3..ad80711ff1 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/files_trashbin/lib/Sabre/PropfindPlugin.php b/apps/files_trashbin/lib/Sabre/PropfindPlugin.php
index 53619c6e85..1920ed1786 100644
--- a/apps/files_trashbin/lib/Sabre/PropfindPlugin.php
+++ b/apps/files_trashbin/lib/Sabre/PropfindPlugin.php
@@ -35,7 +35,6 @@ use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin;
class PropfindPlugin extends ServerPlugin {
-
const TRASHBIN_FILENAME = '{http://nextcloud.org/ns}trashbin-filename';
const TRASHBIN_ORIGINAL_LOCATION = '{http://nextcloud.org/ns}trashbin-original-location';
const TRASHBIN_DELETION_TIME = '{http://nextcloud.org/ns}trashbin-deletion-time';
@@ -111,5 +110,4 @@ class PropfindPlugin extends ServerPlugin {
return '';
});
}
-
}
diff --git a/apps/files_trashbin/lib/Sabre/RestoreFolder.php b/apps/files_trashbin/lib/Sabre/RestoreFolder.php
index 9b9c07f1c5..c31e7dfb49 100644
--- a/apps/files_trashbin/lib/Sabre/RestoreFolder.php
+++ b/apps/files_trashbin/lib/Sabre/RestoreFolder.php
@@ -75,5 +75,4 @@ class RestoreFolder implements ICollection, IMoveTarget {
return $sourceNode->restore();
}
-
}
diff --git a/apps/files_trashbin/lib/Sabre/RootCollection.php b/apps/files_trashbin/lib/Sabre/RootCollection.php
index 95300f923f..55fd0bc7d5 100644
--- a/apps/files_trashbin/lib/Sabre/RootCollection.php
+++ b/apps/files_trashbin/lib/Sabre/RootCollection.php
@@ -70,5 +70,4 @@ class RootCollection extends AbstractPrincipalCollection {
public function getName(): string {
return 'trashbin';
}
-
}
diff --git a/apps/files_trashbin/lib/Trash/BackendNotFoundException.php b/apps/files_trashbin/lib/Trash/BackendNotFoundException.php
index 798b55dbd8..2554faade4 100644
--- a/apps/files_trashbin/lib/Trash/BackendNotFoundException.php
+++ b/apps/files_trashbin/lib/Trash/BackendNotFoundException.php
@@ -24,5 +24,4 @@
namespace OCA\Files_Trashbin\Trash;
class BackendNotFoundException extends \Exception {
-
}
diff --git a/apps/files_trashbin/lib/Trash/LegacyTrashBackend.php b/apps/files_trashbin/lib/Trash/LegacyTrashBackend.php
index d6f8a07746..68ee8c1c51 100644
--- a/apps/files_trashbin/lib/Trash/LegacyTrashBackend.php
+++ b/apps/files_trashbin/lib/Trash/LegacyTrashBackend.php
@@ -93,7 +93,6 @@ class LegacyTrashBackend implements ITrashBackend {
} else {
Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
}
-
}
public function moveToTrash(IStorage $storage, string $internalPath): bool {
diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php
index a308ec7853..adfdf1364b 100644
--- a/apps/files_trashbin/lib/Trashbin.php
+++ b/apps/files_trashbin/lib/Trashbin.php
@@ -316,7 +316,6 @@ class Trashbin {
*/
private static function retainVersions($filename, $owner, $ownerPath, $timestamp) {
if (\OCP\App::isEnabled('files_versions') && !empty($ownerPath)) {
-
$user = User::getUser();
$rootView = new View('/');
@@ -326,7 +325,6 @@ class Trashbin {
}
self::move($rootView, $owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . $filename . '.d' . $timestamp);
} elseif ($versions = \OCA\Files_Versions\Storage::getVersions($owner, $ownerPath)) {
-
foreach ($versions as $v) {
if ($owner !== $user) {
self::copy($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $owner . '/files_trashbin/versions/' . $v['name'] . '.v' . $v['version'] . '.d' . $timestamp);
@@ -461,9 +459,7 @@ class Trashbin {
* @return false|null
*/
private static function restoreVersions(View $view, $file, $filename, $uniqueFilename, $location, $timestamp) {
-
if (\OCP\App::isEnabled('files_versions')) {
-
$user = User::getUser();
$rootView = new View('/');
@@ -513,7 +509,7 @@ class Trashbin {
// Array to store the relative path in (after the file is deleted, the view won't be able to relativise the path anymore)
$filePaths = [];
- foreach($fileInfos as $fileInfo){
+ foreach ($fileInfos as $fileInfo) {
$filePaths[] = $view->getRelativePath($fileInfo->getPath());
}
unset($fileInfos); // save memory
@@ -522,7 +518,7 @@ class Trashbin {
\OC_Hook::emit('\OCP\Trashbin', 'preDeleteAll', ['paths' => $filePaths]);
// Single-File Hooks
- foreach($filePaths as $path){
+ foreach ($filePaths as $path) {
self::emitTrashbinPreDelete($path);
}
@@ -535,7 +531,7 @@ class Trashbin {
\OC_Hook::emit('\OCP\Trashbin', 'deleteAll', ['paths' => $filePaths]);
// Single-File Hooks
- foreach($filePaths as $path){
+ foreach ($filePaths as $path) {
self::emitTrashbinPostDelete($path);
}
@@ -673,7 +669,7 @@ class Trashbin {
private static function calculateFreeSpace($trashbinSize, $user) {
$softQuota = true;
$userObject = \OC::$server->getUserManager()->get($user);
- if(is_null($userObject)) {
+ if (is_null($userObject)) {
return 0;
}
$quota = $userObject->getQuota();
@@ -692,7 +688,7 @@ class Trashbin {
// subtract size of files and current trash bin size from quota
if ($softQuota) {
$userFolder = \OC::$server->getUserFolder($user);
- if(is_null($userFolder)) {
+ if (is_null($userFolder)) {
return 0;
}
$free = $quota - $userFolder->getSize(false); // remaining free space for user
@@ -714,7 +710,6 @@ class Trashbin {
* @param string $user user id
*/
public static function resizeTrash($user) {
-
$size = self::getTrashbinSize($user);
$freeSpace = self::calculateFreeSpace($size, $user);
@@ -998,7 +993,6 @@ class Trashbin {
* @return bool
*/
public static function isEmpty($user) {
-
$view = new View('/' . $user . '/files_trashbin');
if ($view->is_dir('/files') && $dh = $view->opendir('/files')) {
while ($file = readdir($dh)) {
diff --git a/apps/files_trashbin/tests/Command/CleanUpTest.php b/apps/files_trashbin/tests/Command/CleanUpTest.php
index 71391f5288..18ea42e78c 100644
--- a/apps/files_trashbin/tests/Command/CleanUpTest.php
+++ b/apps/files_trashbin/tests/Command/CleanUpTest.php
@@ -106,7 +106,7 @@ class CleanUpTest extends TestCase {
->method('nodeExists')
->with('/' . $this->user0 . '/files_trashbin')
->willReturn($nodeExists);
- if($nodeExists) {
+ if ($nodeExists) {
$this->rootFolder->expects($this->once())
->method('get')
->with('/' . $this->user0 . '/files_trashbin')
@@ -140,7 +140,6 @@ class CleanUpTest extends TestCase {
->fetchAll();
$this->assertSame(10, count($result));
}
-
}
public function dataTestRemoveDeletedFiles() {
return [
@@ -239,5 +238,4 @@ class CleanUpTest extends TestCase {
$this->invokePrivate($this->cleanup, 'execute', [$inputInterface, $outputInterface]);
}
-
}
diff --git a/apps/files_trashbin/tests/StorageTest.php b/apps/files_trashbin/tests/StorageTest.php
index 6047e488a7..3b27e13e88 100644
--- a/apps/files_trashbin/tests/StorageTest.php
+++ b/apps/files_trashbin/tests/StorageTest.php
@@ -94,7 +94,9 @@ class StorageTest extends \Test\TestCase {
\OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');
$this->logout();
$user = \OC::$server->getUserManager()->get($this->user);
- if ($user !== null) { $user->delete(); }
+ if ($user !== null) {
+ $user->delete();
+ }
\OC_Hook::clear();
parent::tearDown();
}
@@ -577,7 +579,6 @@ class StorageTest extends \Test\TestCase {
$this->assertSame($expected,
$this->invokePrivate($storage, 'shouldMoveToTrash', [$path])
);
-
}
public function dataTestShouldMoveToTrash() {
diff --git a/apps/files_trashbin/tests/TrashbinTest.php b/apps/files_trashbin/tests/TrashbinTest.php
index 2e9e130244..fbf1b1c1c1 100644
--- a/apps/files_trashbin/tests/TrashbinTest.php
+++ b/apps/files_trashbin/tests/TrashbinTest.php
@@ -37,7 +37,6 @@ use OCA\Files_Sharing\AppInfo\Application;
* @group DB
*/
class TrashbinTest extends \Test\TestCase {
-
const TEST_TRASHBIN_USER1 = "test-trashbin-user1";
const TEST_TRASHBIN_USER2 = "test-trashbin-user2";
@@ -210,7 +209,6 @@ class TrashbinTest extends \Test\TestCase {
* correctly
*/
public function testExpireOldFilesShared() {
-
$currentTime = time();
$folder = "trashTest-" . $currentTime . '/';
$expiredDate = $currentTime - 3 * 24 * 60 * 60;
@@ -673,7 +671,6 @@ class TrashbinTest extends \Test\TestCase {
try {
\OC::$server->getUserManager()->createUser($user, $user);
} catch (\Exception $e) { // catch username is already being used from previous aborted runs
-
}
}
diff --git a/apps/files_versions/lib/AppInfo/Application.php b/apps/files_versions/lib/AppInfo/Application.php
index 040b72a8f0..36d7b6d276 100644
--- a/apps/files_versions/lib/AppInfo/Application.php
+++ b/apps/files_versions/lib/AppInfo/Application.php
@@ -42,7 +42,6 @@ use OCP\AppFramework\IAppContainer;
use OCP\EventDispatcher\IEventDispatcher;
class Application extends App {
-
const APP_ID = 'files_versions';
public function __construct(array $urlParams = []) {
@@ -95,11 +94,11 @@ class Application extends App {
public function registerVersionBackends() {
$server = $this->getContainer()->getServer();
$appManager = $server->getAppManager();
- foreach($appManager->getInstalledApps() as $app) {
+ foreach ($appManager->getInstalledApps() as $app) {
$appInfo = $appManager->getAppInfo($app);
if (isset($appInfo['versions'])) {
$backends = $appInfo['versions'];
- foreach($backends as $backend) {
+ foreach ($backends as $backend) {
if (isset($backend['@value'])) {
$this->loadBackend($backend);
} else {
@@ -131,5 +130,4 @@ class Application extends App {
$dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
$dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
}
-
}
diff --git a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
index eb4287376e..4c8f82a1c7 100644
--- a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
+++ b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
@@ -31,7 +31,6 @@ use OCP\IUser;
use OCP\IUserManager;
class ExpireVersions extends \OC\BackgroundJob\TimedJob {
-
const ITEMS_PER_SESSION = 1000;
/**
diff --git a/apps/files_versions/lib/Command/CleanUp.php b/apps/files_versions/lib/Command/CleanUp.php
index b5b8f3dcfd..397a145057 100644
--- a/apps/files_versions/lib/Command/CleanUp.php
+++ b/apps/files_versions/lib/Command/CleanUp.php
@@ -61,7 +61,6 @@ class CleanUp extends Command {
protected function execute(InputInterface $input, OutputInterface $output) {
-
$users = $input->getArgument('user_id');
if (!empty($users)) {
foreach ($users as $user) {
@@ -110,5 +109,4 @@ class CleanUp extends Command {
$this->rootFolder->get('/' . $user . '/files_versions')->delete();
}
}
-
}
diff --git a/apps/files_versions/lib/Command/ExpireVersions.php b/apps/files_versions/lib/Command/ExpireVersions.php
index d67542db25..944e013669 100644
--- a/apps/files_versions/lib/Command/ExpireVersions.php
+++ b/apps/files_versions/lib/Command/ExpireVersions.php
@@ -70,7 +70,6 @@ class ExpireVersions extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
-
$maxAge = $this->expiration->getMaxAgeAsTimestamp();
if (!$maxAge) {
$output->writeln("No expiry configured.");
diff --git a/apps/files_versions/lib/Events/CreateVersionEvent.php b/apps/files_versions/lib/Events/CreateVersionEvent.php
index 4f6ddd4367..90281bd8ca 100644
--- a/apps/files_versions/lib/Events/CreateVersionEvent.php
+++ b/apps/files_versions/lib/Events/CreateVersionEvent.php
@@ -78,5 +78,4 @@ class CreateVersionEvent extends Event {
public function shouldCreateVersion() {
return $this->createVersion;
}
-
}
diff --git a/apps/files_versions/lib/Expiration.php b/apps/files_versions/lib/Expiration.php
index a56042e76b..c9c91d67d7 100644
--- a/apps/files_versions/lib/Expiration.php
+++ b/apps/files_versions/lib/Expiration.php
@@ -164,7 +164,7 @@ class Expiration {
);
}
- if (!$isValid){
+ if (!$isValid) {
$minValue = 'auto';
$maxValue = 'auto';
}
diff --git a/apps/files_versions/lib/Hooks.php b/apps/files_versions/lib/Hooks.php
index 179a404ed9..0603228192 100644
--- a/apps/files_versions/lib/Hooks.php
+++ b/apps/files_versions/lib/Hooks.php
@@ -40,7 +40,6 @@ use OC\Files\View;
use OCP\Util;
class Hooks {
-
public static function connectHooks() {
// Listen to write signals
Util::connectHook('OC_Filesystem', 'write', Hooks::class, 'write_hook');
@@ -58,7 +57,7 @@ class Hooks {
*/
public static function write_hook($params) {
$path = $params[Filesystem::signal_param_path];
- if($path !== '') {
+ if ($path !== '') {
Storage::store($path);
}
}
@@ -73,7 +72,7 @@ class Hooks {
*/
public static function remove_hook($params) {
$path = $params[Filesystem::signal_param_path];
- if($path !== '') {
+ if ($path !== '') {
Storage::delete($path);
}
}
@@ -84,9 +83,9 @@ class Hooks {
*/
public static function pre_remove_hook($params) {
$path = $params[Filesystem::signal_param_path];
- if($path !== '') {
- Storage::markDeletedFile($path);
- }
+ if ($path !== '') {
+ Storage::markDeletedFile($path);
+ }
}
/**
@@ -99,7 +98,7 @@ class Hooks {
public static function rename_hook($params) {
$oldpath = $params['oldpath'];
$newpath = $params['newpath'];
- if($oldpath !== '' && $newpath !== '') {
+ if ($oldpath !== '' && $newpath !== '') {
Storage::renameOrCopy($oldpath, $newpath, 'rename');
}
}
@@ -114,7 +113,7 @@ class Hooks {
public static function copy_hook($params) {
$oldpath = $params['oldpath'];
$newpath = $params['newpath'];
- if($oldpath !== '' && $newpath !== '') {
+ if ($oldpath !== '' && $newpath !== '') {
Storage::renameOrCopy($oldpath, $newpath, 'copy');
}
}
diff --git a/apps/files_versions/lib/Listener/LoadAdditionalListener.php b/apps/files_versions/lib/Listener/LoadAdditionalListener.php
index f6d6734107..bebd98eaca 100644
--- a/apps/files_versions/lib/Listener/LoadAdditionalListener.php
+++ b/apps/files_versions/lib/Listener/LoadAdditionalListener.php
@@ -43,5 +43,4 @@ class LoadAdditionalListener implements IEventListener {
// we properly split it between files list and sidebar
Util::addScript(Application::APP_ID, 'files_versions');
}
-
}
diff --git a/apps/files_versions/lib/Listener/LoadSidebarListener.php b/apps/files_versions/lib/Listener/LoadSidebarListener.php
index 875fe8b3fc..3ea696c041 100644
--- a/apps/files_versions/lib/Listener/LoadSidebarListener.php
+++ b/apps/files_versions/lib/Listener/LoadSidebarListener.php
@@ -43,5 +43,4 @@ class LoadSidebarListener implements IEventListener {
// we properly split it between files list and sidebar
Util::addScript(Application::APP_ID, 'files_versions');
}
-
}
diff --git a/apps/files_versions/lib/Sabre/Plugin.php b/apps/files_versions/lib/Sabre/Plugin.php
index cde5e319c8..41c3ff5a5a 100644
--- a/apps/files_versions/lib/Sabre/Plugin.php
+++ b/apps/files_versions/lib/Sabre/Plugin.php
@@ -81,5 +81,4 @@ class Plugin extends ServerPlugin {
. '; filename="' . rawurlencode($filename) . '"');
}
}
-
}
diff --git a/apps/files_versions/lib/Sabre/RestoreFolder.php b/apps/files_versions/lib/Sabre/RestoreFolder.php
index 89f379e3c1..5b52a5777a 100644
--- a/apps/files_versions/lib/Sabre/RestoreFolder.php
+++ b/apps/files_versions/lib/Sabre/RestoreFolder.php
@@ -77,5 +77,4 @@ class RestoreFolder implements ICollection, IMoveTarget {
$sourceNode->rollBack();
return true;
}
-
}
diff --git a/apps/files_versions/lib/Sabre/RootCollection.php b/apps/files_versions/lib/Sabre/RootCollection.php
index e305b758c8..fb68e0f0bf 100644
--- a/apps/files_versions/lib/Sabre/RootCollection.php
+++ b/apps/files_versions/lib/Sabre/RootCollection.php
@@ -81,5 +81,4 @@ class RootCollection extends AbstractPrincipalCollection {
public function getName() {
return 'versions';
}
-
}
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index a149e352e3..f62650e539 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -57,7 +57,6 @@ use OCP\Lock\ILockingProvider;
use OCP\User;
class Storage {
-
const DEFAULTENABLED=true;
const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
const VERSIONS_ROOT = 'files_versions/';
@@ -139,7 +138,6 @@ class Storage {
* @return array with user id and path
*/
public static function getSourcePathAndUser($source) {
-
if (isset(self::$sourcePathAndUser[$source])) {
$uid = self::$sourcePathAndUser[$source]['uid'];
$path = self::$sourcePathAndUser[$source]['path'];
@@ -241,13 +239,11 @@ class Storage {
* Delete versions of a file
*/
public static function delete($path) {
-
$deletedFile = self::$deletedFiles[$path];
$uid = $deletedFile['uid'];
$filename = $deletedFile['filename'];
if (!Filesystem::file_exists($path)) {
-
$view = new View('/' . $uid . '/files_versions');
$versions = self::getVersions($uid, $filename);
@@ -318,7 +314,6 @@ class Storage {
if (!$rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
self::scheduleExpire($targetOwner, $targetPath);
}
-
}
/**
@@ -389,7 +384,6 @@ class Storage {
}
return false;
-
}
/**
@@ -531,7 +525,6 @@ class Storage {
* @return string for example "5 days ago"
*/
private static function getHumanReadableTimestamp($timestamp) {
-
$diff = time() - $timestamp;
if ($diff < 60) { // first minute
@@ -549,7 +542,6 @@ class Storage {
} else {
return round($diff / 29030400) . " years ago";
}
-
}
/**
@@ -750,7 +742,7 @@ class Storage {
if ($quota >= 0) {
if ($softQuota) {
$userFolder = \OC::$server->getUserFolder($uid);
- if(is_null($userFolder)) {
+ if (is_null($userFolder)) {
$availableSpace = 0;
} else {
$free = $quota - $userFolder->getSize(false); // remaining free space for user
@@ -790,7 +782,7 @@ class Storage {
}
$logger = \OC::$server->getLogger();
- foreach($toDelete as $key => $path) {
+ foreach ($toDelete as $key => $path) {
\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
self::deleteVersion($versionsFileview, $path);
\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
@@ -854,5 +846,4 @@ class Storage {
}
return self::$application->getContainer()->query(Expiration::class);
}
-
}
diff --git a/apps/files_versions/lib/Versions/BackendNotFoundException.php b/apps/files_versions/lib/Versions/BackendNotFoundException.php
index 4b4bf96f1c..5338d5eea3 100644
--- a/apps/files_versions/lib/Versions/BackendNotFoundException.php
+++ b/apps/files_versions/lib/Versions/BackendNotFoundException.php
@@ -24,5 +24,4 @@
namespace OCA\Files_Versions\Versions;
class BackendNotFoundException extends \Exception {
-
}
diff --git a/apps/files_versions/tests/Command/CleanupTest.php b/apps/files_versions/tests/Command/CleanupTest.php
index 1fad960f95..8947495416 100644
--- a/apps/files_versions/tests/Command/CleanupTest.php
+++ b/apps/files_versions/tests/Command/CleanupTest.php
@@ -65,14 +65,13 @@ class CleanupTest extends TestCase {
* @param boolean $nodeExists
*/
public function testDeleteVersions($nodeExists) {
-
$this->rootFolder->expects($this->once())
->method('nodeExists')
->with('/testUser/files_versions')
->willReturn($nodeExists);
- if($nodeExists) {
+ if ($nodeExists) {
$this->rootFolder->expects($this->once())
->method('get')
->with('/testUser/files_versions')
@@ -167,5 +166,4 @@ class CleanupTest extends TestCase {
$this->invokePrivate($instance, 'execute', [$inputInterface, $outputInterface]);
}
-
}
diff --git a/apps/files_versions/tests/Controller/PreviewControllerTest.php b/apps/files_versions/tests/Controller/PreviewControllerTest.php
index 084bb25da8..64732ac863 100644
--- a/apps/files_versions/tests/Controller/PreviewControllerTest.php
+++ b/apps/files_versions/tests/Controller/PreviewControllerTest.php
@@ -182,5 +182,4 @@ class PreviewControllerTest extends TestCase {
$this->assertEquals($expected, $res);
}
-
}
diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php
index ae052335a9..c3ae186e73 100644
--- a/apps/files_versions/tests/VersioningTest.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -47,7 +47,6 @@ use OCP\IUser;
* @group DB
*/
class VersioningTest extends \Test\TestCase {
-
const TEST_VERSIONS_USER = 'test-versions-user';
const TEST_VERSIONS_USER2 = 'test-versions-user2';
const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions';
@@ -72,9 +71,13 @@ class VersioningTest extends \Test\TestCase {
public static function tearDownAfterClass(): void {
// cleanup test user
$user = \OC::$server->getUserManager()->get(self::TEST_VERSIONS_USER);
- if ($user !== null) { $user->delete(); }
+ if ($user !== null) {
+ $user->delete();
+ }
$user = \OC::$server->getUserManager()->get(self::TEST_VERSIONS_USER2);
- if ($user !== null) { $user->delete(); }
+ if ($user !== null) {
+ $user->delete();
+ }
parent::tearDownAfterClass();
}
@@ -146,7 +149,7 @@ class VersioningTest extends \Test\TestCase {
$this->assertEquals($sizeOfAllDeletedFiles, $size);
// the deleted array should only contain versions which should be deleted
- foreach($deleted as $key => $path) {
+ foreach ($deleted as $key => $path) {
unset($versions[$key]);
$this->assertEquals("delete", substr($path, 0, strlen("delete")));
}
@@ -155,7 +158,6 @@ class VersioningTest extends \Test\TestCase {
foreach ($versions as $version) {
$this->assertEquals("keep", $version['path']);
}
-
}
public function versionsProvider() {
@@ -277,7 +279,6 @@ class VersioningTest extends \Test\TestCase {
}
public function testRename() {
-
\OC\Files\Filesystem::file_put_contents("test.txt", "test file");
$t1 = time();
@@ -307,7 +308,6 @@ class VersioningTest extends \Test\TestCase {
}
public function testRenameInSharedFolder() {
-
\OC\Files\Filesystem::mkdir('folder1');
\OC\Files\Filesystem::mkdir('folder1/folder2');
\OC\Files\Filesystem::file_put_contents("folder1/test.txt", "test file");
@@ -358,7 +358,6 @@ class VersioningTest extends \Test\TestCase {
}
public function testMoveFolder() {
-
\OC\Files\Filesystem::mkdir('folder1');
\OC\Files\Filesystem::mkdir('folder2');
\OC\Files\Filesystem::file_put_contents('folder1/test.txt', 'test file');
@@ -392,7 +391,6 @@ class VersioningTest extends \Test\TestCase {
public function testMoveFileIntoSharedFolderAsRecipient() {
-
\OC\Files\Filesystem::mkdir('folder1');
$fileInfo = \OC\Files\Filesystem::getFileInfo('folder1');
@@ -443,7 +441,6 @@ class VersioningTest extends \Test\TestCase {
}
public function testMoveFolderIntoSharedFolderAsRecipient() {
-
\OC\Files\Filesystem::mkdir('folder1');
$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
@@ -495,7 +492,6 @@ class VersioningTest extends \Test\TestCase {
}
public function testRenameSharedFile() {
-
\OC\Files\Filesystem::file_put_contents("test.txt", "test file");
$t1 = time();
@@ -545,7 +541,6 @@ class VersioningTest extends \Test\TestCase {
}
public function testCopy() {
-
\OC\Files\Filesystem::file_put_contents("test.txt", "test file");
$t1 = time();
@@ -579,7 +574,6 @@ class VersioningTest extends \Test\TestCase {
* the correct 'path' and 'name'
*/
public function testGetVersions() {
-
$t1 = time();
// second version is two weeks older, this way we make sure that no
// version will be expired
@@ -944,7 +938,6 @@ class VersioningTest extends \Test\TestCase {
* @param bool $create
*/
public static function loginHelper($user, $create = false) {
-
if ($create) {
$backend = new \Test\Util\User\Dummy();
$backend->createUser($user, $user);
@@ -964,7 +957,6 @@ class VersioningTest extends \Test\TestCase {
\OC_Util::setupFS($user);
\OC::$server->getUserFolder($user);
}
-
}
// extend the original class to make it possible to test protected methods
@@ -975,6 +967,5 @@ class VersionStorageToTest extends \OCA\Files_Versions\Storage {
*/
public function callProtectedGetExpireList($time, $versions) {
return self::getExpireList($time, $versions);
-
}
}
diff --git a/apps/lookup_server_connector/lib/AppInfo/Application.php b/apps/lookup_server_connector/lib/AppInfo/Application.php
index aad11c4eff..f5fa5cb7c2 100644
--- a/apps/lookup_server_connector/lib/AppInfo/Application.php
+++ b/apps/lookup_server_connector/lib/AppInfo/Application.php
@@ -57,6 +57,5 @@ class Application extends App {
$updateLookupServer = \OC::$server->query(UpdateLookupServer::class);
$updateLookupServer->userUpdated($user);
});
-
}
}
diff --git a/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php b/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php
index b57d1a00ac..272d66e949 100644
--- a/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php
+++ b/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php
@@ -176,7 +176,6 @@ class RetryJob extends Job {
'lookup_server_connector',
'update_retries'
);
-
} catch (\Exception $e) {
// An error occurred, retry later
$this->retainJob = true;
diff --git a/apps/lookup_server_connector/lib/UpdateLookupServer.php b/apps/lookup_server_connector/lib/UpdateLookupServer.php
index e3c1e48be1..5b02953290 100644
--- a/apps/lookup_server_connector/lib/UpdateLookupServer.php
+++ b/apps/lookup_server_connector/lib/UpdateLookupServer.php
@@ -87,5 +87,4 @@ class UpdateLookupServer {
$this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') === 'yes' &&
$this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') !== '';
}
-
}
diff --git a/apps/oauth2/lib/Controller/SettingsController.php b/apps/oauth2/lib/Controller/SettingsController.php
index 038509786d..89685bbee1 100644
--- a/apps/oauth2/lib/Controller/SettingsController.php
+++ b/apps/oauth2/lib/Controller/SettingsController.php
@@ -81,7 +81,6 @@ class SettingsController extends Controller {
public function addClient(string $name,
string $redirectUri): JSONResponse {
-
if (filter_var($redirectUri, FILTER_VALIDATE_URL) === false) {
return new JSONResponse(['message' => $this->l->t('Your redirect URL needs to be a full URL for example: https://yourdomain.com/path')], Http::STATUS_BAD_REQUEST);
}
diff --git a/apps/oauth2/lib/Exceptions/AccessTokenNotFoundException.php b/apps/oauth2/lib/Exceptions/AccessTokenNotFoundException.php
index 66c982a29d..6033568f15 100644
--- a/apps/oauth2/lib/Exceptions/AccessTokenNotFoundException.php
+++ b/apps/oauth2/lib/Exceptions/AccessTokenNotFoundException.php
@@ -26,4 +26,5 @@ declare(strict_types=1);
namespace OCA\OAuth2\Exceptions;
-class AccessTokenNotFoundException extends \Exception {}
+class AccessTokenNotFoundException extends \Exception {
+}
diff --git a/apps/oauth2/lib/Exceptions/ClientNotFoundException.php b/apps/oauth2/lib/Exceptions/ClientNotFoundException.php
index 91fcaa9989..7f7dad0432 100644
--- a/apps/oauth2/lib/Exceptions/ClientNotFoundException.php
+++ b/apps/oauth2/lib/Exceptions/ClientNotFoundException.php
@@ -26,4 +26,5 @@ declare(strict_types=1);
namespace OCA\OAuth2\Exceptions;
-class ClientNotFoundException extends \Exception {}
+class ClientNotFoundException extends \Exception {
+}
diff --git a/apps/oauth2/lib/Migration/SetTokenExpiration.php b/apps/oauth2/lib/Migration/SetTokenExpiration.php
index 6332ae85ca..b9538ee4ab 100644
--- a/apps/oauth2/lib/Migration/SetTokenExpiration.php
+++ b/apps/oauth2/lib/Migration/SetTokenExpiration.php
@@ -64,7 +64,7 @@ class SetTokenExpiration implements IRepairStep {
$cursor = $qb->execute();
- while($row = $cursor->fetch()) {
+ while ($row = $cursor->fetch()) {
$token = AccessToken::fromRow($row);
try {
$appToken = $this->tokenProvider->getTokenById($token->getTokenId());
@@ -76,5 +76,4 @@ class SetTokenExpiration implements IRepairStep {
}
$cursor->closeCursor();
}
-
}
diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php
index 3579202b36..31a8322e4a 100644
--- a/apps/provisioning_api/lib/Controller/AUserData.php
+++ b/apps/provisioning_api/lib/Controller/AUserData.php
@@ -100,14 +100,14 @@ abstract class AUserData extends OCSController {
// Check if the target user exists
$targetUserObject = $this->userManager->get($userId);
- if($targetUserObject === null) {
+ if ($targetUserObject === null) {
throw new OCSNotFoundException('User does not exist');
}
// Should be at least Admin Or SubAdmin!
if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())
|| $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
- $data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
+ $data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
} else {
// Check they are looking up themselves
if ($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) {
@@ -167,7 +167,7 @@ abstract class AUserData extends OCSController {
protected function getUserSubAdminGroupsData(string $userId): array {
$user = $this->userManager->get($userId);
// Check if the user exists
- if($user === null) {
+ if ($user === null) {
throw new OCSNotFoundException('User does not exist');
}
@@ -215,5 +215,4 @@ abstract class AUserData extends OCSController {
}
return $data;
}
-
}
diff --git a/apps/provisioning_api/lib/Controller/AppsController.php b/apps/provisioning_api/lib/Controller/AppsController.php
index d5a8de9177..e59440e5e8 100644
--- a/apps/provisioning_api/lib/Controller/AppsController.php
+++ b/apps/provisioning_api/lib/Controller/AppsController.php
@@ -64,11 +64,11 @@ class AppsController extends OCSController {
public function getApps(string $filter = null): DataResponse {
$apps = (new OC_App())->listAllApps();
$list = [];
- foreach($apps as $app) {
+ foreach ($apps as $app) {
$list[] = $app['id'];
}
- if($filter){
- switch($filter){
+ if ($filter) {
+ switch ($filter) {
case 'enabled':
return new DataResponse(['apps' => \OC_App::getEnabledApps()]);
break;
@@ -80,7 +80,6 @@ class AppsController extends OCSController {
// Invalid filter variable
throw new OCSException('', 101);
}
-
} else {
return new DataResponse(['apps' => $list]);
}
@@ -93,7 +92,7 @@ class AppsController extends OCSController {
*/
public function getAppInfo(string $app): DataResponse {
$info = \OCP\App::getAppInfo($app);
- if(!is_null($info)) {
+ if (!is_null($info)) {
return new DataResponse(OC_App::getAppInfo($app));
}
@@ -124,5 +123,4 @@ class AppsController extends OCSController {
$this->appManager->disableApp($app);
return new DataResponse();
}
-
}
diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php
index 435f041021..7f2da88a09 100644
--- a/apps/provisioning_api/lib/Controller/GroupsController.php
+++ b/apps/provisioning_api/lib/Controller/GroupsController.php
@@ -163,7 +163,7 @@ class GroupsController extends AUserData {
}
// Check subadmin has access to this group
- if($this->groupManager->isAdmin($user->getUID())
+ if ($this->groupManager->isAdmin($user->getUID())
|| $isSubadminOfGroup) {
$users = $this->groupManager->get($groupId)->getUsers();
$users = array_map(function ($user) {
@@ -201,7 +201,7 @@ class GroupsController extends AUserData {
}
// Check subadmin has access to this group
- if($this->groupManager->isAdmin($currentUser->getUID()) || $isSubadminOfGroup) {
+ if ($this->groupManager->isAdmin($currentUser->getUID()) || $isSubadminOfGroup) {
$users = $group->searchUsers($search, $limit, $offset);
// Extract required number
@@ -219,7 +219,7 @@ class GroupsController extends AUserData {
// only showing its id
$usersDetails[$userId] = ['id' => $userId];
}
- } catch(OCSNotFoundException $e) {
+ } catch (OCSNotFoundException $e) {
// continue if a users ceased to exist.
}
}
@@ -240,12 +240,12 @@ class GroupsController extends AUserData {
*/
public function addGroup(string $groupid): DataResponse {
// Validate name
- if(empty($groupid)) {
+ if (empty($groupid)) {
$this->logger->error('Group name not supplied', ['app' => 'provisioning_api']);
throw new OCSException('Invalid group name', 101);
}
// Check if it exists
- if($this->groupManager->groupExists($groupid)){
+ if ($this->groupManager->groupExists($groupid)) {
throw new OCSException('group exists', 102);
}
$this->groupManager->createGroup($groupid);
@@ -283,9 +283,9 @@ class GroupsController extends AUserData {
*/
public function deleteGroup(string $groupId): DataResponse {
// Check it exists
- if(!$this->groupManager->groupExists($groupId)){
+ if (!$this->groupManager->groupExists($groupId)) {
throw new OCSException('', 101);
- } elseif($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()){
+ } elseif ($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()) {
// Cannot delete admin group
throw new OCSException('', 102);
}
@@ -301,7 +301,7 @@ class GroupsController extends AUserData {
public function getSubAdminsOfGroup(string $groupId): DataResponse {
// Check group exists
$targetGroup = $this->groupManager->get($groupId);
- if($targetGroup === null) {
+ if ($targetGroup === null) {
throw new OCSException('Group does not exist', 101);
}
@@ -315,5 +315,4 @@ class GroupsController extends AUserData {
return new DataResponse($uids);
}
-
}
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
index ff67a880c1..bd327ffe44 100644
--- a/apps/provisioning_api/lib/Controller/UsersController.php
+++ b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -140,7 +140,7 @@ class UsersController extends AUserData {
// Admin? Or SubAdmin?
$uid = $user->getUID();
$subAdminManager = $this->groupManager->getSubAdmin();
- if ($this->groupManager->isAdmin($uid)){
+ if ($this->groupManager->isAdmin($uid)) {
$users = $this->userManager->search($search, $limit, $offset);
} elseif ($subAdminManager->isSubAdmin($user)) {
$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
@@ -173,7 +173,7 @@ class UsersController extends AUserData {
// Admin? Or SubAdmin?
$uid = $currentUser->getUID();
$subAdminManager = $this->groupManager->getSubAdmin();
- if ($this->groupManager->isAdmin($uid)){
+ if ($this->groupManager->isAdmin($uid)) {
$users = $this->userManager->search($search, $limit, $offset);
$users = array_keys($users);
} elseif ($subAdminManager->isSubAdmin($currentUser)) {
@@ -250,7 +250,7 @@ class UsersController extends AUserData {
$isAdmin = $this->groupManager->isAdmin($user->getUID());
$subAdminManager = $this->groupManager->getSubAdmin();
- if(empty($userid) && $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes') {
+ if (empty($userid) && $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes') {
$userid = $this->createNewUserId();
}
@@ -352,7 +352,6 @@ class UsersController extends AUserData {
}
return new DataResponse(['id' => $userid]);
-
} catch (HintException $e) {
$this->logger->logException($e, [
'message' => 'Failed addUser attempt with hint exception.',
@@ -414,7 +413,6 @@ class UsersController extends AUserData {
$data['display-name'] = $data['displayname'];
unset($data['displayname']);
return new DataResponse($data);
-
}
throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
@@ -530,7 +528,7 @@ class UsersController extends AUserData {
throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
}
// Process the edit
- switch($key) {
+ switch ($key) {
case 'display':
case AccountManager::PROPERTY_DISPLAYNAME:
$targetUser->setDisplayName($value);
@@ -755,7 +753,6 @@ class UsersController extends AUserData {
throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
}
}
-
}
/**
@@ -835,7 +832,6 @@ class UsersController extends AUserData {
// Not an admin, so the user must be a subadmin of this group, but that is not allowed.
throw new OCSException('Cannot remove yourself from this group as you are a SubAdmin', 105);
}
-
} elseif (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
/** @var IGroup[] $subAdminGroups */
$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
@@ -973,7 +969,7 @@ class UsersController extends AUserData {
try {
$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
$this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
- } catch(\Exception $e) {
+ } catch (\Exception $e) {
$this->logger->logException($e, [
'message' => "Can't send new user mail to $email",
'level' => ILogger::ERROR,
diff --git a/apps/provisioning_api/lib/FederatedFileSharingFactory.php b/apps/provisioning_api/lib/FederatedFileSharingFactory.php
index 63a0f0ff20..6a630542af 100644
--- a/apps/provisioning_api/lib/FederatedFileSharingFactory.php
+++ b/apps/provisioning_api/lib/FederatedFileSharingFactory.php
@@ -40,5 +40,4 @@ class FederatedFileSharingFactory {
public function get(): Application {
return $this->serverContainer->query(Application::class);
}
-
}
diff --git a/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php b/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
index a87f69a25b..50a00a1e93 100644
--- a/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
@@ -49,7 +49,6 @@ class AppConfigControllerTest extends TestCase {
$this->config = $this->createMock(IConfig::class);
$this->appConfig = $this->createMock(IAppConfig::class);
-
}
/**
@@ -105,7 +104,6 @@ class AppConfigControllerTest extends TestCase {
* @param int $status
*/
public function testGetKeys($app, $keys, $throws, $status) {
-
$api = $this->getInstance(['verifyAppId']);
if ($throws instanceof \Exception) {
$api->expects($this->once())
@@ -153,7 +151,6 @@ class AppConfigControllerTest extends TestCase {
* @param int $status
*/
public function testGetValue($app, $key, $default, $return, $throws, $status) {
-
$api = $this->getInstance(['verifyAppId']);
if ($throws instanceof \Exception) {
$api->expects($this->once())
@@ -202,7 +199,6 @@ class AppConfigControllerTest extends TestCase {
* @param int $status
*/
public function testSetValue($app, $key, $value, $appThrows, $keyThrows, $status) {
-
$api = $this->getInstance(['verifyAppId', 'verifyConfigKey']);
if ($appThrows instanceof \Exception) {
$api->expects($this->once())
@@ -267,7 +263,6 @@ class AppConfigControllerTest extends TestCase {
* @param int $status
*/
public function testDeleteValue($app, $key, $appThrows, $keyThrows, $status) {
-
$api = $this->getInstance(['verifyAppId', 'verifyConfigKey']);
if ($appThrows instanceof \Exception) {
$api->expects($this->once())
diff --git a/apps/provisioning_api/tests/Controller/AppsControllerTest.php b/apps/provisioning_api/tests/Controller/AppsControllerTest.php
index bfc7a2f623..28867f0b80 100644
--- a/apps/provisioning_api/tests/Controller/AppsControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/AppsControllerTest.php
@@ -102,7 +102,7 @@ class AppsControllerTest extends \OCA\Provisioning_API\Tests\TestCase {
$data = $result->getData();
$apps = (new \OC_App)->listAllApps();
$list = [];
- foreach($apps as $app) {
+ foreach ($apps as $app) {
$list[] = $app['id'];
}
$disabled = array_diff($list, \OC_App::getEnabledApps());
diff --git a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php
index 70a920b743..0ed6d58e21 100644
--- a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php
@@ -219,7 +219,6 @@ class GroupsControllerTest extends \Test\TestCase {
$result = $this->api->getGroups($search, $limit, $offset);
$this->assertEquals(['groups' => ['group1', 'group2']], $result->getData());
-
}
/**
@@ -260,7 +259,6 @@ class GroupsControllerTest extends \Test\TestCase {
]
]], $result->getData());
-
}
public function testGetGroupAsSubadmin() {
diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
index aff12547ec..48b970e968 100644
--- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
@@ -440,7 +440,7 @@ class UsersControllerTest extends TestCase {
->expects($this->any())
->method('getAppValue')
->willReturnCallback(function ($appid, $key, $default) {
- if($key === 'newUser.generateUserID') {
+ if ($key === 'newUser.generateUserID') {
return 'yes';
}
return null;
@@ -477,7 +477,9 @@ class UsersControllerTest extends TestCase {
$this->secureRandom->expects($this->any())
->method('generate')
->with(10)
- ->willReturnCallback(function () { return (string)rand(1000000000, 9999999999); });
+ ->willReturnCallback(function () {
+ return (string)rand(1000000000, 9999999999);
+ });
$this->assertTrue(key_exists(
'id',
@@ -495,7 +497,7 @@ class UsersControllerTest extends TestCase {
->expects($this->any())
->method('getAppValue')
->willReturnCallback(function ($appid, $key, $default) {
- if($key === 'newUser.generateUserID') {
+ if ($key === 'newUser.generateUserID') {
return 'yes';
}
return null;
@@ -538,7 +540,7 @@ class UsersControllerTest extends TestCase {
->expects($this->any())
->method('getAppValue')
->willReturnCallback(function ($appid, $key, $default) {
- if($key === 'newUser.requireEmail') {
+ if ($key === 'newUser.requireEmail') {
return 'yes';
}
return null;
@@ -1590,7 +1592,6 @@ class UsersControllerTest extends TestCase {
}
public function testEditUserSelfEditChangeLanguage() {
-
$this->l10nFactory->expects($this->once())
->method('findAvailableLanguages')
->willReturn(['en', 'de', 'sv']);
@@ -1683,7 +1684,6 @@ class UsersControllerTest extends TestCase {
}
public function testEditUserAdminEditChangeLanguage() {
-
$this->l10nFactory->expects($this->once())
->method('findAvailableLanguages')
->willReturn(['en', 'de', 'sv']);
diff --git a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php
index 368fa40356..b3b2184b2b 100644
--- a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php
+++ b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php
@@ -118,6 +118,5 @@ class ProvisioningApiMiddlewareTest extends TestCase {
$this->assertTrue($forwared);
$this->assertSame($exception, $e);
}
-
}
}
diff --git a/apps/provisioning_api/tests/TestCase.php b/apps/provisioning_api/tests/TestCase.php
index f2495cdba6..7ddebfcf32 100644
--- a/apps/provisioning_api/tests/TestCase.php
+++ b/apps/provisioning_api/tests/TestCase.php
@@ -65,7 +65,7 @@ abstract class TestCase extends \Test\TestCase {
}
protected function tearDown(): void {
- foreach($this->users as $user) {
+ foreach ($this->users as $user) {
$user->delete();
}
diff --git a/apps/settings/lib/Activity/GroupProvider.php b/apps/settings/lib/Activity/GroupProvider.php
index 65ca262777..ab34e907ca 100644
--- a/apps/settings/lib/Activity/GroupProvider.php
+++ b/apps/settings/lib/Activity/GroupProvider.php
@@ -36,7 +36,6 @@ use OCP\IUserManager;
use OCP\L10N\IFactory as L10nFactory;
class GroupProvider implements IProvider {
-
public const ADDED_TO_GROUP = 'group_added';
public const REMOVED_FROM_GROUP = 'group_removed';
diff --git a/apps/settings/lib/Activity/Provider.php b/apps/settings/lib/Activity/Provider.php
index ecf653eb0e..5023b4af19 100644
--- a/apps/settings/lib/Activity/Provider.php
+++ b/apps/settings/lib/Activity/Provider.php
@@ -38,7 +38,6 @@ use OCP\IUserManager;
use OCP\L10N\IFactory;
class Provider implements IProvider {
-
public const PASSWORD_CHANGED_BY = 'password_changed_by';
public const PASSWORD_CHANGED_SELF = 'password_changed_self';
public const PASSWORD_RESET = 'password_changed';
@@ -106,14 +105,12 @@ class Provider implements IProvider {
$subject = $this->l->t('You changed your password');
} elseif ($event->getSubject() === self::PASSWORD_RESET) {
$subject = $this->l->t('Your password was reset by an administrator');
-
} elseif ($event->getSubject() === self::EMAIL_CHANGED_BY) {
$subject = $this->l->t('{actor} changed your email address');
} elseif ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
$subject = $this->l->t('You changed your email address');
} elseif ($event->getSubject() === self::EMAIL_CHANGED) {
$subject = $this->l->t('Your email address was changed by an administrator');
-
} elseif ($event->getSubject() === self::APP_TOKEN_CREATED) {
$subject = $this->l->t('You created app password "{token}"');
} elseif ($event->getSubject() === self::APP_TOKEN_DELETED) {
@@ -124,7 +121,6 @@ class Provider implements IProvider {
$subject = $this->l->t('You granted filesystem access to app password "{token}"');
} elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_REVOKED) {
$subject = $this->l->t('You revoked filesystem access from app password "{token}"');
-
} else {
throw new \InvalidArgumentException('Unknown subject');
}
diff --git a/apps/settings/lib/Activity/SecurityFilter.php b/apps/settings/lib/Activity/SecurityFilter.php
index dd0312232f..d814571897 100644
--- a/apps/settings/lib/Activity/SecurityFilter.php
+++ b/apps/settings/lib/Activity/SecurityFilter.php
@@ -63,5 +63,4 @@ class SecurityFilter implements IFilter {
public function getPriority() {
return 30;
}
-
}
diff --git a/apps/settings/lib/Activity/SecurityProvider.php b/apps/settings/lib/Activity/SecurityProvider.php
index 568006d03c..20156bbc40 100644
--- a/apps/settings/lib/Activity/SecurityProvider.php
+++ b/apps/settings/lib/Activity/SecurityProvider.php
@@ -109,5 +109,4 @@ class SecurityProvider implements IProvider {
}
return $event;
}
-
}
diff --git a/apps/settings/lib/Activity/SecuritySetting.php b/apps/settings/lib/Activity/SecuritySetting.php
index d276285d48..c9ed42b2e2 100644
--- a/apps/settings/lib/Activity/SecuritySetting.php
+++ b/apps/settings/lib/Activity/SecuritySetting.php
@@ -62,5 +62,4 @@ class SecuritySetting implements ISetting {
public function isDefaultEnabledStream() {
return true;
}
-
}
diff --git a/apps/settings/lib/AppInfo/Application.php b/apps/settings/lib/AppInfo/Application.php
index f53a5ddcf5..809fe6cf84 100644
--- a/apps/settings/lib/AppInfo/Application.php
+++ b/apps/settings/lib/AppInfo/Application.php
@@ -54,7 +54,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
class Application extends App {
-
const APP_ID = 'settings';
/**
@@ -80,7 +79,7 @@ class Application extends App {
$container->registerService('isSubAdmin', function (IContainer $c) {
$userObject = \OC::$server->getUserSession()->getUser();
$isSubAdmin = false;
- if($userObject !== null) {
+ if ($userObject !== null) {
$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
}
return $isSubAdmin;
@@ -158,7 +157,6 @@ class Application extends App {
/** @var Hooks $hooks */
$hooks = $this->getContainer()->query(Hooks::class);
$hooks->addUserToGroup($group, $user);
-
}
public function removeUserFromGroup(IGroup $group, IUser $user): void {
diff --git a/apps/settings/lib/BackgroundJobs/VerifyUserData.php b/apps/settings/lib/BackgroundJobs/VerifyUserData.php
index a5c46c603b..e77d95ff4d 100644
--- a/apps/settings/lib/BackgroundJobs/VerifyUserData.php
+++ b/apps/settings/lib/BackgroundJobs/VerifyUserData.php
@@ -100,7 +100,6 @@ class VerifyUserData extends Job {
* @param ILogger|null $logger
*/
public function execute($jobList, ILogger $logger = null) {
-
if ($this->shouldRun($this->argument)) {
parent::execute($jobList, $logger);
$jobList->remove($this, $this->argument);
@@ -110,14 +109,12 @@ class VerifyUserData extends Job {
$this->resetVerificationState();
}
}
-
}
protected function run($argument) {
-
$try = (int)$argument['try'] + 1;
- switch($argument['type']) {
+ switch ($argument['type']) {
case AccountManager::PROPERTY_WEBSITE:
$result = $this->verifyWebsite($argument);
break;
@@ -143,7 +140,6 @@ class VerifyUserData extends Job {
* @return bool true if we could check the verification code, otherwise false
*/
protected function verifyWebsite(array $argument) {
-
$result = false;
$url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
@@ -188,7 +184,7 @@ class VerifyUserData extends Job {
* @return bool true if we could check the verification code, otherwise false
*/
protected function verifyViaLookupServer(array $argument, $dataType) {
- if(empty($this->lookupServerUrl) ||
+ if (empty($this->lookupServerUrl) ||
$this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') !== 'yes' ||
$this->config->getSystemValue('has_internet_connection', true) === false) {
return false;
@@ -249,7 +245,6 @@ class VerifyUserData extends Job {
if (is_array($body) && isset($body['federationId']) && $body['federationId'] === $cloudId) {
return $body;
}
-
} catch (\Exception $e) {
// do nothing, we will just re-try later
}
@@ -299,5 +294,4 @@ class VerifyUserData extends Job {
$this->accountManager->updateUser($user, $accountData);
}
}
-
}
diff --git a/apps/settings/lib/Controller/AdminSettingsController.php b/apps/settings/lib/Controller/AdminSettingsController.php
index e7b1a27a63..c50ffc6f1e 100644
--- a/apps/settings/lib/Controller/AdminSettingsController.php
+++ b/apps/settings/lib/Controller/AdminSettingsController.php
@@ -82,7 +82,7 @@ class AdminSettingsController extends Controller {
);
$formatted = $this->formatSettings($settings);
// Do not show legacy forms for sub admins
- if($section === 'additional' && !$isSubAdmin) {
+ if ($section === 'additional' && !$isSubAdmin) {
$formatted['content'] .= $this->getLegacyForms();
}
return $formatted;
@@ -117,6 +117,4 @@ class AdminSettingsController extends Controller {
return $out->fetchPage();
}
-
-
}
diff --git a/apps/settings/lib/Controller/AppSettingsController.php b/apps/settings/lib/Controller/AppSettingsController.php
index f40a8024b6..7dbbaca1a4 100644
--- a/apps/settings/lib/Controller/AppSettingsController.php
+++ b/apps/settings/lib/Controller/AppSettingsController.php
@@ -149,9 +149,9 @@ class AppSettingsController extends Controller {
private function getAppsWithUpdates() {
$appClass = new \OC_App();
$apps = $appClass->listAllApps();
- foreach($apps as $key => $app) {
+ foreach ($apps as $key => $app) {
$newVersion = $this->installer->isUpdateAvailable($app['id']);
- if($newVersion === false) {
+ if ($newVersion === false) {
unset($apps[$key]);
}
}
@@ -169,7 +169,6 @@ class AppSettingsController extends Controller {
];
}
return $result;
-
}
/**
@@ -186,7 +185,7 @@ class AppSettingsController extends Controller {
$formattedCategories = [];
$categories = $this->categoryFetcher->get();
- foreach($categories as $category) {
+ foreach ($categories as $category) {
$formattedCategories[] = [
'id' => $category['id'],
'ident' => $category['id'],
@@ -217,10 +216,10 @@ class AppSettingsController extends Controller {
// add bundle information
$bundles = $this->bundleFetcher->getBundles();
- foreach($bundles as $bundle) {
- foreach($bundle->getAppIdentifiers() as $identifier) {
- foreach($this->allApps as &$app) {
- if($app['id'] === $identifier) {
+ foreach ($bundles as $bundle) {
+ foreach ($bundle->getAppIdentifiers() as $identifier) {
+ foreach ($this->allApps as &$app) {
+ if ($app['id'] === $identifier) {
$app['bundleIds'][] = $bundle->getIdentifier();
continue;
}
@@ -240,7 +239,6 @@ class AppSettingsController extends Controller {
* @throws \Exception
*/
public function listApps(): JSONResponse {
-
$this->fetchApps();
$apps = $this->getAllApps();
@@ -255,7 +253,7 @@ class AppSettingsController extends Controller {
}
$newVersion = $this->installer->isUpdateAvailable($appData['id']);
- if($newVersion) {
+ if ($newVersion) {
$appData['update'] = $newVersion;
}
@@ -307,16 +305,16 @@ class AppSettingsController extends Controller {
$versionParser = new VersionParser();
$formattedApps = [];
$apps = $this->appFetcher->get();
- foreach($apps as $app) {
+ foreach ($apps as $app) {
// Skip all apps not in the requested category
if ($requestedCategory !== '') {
$isInCategory = false;
- foreach($app['categories'] as $category) {
- if($category === $requestedCategory) {
+ foreach ($app['categories'] as $category) {
+ if ($category === $requestedCategory) {
$isInCategory = true;
}
}
- if(!$isInCategory) {
+ if (!$isInCategory) {
continue;
}
}
@@ -326,28 +324,28 @@ class AppSettingsController extends Controller {
}
$nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']);
$nextCloudVersionDependencies = [];
- if($nextCloudVersion->getMinimumVersion() !== '') {
+ if ($nextCloudVersion->getMinimumVersion() !== '') {
$nextCloudVersionDependencies['nextcloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion();
}
- if($nextCloudVersion->getMaximumVersion() !== '') {
+ if ($nextCloudVersion->getMaximumVersion() !== '') {
$nextCloudVersionDependencies['nextcloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion();
}
$phpVersion = $versionParser->getVersion($app['releases'][0]['rawPhpVersionSpec']);
$existsLocally = \OC_App::getAppPath($app['id']) !== false;
$phpDependencies = [];
- if($phpVersion->getMinimumVersion() !== '') {
+ if ($phpVersion->getMinimumVersion() !== '') {
$phpDependencies['php']['@attributes']['min-version'] = $phpVersion->getMinimumVersion();
}
- if($phpVersion->getMaximumVersion() !== '') {
+ if ($phpVersion->getMaximumVersion() !== '') {
$phpDependencies['php']['@attributes']['max-version'] = $phpVersion->getMaximumVersion();
}
- if(isset($app['releases'][0]['minIntSize'])) {
+ if (isset($app['releases'][0]['minIntSize'])) {
$phpDependencies['php']['@attributes']['min-int-size'] = $app['releases'][0]['minIntSize'];
}
$authors = '';
- foreach($app['authors'] as $key => $author) {
+ foreach ($app['authors'] as $key => $author) {
$authors .= $author['name'];
- if($key !== count($app['authors']) - 1) {
+ if ($key !== count($app['authors']) - 1) {
$authors .= ', ';
}
}
@@ -355,12 +353,12 @@ class AppSettingsController extends Controller {
$currentLanguage = substr(\OC::$server->getL10NFactory()->findLanguage(), 0, 2);
$enabledValue = $this->config->getAppValue($app['id'], 'enabled', 'no');
$groups = null;
- if($enabledValue !== 'no' && $enabledValue !== 'yes') {
+ if ($enabledValue !== 'no' && $enabledValue !== 'yes') {
$groups = $enabledValue;
}
$currentVersion = '';
- if($this->appManager->isInstalled($app['id'])) {
+ if ($this->appManager->isInstalled($app['id'])) {
$currentVersion = $this->appManager->getAppVersion($app['id']);
} else {
$currentLanguage = $app['releases'][0]['version'];
@@ -442,7 +440,7 @@ class AppSettingsController extends Controller {
$installer = \OC::$server->query(Installer::class);
$isDownloaded = $installer->isDownloaded($appId);
- if(!$isDownloaded) {
+ if (!$isDownloaded) {
$installer->downloadApp($appId);
}
@@ -458,7 +456,6 @@ class AppSettingsController extends Controller {
}
}
return new JSONResponse(['data' => ['update_required' => $updateRequired]]);
-
} catch (\Exception $e) {
$this->logger->logException($e);
return new JSONResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
@@ -515,7 +512,7 @@ class AppSettingsController extends Controller {
public function uninstallApp(string $appId): JSONResponse {
$appId = OC_App::cleanAppId($appId);
$result = $this->installer->removeApp($appId);
- if($result !== false) {
+ if ($result !== false) {
$this->appManager->clearAppsCache();
return new JSONResponse(['data' => ['appid' => $appId]]);
}
@@ -558,5 +555,4 @@ class AppSettingsController extends Controller {
$this->appManager->ignoreNextcloudRequirementForApp($appId);
return new JSONResponse();
}
-
}
diff --git a/apps/settings/lib/Controller/AuthSettingsController.php b/apps/settings/lib/Controller/AuthSettingsController.php
index 405044746a..0296a1ac5c 100644
--- a/apps/settings/lib/Controller/AuthSettingsController.php
+++ b/apps/settings/lib/Controller/AuthSettingsController.php
@@ -126,8 +126,7 @@ class AuthSettingsController extends Controller {
} catch (SessionNotAvailableException $ex) {
return $this->getServiceNotAvailableResponse();
}
- if ($this->userSession->getImpersonatingUserID() !== null)
- {
+ if ($this->userSession->getImpersonatingUserID() !== null) {
return $this->getServiceNotAvailableResponse();
}
diff --git a/apps/settings/lib/Controller/CertificateController.php b/apps/settings/lib/Controller/CertificateController.php
index d23821bdf9..b7ce174966 100644
--- a/apps/settings/lib/Controller/CertificateController.php
+++ b/apps/settings/lib/Controller/CertificateController.php
@@ -126,7 +126,6 @@ class CertificateController extends Controller {
* @return DataResponse
*/
public function removePersonalRootCertificate($certificateIdentifier) {
-
if ($this->isCertificateImportAllowed() === false) {
return new DataResponse(['Individual certificate management disabled'], Http::STATUS_FORBIDDEN);
}
@@ -168,7 +167,6 @@ class CertificateController extends Controller {
* @return DataResponse
*/
public function removeSystemRootCertificate($certificateIdentifier) {
-
if ($this->isCertificateImportAllowed() === false) {
return new DataResponse(['Individual certificate management disabled'], Http::STATUS_FORBIDDEN);
}
diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php
index 20b8357a6a..439731b22e 100644
--- a/apps/settings/lib/Controller/ChangePasswordController.php
+++ b/apps/settings/lib/Controller/ChangePasswordController.php
@@ -108,8 +108,8 @@ class ChangePasswordController extends Controller {
'status' => 'error'
]);
}
- // password policy app throws exception
- } catch(HintException $e) {
+ // password policy app throws exception
+ } catch (HintException $e) {
return new JSONResponse([
'status' => 'error',
'data' => [
@@ -221,8 +221,8 @@ class ChangePasswordController extends Controller {
} else { // now we know that everything is fine regarding the recovery password, let's try to change the password
try {
$result = $targetUser->setPassword($password, $recoveryPassword);
- // password policy app throws exception
- } catch(HintException $e) {
+ // password policy app throws exception
+ } catch (HintException $e) {
return new JSONResponse([
'status' => 'error',
'data' => [
@@ -256,8 +256,8 @@ class ChangePasswordController extends Controller {
],
]);
}
- // password policy app throws exception
- } catch(HintException $e) {
+ // password policy app throws exception
+ } catch (HintException $e) {
return new JSONResponse([
'status' => 'error',
'data' => [
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
index e386f29a94..a0d374e5b4 100644
--- a/apps/settings/lib/Controller/CheckSetupController.php
+++ b/apps/settings/lib/Controller/CheckSetupController.php
@@ -137,7 +137,7 @@ class CheckSetupController extends Controller {
'www.nextcloud.com', 'www.startpage.com', 'www.eff.org', 'www.edri.org'
]);
- foreach($siteArray as $site) {
+ foreach ($siteArray as $site) {
if ($this->isSiteReachable($site)) {
return false;
}
@@ -208,40 +208,40 @@ class CheckSetupController extends Controller {
// Don't run check when:
// 1. Server has `has_internet_connection` set to false
// 2. AppStore AND S2S is disabled
- if(!$this->config->getSystemValue('has_internet_connection', true)) {
+ if (!$this->config->getSystemValue('has_internet_connection', true)) {
return '';
}
- if(!$this->config->getSystemValue('appstoreenabled', true)
+ if (!$this->config->getSystemValue('appstoreenabled', true)
&& $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
&& $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
return '';
}
$versionString = $this->getCurlVersion();
- if(isset($versionString['ssl_version'])) {
+ if (isset($versionString['ssl_version'])) {
$versionString = $versionString['ssl_version'];
} else {
return '';
}
$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
- if(!$this->config->getSystemValue('appstoreenabled', true)) {
+ if (!$this->config->getSystemValue('appstoreenabled', true)) {
$features = (string)$this->l10n->t('Federated Cloud Sharing');
}
// Check if at least OpenSSL after 1.01d or 1.0.2b
- if(strpos($versionString, 'OpenSSL/') === 0) {
+ if (strpos($versionString, 'OpenSSL/') === 0) {
$majorVersion = substr($versionString, 8, 5);
$patchRelease = substr($versionString, 13, 6);
- if(($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
+ if (($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['OpenSSL', $versionString, $features]);
}
}
// Check if NSS and perform heuristic check
- if(strpos($versionString, 'NSS/') === 0) {
+ if (strpos($versionString, 'NSS/') === 0) {
try {
$firstClient = $this->clientService->newClient();
$firstClient->get('https://nextcloud.com/');
@@ -249,7 +249,7 @@ class CheckSetupController extends Controller {
$secondClient = $this->clientService->newClient();
$secondClient->get('https://nextcloud.com/');
} catch (ClientException $e) {
- if($e->getResponse()->getStatusCode() === 400) {
+ if ($e->getResponse()->getStatusCode() === 400) {
return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['NSS', $versionString, $features]);
}
}
@@ -344,13 +344,13 @@ class CheckSetupController extends Controller {
* @return DataResponse
*/
public function getFailedIntegrityCheckFiles() {
- if(!$this->checker->isCodeCheckEnforced()) {
+ if (!$this->checker->isCodeCheckEnforced()) {
return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
}
$completeResults = $this->checker->getResults();
- if(!empty($completeResults)) {
+ if (!empty($completeResults)) {
$formattedTextResponse = 'Technical information
=====================
The following list covers which files have failed the integrity check. Please read
@@ -360,12 +360,12 @@ them.
Results
=======
';
- foreach($completeResults as $context => $contextResult) {
+ foreach ($completeResults as $context => $contextResult) {
$formattedTextResponse .= "- $context\n";
- foreach($contextResult as $category => $result) {
+ foreach ($contextResult as $category => $result) {
$formattedTextResponse .= "\t- $category\n";
- if($category !== 'EXCEPTION') {
+ if ($category !== 'EXCEPTION') {
foreach ($result as $key => $results) {
$formattedTextResponse .= "\t\t- $key\n";
}
@@ -374,7 +374,6 @@ Results
$formattedTextResponse .= "\t\t- $results\n";
}
}
-
}
}
@@ -406,23 +405,23 @@ Raw output
protected function isOpcacheProperlySetup() {
$iniWrapper = new IniGetWrapper();
- if(!$iniWrapper->getBool('opcache.enable')) {
+ if (!$iniWrapper->getBool('opcache.enable')) {
return false;
}
- if(!$iniWrapper->getBool('opcache.save_comments')) {
+ if (!$iniWrapper->getBool('opcache.save_comments')) {
return false;
}
- if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
+ if ($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
return false;
}
- if($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
+ if ($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
return false;
}
- if($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
+ if ($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
return false;
}
diff --git a/apps/settings/lib/Controller/CommonSettingsTrait.php b/apps/settings/lib/Controller/CommonSettingsTrait.php
index 7aa202429e..f5c8bb465f 100644
--- a/apps/settings/lib/Controller/CommonSettingsTrait.php
+++ b/apps/settings/lib/Controller/CommonSettingsTrait.php
@@ -38,7 +38,7 @@ use OCP\Settings\IIconSection;
use OCP\Settings\IManager as ISettingsManager;
use OCP\Settings\ISettings;
-trait CommonSettingsTrait {
+trait CommonSettingsTrait {
/** @var ISettingsManager */
private $settingsManager;
@@ -85,11 +85,11 @@ trait CommonSettingsTrait {
protected function formatSections($sections, $currentSection, $type, $currentType, bool $subAdminOnly = false) {
$templateParameters = [];
/** @var \OCP\Settings\ISection[] $prioritizedSections */
- foreach($sections as $prioritizedSections) {
+ foreach ($sections as $prioritizedSections) {
foreach ($prioritizedSections as $section) {
- if($type === 'admin') {
+ if ($type === 'admin') {
$settings = $this->settingsManager->getAdminSettings($section->getID(), $subAdminOnly);
- } elseif($type === 'personal') {
+ } elseif ($type === 'personal') {
$settings = $this->settingsManager->getPersonalSettings($section->getID());
}
if (empty($settings) && !($section->getID() === 'additional' && count(\OC_App::getForms('admin')) > 0)) {
diff --git a/apps/settings/lib/Controller/HelpController.php b/apps/settings/lib/Controller/HelpController.php
index cf470d6af4..58fb18ea2c 100644
--- a/apps/settings/lib/Controller/HelpController.php
+++ b/apps/settings/lib/Controller/HelpController.php
@@ -71,7 +71,7 @@ class HelpController extends Controller {
public function help(string $mode = 'user'): TemplateResponse {
$this->navigationManager->setActiveEntry('help');
- if(!isset($mode) || $mode !== 'admin') {
+ if (!isset($mode) || $mode !== 'admin') {
$mode = 'user';
}
@@ -93,7 +93,5 @@ class HelpController extends Controller {
$policy->addAllowedFrameDomain('\'self\'');
$response->setContentSecurityPolicy($policy);
return $response;
-
}
-
}
diff --git a/apps/settings/lib/Controller/LogSettingsController.php b/apps/settings/lib/Controller/LogSettingsController.php
index 648b0ff1c3..31abc14437 100644
--- a/apps/settings/lib/Controller/LogSettingsController.php
+++ b/apps/settings/lib/Controller/LogSettingsController.php
@@ -51,7 +51,7 @@ class LogSettingsController extends Controller {
* @return StreamResponse
*/
public function download() {
- if(!$this->log instanceof Log) {
+ if (!$this->log instanceof Log) {
throw new \UnexpectedValueException('Log file not available');
}
$resp = new StreamResponse($this->log->getLogPath());
diff --git a/apps/settings/lib/Controller/MailSettingsController.php b/apps/settings/lib/Controller/MailSettingsController.php
index 5dc0ff9d89..94f9d72caf 100644
--- a/apps/settings/lib/Controller/MailSettingsController.php
+++ b/apps/settings/lib/Controller/MailSettingsController.php
@@ -93,10 +93,9 @@ class MailSettingsController extends Controller {
$mail_smtpauth,
$mail_smtpport,
$mail_sendmailmode) {
-
$params = get_defined_vars();
$configs = [];
- foreach($params as $key => $value) {
+ foreach ($params as $key => $value) {
$configs[$key] = empty($value) ? null : $value;
}
@@ -168,5 +167,4 @@ class MailSettingsController extends Controller {
return new DataResponse($this->l10n->t('You need to set your user email before being able to send test emails.'), Http::STATUS_BAD_REQUEST);
}
-
}
diff --git a/apps/settings/lib/Controller/PersonalSettingsController.php b/apps/settings/lib/Controller/PersonalSettingsController.php
index 12d8af3af1..0aff8bee64 100644
--- a/apps/settings/lib/Controller/PersonalSettingsController.php
+++ b/apps/settings/lib/Controller/PersonalSettingsController.php
@@ -65,7 +65,6 @@ class PersonalSettingsController extends Controller {
*/
public function index($section) {
return $this->getIndexResponse('personal', $section);
-
}
/**
@@ -75,7 +74,7 @@ class PersonalSettingsController extends Controller {
protected function getSettings($section) {
$settings = $this->settingsManager->getPersonalSettings($section);
$formatted = $this->formatSettings($settings);
- if($section === 'additional') {
+ if ($section === 'additional') {
$formatted['content'] .= $this->getLegacyForms();
}
return $formatted;
diff --git a/apps/settings/lib/Controller/TwoFactorSettingsController.php b/apps/settings/lib/Controller/TwoFactorSettingsController.php
index 77d8e88235..36b554c818 100644
--- a/apps/settings/lib/Controller/TwoFactorSettingsController.php
+++ b/apps/settings/lib/Controller/TwoFactorSettingsController.php
@@ -56,5 +56,4 @@ class TwoFactorSettingsController extends Controller {
return new JSONResponse($this->mandatoryTwoFactor->getState());
}
-
}
diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php
index 5a4ebd122f..abc4715df6 100644
--- a/apps/settings/lib/Controller/UsersController.php
+++ b/apps/settings/lib/Controller/UsersController.php
@@ -172,7 +172,7 @@ class UsersController extends Controller {
$groupsInfo->setSorting($sortGroupsBy);
list($adminGroup, $groups) = $groupsInfo->get();
- if(!$isLDAPUsed && $this->appManager->isEnabledForUser('user_ldap')) {
+ if (!$isLDAPUsed && $this->appManager->isEnabledForUser('user_ldap')) {
$isLDAPUsed = (bool)array_reduce($this->userManager->getBackends(), function ($ldapFound, $backend) {
return $ldapFound || $backend instanceof User_Proxy;
});
@@ -181,7 +181,7 @@ class UsersController extends Controller {
$disabledUsers = -1;
$userCount = 0;
- if(!$isLDAPUsed) {
+ if (!$isLDAPUsed) {
if ($this->isAdmin) {
$disabledUsers = $this->userManager->countDisabledUsers();
$userCount = array_reduce($this->userManager->countUsers(), function ($v, $w) {
@@ -193,7 +193,7 @@ class UsersController extends Controller {
$userGroups = $this->groupManager->getUserGroups($user);
$groupsNames = [];
- foreach($groups as $key => $group) {
+ foreach ($groups as $key => $group) {
// $userCount += (int)$group['usercount'];
array_push($groupsNames, $group['name']);
// we prevent subadmins from looking up themselves
@@ -447,7 +447,6 @@ class UsersController extends Controller {
* @return DataResponse
*/
public function getVerificationCode(string $account, bool $onlyVerificationCode): DataResponse {
-
$user = $this->userSession->getUser();
if ($user === null) {
diff --git a/apps/settings/lib/Controller/WebAuthnController.php b/apps/settings/lib/Controller/WebAuthnController.php
index cbc396b675..c1ce7a6cf9 100644
--- a/apps/settings/lib/Controller/WebAuthnController.php
+++ b/apps/settings/lib/Controller/WebAuthnController.php
@@ -37,7 +37,6 @@ use OCP\IUserSession;
use Webauthn\PublicKeyCredentialCreationOptions;
class WebAuthnController extends Controller {
-
private const WEBAUTHN_REGISTRATION = 'webauthn_registration';
/** @var Manager */
diff --git a/apps/settings/lib/Hooks.php b/apps/settings/lib/Hooks.php
index baa8941bd3..851f2f143d 100644
--- a/apps/settings/lib/Hooks.php
+++ b/apps/settings/lib/Hooks.php
@@ -157,7 +157,6 @@ class Hooks {
* @throws \BadMethodCallException
*/
public function onChangeEmail(IUser $user, $oldMailAddress) {
-
if ($oldMailAddress === $user->getEMailAddress() ||
$user->getLastLogin() === 0) {
// Email didn't really change or user didn't login,
diff --git a/apps/settings/lib/Mailer/NewUserMailHelper.php b/apps/settings/lib/Mailer/NewUserMailHelper.php
index ca6a594752..75b1593c6b 100644
--- a/apps/settings/lib/Mailer/NewUserMailHelper.php
+++ b/apps/settings/lib/Mailer/NewUserMailHelper.php
@@ -139,7 +139,7 @@ class NewUserMailHelper {
$emailTemplate->addHeading($l10n->t('Welcome aboard %s', [$displayName]));
}
$emailTemplate->addBodyText($l10n->t('Welcome to your %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()]));
- if($user->getBackendClassName() !== 'LDAP') {
+ if ($user->getBackendClassName() !== 'LDAP') {
$emailTemplate->addBodyText($l10n->t('Your username is: %s', [$userId]));
}
if ($generatePasswordResetToken) {
diff --git a/apps/settings/lib/Middleware/SubadminMiddleware.php b/apps/settings/lib/Middleware/SubadminMiddleware.php
index ffc507e50e..7fa30c8e26 100644
--- a/apps/settings/lib/Middleware/SubadminMiddleware.php
+++ b/apps/settings/lib/Middleware/SubadminMiddleware.php
@@ -65,8 +65,8 @@ class SubadminMiddleware extends Middleware {
* @throws \Exception
*/
public function beforeController($controller, $methodName) {
- if(!$this->reflector->hasAnnotation('NoSubadminRequired')) {
- if(!$this->isSubAdmin) {
+ if (!$this->reflector->hasAnnotation('NoSubadminRequired')) {
+ if (!$this->isSubAdmin) {
throw new NotAdminException($this->l10n->t('Logged in user must be a subadmin'));
}
}
@@ -81,7 +81,7 @@ class SubadminMiddleware extends Middleware {
* @throws \Exception
*/
public function afterException($controller, $methodName, \Exception $exception) {
- if($exception instanceof NotAdminException) {
+ if ($exception instanceof NotAdminException) {
$response = new TemplateResponse('core', '403', [], 'guest');
$response->setStatus(Http::STATUS_FORBIDDEN);
return $response;
@@ -89,5 +89,4 @@ class SubadminMiddleware extends Middleware {
throw $exception;
}
-
}
diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php
index e6bc438835..152259b743 100644
--- a/apps/settings/lib/Settings/Personal/PersonalInfo.php
+++ b/apps/settings/lib/Settings/Personal/PersonalInfo.php
@@ -95,7 +95,7 @@ class PersonalInfo implements ISettings {
public function getForm() {
$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
$lookupServerUploadEnabled = false;
- if($federatedFileSharingEnabled) {
+ if ($federatedFileSharingEnabled) {
$federatedFileSharing = \OC::$server->query(Application::class);
$shareProvider = $federatedFileSharing->getFederatedShareProvider();
$lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
@@ -194,7 +194,7 @@ class PersonalInfo implements ISettings {
*/
private function getLanguages(IUser $user) {
$forceLanguage = $this->config->getSystemValue('force_language', false);
- if($forceLanguage !== false) {
+ if ($forceLanguage !== false) {
return [];
}
@@ -227,7 +227,7 @@ class PersonalInfo implements ISettings {
private function getLocales(IUser $user) {
$forceLanguage = $this->config->getSystemValue('force_locale', false);
- if($forceLanguage !== false) {
+ if ($forceLanguage !== false) {
return [];
}
@@ -243,8 +243,7 @@ class PersonalInfo implements ISettings {
return $userLocaleString === $value['code'];
});
- if (!empty($userLocale))
- {
+ if (!empty($userLocale)) {
$userLocale = reset($userLocale);
}
@@ -289,5 +288,4 @@ class PersonalInfo implements ISettings {
}
return $messageParameters;
}
-
}
diff --git a/apps/settings/lib/Settings/Personal/Security/Authtokens.php b/apps/settings/lib/Settings/Personal/Security/Authtokens.php
index 3e33723a62..22aca1660d 100644
--- a/apps/settings/lib/Settings/Personal/Security/Authtokens.php
+++ b/apps/settings/lib/Settings/Personal/Security/Authtokens.php
@@ -117,5 +117,4 @@ class Authtokens implements ISettings {
return $data;
}, $tokens);
}
-
}
diff --git a/apps/settings/lib/Settings/Personal/Security/TwoFactor.php b/apps/settings/lib/Settings/Personal/Security/TwoFactor.php
index 4db8f6f8ab..ca20274b33 100644
--- a/apps/settings/lib/Settings/Personal/Security/TwoFactor.php
+++ b/apps/settings/lib/Settings/Personal/Security/TwoFactor.php
@@ -66,7 +66,6 @@ class TwoFactor implements ISettings {
'twoFactorProviderData' => $this->getTwoFactorProviderData(),
'themedark' => $this->config->getUserValue($this->uid, 'accessibility', 'theme', false)
]);
-
}
public function getSection(): string {
diff --git a/apps/settings/templates/help.php b/apps/settings/templates/help.php
index 0eccf78cc9..045f45d5d8 100644
--- a/apps/settings/templates/help.php
+++ b/apps/settings/templates/help.php
@@ -4,14 +4,18 @@
-
-
t('User documentation')); ?>
-
+
-
-
t('Administrator documentation')); ?>
diff --git a/apps/settings/templates/settings-vue.php b/apps/settings/templates/settings-vue.php
index f04d577fda..8db9dc6286 100644
--- a/apps/settings/templates/settings-vue.php
+++ b/apps/settings/templates/settings-vue.php
@@ -25,7 +25,8 @@ script('settings', 'vue-settings-apps-users-management');
style('settings', 'settings');
// Do we have some data to inject ?
-if(is_array($_['serverData'])) {
-?>
-
-
+if (is_array($_['serverData'])) {
+ ?>
+
+
diff --git a/apps/settings/templates/settings/additional.php b/apps/settings/templates/settings/additional.php
index 3af78adde7..ac6b91e8d7 100644
--- a/apps/settings/templates/settings/additional.php
+++ b/apps/settings/templates/settings/additional.php
@@ -26,7 +26,7 @@
?>
-
-
+
diff --git a/apps/settings/templates/settings/admin/security.php b/apps/settings/templates/settings/admin/security.php
index 0e32399f32..f0689b948a 100644
--- a/apps/settings/templates/settings/admin/security.php
+++ b/apps/settings/templates/settings/admin/security.php
@@ -43,7 +43,9 @@ script('settings', 'vue-settings-admin-security');
/>
+ value="1" />
@@ -62,8 +64,12 @@ script('settings', 'vue-settings-admin-security');
value="t("Enable encryption")); ?>" />
-
-
+
+
t('No encryption module loaded, please enable an encryption module in the app menu.'));
@@ -75,8 +81,8 @@ script('settings', 'vue-settings-admin-security');
name="default_encryption_module"
value=""
>
+ p('checked');
+ } ?>>
@@ -84,7 +90,9 @@ script('settings', 'vue-settings-admin-security');
-
diff --git a/apps/settings/templates/settings/admin/server.php b/apps/settings/templates/settings/admin/server.php
index bde4423f67..c848ef5c49 100644
--- a/apps/settings/templates/settings/admin/server.php
+++ b/apps/settings/templates/settings/admin/server.php
@@ -30,19 +30,19 @@
t('Background jobs'));?>
getDateTimeFormatter();
- $absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
- $maxAgeAbsoluteTime = $formatter->formatDateTime($_['cronMaxAge'], 'long', 'long');
- if (time() - $_['lastcron'] > 600) { ?>
+ $formatter = \OC::$server->getDateTimeFormatter();
+ $absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
+ $maxAgeAbsoluteTime = $formatter->formatDateTime($_['cronMaxAge'], 'long', 'long');
+ if (time() - $_['lastcron'] > 600) { ?>
t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
12*3600) {
- if ($_['backgroundjobs_mode'] === 'cron') { ?>
+ if ($_['backgroundjobs_mode'] === 'cron') { ?>
t("Some jobs haven’t been executed since %s. Please consider increasing the execution frequency.", [$maxAgeRelativeTime]));?>
@@ -53,13 +53,13 @@
t("Some jobs didn’t execute since %s. Please consider switching to system cron.", [$maxAgeRelativeTime]));?>
+ } else { ?>
t("Last job ran %s.", [$relative_time]));?>
+} else { ?>
t("Background job didn’t run yet!"));
} ?>
@@ -75,33 +75,33 @@
>
+ print_unescaped('checked="checked"');
+ } ?>>
t("Execute one task with each page loaded")); ?>
>
+ print_unescaped('checked="checked"');
+ } ?>>
t("cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP.")); ?>
>
t("Use system cron service to call the cron.php file every 5 minutes.")); ?>
- t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
- } else {
- print_unescaped(str_replace(
+ t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
+ } else {
+ print_unescaped(str_replace(
['{linkstart}', '{linkend}'],
['', ' ↗'],
$l->t('To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details.')
diff --git a/apps/settings/templates/settings/admin/sharing.php b/apps/settings/templates/settings/admin/sharing.php
index 0cfbb3e849..bd75b04eed 100644
--- a/apps/settings/templates/settings/admin/sharing.php
+++ b/apps/settings/templates/settings/admin/sharing.php
@@ -34,110 +34,172 @@
t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.'));?>
/>
+ value="1" />
-
+
/>
+ value="1" />
-
+
t('Expire after ')); ?>
' />
t('days')); ?>
/>
+ value="1" />
-
+
/>
+ value="1" />
-
+
/>
+ value="1" />
/>
+ value="1" />
/>
+ value="1" />
/>
+ value="1" />
-
+
t('Expire after ')); ?>
' />
t('days')); ?>
/>
+ value="1" />
-
+
/>
+ value="1" />
-
+
/>
+ value="1" />
-
+
/>
+ value="1" />
-
+
/>
+ value="1" />
-
+
t('These groups will still be able to receive shares, but not to initiate them.')); ?>
-
+
/>
+ />
-
+
/>
+ />
/>
+ />
-
+
t('Default share permissions'));?>
-
+
/>
+ class="noautosave checkbox" value="" />
diff --git a/apps/settings/templates/settings/frame.php b/apps/settings/templates/settings/frame.php
index d6658e9c63..5f7186559a 100644
--- a/apps/settings/templates/settings/frame.php
+++ b/apps/settings/templates/settings/frame.php
@@ -30,17 +30,16 @@ script('files', 'jquery.fileupload');
-
+
@@ -92,7 +92,7 @@ script('settings', [
-
+
+
+
placeholder="t('Your email address')); ?>"
autocomplete="on" autocapitalize="none" autocorrect="off" />
-
-
t('No email address set')); }?>
+
+
t('No email address set'));
+ }?>
-
+
t('For password reset and notifications')); ?>
-
+
@@ -175,12 +189,14 @@ script('settings', [
+
+
 {
+ switch ($_['websiteVerification']) {
case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
p(image_path('core', 'actions/verifying.svg'));
break;
@@ -234,7 +254,9 @@ script('settings', [
p(image_path('core', 'actions/verify.svg'));
}
?> "<?php p($_['websiteMessage']); ?>")
+
>