sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1873 from nextcloud/files_sharing_singular 

Move files_sharing Controllers => Controller
pull/1879/head
Roeland Jago Douma 2016-10-24 14:16:02 +07:00 committed by GitHub
parent bd8b3f52f0 b4ebf03bef
commit 729c06548f
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_sharing/lib/AppInfo/Application.php
Unescape Escape View File

@ -32,8 +32,8 @@ use OCA\Files_Sharing\Middleware\OCSShareAPIMiddleware;
use OCA\Files_Sharing\MountProvider; use OCA\Files_Sharing\MountProvider;
use OCP\AppFramework\App; use OCP\AppFramework\App;
use OC\AppFramework\Utility\SimpleContainer; use OC\AppFramework\Utility\SimpleContainer;
use OCA\Files_Sharing\Controllers\ExternalSharesController; use OCA\Files_Sharing\Controller\ExternalSharesController;
use OCA\Files_Sharing\Controllers\ShareController; use OCA\Files_Sharing\Controller\ShareController;
use OCA\Files_Sharing\Middleware\SharingCheckMiddleware; use OCA\Files_Sharing\Middleware\SharingCheckMiddleware;
use \OCP\IContainer; use \OCP\IContainer;
use OCP\IServerContainer; use OCP\IServerContainer;

4
apps/files_sharing/lib/Controllers/ExternalSharesController.php → apps/files_sharing/lib/Controller/ExternalSharesController.php
Unescape Escape View File

@ -24,7 +24,7 @@
* *
*/ */
namespace OCA\Files_Sharing\Controllers; namespace OCA\Files_Sharing\Controller;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\IRequest; use OCP\IRequest;
@ -35,7 +35,7 @@ use OCP\AppFramework\Http\DataResponse;
/** /**
* Class ExternalSharesController * Class ExternalSharesController
* *
* @package OCA\Files_Sharing\Controllers * @package OCA\Files_Sharing\Controller
*/ */
class ExternalSharesController extends Controller { class ExternalSharesController extends Controller {

2
apps/files_sharing/lib/Controllers/ShareController.php → apps/files_sharing/lib/Controller/ShareController.php
Unescape Escape View File

@ -30,7 +30,7 @@
* *
*/ */
namespace OCA\Files_Sharing\Controllers; namespace OCA\Files_Sharing\Controller;
use OC_Files; use OC_Files;
use OC_Util; use OC_Util;

4
apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php
Unescape Escape View File

@ -78,10 +78,10 @@ class SharingCheckMiddleware extends Middleware {
throw new NotFoundException('Sharing is disabled.'); throw new NotFoundException('Sharing is disabled.');
} }
if ($controller instanceof \OCA\Files_Sharing\Controllers\ExternalSharesController && if ($controller instanceof \OCA\Files_Sharing\Controller\ExternalSharesController &&
!$this->externalSharesChecks()) { !$this->externalSharesChecks()) {
throw new S2SException('Federated sharing not allowed'); throw new S2SException('Federated sharing not allowed');
} else if ($controller instanceof \OCA\Files_Sharing\Controllers\ShareController && } else if ($controller instanceof \OCA\Files_Sharing\Controller\ShareController &&
!$this->isLinkSharingEnabled()) { !$this->isLinkSharingEnabled()) {
throw new NotFoundException('Link sharing is disabled'); throw new NotFoundException('Link sharing is disabled');
} }

2
apps/files_sharing/tests/Controllers/ExternalShareControllerTest.php → apps/files_sharing/tests/Controller/ExternalShareControllerTest.php
Unescape Escape View File

@ -24,7 +24,7 @@
namespace OCA\Files_Sharing\Tests\Controllers; namespace OCA\Files_Sharing\Tests\Controllers;
use OCA\Files_Sharing\Controllers\ExternalSharesController; use OCA\Files_Sharing\Controller\ExternalSharesController;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\JSONResponse;
use OCP\Http\Client\IClientService; use OCP\Http\Client\IClientService;

4
apps/files_sharing/tests/Controllers/ShareControllerTest.php → apps/files_sharing/tests/Controller/ShareControllerTest.php
Unescape Escape View File

@ -33,7 +33,7 @@ namespace OCA\Files_Sharing\Tests\Controllers;
use OC\Files\Filesystem; use OC\Files\Filesystem;
use OCA\FederatedFileSharing\FederatedShareProvider; use OCA\FederatedFileSharing\FederatedShareProvider;
use OCA\Files_Sharing\Controllers\ShareController; use OCA\Files_Sharing\Controller\ShareController;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\Exceptions\ShareNotFound;
use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\NotFoundResponse;
@ -96,7 +96,7 @@ class ShareControllerTest extends \Test\TestCase {
->method('isIncomingServer2serverShareEnabled')->willReturn(true); ->method('isIncomingServer2serverShareEnabled')->willReturn(true);
$this->eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock(); $this->eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$this->shareController = new \OCA\Files_Sharing\Controllers\ShareController( $this->shareController = new \OCA\Files_Sharing\Controller\ShareController(
$this->appName, $this->appName,
$this->getMockBuilder('\OCP\IRequest')->getMock(), $this->getMockBuilder('\OCP\IRequest')->getMock(),
$this->config, $this->config,

38
apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php
Unescape Escape View File

@ -24,37 +24,40 @@
*/ */
namespace OCA\Files_Sharing\Middleware; namespace OCA\Files_Sharing\Middleware;
use OCA\Files_Sharing\Controller\ExternalSharesController;
use OCA\Files_Sharing\Controller\ShareController;
use OCP\App\IAppManager;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\NotFoundResponse;
use OCP\Files\NotFoundException; use OCP\Files\NotFoundException;
use OCP\AppFramework\Utility\IControllerMethodReflector; use OCP\AppFramework\Utility\IControllerMethodReflector;
use OCA\Files_Sharing\Exceptions\S2SException; use OCA\Files_Sharing\Exceptions\S2SException;
use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\JSONResponse;
use OCP\IConfig;
/** /**
* @package OCA\Files_Sharing\Middleware\SharingCheckMiddleware * @package OCA\Files_Sharing\Middleware\SharingCheckMiddleware
*/ */
class SharingCheckMiddlewareTest extends \Test\TestCase { class SharingCheckMiddlewareTest extends \Test\TestCase {
/** @var \OCP\IConfig */ /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config; private $config;
/** @var \OCP\App\IAppManager */ /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */
private $appManager; private $appManager;
/** @var SharingCheckMiddleware */ /** @var SharingCheckMiddleware */
private $sharingCheckMiddleware; private $sharingCheckMiddleware;
/** @var \OCP\AppFramework\Controller */ /** @var Controller|\PHPUnit_Framework_MockObject_MockObject */
private $controllerMock; private $controllerMock;
/** @var IControllerMethodReflector */ /** @var IControllerMethodReflector|\PHPUnit_Framework_MockObject_MockObject */
private $reflector; private $reflector;
protected function setUp() { protected function setUp() {
$this->config = $this->getMockBuilder('\OCP\IConfig') parent::setUp();
->disableOriginalConstructor()->getMock();
$this->appManager = $this->getMockBuilder('\OCP\App\IAppManager') $this->config = $this->createMock(IConfig::class);
->disableOriginalConstructor()->getMock(); $this->appManager = $this->createMock(IAppManager::class);
$this->controllerMock = $this->getMockBuilder('\OCP\AppFramework\Controller') $this->controllerMock = $this->createMock(Controller::class);
->disableOriginalConstructor()->getMock(); $this->reflector = $this->createMock(IControllerMethodReflector::class);
$this->reflector = $this->getMockBuilder('\OCP\AppFramework\Utility\IControllerMethodReflector')
->disableOriginalConstructor()->getMock();
$this->sharingCheckMiddleware = new SharingCheckMiddleware( $this->sharingCheckMiddleware = new SharingCheckMiddleware(
'files_sharing', 'files_sharing',
@ -198,14 +201,13 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
->method('getAppValue') ->method('getAppValue')
->will($this->returnValueMap($config)); ->will($this->returnValueMap($config));
$controller = $this->getMockBuilder('\OCA\Files_Sharing\Controllers\ExternalSharesController') $controller = $this->createMock(ExternalSharesController::class);
->disableOriginalConstructor()->getMock();
$exceptionThrown = false; $exceptionThrown = false;
try { try {
$this->sharingCheckMiddleware->beforeController($controller, 'myMethod'); $this->sharingCheckMiddleware->beforeController($controller, 'myMethod');
} catch (\OCA\Files_Sharing\Exceptions\S2SException $exception) { } catch (S2SException $exception) {
$exceptionThrown = true; $exceptionThrown = true;
} }
@ -231,8 +233,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
->with('core', 'shareapi_allow_links', 'yes') ->with('core', 'shareapi_allow_links', 'yes')
->will($this->returnValue('yes')); ->will($this->returnValue('yes'));
$controller = $this->getMockBuilder('\OCA\Files_Sharing\Controllers\ShareController') $controller = $this->createMock(ShareController::class);
->disableOriginalConstructor()->getMock();
$this->sharingCheckMiddleware->beforeController($controller, 'myMethod'); $this->sharingCheckMiddleware->beforeController($controller, 'myMethod');
} }
@ -248,8 +249,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
->with('files_sharing') ->with('files_sharing')
->will($this->returnValue(true)); ->will($this->returnValue(true));
$controller = $this->getMockBuilder('\OCA\Files_Sharing\Controllers\ShareController') $controller = $this->createMock(ShareController::class);
->disableOriginalConstructor()->getMock();
$this->sharingCheckMiddleware->beforeController($controller, 'myMethod'); $this->sharingCheckMiddleware->beforeController($controller, 'myMethod');
} }