Merge pull request #5482 from owncloud/fix_weird_http_namespace

Fix namespace for OCP\Appframework\Http

lib/private/appframework/dependencyinjection/dicontainer.php

@@ -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;

lib/private/appframework/http.php

@@ -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;

lib/private/appframework/http/dispatcher.php

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

lib/private/appframework/http/redirectresponse.php

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

lib/private/appframework/middleware/security/securitymiddleware.php

@@ -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;

lib/public/appframework/http.php

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

lib/public/appframework/http/jsonresponse.php

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

lib/public/appframework/http/response.php

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

tests/lib/appframework/http/DispatcherTest.php

@@ -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();
 

tests/lib/appframework/http/HttpTest.php

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

tests/lib/appframework/http/RedirectResponseTest.php

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

tests/lib/appframework/http/ResponseTest.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 {

tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php

@@ -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;