Completed
Pull Request — master (#6790)
by Blizzz
14:04
created
lib/public/AppFramework/Http/DownloadResponse.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -32,22 +32,22 @@
 block discarded – undo
32 32
  */
33 33
 class DownloadResponse extends \OCP\AppFramework\Http\Response {
34 34
 
35
-	private $filename;
36
-	private $contentType;
37
-
38
-	/**
39
-	 * Creates a response that prompts the user to download the file
40
-	 * @param string $filename the name that the downloaded file should have
41
-	 * @param string $contentType the mimetype that the downloaded file should have
42
-	 * @since 7.0.0
43
-	 */
44
-	public function __construct($filename, $contentType) {
45
-		$this->filename = $filename;
46
-		$this->contentType = $contentType;
47
-
48
-		$this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
49
-		$this->addHeader('Content-Type', $contentType);
50
-	}
35
+    private $filename;
36
+    private $contentType;
37
+
38
+    /**
39
+     * Creates a response that prompts the user to download the file
40
+     * @param string $filename the name that the downloaded file should have
41
+     * @param string $contentType the mimetype that the downloaded file should have
42
+     * @since 7.0.0
43
+     */
44
+    public function __construct($filename, $contentType) {
45
+        $this->filename = $filename;
46
+        $this->contentType = $contentType;
47
+
48
+        $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
49
+        $this->addHeader('Content-Type', $contentType);
50
+    }
51 51
 
52 52
 
53 53
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/Middleware.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -44,69 +44,69 @@
 block discarded – undo
44 44
 abstract class Middleware {
45 45
 
46 46
 
47
-	/**
48
-	 * This is being run in normal order before the controller is being
49
-	 * called which allows several modifications and checks
50
-	 *
51
-	 * @param Controller $controller the controller that is being called
52
-	 * @param string $methodName the name of the method that will be called on
53
-	 *                           the controller
54
-	 * @since 6.0.0
55
-	 */
56
-	public function beforeController($controller, $methodName){
47
+    /**
48
+     * This is being run in normal order before the controller is being
49
+     * called which allows several modifications and checks
50
+     *
51
+     * @param Controller $controller the controller that is being called
52
+     * @param string $methodName the name of the method that will be called on
53
+     *                           the controller
54
+     * @since 6.0.0
55
+     */
56
+    public function beforeController($controller, $methodName){
57 57
 
58
-	}
58
+    }
59 59
 
60 60
 
61
-	/**
62
-	 * This is being run when either the beforeController method or the
63
-	 * controller method itself is throwing an exception. The middleware is
64
-	 * asked in reverse order to handle the exception and to return a response.
65
-	 * If the response is null, it is assumed that the exception could not be
66
-	 * handled and the error will be thrown again
67
-	 *
68
-	 * @param Controller $controller the controller that is being called
69
-	 * @param string $methodName the name of the method that will be called on
70
-	 *                           the controller
71
-	 * @param \Exception $exception the thrown exception
72
-	 * @throws \Exception the passed in exception if it can't handle it
73
-	 * @return Response a Response object in case that the exception was handled
74
-	 * @since 6.0.0
75
-	 */
76
-	public function afterException($controller, $methodName, \Exception $exception){
77
-		throw $exception;
78
-	}
61
+    /**
62
+     * This is being run when either the beforeController method or the
63
+     * controller method itself is throwing an exception. The middleware is
64
+     * asked in reverse order to handle the exception and to return a response.
65
+     * If the response is null, it is assumed that the exception could not be
66
+     * handled and the error will be thrown again
67
+     *
68
+     * @param Controller $controller the controller that is being called
69
+     * @param string $methodName the name of the method that will be called on
70
+     *                           the controller
71
+     * @param \Exception $exception the thrown exception
72
+     * @throws \Exception the passed in exception if it can't handle it
73
+     * @return Response a Response object in case that the exception was handled
74
+     * @since 6.0.0
75
+     */
76
+    public function afterException($controller, $methodName, \Exception $exception){
77
+        throw $exception;
78
+    }
79 79
 
80 80
 
81
-	/**
82
-	 * This is being run after a successful controllermethod call and allows
83
-	 * the manipulation of a Response object. The middleware is run in reverse order
84
-	 *
85
-	 * @param Controller $controller the controller that is being called
86
-	 * @param string $methodName the name of the method that will be called on
87
-	 *                           the controller
88
-	 * @param Response $response the generated response from the controller
89
-	 * @return Response a Response object
90
-	 * @since 6.0.0
91
-	 */
92
-	public function afterController($controller, $methodName, Response $response){
93
-		return $response;
94
-	}
81
+    /**
82
+     * This is being run after a successful controllermethod call and allows
83
+     * the manipulation of a Response object. The middleware is run in reverse order
84
+     *
85
+     * @param Controller $controller the controller that is being called
86
+     * @param string $methodName the name of the method that will be called on
87
+     *                           the controller
88
+     * @param Response $response the generated response from the controller
89
+     * @return Response a Response object
90
+     * @since 6.0.0
91
+     */
92
+    public function afterController($controller, $methodName, Response $response){
93
+        return $response;
94
+    }
95 95
 
96 96
 
97
-	/**
98
-	 * This is being run after the response object has been rendered and
99
-	 * allows the manipulation of the output. The middleware is run in reverse order
100
-	 *
101
-	 * @param Controller $controller the controller that is being called
102
-	 * @param string $methodName the name of the method that will be called on
103
-	 *                           the controller
104
-	 * @param string $output the generated output from a response
105
-	 * @return string the output that should be printed
106
-	 * @since 6.0.0
107
-	 */
108
-	public function beforeOutput($controller, $methodName, $output){
109
-		return $output;
110
-	}
97
+    /**
98
+     * This is being run after the response object has been rendered and
99
+     * allows the manipulation of the output. The middleware is run in reverse order
100
+     *
101
+     * @param Controller $controller the controller that is being called
102
+     * @param string $methodName the name of the method that will be called on
103
+     *                           the controller
104
+     * @param string $output the generated output from a response
105
+     * @return string the output that should be printed
106
+     * @since 6.0.0
107
+     */
108
+    public function beforeOutput($controller, $methodName, $output){
109
+        return $output;
110
+    }
111 111
 
112 112
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/Http.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -35,63 +35,63 @@
 block discarded – undo
35 35
  */
36 36
 class Http {
37 37
 
38
-	const STATUS_CONTINUE = 100;
39
-	const STATUS_SWITCHING_PROTOCOLS = 101;
40
-	const STATUS_PROCESSING = 102;
41
-	const STATUS_OK = 200;
42
-	const STATUS_CREATED = 201;
43
-	const STATUS_ACCEPTED = 202;
44
-	const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
45
-	const STATUS_NO_CONTENT = 204;
46
-	const STATUS_RESET_CONTENT = 205;
47
-	const STATUS_PARTIAL_CONTENT = 206;
48
-	const STATUS_MULTI_STATUS = 207;
49
-	const STATUS_ALREADY_REPORTED = 208;
50
-	const STATUS_IM_USED = 226;
51
-	const STATUS_MULTIPLE_CHOICES = 300;
52
-	const STATUS_MOVED_PERMANENTLY = 301;
53
-	const STATUS_FOUND = 302;
54
-	const STATUS_SEE_OTHER = 303;
55
-	const STATUS_NOT_MODIFIED = 304;
56
-	const STATUS_USE_PROXY = 305;
57
-	const STATUS_RESERVED = 306;
58
-	const STATUS_TEMPORARY_REDIRECT = 307;
59
-	const STATUS_BAD_REQUEST = 400;
60
-	const STATUS_UNAUTHORIZED = 401;
61
-	const STATUS_PAYMENT_REQUIRED = 402;
62
-	const STATUS_FORBIDDEN = 403;
63
-	const STATUS_NOT_FOUND = 404;
64
-	const STATUS_METHOD_NOT_ALLOWED = 405;
65
-	const STATUS_NOT_ACCEPTABLE = 406;
66
-	const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
67
-	const STATUS_REQUEST_TIMEOUT = 408;
68
-	const STATUS_CONFLICT = 409;
69
-	const STATUS_GONE = 410;
70
-	const STATUS_LENGTH_REQUIRED = 411;
71
-	const STATUS_PRECONDITION_FAILED = 412;
72
-	const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
73
-	const STATUS_REQUEST_URI_TOO_LONG = 414;
74
-	const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
75
-	const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
76
-	const STATUS_EXPECTATION_FAILED = 417;
77
-	const STATUS_IM_A_TEAPOT = 418;
78
-	const STATUS_UNPROCESSABLE_ENTITY = 422;
79
-	const STATUS_LOCKED = 423;
80
-	const STATUS_FAILED_DEPENDENCY = 424;
81
-	const STATUS_UPGRADE_REQUIRED = 426;
82
-	const STATUS_PRECONDITION_REQUIRED = 428;
83
-	const STATUS_TOO_MANY_REQUESTS = 429;
84
-	const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
85
-	const STATUS_INTERNAL_SERVER_ERROR = 500;
86
-	const STATUS_NOT_IMPLEMENTED = 501;
87
-	const STATUS_BAD_GATEWAY = 502;
88
-	const STATUS_SERVICE_UNAVAILABLE = 503;
89
-	const STATUS_GATEWAY_TIMEOUT = 504;
90
-	const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
91
-	const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
92
-	const STATUS_INSUFFICIENT_STORAGE = 507;
93
-	const STATUS_LOOP_DETECTED = 508;
94
-	const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
95
-	const STATUS_NOT_EXTENDED = 510;
96
-	const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
38
+    const STATUS_CONTINUE = 100;
39
+    const STATUS_SWITCHING_PROTOCOLS = 101;
40
+    const STATUS_PROCESSING = 102;
41
+    const STATUS_OK = 200;
42
+    const STATUS_CREATED = 201;
43
+    const STATUS_ACCEPTED = 202;
44
+    const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
45
+    const STATUS_NO_CONTENT = 204;
46
+    const STATUS_RESET_CONTENT = 205;
47
+    const STATUS_PARTIAL_CONTENT = 206;
48
+    const STATUS_MULTI_STATUS = 207;
49
+    const STATUS_ALREADY_REPORTED = 208;
50
+    const STATUS_IM_USED = 226;
51
+    const STATUS_MULTIPLE_CHOICES = 300;
52
+    const STATUS_MOVED_PERMANENTLY = 301;
53
+    const STATUS_FOUND = 302;
54
+    const STATUS_SEE_OTHER = 303;
55
+    const STATUS_NOT_MODIFIED = 304;
56
+    const STATUS_USE_PROXY = 305;
57
+    const STATUS_RESERVED = 306;
58
+    const STATUS_TEMPORARY_REDIRECT = 307;
59
+    const STATUS_BAD_REQUEST = 400;
60
+    const STATUS_UNAUTHORIZED = 401;
61
+    const STATUS_PAYMENT_REQUIRED = 402;
62
+    const STATUS_FORBIDDEN = 403;
63
+    const STATUS_NOT_FOUND = 404;
64
+    const STATUS_METHOD_NOT_ALLOWED = 405;
65
+    const STATUS_NOT_ACCEPTABLE = 406;
66
+    const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
67
+    const STATUS_REQUEST_TIMEOUT = 408;
68
+    const STATUS_CONFLICT = 409;
69
+    const STATUS_GONE = 410;
70
+    const STATUS_LENGTH_REQUIRED = 411;
71
+    const STATUS_PRECONDITION_FAILED = 412;
72
+    const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
73
+    const STATUS_REQUEST_URI_TOO_LONG = 414;
74
+    const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
75
+    const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
76
+    const STATUS_EXPECTATION_FAILED = 417;
77
+    const STATUS_IM_A_TEAPOT = 418;
78
+    const STATUS_UNPROCESSABLE_ENTITY = 422;
79
+    const STATUS_LOCKED = 423;
80
+    const STATUS_FAILED_DEPENDENCY = 424;
81
+    const STATUS_UPGRADE_REQUIRED = 426;
82
+    const STATUS_PRECONDITION_REQUIRED = 428;
83
+    const STATUS_TOO_MANY_REQUESTS = 429;
84
+    const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
85
+    const STATUS_INTERNAL_SERVER_ERROR = 500;
86
+    const STATUS_NOT_IMPLEMENTED = 501;
87
+    const STATUS_BAD_GATEWAY = 502;
88
+    const STATUS_SERVICE_UNAVAILABLE = 503;
89
+    const STATUS_GATEWAY_TIMEOUT = 504;
90
+    const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
91
+    const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
92
+    const STATUS_INSUFFICIENT_STORAGE = 507;
93
+    const STATUS_LOOP_DETECTED = 508;
94
+    const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
95
+    const STATUS_NOT_EXTENDED = 510;
96
+    const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
97 97
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/OCS/OCSForbiddenException.php 1 patch
Indentation   +10 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,6 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
-
4 3
  *
5 4
  * @author Roeland Jago Douma <[email protected]>
6 5
  *
@@ -32,14 +31,14 @@  discard block
 block discarded – undo
32 31
  * @since 9.1.0
33 32
  */
34 33
 class OCSForbiddenException extends OCSException {
35
-	/**
36
-	 * OCSForbiddenException constructor.
37
-	 *
38
-	 * @param string $message
39
-	 * @param Exception|null $previous
40
-	 * @since 9.1.0
41
-	 */
42
-	public function __construct($message = '', Exception $previous = null) {
43
-		parent::__construct($message, Http::STATUS_FORBIDDEN, $previous);
44
-	}
34
+    /**
35
+     * OCSForbiddenException constructor.
36
+     *
37
+     * @param string $message
38
+     * @param Exception|null $previous
39
+     * @since 9.1.0
40
+     */
41
+    public function __construct($message = '', Exception $previous = null) {
42
+        parent::__construct($message, Http::STATUS_FORBIDDEN, $previous);
43
+    }
45 44
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/OCS/OCSBadRequestException.php 1 patch
Indentation   +10 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,6 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
-
4 3
  *
5 4
  * @author Roeland Jago Douma <[email protected]>
6 5
  *
@@ -32,15 +31,15 @@  discard block
 block discarded – undo
32 31
  * @since 9.1.0
33 32
  */
34 33
 class OCSBadRequestException extends OCSException {
35
-	/**
36
-	 * OCSBadRequestException constructor.
37
-	 *
38
-	 * @param string $message
39
-	 * @param Exception|null $previous
40
-	 * @since 9.1.0
41
-	 */
42
-	public function __construct($message = '', Exception $previous = null) {
43
-		parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous);
44
-	}
34
+    /**
35
+     * OCSBadRequestException constructor.
36
+     *
37
+     * @param string $message
38
+     * @param Exception|null $previous
39
+     * @since 9.1.0
40
+     */
41
+    public function __construct($message = '', Exception $previous = null) {
42
+        parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous);
43
+    }
45 44
 
46 45
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/OCS/OCSNotFoundException.php 1 patch
Indentation   +10 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,6 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
-
4 3
  *
5 4
  * @author Roeland Jago Douma <[email protected]>
6 5
  *
@@ -32,14 +31,14 @@  discard block
 block discarded – undo
32 31
  * @since 9.1.0
33 32
  */
34 33
 class OCSNotFoundException extends OCSException {
35
-	/**
36
-	 * OCSNotFoundException constructor.
37
-	 *
38
-	 * @param string $message
39
-	 * @param Exception|null $previous
40
-	 * @since 9.1.0
41
-	 */
42
-	public function __construct($message = '', Exception $previous = null) {
43
-		parent::__construct($message, Http::STATUS_NOT_FOUND, $previous);
44
-	}
34
+    /**
35
+     * OCSNotFoundException constructor.
36
+     *
37
+     * @param string $message
38
+     * @param Exception|null $previous
39
+     * @since 9.1.0
40
+     */
41
+    public function __construct($message = '', Exception $previous = null) {
42
+        parent::__construct($message, Http::STATUS_NOT_FOUND, $previous);
43
+    }
45 44
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/OCS/OCSException.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,5 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
-
4 3
  *
5 4
  * @author Roeland Jago Douma <[email protected]>
6 5
  *
Please login to merge, or discard this patch.
lib/public/AppFramework/ApiController.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
      * defaults to 'Authorization, Content-Type, Accept'
56 56
      * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
57 57
      * request should be cached, defaults to 1728000 seconds
58
-	 * @since 7.0.0
58
+     * @since 7.0.0
59 59
      */
60 60
     public function __construct($appName,
61 61
                                 IRequest $request,
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
      * @NoAdminRequired
77 77
      * @NoCSRFRequired
78 78
      * @PublicPage
79
-	 * @since 7.0.0
79
+     * @since 7.0.0
80 80
      */
81 81
     public function preflightedCors() {
82 82
         if(isset($this->request->server['HTTP_ORIGIN'])) {
Please login to merge, or discard this patch.
lib/public/AppFramework/Db/MultipleObjectsReturnedException.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -32,13 +32,13 @@
 block discarded – undo
32 32
  */
33 33
 class MultipleObjectsReturnedException extends \Exception {
34 34
 
35
-	/**
36
-	 * Constructor
37
-	 * @param string $msg the error message
38
-	 * @since 7.0.0
39
-	 */
40
-	public function __construct($msg){
41
-		parent::__construct($msg);
42
-	}
35
+    /**
36
+     * Constructor
37
+     * @param string $msg the error message
38
+     * @since 7.0.0
39
+     */
40
+    public function __construct($msg){
41
+        parent::__construct($msg);
42
+    }
43 43
 
44 44
 }
Please login to merge, or discard this patch.