From ee545d684042c2b602cff9f80b740f89d8484352 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 5 Dec 2018 11:27:38 +0100
Subject: [PATCH] Fix typo in "incoming"
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
apps/files_sharing/lib/Controller/ShareAPIController.php | 4 ++--
apps/files_sharing/tests/CapabilitiesTest.php | 4 ++--
tests/lib/Share20/ManagerTest.php | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
index 2bd535e319f..797558fbd9a 100644
--- a/apps/files_sharing/lib/Controller/ShareAPIController.php
+++ b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -809,7 +809,7 @@ class ShareAPIController extends OCSController {
}
if ($share->getShareOwner() !== $this->currentUser && $share->getSharedBy() !== $this->currentUser) {
- throw new OCSForbiddenException('You are not allowed to edit incomming shares');
+ throw new OCSForbiddenException('You are not allowed to edit incoming shares');
}
if ($permissions === null &&
@@ -955,7 +955,7 @@ class ShareAPIController extends OCSController {
}
if ($permissions !== null && $share->getShareOwner() !== $this->currentUser) {
- /* Check if this is an incomming share */
+ /* Check if this is an incoming share */
$incomingShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $share->getNode(), -1, 0);
$incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0));
$incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_ROOM, $share->getNode(), -1, 0));
diff --git a/apps/files_sharing/tests/CapabilitiesTest.php b/apps/files_sharing/tests/CapabilitiesTest.php
index 721dd0fbf5e..077f2cdbe71 100644
--- a/apps/files_sharing/tests/CapabilitiesTest.php
+++ b/apps/files_sharing/tests/CapabilitiesTest.php
@@ -249,7 +249,7 @@ class CapabilitiesTest extends \Test\TestCase {
$this->assertTrue($result['group_sharing']);
}
- public function testFederatedSharingIncomming() {
+ public function testFederatedSharingIncoming() {
$map = [
['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'yes'],
];
@@ -258,7 +258,7 @@ class CapabilitiesTest extends \Test\TestCase {
$this->assertTrue($result['federation']['incoming']);
}
- public function testFederatedSharingNoIncomming() {
+ public function testFederatedSharingNoIncoming() {
$map = [
['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'no'],
];
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index 1125cae9565..0a810730588 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -1947,7 +1947,7 @@ class ManagerTest extends \Test\TestCase {
$manager->createShare($share);
}
- public function testCreateShareOfIncommingFederatedShare() {
+ public function testCreateShareOfIncomingFederatedShare() {
$manager = $this->createManagerMock()
->setMethods(['canShare', 'generalCreateChecks', 'userCreateChecks', 'pathCreateChecks'])
->getMock();
--
GitLab