@@ -21,7 +21,7 @@ |
||
21 | 21 | /** |
22 | 22 | * @return string |
23 | 23 | */ |
24 | - public function getVCard(){ |
|
24 | + public function getVCard() { |
|
25 | 25 | return isset($this->found_props['calendar-data']) ? $this->found_props['calendar-data'] : null; |
26 | 26 | } |
27 | 27 | } |
28 | 28 | \ No newline at end of file |
@@ -21,7 +21,7 @@ |
||
21 | 21 | /** |
22 | 22 | * @return bool |
23 | 23 | */ |
24 | - public function isSuccessFull(){ |
|
24 | + public function isSuccessFull() { |
|
25 | 25 | return $this->code == HttpResponse::HttpCodeNoContent; |
26 | 26 | } |
27 | 27 | } |
28 | 28 | \ No newline at end of file |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | $this->timezone = $timezone; |
61 | 61 | $this->uid = md5(uniqid(mt_rand(), true)); |
62 | 62 | |
63 | - if(is_null($this->timezone)){ |
|
63 | + if (is_null($this->timezone)) { |
|
64 | 64 | $this->timezone = new DateTimeZone('UTC'); |
65 | 65 | } |
66 | 66 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | /** |
69 | 69 | * @param string $uid |
70 | 70 | */ |
71 | - public function setUID($uid){ |
|
71 | + public function setUID($uid) { |
|
72 | 72 | $this->uid = $uid; |
73 | 73 | } |
74 | 74 |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | * @param array $params |
27 | 27 | * @return array |
28 | 28 | */ |
29 | - private static function createHeadersFor($http_method, array $params = []){ |
|
30 | - switch ($http_method){ |
|
29 | + private static function createHeadersFor($http_method, array $params = []) { |
|
30 | + switch ($http_method) { |
|
31 | 31 | case HttpMethods::PropFind: |
32 | 32 | case HttpMethods::Options: |
33 | 33 | case HttpMethods::Report: |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | ]; |
39 | 39 | case HttpMethods::Delete: |
40 | 40 | $etag = $params[0]; |
41 | - if(!empty($etag)) { |
|
41 | + if (!empty($etag)) { |
|
42 | 42 | return [ |
43 | 43 | Headers::IfMatch => $etag, |
44 | 44 | ]; |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | ]; |
51 | 51 | case HttpMethods::Put: |
52 | 52 | $etag = $params[0]; |
53 | - if(!empty($etag)){ |
|
53 | + if (!empty($etag)) { |
|
54 | 54 | return [ |
55 | 55 | Headers::ContentType => ContentTypes::Calendar, |
56 | 56 | Headers::IfMatch => $etag |
@@ -65,11 +65,10 @@ discard block |
||
65 | 65 | * @param int $depth |
66 | 66 | * @return Request |
67 | 67 | */ |
68 | - public static function createPropFindRequest($url , $body, $depth = 1){ |
|
69 | - return new Request |
|
70 | - ( |
|
68 | + public static function createPropFindRequest($url, $body, $depth = 1) { |
|
69 | + return new Request( |
|
71 | 70 | HttpMethods::PropFind, |
72 | - $url , |
|
71 | + $url, |
|
73 | 72 | self::createHeadersFor(HttpMethods::PropFind, [$depth]), |
74 | 73 | $body |
75 | 74 | ); |
@@ -80,9 +79,8 @@ discard block |
||
80 | 79 | * @param string $body |
81 | 80 | * @return Request |
82 | 81 | */ |
83 | - public static function createMakeCalendarRequest($url , $body){ |
|
84 | - return new Request |
|
85 | - ( |
|
82 | + public static function createMakeCalendarRequest($url, $body) { |
|
83 | + return new Request( |
|
86 | 84 | HttpMethods::MakeCalendar, |
87 | 85 | $url, |
88 | 86 | self::createHeadersFor(HttpMethods::MakeCalendar), |
@@ -95,9 +93,8 @@ discard block |
||
95 | 93 | * @param int $depth |
96 | 94 | * @return Request |
97 | 95 | */ |
98 | - public static function createOptionsRequest($url, $depth = 1){ |
|
99 | - return new Request |
|
100 | - ( |
|
96 | + public static function createOptionsRequest($url, $depth = 1) { |
|
97 | + return new Request( |
|
101 | 98 | HttpMethods::Options, |
102 | 99 | $url, |
103 | 100 | self::createHeadersFor(HttpMethods::Options, [$depth]) |
@@ -110,9 +107,8 @@ discard block |
||
110 | 107 | * @param int $depth |
111 | 108 | * @return Request |
112 | 109 | */ |
113 | - public static function createReportRequest($url , $body, $depth = 1){ |
|
114 | - return new Request |
|
115 | - ( |
|
110 | + public static function createReportRequest($url, $body, $depth = 1) { |
|
111 | + return new Request( |
|
116 | 112 | HttpMethods::Report, |
117 | 113 | $url, |
118 | 114 | self::createHeadersFor(HttpMethods::Report, [$depth]), |
@@ -125,9 +121,8 @@ discard block |
||
125 | 121 | * @param string $etag |
126 | 122 | * @return Request |
127 | 123 | */ |
128 | - public static function createDeleteRequest($url , $etag){ |
|
129 | - return new Request |
|
130 | - ( |
|
124 | + public static function createDeleteRequest($url, $etag) { |
|
125 | + return new Request( |
|
131 | 126 | HttpMethods::Delete, |
132 | 127 | $url, |
133 | 128 | self::createHeadersFor(HttpMethods::Delete, [$etag]) |
@@ -138,9 +133,8 @@ discard block |
||
138 | 133 | * @param string $url |
139 | 134 | * @return Request |
140 | 135 | */ |
141 | - public static function createGetRequest($url){ |
|
142 | - return new Request |
|
143 | - ( |
|
136 | + public static function createGetRequest($url) { |
|
137 | + return new Request( |
|
144 | 138 | HttpMethods::Get, |
145 | 139 | $url, |
146 | 140 | self::createHeadersFor(HttpMethods::Get) |
@@ -153,9 +147,8 @@ discard block |
||
153 | 147 | * @param string $etag |
154 | 148 | * @return Request |
155 | 149 | */ |
156 | - public static function createPutRequest($url, $body, $etag = null){ |
|
157 | - return new Request |
|
158 | - ( |
|
150 | + public static function createPutRequest($url, $body, $etag = null) { |
|
151 | + return new Request( |
|
159 | 152 | HttpMethods::Put, |
160 | 153 | $url, |
161 | 154 | self::createHeadersFor(HttpMethods::Put, [$etag]), |
@@ -125,15 +125,15 @@ discard block |
||
125 | 125 | * @param Request $http_request |
126 | 126 | * @return mixed|\Psr\Http\Message\ResponseInterface |
127 | 127 | */ |
128 | - private function makeRequest(Request $http_request){ |
|
129 | - try{ |
|
128 | + private function makeRequest(Request $http_request) { |
|
129 | + try { |
|
130 | 130 | return $this->client->send($http_request, [ |
131 | 131 | 'auth' => [$this->user, $this->password], |
132 | 132 | 'timeout' => $this->timeout |
133 | 133 | ]); |
134 | 134 | } |
135 | - catch (ClientException $ex){ |
|
136 | - switch($ex->getCode()){ |
|
135 | + catch (ClientException $ex) { |
|
136 | + switch ($ex->getCode()) { |
|
137 | 137 | case 401: |
138 | 138 | throw new UserUnAuthorizedException(); |
139 | 139 | break; |
@@ -161,9 +161,9 @@ discard block |
||
161 | 161 | |
162 | 162 | $res = $http_response->hasHeader(self::DAVHeader); |
163 | 163 | $options = []; |
164 | - if($res){ |
|
164 | + if ($res) { |
|
165 | 165 | $val = $http_response->getHeaderLine(self::DAVHeader); |
166 | - if(!empty($val)){ |
|
166 | + if (!empty($val)) { |
|
167 | 167 | $options = explode(', ', $val); |
168 | 168 | } |
169 | 169 | } |
@@ -177,14 +177,13 @@ discard block |
||
177 | 177 | public function getUserPrincipal() |
178 | 178 | { |
179 | 179 | $http_response = $this->makeRequest( |
180 | - RequestFactory::createPropFindRequest |
|
181 | - ( |
|
180 | + RequestFactory::createPropFindRequest( |
|
182 | 181 | $this->server_url, |
183 | 182 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::PrincipalRequestType)->getContent() |
184 | 183 | ) |
185 | 184 | ); |
186 | 185 | |
187 | - return new UserPrincipalResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode()); |
|
186 | + return new UserPrincipalResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode()); |
|
188 | 187 | } |
189 | 188 | |
190 | 189 | /** |
@@ -194,14 +193,13 @@ discard block |
||
194 | 193 | public function getCalendarHome($principal_url) |
195 | 194 | { |
196 | 195 | $http_response = $this->makeRequest( |
197 | - RequestFactory::createPropFindRequest |
|
198 | - ( |
|
196 | + RequestFactory::createPropFindRequest( |
|
199 | 197 | $principal_url, |
200 | 198 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarHomeRequestType)->getContent() |
201 | 199 | ) |
202 | 200 | ); |
203 | 201 | |
204 | - return new CalendarHomesResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode()); |
|
202 | + return new CalendarHomesResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode()); |
|
205 | 203 | } |
206 | 204 | |
207 | 205 | /** |
@@ -215,8 +213,7 @@ discard block |
||
215 | 213 | $uid = $vo->getUID(); |
216 | 214 | $resource_url = $calendar_home_set.$uid; |
217 | 215 | $http_response = $this->makeRequest( |
218 | - RequestFactory::createMakeCalendarRequest |
|
219 | - ( |
|
216 | + RequestFactory::createMakeCalendarRequest( |
|
220 | 217 | $resource_url, |
221 | 218 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarCreateRequestType, [$vo])->getContent() |
222 | 219 | ) |
@@ -232,14 +229,13 @@ discard block |
||
232 | 229 | public function getCalendars($calendar_home_set_url) |
233 | 230 | { |
234 | 231 | $http_response = $this->makeRequest( |
235 | - RequestFactory::createPropFindRequest |
|
236 | - ( |
|
232 | + RequestFactory::createPropFindRequest( |
|
237 | 233 | $calendar_home_set_url, |
238 | 234 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarsRequestType)->getContent() |
239 | 235 | ) |
240 | 236 | ); |
241 | 237 | |
242 | - return new GetCalendarsResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode()); |
|
238 | + return new GetCalendarsResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode()); |
|
243 | 239 | } |
244 | 240 | |
245 | 241 | /** |
@@ -249,15 +245,14 @@ discard block |
||
249 | 245 | public function getCalendar($calendar_url) |
250 | 246 | { |
251 | 247 | $http_response = $this->makeRequest( |
252 | - RequestFactory::createPropFindRequest |
|
253 | - ( |
|
248 | + RequestFactory::createPropFindRequest( |
|
254 | 249 | $calendar_url, |
255 | 250 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarRequestType)->getContent(), |
256 | 251 | 0 |
257 | 252 | ) |
258 | 253 | ); |
259 | 254 | |
260 | - return new GetCalendarResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode()); |
|
255 | + return new GetCalendarResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode()); |
|
261 | 256 | } |
262 | 257 | |
263 | 258 | |
@@ -270,14 +265,13 @@ discard block |
||
270 | 265 | { |
271 | 266 | |
272 | 267 | $http_response = $this->makeRequest( |
273 | - RequestFactory::createReportRequest |
|
274 | - ( |
|
268 | + RequestFactory::createReportRequest( |
|
275 | 269 | $calendar_url, |
276 | 270 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarSyncRequestType, [$sync_token])->getContent() |
277 | 271 | ) |
278 | 272 | ); |
279 | 273 | |
280 | - return new CalendarSyncInfoResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode()); |
|
274 | + return new CalendarSyncInfoResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode()); |
|
281 | 275 | } |
282 | 276 | |
283 | 277 | /** |
@@ -290,19 +284,17 @@ discard block |
||
290 | 284 | $uid = $vo->getUID(); |
291 | 285 | $resource_url = $calendar_url.$uid.self::SchedulingInformationSuffix; |
292 | 286 | $http_response = $this->makeRequest( |
293 | - RequestFactory::createPutRequest |
|
294 | - ( |
|
287 | + RequestFactory::createPutRequest( |
|
295 | 288 | $resource_url, |
296 | 289 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::EventCreateRequestType, [$vo])->getContent() |
297 | 290 | ) |
298 | 291 | ); |
299 | 292 | $etag = $http_response->hasHeader(self::ETagHeader) ? $http_response->getHeaderLine(self::ETagHeader) : null; |
300 | - return new EventCreatedResponse |
|
301 | - ( |
|
293 | + return new EventCreatedResponse( |
|
302 | 294 | $uid, |
303 | 295 | $etag, |
304 | 296 | $resource_url, |
305 | - (string)$http_response->getBody(), |
|
297 | + (string) $http_response->getBody(), |
|
306 | 298 | $http_response->getStatusCode() |
307 | 299 | ); |
308 | 300 | } |
@@ -318,20 +310,18 @@ discard block |
||
318 | 310 | $uid = $vo->getUID(); |
319 | 311 | $resource_url = $calendar_url.$uid.self::SchedulingInformationSuffix; |
320 | 312 | $http_response = $this->makeRequest( |
321 | - RequestFactory::createPutRequest |
|
322 | - ( |
|
313 | + RequestFactory::createPutRequest( |
|
323 | 314 | $resource_url, |
324 | 315 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::EventUpdateRequestType, [$vo])->getContent(), |
325 | 316 | $etag |
326 | 317 | ) |
327 | 318 | ); |
328 | 319 | $etag = $http_response->hasHeader(self::ETagHeader) ? $http_response->getHeaderLine(self::ETagHeader) : null; |
329 | - return new EventUpdatedResponse |
|
330 | - ( |
|
320 | + return new EventUpdatedResponse( |
|
331 | 321 | $uid, |
332 | 322 | $etag, |
333 | 323 | $resource_url, |
334 | - (string)$http_response->getBody(), |
|
324 | + (string) $http_response->getBody(), |
|
335 | 325 | $http_response->getStatusCode() |
336 | 326 | ); |
337 | 327 | } |
@@ -345,16 +335,14 @@ discard block |
||
345 | 335 | public function deleteEvent($calendar_url, $uid, $etag = null) |
346 | 336 | { |
347 | 337 | $http_response = $this->makeRequest( |
348 | - RequestFactory::createDeleteRequest |
|
349 | - ( |
|
338 | + RequestFactory::createDeleteRequest( |
|
350 | 339 | $calendar_url.$uid.self::SchedulingInformationSuffix, |
351 | 340 | $etag |
352 | 341 | ) |
353 | 342 | ); |
354 | 343 | |
355 | - return new EventDeletedResponse |
|
356 | - ( |
|
357 | - (string)$http_response->getBody(), $http_response->getStatusCode() |
|
344 | + return new EventDeletedResponse( |
|
345 | + (string) $http_response->getBody(), $http_response->getStatusCode() |
|
358 | 346 | ); |
359 | 347 | } |
360 | 348 | |
@@ -362,15 +350,14 @@ discard block |
||
362 | 350 | * @param string $event_url |
363 | 351 | * @return string |
364 | 352 | */ |
365 | - public function getEventVCardBy($event_url){ |
|
353 | + public function getEventVCardBy($event_url) { |
|
366 | 354 | $http_response = $this->makeRequest( |
367 | - RequestFactory::createGetRequest |
|
368 | - ( |
|
355 | + RequestFactory::createGetRequest( |
|
369 | 356 | $event_url |
370 | 357 | ) |
371 | 358 | ); |
372 | 359 | |
373 | - $ical = (string)$http_response->getBody(); |
|
360 | + $ical = (string) $http_response->getBody(); |
|
374 | 361 | return $ical; |
375 | 362 | } |
376 | 363 | |
@@ -382,17 +369,15 @@ discard block |
||
382 | 369 | public function getEventsBy($calendar_url, array $events_urls) |
383 | 370 | { |
384 | 371 | $http_response = $this->makeRequest( |
385 | - RequestFactory::createReportRequest |
|
386 | - ( |
|
372 | + RequestFactory::createReportRequest( |
|
387 | 373 | $calendar_url, |
388 | 374 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarMultiGetRequestType, [$events_urls])->getContent() |
389 | 375 | ) |
390 | 376 | ); |
391 | 377 | |
392 | - return new ResourceCollectionResponse |
|
393 | - ( |
|
378 | + return new ResourceCollectionResponse( |
|
394 | 379 | $this->server_url, |
395 | - (string)$http_response->getBody(), |
|
380 | + (string) $http_response->getBody(), |
|
396 | 381 | $http_response->getStatusCode() |
397 | 382 | ); |
398 | 383 | } |
@@ -406,17 +391,15 @@ discard block |
||
406 | 391 | { |
407 | 392 | |
408 | 393 | $http_response = $this->makeRequest( |
409 | - RequestFactory::createReportRequest |
|
410 | - ( |
|
394 | + RequestFactory::createReportRequest( |
|
411 | 395 | $calendar_url, |
412 | 396 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarQueryRequestType, [$filter])->getContent() |
413 | 397 | ) |
414 | 398 | ); |
415 | 399 | |
416 | - return new ResourceCollectionResponse |
|
417 | - ( |
|
400 | + return new ResourceCollectionResponse( |
|
418 | 401 | $this->server_url, |
419 | - (string)$http_response->getBody(), |
|
402 | + (string) $http_response->getBody(), |
|
420 | 403 | $http_response->getStatusCode() |
421 | 404 | ); |
422 | 405 | } |
@@ -429,16 +412,14 @@ discard block |
||
429 | 412 | public function deleteCalendar($calendar_url, $etag = null) |
430 | 413 | { |
431 | 414 | $http_response = $this->makeRequest( |
432 | - RequestFactory::createDeleteRequest |
|
433 | - ( |
|
415 | + RequestFactory::createDeleteRequest( |
|
434 | 416 | $calendar_url, |
435 | 417 | $etag |
436 | 418 | ) |
437 | 419 | ); |
438 | 420 | |
439 | - return new CalendarDeletedResponse |
|
440 | - ( |
|
441 | - $this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode() |
|
421 | + return new CalendarDeletedResponse( |
|
422 | + $this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode() |
|
442 | 423 | ); |
443 | 424 | } |
444 | 425 | } |
445 | 426 | \ No newline at end of file |
@@ -22,7 +22,7 @@ |
||
22 | 22 | * @return string |
23 | 23 | */ |
24 | 24 | public function getPrincipalUrl() { |
25 | - return isset($this->found_props['current-user-principal']) && isset($this->found_props['current-user-principal']['href']) ? |
|
25 | + return isset($this->found_props['current-user-principal']) && isset($this->found_props['current-user-principal']['href']) ? |
|
26 | 26 | $this->server_url.$this->found_props['current-user-principal']['href'] : null; |
27 | 27 | } |
28 | 28 | } |
29 | 29 | \ No newline at end of file |
@@ -42,14 +42,14 @@ discard block |
||
42 | 42 | * @param string|null $body |
43 | 43 | * @param int $code |
44 | 44 | */ |
45 | - public function __construct($server_url = null, $body = null, $code = HttpResponse::HttpCodeOk ) |
|
45 | + public function __construct($server_url = null, $body = null, $code = HttpResponse::HttpCodeOk) |
|
46 | 46 | { |
47 | 47 | parent::__construct($body, $code); |
48 | 48 | $this->server_url = $server_url; |
49 | - if(!empty($this->body)) { |
|
49 | + if (!empty($this->body)) { |
|
50 | 50 | $this->stripped = $this->stripNamespacesFromTags($this->body); |
51 | - $this->xml = simplexml_load_string($this->stripped); |
|
52 | - if($this->xml === FALSE) |
|
51 | + $this->xml = simplexml_load_string($this->stripped); |
|
52 | + if ($this->xml === FALSE) |
|
53 | 53 | throw new XMLResponseParseException(); |
54 | 54 | $this->content = $this->toAssocArray($this->xml); |
55 | 55 | |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | { |
62 | 62 | } |
63 | 63 | |
64 | - protected function setContent($content){ |
|
64 | + protected function setContent($content) { |
|
65 | 65 | $this->content = $content; |
66 | 66 | } |
67 | 67 | |
@@ -94,13 +94,13 @@ discard block |
||
94 | 94 | $nameSpaceDefRegEx = '(\S+)=["\']?((?:.(?!["\']?\s+(?:\S+)=|[>"\']))+.)["\']?'; |
95 | 95 | |
96 | 96 | // Cycle through each namespace and remove it from the XML string |
97 | - foreach( $toRemove as $remove ) { |
|
97 | + foreach ($toRemove as $remove) { |
|
98 | 98 | // First remove the namespace from the opening of the tag |
99 | - $xml = str_replace('<' . $remove . ':', '<', $xml); |
|
99 | + $xml = str_replace('<'.$remove.':', '<', $xml); |
|
100 | 100 | // Now remove the namespace from the closing of the tag |
101 | - $xml = str_replace('</' . $remove . ':', '</', $xml); |
|
101 | + $xml = str_replace('</'.$remove.':', '</', $xml); |
|
102 | 102 | // This XML uses the name space with CommentText, so remove that too |
103 | - $xml = str_replace($remove . ':commentText', 'commentText', $xml); |
|
103 | + $xml = str_replace($remove.':commentText', 'commentText', $xml); |
|
104 | 104 | // Complete the pattern for RegEx to remove this namespace declaration |
105 | 105 | $pattern = "/xmlns:{$remove}{$nameSpaceDefRegEx}/"; |
106 | 106 | // Remove the actual namespace declaration using the Pattern |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | /** |
125 | 125 | * @return bool |
126 | 126 | */ |
127 | - protected function isValid(){ |
|
127 | + protected function isValid() { |
|
128 | 128 | return isset($this->content['response']); |
129 | 129 | } |
130 | 130 | } |
131 | 131 | \ No newline at end of file |