summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2013-10-23 05:57:34 +0200
committerThomas Tanghus <thomas@tanghus.net>2013-10-23 05:57:34 +0200
commitad017285e15b077bf0ca3457f05a7b082abea6b0 (patch)
tree56445784a888c80d163b190c0a1c73a6382971f9 /tests
parent064fd5ae53b4f3384d040ddf2dcb648cc3c7445f (diff)
downloadnextcloud-server-ad017285e15b077bf0ca3457f05a7b082abea6b0.tar.gz
nextcloud-server-ad017285e15b077bf0ca3457f05a7b082abea6b0.zip
Fix namespace for OCP\Appframework\Http
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.
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/appframework/http/DispatcherTest.php4
-rw-r--r--tests/lib/appframework/http/HttpTest.php1
-rw-r--r--tests/lib/appframework/http/RedirectResponseTest.php1
-rw-r--r--tests/lib/appframework/http/ResponseTest.php3
-rw-r--r--tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php2
5 files changed, 7 insertions, 4 deletions
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php
index 9052fe0781a..6cf0da879ff 100644
--- a/tests/lib/appframework/http/DispatcherTest.php
+++ b/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();
diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php
index 382d511b116..0bdcee24c99 100644
--- a/tests/lib/appframework/http/HttpTest.php
+++ b/tests/lib/appframework/http/HttpTest.php
@@ -24,6 +24,7 @@
namespace OC\AppFramework\Http;
+use OC\AppFramework\Http;
//require_once(__DIR__ . "/../classloader.php");
diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php
index 1946655b0fa..f82d0c3a675 100644
--- a/tests/lib/appframework/http/RedirectResponseTest.php
+++ b/tests/lib/appframework/http/RedirectResponseTest.php
@@ -24,6 +24,7 @@
namespace OC\AppFramework\Http;
+use OCP\AppFramework\Http;
//require_once(__DIR__ . "/../classloader.php");
diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php
index 7e09086f801..1a38c38c1e7 100644
--- a/tests/lib/appframework/http/ResponseTest.php
+++ b/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 {
diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
index 4bfd725ffd0..dae6135dc54 100644
--- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
+++ b/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;