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

Merge pull request #24725 from owncloud/ocs-provider-psr4 

Move OCS Provider to PSR-4 namespace
This commit is contained in:
Vincent Petry 2016-05-19 15:36:19 +02:00
parent 0bbf825f6e 20f229eed9
commit f42cdec4c4
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ocs-provider/provider.php → lib/private/OCS/Provider.php
View File

@ -19,6 +19,8 @@
*
*/
namespace OC\OCS;
class Provider extends \OCP\AppFramework\Controller {
/** @var \OCP\App\IAppManager */
private $appManager;

3
ocs-provider/index.php
View File

@ -20,13 +20,12 @@
*/
require_once('../lib/base.php');
require_once(__DIR__ . '/provider.php');
header('Content-Type: application/json');
$server = \OC::$server;
$controller = new Provider(
$controller = new \OC\OCS\Provider(
'ocs_provider',
$server->getRequest(),
$server->getAppManager()

10
tests/ocs/response.php → tests/lib/ocs/MapStatusCodeTest.php
View File

@ -1,6 +1,4 @@
<?php
use OCP\AppFramework\Http;
/**
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
@ -21,13 +19,17 @@ use OCP\AppFramework\Http;
*
*/
class OcsResponseTest extends \Test\TestCase {
namespace Test\OCS;
use OCP\AppFramework\Http;
class MapStatusCodeTest extends \Test\TestCase {
/**
* @dataProvider providesStatusCodes
*/
public function testStatusCodeMapper($expected, $sc) {
$result = OC_API::mapStatusCodes($sc);
$result = \OC_API::mapStatusCodes($sc);
$this->assertEquals($expected, $result);
}

8
tests/ocs-provider/provider.php → tests/lib/ocs/ProviderTest.php
View File

@ -19,7 +19,11 @@
*
*/
class OcsProviderTest extends \Test\TestCase {
namespace Test\OCS;
use OC\OCS\Provider;
class ProviderTest extends \Test\TestCase {
/** @var \OCP\IRequest */
private $request;
/** @var \OCP\App\IAppManager */
@ -30,8 +34,6 @@ class OcsProviderTest extends \Test\TestCase {
public function setUp() {
parent::setUp();
require_once '../ocs-provider/provider.php';
$this->request = $this->getMockBuilder('\\OCP\\IRequest')->getMock();
$this->appManager = $this->getMockBuilder('\\OCP\\App\\IAppManager')->getMock();
$this->ocsProvider = new Provider('ocs_provider', $this->request, $this->appManager);