Merge pull request #5482 from owncloud/fix_weird_http_namespace
Fix namespace for OCP\Appframework\Http
This commit is contained in:
commit
4bf37f72b2
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
namespace OC\AppFramework\DependencyInjection;
|
namespace OC\AppFramework\DependencyInjection;
|
||||||
|
|
||||||
use OC\AppFramework\Http\Http;
|
use OC\AppFramework\Http;
|
||||||
use OC\AppFramework\Http\Request;
|
use OC\AppFramework\Http\Request;
|
||||||
use OC\AppFramework\Http\Dispatcher;
|
use OC\AppFramework\Http\Dispatcher;
|
||||||
use OC\AppFramework\Core\API;
|
use OC\AppFramework\Core\API;
|
||||||
|
|
|
@ -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 $server;
|
||||||
private $protocolVersion;
|
private $protocolVersion;
|
|
@ -25,6 +25,7 @@
|
||||||
namespace OC\AppFramework\Http;
|
namespace OC\AppFramework\Http;
|
||||||
|
|
||||||
use \OC\AppFramework\Middleware\MiddlewareDispatcher;
|
use \OC\AppFramework\Middleware\MiddlewareDispatcher;
|
||||||
|
use \OC\AppFramework\Http;
|
||||||
use OCP\AppFramework\Controller;
|
use OCP\AppFramework\Controller;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,8 @@
|
||||||
|
|
||||||
namespace OC\AppFramework\Http;
|
namespace OC\AppFramework\Http;
|
||||||
|
|
||||||
use OCP\AppFramework\Http\Response;
|
use OCP\AppFramework\Http\Response,
|
||||||
|
OCP\AppFramework\Http;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
namespace OC\AppFramework\Middleware\Security;
|
namespace OC\AppFramework\Middleware\Security;
|
||||||
|
|
||||||
use OC\AppFramework\Http\Http;
|
use OC\AppFramework\Http;
|
||||||
use OC\AppFramework\Http\RedirectResponse;
|
use OC\AppFramework\Http\RedirectResponse;
|
||||||
use OC\AppFramework\Utility\MethodAnnotationReader;
|
use OC\AppFramework\Utility\MethodAnnotationReader;
|
||||||
use OCP\AppFramework\Middleware;
|
use OCP\AppFramework\Middleware;
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
namespace OCP\AppFramework\Http;
|
namespace OCP\AppFramework;
|
||||||
|
|
||||||
|
|
||||||
class Http {
|
class Http {
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
namespace OCP\AppFramework\Http;
|
namespace OCP\AppFramework\Http;
|
||||||
|
|
||||||
|
use OCP\AppFramework\Http;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A renderer for JSON calls
|
* A renderer for JSON calls
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
namespace OCP\AppFramework\Http;
|
namespace OCP\AppFramework\Http;
|
||||||
|
|
||||||
|
use OCP\AppFramework\Http;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Base class for responses. Also used to just send headers.
|
* Base class for responses. Also used to just send headers.
|
||||||
|
|
|
@ -26,7 +26,7 @@ namespace OC\AppFramework\Http;
|
||||||
|
|
||||||
use OC\AppFramework\Core\API;
|
use OC\AppFramework\Core\API;
|
||||||
use OC\AppFramework\Middleware\MiddlewareDispatcher;
|
use OC\AppFramework\Middleware\MiddlewareDispatcher;
|
||||||
|
use OCP\AppFramework\Http;
|
||||||
//require_once(__DIR__ . "/../classloader.php");
|
//require_once(__DIR__ . "/../classloader.php");
|
||||||
|
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
|
||||||
->disableOriginalConstructor()
|
->disableOriginalConstructor()
|
||||||
->getMock();
|
->getMock();
|
||||||
$this->http = $this->getMockBuilder(
|
$this->http = $this->getMockBuilder(
|
||||||
'\OC\AppFramework\Http\Http')
|
'\OC\AppFramework\Http')
|
||||||
->disableOriginalConstructor()
|
->disableOriginalConstructor()
|
||||||
->getMock();
|
->getMock();
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
namespace OC\AppFramework\Http;
|
namespace OC\AppFramework\Http;
|
||||||
|
|
||||||
|
use OC\AppFramework\Http;
|
||||||
|
|
||||||
//require_once(__DIR__ . "/../classloader.php");
|
//require_once(__DIR__ . "/../classloader.php");
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
namespace OC\AppFramework\Http;
|
namespace OC\AppFramework\Http;
|
||||||
|
|
||||||
|
use OCP\AppFramework\Http;
|
||||||
|
|
||||||
//require_once(__DIR__ . "/../classloader.php");
|
//require_once(__DIR__ . "/../classloader.php");
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,8 @@
|
||||||
namespace OC\AppFramework\Http;
|
namespace OC\AppFramework\Http;
|
||||||
|
|
||||||
|
|
||||||
use OCP\AppFramework\Http\Response;
|
use OCP\AppFramework\Http\Response,
|
||||||
|
OCP\AppFramework\Http;
|
||||||
|
|
||||||
|
|
||||||
class ResponseTest extends \PHPUnit_Framework_TestCase {
|
class ResponseTest extends \PHPUnit_Framework_TestCase {
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
namespace OC\AppFramework\Middleware\Security;
|
namespace OC\AppFramework\Middleware\Security;
|
||||||
|
|
||||||
use OC\AppFramework\Http\Http;
|
use OC\AppFramework\Http;
|
||||||
use OC\AppFramework\Http\Request;
|
use OC\AppFramework\Http\Request;
|
||||||
use OC\AppFramework\Http\RedirectResponse;
|
use OC\AppFramework\Http\RedirectResponse;
|
||||||
use OCP\AppFramework\Http\JSONResponse;
|
use OCP\AppFramework\Http\JSONResponse;
|
||||||
|
|
Loading…
Reference in New Issue