diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2019-09-11 14:59:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-11 14:59:37 +0200 |
| commit | 15d39c48e652a76fd63b6986ecbabe62c00631cb (patch) | |
| tree | 95726f3df49095900cd7986fa6d78ce113e6193d /apps | |
| parent | 2187f856ce4eadeee88bd8b9ff47719df52ea025 (diff) | |
| parent | 858b18e34a12999504c92d0ecee0287b148542d0 (diff) | |
| download | nextcloud-server-15d39c48e652a76fd63b6986ecbabe62c00631cb.tar.gz nextcloud-server-15d39c48e652a76fd63b6986ecbabe62c00631cb.zip | |
Merge pull request #17021 from nextcloud/bye-spreed-hello-talk
Bye Spreed namespace, hello Talk!
Diffstat (limited to 'apps')
3 files changed, 12 insertions, 12 deletions
diff --git a/apps/files_sharing/lib/Controller/DeletedShareAPIController.php b/apps/files_sharing/lib/Controller/DeletedShareAPIController.php index 6c7242ef613..766331b28f7 100644 --- a/apps/files_sharing/lib/Controller/DeletedShareAPIController.php +++ b/apps/files_sharing/lib/Controller/DeletedShareAPIController.php @@ -201,7 +201,7 @@ class DeletedShareAPIController extends OCSController { * If the Talk application is not enabled or the helper is not available * a QueryException is thrown instead. * - * @return \OCA\Spreed\Share\Helper\DeletedShareAPIController + * @return \OCA\Talk\Share\Helper\DeletedShareAPIController * @throws QueryException */ private function getRoomShareHelper() { @@ -209,6 +209,6 @@ class DeletedShareAPIController extends OCSController { throw new QueryException(); } - return $this->serverContainer->query('\OCA\Spreed\Share\Helper\DeletedShareAPIController'); + return $this->serverContainer->query('\OCA\Talk\Share\Helper\DeletedShareAPIController'); } } diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index 09489861e1c..86573bcfd79 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -1138,7 +1138,7 @@ class ShareAPIController extends OCSController { * If the Talk application is not enabled or the helper is not available * a QueryException is thrown instead. * - * @return \OCA\Spreed\Share\Helper\ShareAPIController + * @return \OCA\Talk\Share\Helper\ShareAPIController * @throws QueryException */ private function getRoomShareHelper() { @@ -1146,7 +1146,7 @@ class ShareAPIController extends OCSController { throw new QueryException(); } - return $this->serverContainer->query('\OCA\Spreed\Share\Helper\ShareAPIController'); + return $this->serverContainer->query('\OCA\Talk\Share\Helper\ShareAPIController'); } diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index dcf264aae66..3d4dee5c64b 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -661,7 +661,7 @@ class ShareAPIControllerTest extends TestCase { ->with('spreed') ->willReturn(true); - $helper = $this->getMockBuilder('\OCA\Spreed\Share\Helper\ShareAPIController') + $helper = $this->getMockBuilder('\OCA\Talk\Share\Helper\ShareAPIController') ->setMethods(array('canAccessShare')) ->getMock(); $helper->method('canAccessShare') @@ -669,7 +669,7 @@ class ShareAPIControllerTest extends TestCase { ->willReturn($canAccessShareByHelper); $this->serverContainer->method('query') - ->with('\OCA\Spreed\Share\Helper\ShareAPIController') + ->with('\OCA\Talk\Share\Helper\ShareAPIController') ->willReturn($helper); } @@ -1306,7 +1306,7 @@ class ShareAPIControllerTest extends TestCase { ->with('spreed') ->willReturn(true); - $helper = $this->getMockBuilder('\OCA\Spreed\Share\Helper\ShareAPIController') + $helper = $this->getMockBuilder('\OCA\Talk\Share\Helper\ShareAPIController') ->setMethods(array('createShare')) ->getMock(); $helper->method('createShare') @@ -1329,7 +1329,7 @@ class ShareAPIControllerTest extends TestCase { )); $this->serverContainer->method('query') - ->with('\OCA\Spreed\Share\Helper\ShareAPIController') + ->with('\OCA\Talk\Share\Helper\ShareAPIController') ->willReturn($helper); $this->shareManager->method('createShare') @@ -1429,7 +1429,7 @@ class ShareAPIControllerTest extends TestCase { ->with('spreed') ->willReturn(true); - $helper = $this->getMockBuilder('\OCA\Spreed\Share\Helper\ShareAPIController') + $helper = $this->getMockBuilder('\OCA\Talk\Share\Helper\ShareAPIController') ->setMethods(array('createShare')) ->getMock(); $helper->method('createShare') @@ -1447,7 +1447,7 @@ class ShareAPIControllerTest extends TestCase { )); $this->serverContainer->method('query') - ->with('\OCA\Spreed\Share\Helper\ShareAPIController') + ->with('\OCA\Talk\Share\Helper\ShareAPIController') ->willReturn($helper); $this->shareManager->expects($this->never())->method('createShare'); @@ -3342,7 +3342,7 @@ class ShareAPIControllerTest extends TestCase { ->with('spreed') ->willReturn(true); - $helper = $this->getMockBuilder('\OCA\Spreed\Share\Helper\ShareAPIController') + $helper = $this->getMockBuilder('\OCA\Talk\Share\Helper\ShareAPIController') ->setMethods(array('formatShare')) ->getMock(); $helper->method('formatShare') @@ -3350,7 +3350,7 @@ class ShareAPIControllerTest extends TestCase { ->willReturn($formatShareByHelper); $this->serverContainer->method('query') - ->with('\OCA\Spreed\Share\Helper\ShareAPIController') + ->with('\OCA\Talk\Share\Helper\ShareAPIController') ->willReturn($helper); } |