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

Merge pull request #5482 from owncloud/fix_weird_http_namespace 

Fix namespace for OCP\Appframework\Http
This commit is contained in:
Thomas Müller 2013-10-23 00:40:30 -07:00
parent cf61b1a977 ad017285e1
commit 4bf37f72b2
13 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/appframework/dependencyinjection/dicontainer.php
View File

@ -24,7 +24,7 @@
namespace OC\AppFramework\DependencyInjection;
use OC\AppFramework\Http\Http;
use OC\AppFramework\Http;
use OC\AppFramework\Http\Request;
use OC\AppFramework\Http\Dispatcher;
use OC\AppFramework\Core\API;

5
lib/private/appframework/http/http.php → lib/private/appframework/http.php
View File

@ -22,10 +22,11 @@
*/
namespace OC\AppFramework\Http;
namespace OC\AppFramework;
use OCP\AppFramework\Http as BaseHttp;
class Http extends \OCP\AppFramework\Http\Http{
class Http extends BaseHttp {
private $server;
private $protocolVersion;

1
lib/private/appframework/http/dispatcher.php
View File

@ -25,6 +25,7 @@
namespace OC\AppFramework\Http;
use \OC\AppFramework\Middleware\MiddlewareDispatcher;
use \OC\AppFramework\Http;
use OCP\AppFramework\Controller;

3
lib/private/appframework/http/redirectresponse.php
View File

@ -24,7 +24,8 @@
namespace OC\AppFramework\Http;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\Response,
OCP\AppFramework\Http;
/**

2
lib/private/appframework/middleware/security/securitymiddleware.php
View File

@ -24,7 +24,7 @@
namespace OC\AppFramework\Middleware\Security;
use OC\AppFramework\Http\Http;
use OC\AppFramework\Http;
use OC\AppFramework\Http\RedirectResponse;
use OC\AppFramework\Utility\MethodAnnotationReader;
use OCP\AppFramework\Middleware;

2
lib/public/appframework/http/http.php → lib/public/appframework/http.php
View File

@ -22,7 +22,7 @@
*/
namespace OCP\AppFramework\Http;
namespace OCP\AppFramework;
class Http {

1
lib/public/appframework/http/jsonresponse.php
View File

@ -24,6 +24,7 @@
namespace OCP\AppFramework\Http;
use OCP\AppFramework\Http;
/**
* A renderer for JSON calls

1
lib/public/appframework/http/response.php
View File

@ -24,6 +24,7 @@
namespace OCP\AppFramework\Http;
use OCP\AppFramework\Http;
/**
* Base class for responses. Also used to just send headers.

4
tests/lib/appframework/http/DispatcherTest.php
View File

@ -26,7 +26,7 @@ namespace OC\AppFramework\Http;
use OC\AppFramework\Core\API;
use OC\AppFramework\Middleware\MiddlewareDispatcher;
use OCP\AppFramework\Http;
//require_once(__DIR__ . "/../classloader.php");
@ -53,7 +53,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
->disableOriginalConstructor()
->getMock();
$this->http = $this->getMockBuilder(
'\OC\AppFramework\Http\Http')
'\OC\AppFramework\Http')
->disableOriginalConstructor()
->getMock();

1
tests/lib/appframework/http/HttpTest.php
View File

@ -24,6 +24,7 @@
namespace OC\AppFramework\Http;
use OC\AppFramework\Http;
//require_once(__DIR__ . "/../classloader.php");

1
tests/lib/appframework/http/RedirectResponseTest.php
View File

@ -24,6 +24,7 @@
namespace OC\AppFramework\Http;
use OCP\AppFramework\Http;
//require_once(__DIR__ . "/../classloader.php");

3
tests/lib/appframework/http/ResponseTest.php
View File

@ -25,7 +25,8 @@
namespace OC\AppFramework\Http;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\Response,
OCP\AppFramework\Http;
class ResponseTest extends \PHPUnit_Framework_TestCase {

2
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
View File

@ -24,7 +24,7 @@
namespace OC\AppFramework\Middleware\Security;
use OC\AppFramework\Http\Http;
use OC\AppFramework\Http;
use OC\AppFramework\Http\Request;
use OC\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\JSONResponse;