@@ -31,6 +31,6 @@ |
||
31 | 31 | * @since 11.0.0 |
32 | 32 | * @internal This interface is experimental and might change for NC12 |
33 | 33 | */ |
34 | -interface IAppData extends ISimpleRoot { |
|
34 | +interface IAppData extends ISimpleRoot { |
|
35 | 35 | |
36 | 36 | } |
@@ -57,6 +57,6 @@ |
||
57 | 57 | * @since 7.0.0 |
58 | 58 | */ |
59 | 59 | public function __toString() { |
60 | - return __CLASS__ . ": [{$this->code}]: {$this->message}\n"; |
|
60 | + return __CLASS__.": [{$this->code}]: {$this->message}\n"; |
|
61 | 61 | } |
62 | 62 | } |
@@ -48,7 +48,7 @@ |
||
48 | 48 | * @since 8.1.0 |
49 | 49 | */ |
50 | 50 | public function __construct($path, \Exception $previous = null) { |
51 | - parent::__construct('"' . $path . '" is locked', 0, $previous); |
|
51 | + parent::__construct('"'.$path.'" is locked', 0, $previous); |
|
52 | 52 | $this->path = $path; |
53 | 53 | } |
54 | 54 |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | * @param bool $setContentType the optional content type |
47 | 47 | * @deprecated 8.1.0 Use a AppFramework JSONResponse instead |
48 | 48 | */ |
49 | - public static function encodedPrint( $data, $setContentType=true ) { |
|
49 | + public static function encodedPrint($data, $setContentType = true) { |
|
50 | 50 | \OC_JSON::encodedPrint($data, $setContentType); |
51 | 51 | } |
52 | 52 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @return string json formatted string. |
102 | 102 | * @deprecated 8.1.0 Use a AppFramework JSONResponse instead |
103 | 103 | */ |
104 | - public static function success( $data = array() ) { |
|
104 | + public static function success($data = array()) { |
|
105 | 105 | \OC_JSON::success($data); |
106 | 106 | } |
107 | 107 | |
@@ -124,8 +124,8 @@ discard block |
||
124 | 124 | * @return string json formatted error string. |
125 | 125 | * @deprecated 8.1.0 Use a AppFramework JSONResponse instead |
126 | 126 | */ |
127 | - public static function error( $data = array() ) { |
|
128 | - \OC_JSON::error( $data ); |
|
127 | + public static function error($data = array()) { |
|
128 | + \OC_JSON::error($data); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * @param string $type The content type header |
134 | 134 | * @deprecated 8.1.0 Use a AppFramework JSONResponse instead |
135 | 135 | */ |
136 | - public static function setContentTypeHeader( $type='application/json' ) { |
|
136 | + public static function setContentTypeHeader($type = 'application/json') { |
|
137 | 137 | \OC_JSON::setContentTypeHeader($type); |
138 | 138 | } |
139 | 139 | |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | * @param string $app The app to check |
154 | 154 | * @deprecated 8.1.0 Use the AppFramework instead. It will automatically check if the app is enabled. |
155 | 155 | */ |
156 | - public static function checkAppEnabled( $app ) { |
|
156 | + public static function checkAppEnabled($app) { |
|
157 | 157 | \OC_JSON::checkAppEnabled($app); |
158 | 158 | } |
159 | 159 |
@@ -61,15 +61,15 @@ |
||
61 | 61 | */ |
62 | 62 | public function __construct($appName, |
63 | 63 | IRequest $request, |
64 | - $corsMethods='PUT, POST, GET, DELETE, PATCH', |
|
65 | - $corsAllowedHeaders='Authorization, Content-Type, Accept', |
|
66 | - $corsMaxAge=1728000){ |
|
64 | + $corsMethods = 'PUT, POST, GET, DELETE, PATCH', |
|
65 | + $corsAllowedHeaders = 'Authorization, Content-Type, Accept', |
|
66 | + $corsMaxAge = 1728000) { |
|
67 | 67 | parent::__construct($appName, $request, $corsMethods, |
68 | 68 | $corsAllowedHeaders, $corsMaxAge); |
69 | - $this->registerResponder('json', function ($data) { |
|
69 | + $this->registerResponder('json', function($data) { |
|
70 | 70 | return $this->buildOCSResponse('json', $data); |
71 | 71 | }); |
72 | - $this->registerResponder('xml', function ($data) { |
|
72 | + $this->registerResponder('xml', function($data) { |
|
73 | 73 | return $this->buildOCSResponse('xml', $data); |
74 | 74 | }); |
75 | 75 | } |
@@ -55,8 +55,8 @@ |
||
55 | 55 | * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController |
56 | 56 | */ |
57 | 57 | public function __construct($format, $statuscode, $message, |
58 | - $data=[], $itemscount='', |
|
59 | - $itemsperpage='') { |
|
58 | + $data = [], $itemscount = '', |
|
59 | + $itemsperpage = '') { |
|
60 | 60 | $this->format = $format; |
61 | 61 | $this->statuscode = $statuscode; |
62 | 62 | $this->message = $message; |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | * @param int $statusCode the Http status code, defaults to 200 |
53 | 53 | * @since 6.0.0 |
54 | 54 | */ |
55 | - public function __construct($data=array(), $statusCode=Http::STATUS_OK) { |
|
55 | + public function __construct($data = array(), $statusCode = Http::STATUS_OK) { |
|
56 | 56 | $this->data = $data; |
57 | 57 | $this->setStatus($statusCode); |
58 | 58 | $this->addHeader('Content-Type', 'application/json; charset=utf-8'); |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function render() { |
69 | 69 | $response = json_encode($this->data, JSON_HEX_TAG); |
70 | - if($response === false) { |
|
71 | - throw new \Exception(sprintf('Could not json_encode due to invalid ' . |
|
70 | + if ($response === false) { |
|
71 | + throw new \Exception(sprintf('Could not json_encode due to invalid '. |
|
72 | 72 | 'non UTF-8 characters in the array: %s', var_export($this->data, true))); |
73 | 73 | } |
74 | 74 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | * @return JSONResponse Reference to this object |
83 | 83 | * @since 6.0.0 - return value was added in 7.0.0 |
84 | 84 | */ |
85 | - public function setData($data){ |
|
85 | + public function setData($data) { |
|
86 | 86 | $this->data = $data; |
87 | 87 | |
88 | 88 | return $this; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * @return array the data |
95 | 95 | * @since 6.0.0 |
96 | 96 | */ |
97 | - public function getData(){ |
|
97 | + public function getData() { |
|
98 | 98 | return $this->data; |
99 | 99 | } |
100 | 100 |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | * @param array $headers additional key value based headers |
51 | 51 | * @since 8.0.0 |
52 | 52 | */ |
53 | - public function __construct($data=array(), $statusCode=Http::STATUS_OK, |
|
54 | - array $headers=array()) { |
|
53 | + public function __construct($data = array(), $statusCode = Http::STATUS_OK, |
|
54 | + array $headers = array()) { |
|
55 | 55 | $this->data = $data; |
56 | 56 | $this->setStatus($statusCode); |
57 | 57 | $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * @return DataResponse Reference to this object |
65 | 65 | * @since 8.0.0 |
66 | 66 | */ |
67 | - public function setData($data){ |
|
67 | + public function setData($data) { |
|
68 | 68 | $this->data = $data; |
69 | 69 | |
70 | 70 | return $this; |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * @return array the data |
77 | 77 | * @since 8.0.0 |
78 | 78 | */ |
79 | - public function getData(){ |
|
79 | + public function getData() { |
|
80 | 80 | return $this->data; |
81 | 81 | } |
82 | 82 |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | */ |
92 | 92 | public function cacheFor($cacheSeconds) { |
93 | 93 | |
94 | - if($cacheSeconds > 0) { |
|
95 | - $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . ', must-revalidate'); |
|
94 | + if ($cacheSeconds > 0) { |
|
95 | + $this->addHeader('Cache-Control', 'max-age='.$cacheSeconds.', must-revalidate'); |
|
96 | 96 | } else { |
97 | 97 | $this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate'); |
98 | 98 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | * @since 8.0.0 |
147 | 147 | */ |
148 | 148 | public function invalidateCookies(array $cookieNames) { |
149 | - foreach($cookieNames as $cookieName) { |
|
149 | + foreach ($cookieNames as $cookieName) { |
|
150 | 150 | $this->invalidateCookie($cookieName); |
151 | 151 | } |
152 | 152 | return $this; |
@@ -170,11 +170,11 @@ discard block |
||
170 | 170 | * @since 6.0.0 - return value was added in 7.0.0 |
171 | 171 | */ |
172 | 172 | public function addHeader($name, $value) { |
173 | - $name = trim($name); // always remove leading and trailing whitespace |
|
173 | + $name = trim($name); // always remove leading and trailing whitespace |
|
174 | 174 | // to be able to reliably check for security |
175 | 175 | // headers |
176 | 176 | |
177 | - if(is_null($value)) { |
|
177 | + if (is_null($value)) { |
|
178 | 178 | unset($this->headers[$name]); |
179 | 179 | } else { |
180 | 180 | $this->headers[$name] = $value; |
@@ -205,19 +205,19 @@ discard block |
||
205 | 205 | public function getHeaders() { |
206 | 206 | $mergeWith = []; |
207 | 207 | |
208 | - if($this->lastModified) { |
|
208 | + if ($this->lastModified) { |
|
209 | 209 | $mergeWith['Last-Modified'] = |
210 | 210 | $this->lastModified->format(\DateTime::RFC2822); |
211 | 211 | } |
212 | 212 | |
213 | 213 | // Build Content-Security-Policy and use default if none has been specified |
214 | - if(is_null($this->contentSecurityPolicy)) { |
|
214 | + if (is_null($this->contentSecurityPolicy)) { |
|
215 | 215 | $this->setContentSecurityPolicy(new ContentSecurityPolicy()); |
216 | 216 | } |
217 | 217 | $this->headers['Content-Security-Policy'] = $this->contentSecurityPolicy->buildPolicy(); |
218 | 218 | |
219 | - if($this->ETag) { |
|
220 | - $mergeWith['ETag'] = '"' . $this->ETag . '"'; |
|
219 | + if ($this->ETag) { |
|
220 | + $mergeWith['ETag'] = '"'.$this->ETag.'"'; |
|
221 | 221 | } |
222 | 222 | |
223 | 223 | return array_merge($mergeWith, $this->headers); |