]> source.dussan.org Git - nextcloud-server.git/commitdiff
Fix namespace for OCP\Appframework\Http
authorThomas Tanghus <thomas@tanghus.net>
Wed, 23 Oct 2013 03:57:34 +0000 (05:57 +0200)
committerThomas Tanghus <thomas@tanghus.net>
Wed, 23 Oct 2013 03:57:34 +0000 (05:57 +0200)
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.

15 files changed:
lib/private/appframework/dependencyinjection/dicontainer.php
lib/private/appframework/http.php [new file with mode: 0644]
lib/private/appframework/http/dispatcher.php
lib/private/appframework/http/http.php [deleted file]
lib/private/appframework/http/redirectresponse.php
lib/private/appframework/middleware/security/securitymiddleware.php
lib/public/appframework/http.php [new file with mode: 0644]
lib/public/appframework/http/http.php [deleted file]
lib/public/appframework/http/jsonresponse.php
lib/public/appframework/http/response.php
tests/lib/appframework/http/DispatcherTest.php
tests/lib/appframework/http/HttpTest.php
tests/lib/appframework/http/RedirectResponseTest.php
tests/lib/appframework/http/ResponseTest.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php

index 81910df6990c5ae7d5bd9b59d85c17e21e78b0e0..ae2c5e8546b96b3a33c5f5bb5d7ce938fc819dad 100644 (file)
@@ -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;
diff --git a/lib/private/appframework/http.php b/lib/private/appframework/http.php
new file mode 100644 (file)
index 0000000..41fc0db
--- /dev/null
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework;
+
+use OCP\AppFramework\Http as BaseHttp;
+
+class Http extends BaseHttp {
+
+       private $server;
+       private $protocolVersion;
+       protected $headers;
+
+       /**
+        * @param $_SERVER $server
+        * @param string $protocolVersion the http version to use defaults to HTTP/1.1
+        */
+       public function __construct($server, $protocolVersion='HTTP/1.1') {
+               $this->server = $server;
+               $this->protocolVersion = $protocolVersion;
+
+               $this->headers = array(
+                       self::STATUS_CONTINUE => 'Continue',
+                       self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
+                       self::STATUS_PROCESSING => 'Processing',
+                       self::STATUS_OK => 'OK',
+                       self::STATUS_CREATED => 'Created',
+                       self::STATUS_ACCEPTED => 'Accepted',
+                       self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
+                       self::STATUS_NO_CONTENT => 'No Content',
+                       self::STATUS_RESET_CONTENT => 'Reset Content',
+                       self::STATUS_PARTIAL_CONTENT => 'Partial Content',
+                       self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
+                       self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
+                       self::STATUS_IM_USED => 'IM Used', // RFC 3229
+                       self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
+                       self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
+                       self::STATUS_FOUND => 'Found',
+                       self::STATUS_SEE_OTHER => 'See Other',
+                       self::STATUS_NOT_MODIFIED => 'Not Modified',
+                       self::STATUS_USE_PROXY => 'Use Proxy',
+                       self::STATUS_RESERVED => 'Reserved',
+                       self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
+                       self::STATUS_BAD_REQUEST => 'Bad request',
+                       self::STATUS_UNAUTHORIZED => 'Unauthorized',
+                       self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
+                       self::STATUS_FORBIDDEN => 'Forbidden',
+                       self::STATUS_NOT_FOUND => 'Not Found',
+                       self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
+                       self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
+                       self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
+                       self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
+                       self::STATUS_CONFLICT => 'Conflict',
+                       self::STATUS_GONE => 'Gone',
+                       self::STATUS_LENGTH_REQUIRED => 'Length Required',
+                       self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
+                       self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
+                       self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
+                       self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
+                       self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
+                       self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
+                       self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
+                       self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
+                       self::STATUS_LOCKED => 'Locked', // RFC 4918
+                       self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
+                       self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
+                       self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
+                       self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
+                       self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
+                       self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
+                       self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
+                       self::STATUS_BAD_GATEWAY => 'Bad Gateway',
+                       self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
+                       self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
+                       self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
+                       self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
+                       self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
+                       self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
+                       self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
+                       self::STATUS_NOT_EXTENDED => 'Not extended',
+                       self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
+               );
+       }
+
+
+       /**
+        * Gets the correct header
+        * @param Http::CONSTANT $status the constant from the Http class
+        * @param \DateTime $lastModified formatted last modified date
+        * @param string $Etag the etag
+        */
+       public function getStatusHeader($status, \DateTime $lastModified=null, 
+                                       $ETag=null) {
+
+               if(!is_null($lastModified)) {
+                       $lastModified = $lastModified->format(\DateTime::RFC2822);
+               }
+
+               // if etag or lastmodified have not changed, return a not modified
+               if ((isset($this->server['HTTP_IF_NONE_MATCH'])
+                       && trim($this->server['HTTP_IF_NONE_MATCH']) === $ETag) 
+
+                       ||
+
+                       (isset($this->server['HTTP_IF_MODIFIED_SINCE'])
+                       && trim($this->server['HTTP_IF_MODIFIED_SINCE']) === 
+                               $lastModified)) {
+
+                       $status = self::STATUS_NOT_MODIFIED;
+               }
+
+               // we have one change currently for the http 1.0 header that differs
+               // from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
+               // if this differs any more, we want to create childclasses for this
+               if($status === self::STATUS_TEMPORARY_REDIRECT 
+                       && $this->protocolVersion === 'HTTP/1.0') {
+
+                       $status = self::STATUS_FOUND;
+               }
+
+               return $this->protocolVersion . ' ' . $status . ' ' . 
+                       $this->headers[$status];
+       }
+
+
+}
+
+
index 51283fd64e7cb73f2f91a522a85d5995e608df8f..a2afb53f0fab86ef0e005e96652372bbfa616a36 100644 (file)
@@ -25,6 +25,7 @@
 namespace OC\AppFramework\Http;
 
 use \OC\AppFramework\Middleware\MiddlewareDispatcher;
+use \OC\AppFramework\Http;
 use OCP\AppFramework\Controller;
 
 
diff --git a/lib/private/appframework/http/http.php b/lib/private/appframework/http/http.php
deleted file mode 100644 (file)
index e00dc9c..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-/**
- * ownCloud - App Framework
- *
- * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-namespace OC\AppFramework\Http;
-
-
-class Http extends \OCP\AppFramework\Http\Http{
-
-       private $server;
-       private $protocolVersion;
-       protected $headers;
-
-       /**
-        * @param $_SERVER $server
-        * @param string $protocolVersion the http version to use defaults to HTTP/1.1
-        */
-       public function __construct($server, $protocolVersion='HTTP/1.1') {
-               $this->server = $server;
-               $this->protocolVersion = $protocolVersion;
-
-               $this->headers = array(
-                       self::STATUS_CONTINUE => 'Continue',
-                       self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
-                       self::STATUS_PROCESSING => 'Processing',
-                       self::STATUS_OK => 'OK',
-                       self::STATUS_CREATED => 'Created',
-                       self::STATUS_ACCEPTED => 'Accepted',
-                       self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
-                       self::STATUS_NO_CONTENT => 'No Content',
-                       self::STATUS_RESET_CONTENT => 'Reset Content',
-                       self::STATUS_PARTIAL_CONTENT => 'Partial Content',
-                       self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
-                       self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
-                       self::STATUS_IM_USED => 'IM Used', // RFC 3229
-                       self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
-                       self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
-                       self::STATUS_FOUND => 'Found',
-                       self::STATUS_SEE_OTHER => 'See Other',
-                       self::STATUS_NOT_MODIFIED => 'Not Modified',
-                       self::STATUS_USE_PROXY => 'Use Proxy',
-                       self::STATUS_RESERVED => 'Reserved',
-                       self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
-                       self::STATUS_BAD_REQUEST => 'Bad request',
-                       self::STATUS_UNAUTHORIZED => 'Unauthorized',
-                       self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
-                       self::STATUS_FORBIDDEN => 'Forbidden',
-                       self::STATUS_NOT_FOUND => 'Not Found',
-                       self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
-                       self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
-                       self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
-                       self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
-                       self::STATUS_CONFLICT => 'Conflict',
-                       self::STATUS_GONE => 'Gone',
-                       self::STATUS_LENGTH_REQUIRED => 'Length Required',
-                       self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
-                       self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
-                       self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
-                       self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
-                       self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
-                       self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
-                       self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
-                       self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
-                       self::STATUS_LOCKED => 'Locked', // RFC 4918
-                       self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
-                       self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
-                       self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
-                       self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
-                       self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
-                       self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
-                       self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
-                       self::STATUS_BAD_GATEWAY => 'Bad Gateway',
-                       self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
-                       self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
-                       self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
-                       self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
-                       self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
-                       self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
-                       self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
-                       self::STATUS_NOT_EXTENDED => 'Not extended',
-                       self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
-               );
-       }
-
-
-       /**
-        * Gets the correct header
-        * @param Http::CONSTANT $status the constant from the Http class
-        * @param \DateTime $lastModified formatted last modified date
-        * @param string $Etag the etag
-        */
-       public function getStatusHeader($status, \DateTime $lastModified=null, 
-                                       $ETag=null) {
-
-               if(!is_null($lastModified)) {
-                       $lastModified = $lastModified->format(\DateTime::RFC2822);
-               }
-
-               // if etag or lastmodified have not changed, return a not modified
-               if ((isset($this->server['HTTP_IF_NONE_MATCH'])
-                       && trim($this->server['HTTP_IF_NONE_MATCH']) === $ETag) 
-
-                       ||
-
-                       (isset($this->server['HTTP_IF_MODIFIED_SINCE'])
-                       && trim($this->server['HTTP_IF_MODIFIED_SINCE']) === 
-                               $lastModified)) {
-
-                       $status = self::STATUS_NOT_MODIFIED;
-               }
-
-               // we have one change currently for the http 1.0 header that differs
-               // from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
-               // if this differs any more, we want to create childclasses for this
-               if($status === self::STATUS_TEMPORARY_REDIRECT 
-                       && $this->protocolVersion === 'HTTP/1.0') {
-
-                       $status = self::STATUS_FOUND;
-               }
-
-               return $this->protocolVersion . ' ' . $status . ' ' . 
-                       $this->headers[$status];
-       }
-
-
-}
-
-
index 688447f16180c2943a704cad0c95009d1d627841..c4e21059480706e9c9d8565a6a04ec115d237d97 100644 (file)
@@ -24,7 +24,8 @@
 
 namespace OC\AppFramework\Http;
 
-use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Http\Response,
+       OCP\AppFramework\Http;
 
 
 /**
index f103a40ee7fcba718b89f9c5e1a4be3224949bca..c3143754823972de64196e383cdd9fd02fe195ba 100644 (file)
@@ -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;
diff --git a/lib/public/appframework/http.php b/lib/public/appframework/http.php
new file mode 100644 (file)
index 0000000..c05d8f8
--- /dev/null
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCP\AppFramework;
+
+
+class Http {
+
+       const STATUS_CONTINUE = 100;
+       const STATUS_SWITCHING_PROTOCOLS = 101;
+       const STATUS_PROCESSING = 102;
+       const STATUS_OK = 200;
+       const STATUS_CREATED = 201;
+       const STATUS_ACCEPTED = 202;
+       const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
+       const STATUS_NO_CONTENT = 204;
+       const STATUS_RESET_CONTENT = 205;
+       const STATUS_PARTIAL_CONTENT = 206;
+       const STATUS_MULTI_STATUS = 207;
+       const STATUS_ALREADY_REPORTED = 208;
+       const STATUS_IM_USED = 226;
+       const STATUS_MULTIPLE_CHOICES = 300;
+       const STATUS_MOVED_PERMANENTLY = 301;
+       const STATUS_FOUND = 302;
+       const STATUS_SEE_OTHER = 303;
+       const STATUS_NOT_MODIFIED = 304;
+       const STATUS_USE_PROXY = 305;
+       const STATUS_RESERVED = 306;
+       const STATUS_TEMPORARY_REDIRECT = 307;
+       const STATUS_BAD_REQUEST = 400;
+       const STATUS_UNAUTHORIZED = 401;
+       const STATUS_PAYMENT_REQUIRED = 402;
+       const STATUS_FORBIDDEN = 403;
+       const STATUS_NOT_FOUND = 404;
+       const STATUS_METHOD_NOT_ALLOWED = 405;
+       const STATUS_NOT_ACCEPTABLE = 406;
+       const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
+       const STATUS_REQUEST_TIMEOUT = 408;
+       const STATUS_CONFLICT = 409;
+       const STATUS_GONE = 410;
+       const STATUS_LENGTH_REQUIRED = 411;
+       const STATUS_PRECONDITION_FAILED = 412;
+       const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
+       const STATUS_REQUEST_URI_TOO_LONG = 414;
+       const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
+       const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
+       const STATUS_EXPECTATION_FAILED = 417;
+       const STATUS_IM_A_TEAPOT = 418;
+       const STATUS_UNPROCESSABLE_ENTITY = 422;
+       const STATUS_LOCKED = 423;
+       const STATUS_FAILED_DEPENDENCY = 424;
+       const STATUS_UPGRADE_REQUIRED = 426;
+       const STATUS_PRECONDITION_REQUIRED = 428;
+       const STATUS_TOO_MANY_REQUESTS = 429;
+       const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
+       const STATUS_INTERNAL_SERVER_ERROR = 500;
+       const STATUS_NOT_IMPLEMENTED = 501;
+       const STATUS_BAD_GATEWAY = 502;
+       const STATUS_SERVICE_UNAVAILABLE = 503;
+       const STATUS_GATEWAY_TIMEOUT = 504;
+       const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
+       const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
+       const STATUS_INSUFFICIENT_STORAGE = 507;
+       const STATUS_LOOP_DETECTED = 508;
+       const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
+       const STATUS_NOT_EXTENDED = 510;
+       const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
+}
diff --git a/lib/public/appframework/http/http.php b/lib/public/appframework/http/http.php
deleted file mode 100644 (file)
index 9eafe78..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * ownCloud - App Framework
- *
- * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-namespace OCP\AppFramework\Http;
-
-
-class Http {
-
-       const STATUS_CONTINUE = 100;
-       const STATUS_SWITCHING_PROTOCOLS = 101;
-       const STATUS_PROCESSING = 102;
-       const STATUS_OK = 200;
-       const STATUS_CREATED = 201;
-       const STATUS_ACCEPTED = 202;
-       const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
-       const STATUS_NO_CONTENT = 204;
-       const STATUS_RESET_CONTENT = 205;
-       const STATUS_PARTIAL_CONTENT = 206;
-       const STATUS_MULTI_STATUS = 207;
-       const STATUS_ALREADY_REPORTED = 208;
-       const STATUS_IM_USED = 226;
-       const STATUS_MULTIPLE_CHOICES = 300;
-       const STATUS_MOVED_PERMANENTLY = 301;
-       const STATUS_FOUND = 302;
-       const STATUS_SEE_OTHER = 303;
-       const STATUS_NOT_MODIFIED = 304;
-       const STATUS_USE_PROXY = 305;
-       const STATUS_RESERVED = 306;
-       const STATUS_TEMPORARY_REDIRECT = 307;
-       const STATUS_BAD_REQUEST = 400;
-       const STATUS_UNAUTHORIZED = 401;
-       const STATUS_PAYMENT_REQUIRED = 402;
-       const STATUS_FORBIDDEN = 403;
-       const STATUS_NOT_FOUND = 404;
-       const STATUS_METHOD_NOT_ALLOWED = 405;
-       const STATUS_NOT_ACCEPTABLE = 406;
-       const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
-       const STATUS_REQUEST_TIMEOUT = 408;
-       const STATUS_CONFLICT = 409;
-       const STATUS_GONE = 410;
-       const STATUS_LENGTH_REQUIRED = 411;
-       const STATUS_PRECONDITION_FAILED = 412;
-       const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
-       const STATUS_REQUEST_URI_TOO_LONG = 414;
-       const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
-       const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
-       const STATUS_EXPECTATION_FAILED = 417;
-       const STATUS_IM_A_TEAPOT = 418;
-       const STATUS_UNPROCESSABLE_ENTITY = 422;
-       const STATUS_LOCKED = 423;
-       const STATUS_FAILED_DEPENDENCY = 424;
-       const STATUS_UPGRADE_REQUIRED = 426;
-       const STATUS_PRECONDITION_REQUIRED = 428;
-       const STATUS_TOO_MANY_REQUESTS = 429;
-       const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
-       const STATUS_INTERNAL_SERVER_ERROR = 500;
-       const STATUS_NOT_IMPLEMENTED = 501;
-       const STATUS_BAD_GATEWAY = 502;
-       const STATUS_SERVICE_UNAVAILABLE = 503;
-       const STATUS_GATEWAY_TIMEOUT = 504;
-       const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
-       const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
-       const STATUS_INSUFFICIENT_STORAGE = 507;
-       const STATUS_LOOP_DETECTED = 508;
-       const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
-       const STATUS_NOT_EXTENDED = 510;
-       const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
-}
index 085fdbed2f9da300aa400bae218d35dde4176873..fa7d32596e862ce6e867475adab7c739392a7eea 100644 (file)
@@ -24,6 +24,7 @@
 
 namespace OCP\AppFramework\Http;
 
+use OCP\AppFramework\Http;
 
 /**
  * A renderer for JSON calls
index 5ca389b99467920eaf08ad51efc151fde65d3ffe..54dc860fec21f582e510bc14e281eec491575e34 100644 (file)
@@ -24,6 +24,7 @@
 
 namespace OCP\AppFramework\Http;
 
+use OCP\AppFramework\Http;
 
 /**
  * Base class for responses. Also used to just send headers.
index 9052fe0781ac8929e27d2b7604ccd9a5afbafe99..6cf0da879ff181c26f26ca7c18e7d620d7abdae8 100644 (file)
@@ -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();
 
index 382d511b116449aa0ecda0047db07110ebbd93ad..0bdcee24c995a196b22cab20e692a18790e23b02 100644 (file)
@@ -24,6 +24,7 @@
 
 namespace OC\AppFramework\Http;
 
+use OC\AppFramework\Http;
 
 //require_once(__DIR__ . "/../classloader.php");
 
index 1946655b0fa54ea6c95ab9cdb3fff6e0fbefe2a9..f82d0c3a6758bb6387628d07c602faa210ea5b4a 100644 (file)
@@ -24,6 +24,7 @@
 
 namespace OC\AppFramework\Http;
 
+use OCP\AppFramework\Http;
 
 //require_once(__DIR__ . "/../classloader.php");
 
index 7e09086f80172d3f4bd0a9245434560347b47363..1a38c38c1e7b8e3567db5913d795a1557c04e890 100644 (file)
@@ -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 {
index 4bfd725ffd02d797647e2aa606d242101de86dbe..dae6135dc54f574e8ca9cebfa5e1b0fb54c857b2 100644 (file)
@@ -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;