mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17021 from nextcloud/bye-spreed-hello-talk 

Bye Spreed namespace, hello Talk!
This commit is contained in:
Joas Schilling 2019-09-11 14:59:37 +02:00 committed by GitHub
parent 2187f856ce 858b18e34a
commit 15d39c48e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_sharing/lib/Controller/DeletedShareAPIController.php
View File

@ -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');
}
}

4
apps/files_sharing/lib/Controller/ShareAPIController.php
View File

@ -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');
}

16
apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
View File

@ -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);
}

4
lib/private/Share20/ProviderFactory.php
View File

@ -60,7 +60,7 @@ class ProviderFactory implements IProviderFactory {
private $shareByCircleProvider = null;
/** @var bool */
private $circlesAreNotAvailable = false;
/** @var \OCA\Spreed\Share\RoomShareProvider */
/** @var \OCA\Talk\Share\RoomShareProvider */
private $roomShareProvider = null;
/**
@ -239,7 +239,7 @@ class ProviderFactory implements IProviderFactory {
}
try {
$this->roomShareProvider = $this->serverContainer->query('\OCA\Spreed\Share\RoomShareProvider');
$this->roomShareProvider = $this->serverContainer->query('\OCA\Talk\Share\RoomShareProvider');
} catch (\OCP\AppFramework\QueryException $e) {
return null;
}