To avoid having to use OCP\Appframework\Http\Http in the public - and stable - API OCP\Appframework\Http is now both a class and a namespace.tags/v6.0.0beta2
@@ -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; |
@@ -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; |
@@ -25,6 +25,7 @@ | |||
namespace OC\AppFramework\Http; | |||
use \OC\AppFramework\Middleware\MiddlewareDispatcher; | |||
use \OC\AppFramework\Http; | |||
use OCP\AppFramework\Controller; | |||
@@ -24,7 +24,8 @@ | |||
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; | |||
use OC\AppFramework\Http\Http; | |||
use OC\AppFramework\Http; | |||
use OC\AppFramework\Http\RedirectResponse; | |||
use OC\AppFramework\Utility\MethodAnnotationReader; | |||
use OCP\AppFramework\Middleware; |
@@ -22,7 +22,7 @@ | |||
*/ | |||
namespace OCP\AppFramework\Http; | |||
namespace OCP\AppFramework; | |||
class Http { |
@@ -24,6 +24,7 @@ | |||
namespace OCP\AppFramework\Http; | |||
use OCP\AppFramework\Http; | |||
/** | |||
* A renderer for JSON calls |
@@ -24,6 +24,7 @@ | |||
namespace OCP\AppFramework\Http; | |||
use OCP\AppFramework\Http; | |||
/** | |||
* 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\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(); | |||
@@ -24,6 +24,7 @@ | |||
namespace OC\AppFramework\Http; | |||
use OC\AppFramework\Http; | |||
//require_once(__DIR__ . "/../classloader.php"); | |||
@@ -24,6 +24,7 @@ | |||
namespace OC\AppFramework\Http; | |||
use OCP\AppFramework\Http; | |||
//require_once(__DIR__ . "/../classloader.php"); | |||
@@ -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 { |
@@ -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; |