@@ -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,10 +213,9 @@ discard block |
||
215 | 213 | $uid = $vo->getUID(); |
216 | 214 | $resource_name = $vo->getResourceName(); |
217 | 215 | |
218 | - $resource_url = $calendar_home_set . ($resource_name ? $resource_name : $uid); |
|
216 | + $resource_url = $calendar_home_set.($resource_name ? $resource_name : $uid); |
|
219 | 217 | $http_response = $this->makeRequest( |
220 | - RequestFactory::createMakeCalendarRequest |
|
221 | - ( |
|
218 | + RequestFactory::createMakeCalendarRequest( |
|
222 | 219 | $resource_url, |
223 | 220 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarCreateRequestType, [$vo])->getContent() |
224 | 221 | ) |
@@ -234,14 +231,13 @@ discard block |
||
234 | 231 | public function getCalendars($calendar_home_set_url) |
235 | 232 | { |
236 | 233 | $http_response = $this->makeRequest( |
237 | - RequestFactory::createPropFindRequest |
|
238 | - ( |
|
234 | + RequestFactory::createPropFindRequest( |
|
239 | 235 | $calendar_home_set_url, |
240 | 236 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarsRequestType)->getContent() |
241 | 237 | ) |
242 | 238 | ); |
243 | 239 | |
244 | - return new GetCalendarsResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode()); |
|
240 | + return new GetCalendarsResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode()); |
|
245 | 241 | } |
246 | 242 | |
247 | 243 | /** |
@@ -251,15 +247,14 @@ discard block |
||
251 | 247 | public function getCalendar($calendar_url) |
252 | 248 | { |
253 | 249 | $http_response = $this->makeRequest( |
254 | - RequestFactory::createPropFindRequest |
|
255 | - ( |
|
250 | + RequestFactory::createPropFindRequest( |
|
256 | 251 | $calendar_url, |
257 | 252 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarRequestType)->getContent(), |
258 | 253 | 0 |
259 | 254 | ) |
260 | 255 | ); |
261 | 256 | |
262 | - return new GetCalendarResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode()); |
|
257 | + return new GetCalendarResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode()); |
|
263 | 258 | } |
264 | 259 | |
265 | 260 | |
@@ -272,14 +267,13 @@ discard block |
||
272 | 267 | { |
273 | 268 | |
274 | 269 | $http_response = $this->makeRequest( |
275 | - RequestFactory::createReportRequest |
|
276 | - ( |
|
270 | + RequestFactory::createReportRequest( |
|
277 | 271 | $calendar_url, |
278 | 272 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarSyncRequestType, [$sync_token])->getContent() |
279 | 273 | ) |
280 | 274 | ); |
281 | 275 | |
282 | - return new CalendarSyncInfoResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode()); |
|
276 | + return new CalendarSyncInfoResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode()); |
|
283 | 277 | } |
284 | 278 | |
285 | 279 | /** |
@@ -292,19 +286,17 @@ discard block |
||
292 | 286 | $uid = $vo->getUID(); |
293 | 287 | $resource_url = $calendar_url.$uid.self::SchedulingInformationSuffix; |
294 | 288 | $http_response = $this->makeRequest( |
295 | - RequestFactory::createPutRequest |
|
296 | - ( |
|
289 | + RequestFactory::createPutRequest( |
|
297 | 290 | $resource_url, |
298 | 291 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::EventCreateRequestType, [$vo])->getContent() |
299 | 292 | ) |
300 | 293 | ); |
301 | 294 | $etag = $http_response->hasHeader(self::ETagHeader) ? $http_response->getHeaderLine(self::ETagHeader) : null; |
302 | - return new EventCreatedResponse |
|
303 | - ( |
|
295 | + return new EventCreatedResponse( |
|
304 | 296 | $uid, |
305 | 297 | $etag, |
306 | 298 | $resource_url, |
307 | - (string)$http_response->getBody(), |
|
299 | + (string) $http_response->getBody(), |
|
308 | 300 | $http_response->getStatusCode() |
309 | 301 | ); |
310 | 302 | } |
@@ -320,20 +312,18 @@ discard block |
||
320 | 312 | $uid = $vo->getUID(); |
321 | 313 | $resource_url = $calendar_url.$uid.self::SchedulingInformationSuffix; |
322 | 314 | $http_response = $this->makeRequest( |
323 | - RequestFactory::createPutRequest |
|
324 | - ( |
|
315 | + RequestFactory::createPutRequest( |
|
325 | 316 | $resource_url, |
326 | 317 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::EventUpdateRequestType, [$vo])->getContent(), |
327 | 318 | $etag |
328 | 319 | ) |
329 | 320 | ); |
330 | 321 | $etag = $http_response->hasHeader(self::ETagHeader) ? $http_response->getHeaderLine(self::ETagHeader) : null; |
331 | - return new EventUpdatedResponse |
|
332 | - ( |
|
322 | + return new EventUpdatedResponse( |
|
333 | 323 | $uid, |
334 | 324 | $etag, |
335 | 325 | $resource_url, |
336 | - (string)$http_response->getBody(), |
|
326 | + (string) $http_response->getBody(), |
|
337 | 327 | $http_response->getStatusCode() |
338 | 328 | ); |
339 | 329 | } |
@@ -347,16 +337,14 @@ discard block |
||
347 | 337 | public function deleteEvent($calendar_url, $uid, $etag = null) |
348 | 338 | { |
349 | 339 | $http_response = $this->makeRequest( |
350 | - RequestFactory::createDeleteRequest |
|
351 | - ( |
|
340 | + RequestFactory::createDeleteRequest( |
|
352 | 341 | $calendar_url.$uid.self::SchedulingInformationSuffix, |
353 | 342 | $etag |
354 | 343 | ) |
355 | 344 | ); |
356 | 345 | |
357 | - return new EventDeletedResponse |
|
358 | - ( |
|
359 | - (string)$http_response->getBody(), $http_response->getStatusCode() |
|
346 | + return new EventDeletedResponse( |
|
347 | + (string) $http_response->getBody(), $http_response->getStatusCode() |
|
360 | 348 | ); |
361 | 349 | } |
362 | 350 | |
@@ -364,15 +352,14 @@ discard block |
||
364 | 352 | * @param string $event_url |
365 | 353 | * @return string |
366 | 354 | */ |
367 | - public function getEventVCardBy($event_url){ |
|
355 | + public function getEventVCardBy($event_url) { |
|
368 | 356 | $http_response = $this->makeRequest( |
369 | - RequestFactory::createGetRequest |
|
370 | - ( |
|
357 | + RequestFactory::createGetRequest( |
|
371 | 358 | $event_url |
372 | 359 | ) |
373 | 360 | ); |
374 | 361 | |
375 | - $ical = (string)$http_response->getBody(); |
|
362 | + $ical = (string) $http_response->getBody(); |
|
376 | 363 | return $ical; |
377 | 364 | } |
378 | 365 | |
@@ -384,17 +371,15 @@ discard block |
||
384 | 371 | public function getEventsBy($calendar_url, array $events_urls) |
385 | 372 | { |
386 | 373 | $http_response = $this->makeRequest( |
387 | - RequestFactory::createReportRequest |
|
388 | - ( |
|
374 | + RequestFactory::createReportRequest( |
|
389 | 375 | $calendar_url, |
390 | 376 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarMultiGetRequestType, [$events_urls])->getContent() |
391 | 377 | ) |
392 | 378 | ); |
393 | 379 | |
394 | - return new ResourceCollectionResponse |
|
395 | - ( |
|
380 | + return new ResourceCollectionResponse( |
|
396 | 381 | $this->server_url, |
397 | - (string)$http_response->getBody(), |
|
382 | + (string) $http_response->getBody(), |
|
398 | 383 | $http_response->getStatusCode() |
399 | 384 | ); |
400 | 385 | } |
@@ -408,17 +393,15 @@ discard block |
||
408 | 393 | { |
409 | 394 | |
410 | 395 | $http_response = $this->makeRequest( |
411 | - RequestFactory::createReportRequest |
|
412 | - ( |
|
396 | + RequestFactory::createReportRequest( |
|
413 | 397 | $calendar_url, |
414 | 398 | CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarQueryRequestType, [$filter])->getContent() |
415 | 399 | ) |
416 | 400 | ); |
417 | 401 | |
418 | - return new ResourceCollectionResponse |
|
419 | - ( |
|
402 | + return new ResourceCollectionResponse( |
|
420 | 403 | $this->server_url, |
421 | - (string)$http_response->getBody(), |
|
404 | + (string) $http_response->getBody(), |
|
422 | 405 | $http_response->getStatusCode() |
423 | 406 | ); |
424 | 407 | } |
@@ -431,16 +414,14 @@ discard block |
||
431 | 414 | public function deleteCalendar($calendar_url, $etag = null) |
432 | 415 | { |
433 | 416 | $http_response = $this->makeRequest( |
434 | - RequestFactory::createDeleteRequest |
|
435 | - ( |
|
417 | + RequestFactory::createDeleteRequest( |
|
436 | 418 | $calendar_url, |
437 | 419 | $etag |
438 | 420 | ) |
439 | 421 | ); |
440 | 422 | |
441 | - return new CalendarDeletedResponse |
|
442 | - ( |
|
443 | - $this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode() |
|
423 | + return new CalendarDeletedResponse( |
|
424 | + $this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode() |
|
444 | 425 | ); |
445 | 426 | } |
446 | 427 | } |