diff options
author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2020-04-09 21:39:37 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-09 21:39:37 +0300 |
commit | 008e6d7e849a82fdc3aa20169c4c8bdd0fe506be (patch) | |
tree | 6abbe3d8741de956ad787b5e3d55cec85ceb558f /apps/files_sharing | |
parent | 64510932b8bd7d4d1d490f7da7fb9ebcf21e31c2 (diff) | |
parent | 3a415e4139d6e28c16b0420ab411e6df5ff6d54a (diff) |
Merge pull request #20391 from nextcloud/refactor/spaces-cleanup
Remove all extra whitespace PSR2 does not like
Diffstat (limited to 'apps/files_sharing')
5 files changed, 24 insertions, 26 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 1cf798c9750..48914e27771 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -425,7 +425,7 @@ class ShareController extends AuthPublicShareController { $shareTmpl['previewURL'] = $shareTmpl['downloadURL']; if ($shareTmpl['previewSupported']) { - $shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute( 'files_sharing.PublicPreview.getPreview', + $shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.PublicPreview.getPreview', ['x' => 200, 'y' => 200, 'file' => $shareTmpl['directory_path'], 'token' => $shareTmpl['dirToken']]); $ogPreview = $shareTmpl['previewImage']; diff --git a/apps/files_sharing/lib/Exceptions/SharingRightsException.php b/apps/files_sharing/lib/Exceptions/SharingRightsException.php index 868ead81e7f..02d197d4034 100644 --- a/apps/files_sharing/lib/Exceptions/SharingRightsException.php +++ b/apps/files_sharing/lib/Exceptions/SharingRightsException.php @@ -25,7 +25,6 @@ namespace OCA\Files_Sharing\Exceptions; use Exception; - /** * Sharing and Resharing rights. * @@ -36,4 +35,3 @@ use Exception; class SharingRightsException extends Exception { } - diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php index 95ba9160a9f..03c097725a1 100644 --- a/apps/files_sharing/templates/list.php +++ b/apps/files_sharing/templates/list.php @@ -15,14 +15,14 @@ <tr> <th id='headerName' class="hidden column-name"> <div id="headerName-container"> - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> </div> </th> <th id="headerDate" class="hidden column-mtime"> - <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a> + <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Share time')); ?></span><span class="sort-indicator"></span></a> </th> <th class="hidden column-expiration"> - <a class="columntitle"><span><?php p($l->t( 'Expiration date' )); ?></span></a> + <a class="columntitle"><span><?php p($l->t('Expiration date')); ?></span></a> </th> </tr> </thead> diff --git a/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php b/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php index cf50902d035..b2f5fd7c851 100644 --- a/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php +++ b/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php @@ -109,7 +109,7 @@ class SetPasswordColumnTest extends TestCase { foreach ($allShares as $share) { if ((int)$share['share_type'] === Share::SHARE_TYPE_LINK) { - $this->assertNull( $share['share_with']); + $this->assertNull($share['share_with']); $this->assertSame('shareWith', $share['password']); } else { $this->assertSame('shareWith', $share['share_with']); diff --git a/apps/files_sharing/tests/MountProviderTest.php b/apps/files_sharing/tests/MountProviderTest.php index cd1afb1f6ff..ec52db8542e 100644 --- a/apps/files_sharing/tests/MountProviderTest.php +++ b/apps/files_sharing/tests/MountProviderTest.php @@ -112,9 +112,9 @@ class MountProviderTest extends \Test\TestCase { $this->makeMockShare(2, 100, 'user2', '/share2', 31), ]; $groupShares = [ - $this->makeMockShare(3, 100, 'user2', '/share2', 0), - $this->makeMockShare(4, 101, 'user2', '/share4', 31), - $this->makeMockShare(5, 100, 'user1', '/share4', 31), + $this->makeMockShare(3, 100, 'user2', '/share2', 0), + $this->makeMockShare(4, 101, 'user2', '/share4', 31), + $this->makeMockShare(5, 100, 'user1', '/share4', 31), ]; $roomShares = [ $this->makeMockShare(6, 102, 'user2', '/share6', 0), @@ -180,10 +180,10 @@ class MountProviderTest extends \Test\TestCase { // #0: share as outsider with "group1" and "user1" with same permissions [ [ - [1, 100, 'user2', '/share2', 31], + [1, 100, 'user2', '/share2', 31], ], [ - [2, 100, 'user2', '/share2', 31], + [2, 100, 'user2', '/share2', 31], ], [ // combined, user share has higher priority @@ -193,10 +193,10 @@ class MountProviderTest extends \Test\TestCase { // #1: share as outsider with "group1" and "user1" with different permissions [ [ - [1, 100, 'user2', '/share', 31], + [1, 100, 'user2', '/share', 31], ], [ - [2, 100, 'user2', '/share', 15], + [2, 100, 'user2', '/share', 15], ], [ // use highest permissions @@ -208,8 +208,8 @@ class MountProviderTest extends \Test\TestCase { [ ], [ - [1, 100, 'user2', '/share', 31], - [2, 100, 'user2', '/share', 31], + [1, 100, 'user2', '/share', 31], + [2, 100, 'user2', '/share', 31], ], [ // combined, first group share has higher priority @@ -221,8 +221,8 @@ class MountProviderTest extends \Test\TestCase { [ ], [ - [1, 100, 'user2', '/share', 31], - [2, 100, 'user2', '/share', 15], + [1, 100, 'user2', '/share', 31], + [2, 100, 'user2', '/share', 15], ], [ // use higher permissions @@ -234,7 +234,7 @@ class MountProviderTest extends \Test\TestCase { [ ], [ - [1, 100, 'user1', '/share', 31], + [1, 100, 'user1', '/share', 31], ], [ // no received share since "user1" is the sharer/owner @@ -245,8 +245,8 @@ class MountProviderTest extends \Test\TestCase { [ ], [ - [1, 100, 'user1', '/share', 31], - [2, 100, 'user1', '/share', 15], + [1, 100, 'user1', '/share', 31], + [2, 100, 'user1', '/share', 15], ], [ // no received share since "user1" is the sharer/owner @@ -257,7 +257,7 @@ class MountProviderTest extends \Test\TestCase { [ ], [ - [1, 100, 'user2', '/share', 0], + [1, 100, 'user2', '/share', 0], ], [ // no received share since "user1" opted out @@ -266,10 +266,10 @@ class MountProviderTest extends \Test\TestCase { // #7: share as outsider with "group1" and "user1" where recipient renamed in between [ [ - [1, 100, 'user2', '/share2-renamed', 31], + [1, 100, 'user2', '/share2-renamed', 31], ], [ - [2, 100, 'user2', '/share2', 31], + [2, 100, 'user2', '/share2', 31], ], [ // use target of least recent share @@ -279,10 +279,10 @@ class MountProviderTest extends \Test\TestCase { // #8: share as outsider with "group1" and "user1" where recipient renamed in between [ [ - [2, 100, 'user2', '/share2', 31], + [2, 100, 'user2', '/share2', 31], ], [ - [1, 100, 'user2', '/share2-renamed', 31], + [1, 100, 'user2', '/share2-renamed', 31], ], [ // use target of least recent share |