diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-04-22 00:08:04 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-04-22 00:08:04 +0200 |
| commit | 0ebb4662ec956030f9a19cce5a63dca3a7c9f3ac (patch) | |
| tree | 340ee60d084d3822890aeb8e05600651b565e1ae | |
| parent | ee70eb0808809abe5fe8b58a6b730db8a7ce997f (diff) | |
| parent | 7e447f4f42de8dc0cf9a1f92c61a71dfda8f8dcd (diff) | |
| download | nextcloud-server-0ebb4662ec956030f9a19cce5a63dca3a7c9f3ac.tar.gz nextcloud-server-0ebb4662ec956030f9a19cce5a63dca3a7c9f3ac.zip | |
Merge pull request #8281 from owncloud/public-responses
make download and redirectresponse public
| -rw-r--r-- | lib/private/appframework/middleware/security/securitymiddleware.php | 2 | ||||
| -rw-r--r-- | lib/public/appframework/http/downloadresponse.php (renamed from lib/private/appframework/http/downloadresponse.php) | 2 | ||||
| -rw-r--r-- | lib/public/appframework/http/redirectresponse.php (renamed from lib/private/appframework/http/redirectresponse.php) | 2 | ||||
| -rw-r--r-- | tests/lib/appframework/http/DownloadResponseTest.php | 2 | ||||
| -rw-r--r-- | tests/lib/appframework/http/RedirectResponseTest.php | 2 | ||||
| -rw-r--r-- | tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php index bb02d565fa4..0f160d224ad 100644 --- a/lib/private/appframework/middleware/security/securitymiddleware.php +++ b/lib/private/appframework/middleware/security/securitymiddleware.php @@ -25,8 +25,8 @@ namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Http; -use OC\AppFramework\Http\RedirectResponse; use OC\AppFramework\Utility\MethodAnnotationReader; +use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Middleware; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\JSONResponse; diff --git a/lib/private/appframework/http/downloadresponse.php b/lib/public/appframework/http/downloadresponse.php index 67b9542dba6..d3c2818e828 100644 --- a/lib/private/appframework/http/downloadresponse.php +++ b/lib/public/appframework/http/downloadresponse.php @@ -22,7 +22,7 @@ */ -namespace OC\AppFramework\Http; +namespace OCP\AppFramework\Http; /** diff --git a/lib/private/appframework/http/redirectresponse.php b/lib/public/appframework/http/redirectresponse.php index 05353349065..416e1533635 100644 --- a/lib/private/appframework/http/redirectresponse.php +++ b/lib/public/appframework/http/redirectresponse.php @@ -22,7 +22,7 @@ */ -namespace OC\AppFramework\Http; +namespace OCP\AppFramework\Http; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http; diff --git a/tests/lib/appframework/http/DownloadResponseTest.php b/tests/lib/appframework/http/DownloadResponseTest.php index 64fe7992b6a..b305c63ad4d 100644 --- a/tests/lib/appframework/http/DownloadResponseTest.php +++ b/tests/lib/appframework/http/DownloadResponseTest.php @@ -22,7 +22,7 @@ */ -namespace OC\AppFramework\Http; +namespace OCP\AppFramework\Http; //require_once(__DIR__ . "/../classloader.php"); diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php index f82d0c3a675..f62b420f4ee 100644 --- a/tests/lib/appframework/http/RedirectResponseTest.php +++ b/tests/lib/appframework/http/RedirectResponseTest.php @@ -22,7 +22,7 @@ */ -namespace OC\AppFramework\Http; +namespace OCP\AppFramework\Http; use OCP\AppFramework\Http; diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php index 63c48a62829..19e8a68c388 100644 --- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php +++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php @@ -26,7 +26,7 @@ namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Http; use OC\AppFramework\Http\Request; -use OC\AppFramework\Http\RedirectResponse; +use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\JSONResponse; |