smarcet / CalDAVClient

src/Facade/CalDavClient.php

Spacing +40 added lines, -59 removed lines

@@ -108,7 +108,7 @@ 
      * @param string $authtype
      * @param array $headers Additional headers to send with each request
      */
-    public function __construct($server_url, $user = null, $password = null, $authtype = self::DefaultAuthType, $headers=[])
+    public function __construct($server_url, $user = null, $password = null, $authtype = self::DefaultAuthType, $headers = [])
     {
         $this->server_url = $server_url;
         $this->user       = $user;
@@ -157,8 +157,8 @@ 
      * @return mixed|\Psr\Http\Message\ResponseInterface
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    private function makeRequest(Request $http_request){
-        try{
+    private function makeRequest(Request $http_request) {
+        try {
             $options = [
                 'timeout' => $this->timeout
             ];
@@ -176,8 +176,8 @@ 
 
             return $this->client->send($http_request, $options);
         }
-        catch (ClientException $ex){
-            switch($ex->getCode()){
+        catch (ClientException $ex) {
+            switch ($ex->getCode()) {
                 case 401:
                     throw new UserUnAuthorizedException();
                     break;
@@ -210,9 +210,9 @@ 
 
         $res     = $http_response->hasHeader(self::DAVHeader);
         $options = [];
-        if($res){
+        if ($res) {
             $val = $http_response->getHeaderLine(self::DAVHeader);
-            if(!empty($val)){
+            if (!empty($val)) {
                 $options = explode(', ', $val);
             }
         }
@@ -226,15 +226,14 @@ 
     public function getUserPrincipal()
     {
         $http_response = $this->makeRequest(
-            RequestFactory::createPropFindRequest
-            (
+            RequestFactory::createPropFindRequest(
                 $this->server_url,
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::PrincipalRequestType)->getContent(),
                 0
             )
         );
 
-        return new UserPrincipalResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode());
+        return new UserPrincipalResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode());
     }
 
     /**
@@ -245,15 +244,14 @@ 
     public function getCalendarHome($principal_url)
     {
         $http_response = $this->makeRequest(
-            RequestFactory::createPropFindRequest
-            (
+            RequestFactory::createPropFindRequest(
                 $principal_url,
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarHomeRequestType)->getContent(),
                 0
             )
         );
 
-        return new CalendarHomesResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode());
+        return new CalendarHomesResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode());
     }
 
     /**
@@ -268,10 +266,9 @@ 
         $uid           = $vo->getUID();
         $resource_name = $vo->getResourceName();
 
-        $resource_url  = $calendar_home_set . ($resource_name ? $resource_name : $uid);
+        $resource_url  = $calendar_home_set.($resource_name ? $resource_name : $uid);
         $http_response = $this->makeRequest(
-            RequestFactory::createMakeCalendarRequest
-            (
+            RequestFactory::createMakeCalendarRequest(
                 $resource_url,
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarCreateRequestType, [$vo])->getContent()
             )
@@ -288,14 +285,13 @@ 
     public function getCalendars($calendar_home_set_url)
     {
         $http_response = $this->makeRequest(
-            RequestFactory::createPropFindRequest
-            (
+            RequestFactory::createPropFindRequest(
                 $calendar_home_set_url,
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarsRequestType)->getContent()
             )
         );
 
-        return new GetCalendarsResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode());
+        return new GetCalendarsResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode());
     }
 
     /**
@@ -306,15 +302,14 @@ 
     public function getCalendar($calendar_url)
     {
         $http_response = $this->makeRequest(
-            RequestFactory::createPropFindRequest
-            (
+            RequestFactory::createPropFindRequest(
                 $calendar_url,
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarRequestType)->getContent(),
                 0
             )
         );
 
-        return new GetCalendarResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode());
+        return new GetCalendarResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode());
     }
 
 
@@ -328,14 +323,13 @@ 
     {
 
         $http_response = $this->makeRequest(
-            RequestFactory::createReportRequest
-            (
+            RequestFactory::createReportRequest(
                 $calendar_url,
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarSyncRequestType, [$sync_token])->getContent()
             )
         );
 
-        return new CalendarSyncInfoResponse($this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode());
+        return new CalendarSyncInfoResponse($this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode());
     }
 
     /**
@@ -349,19 +343,17 @@ 
         $uid           = $vo->getUID();
         $resource_url  = $calendar_url.$uid.self::SchedulingInformationSuffix;
         $http_response = $this->makeRequest(
-            RequestFactory::createPutRequest
-            (
+            RequestFactory::createPutRequest(
                 $resource_url,
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::EventCreateRequestType, [$vo])->getContent()
             )
         );
         $etag = $http_response->hasHeader(self::ETagHeader) ? $http_response->getHeaderLine(self::ETagHeader) : null;
-        return new EventCreatedResponse
-        (
+        return new EventCreatedResponse(
             $uid,
             $etag,
             $resource_url,
-            (string)$http_response->getBody(),
+            (string) $http_response->getBody(),
             $http_response->getStatusCode()
         );
     }
@@ -378,20 +370,18 @@ 
         $uid           = $vo->getUID();
         $resource_url  = $calendar_url.$uid.self::SchedulingInformationSuffix;
         $http_response = $this->makeRequest(
-            RequestFactory::createPutRequest
-            (
+            RequestFactory::createPutRequest(
                 $resource_url,
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::EventUpdateRequestType, [$vo])->getContent(),
                 $etag
             )
         );
         $etag = $http_response->hasHeader(self::ETagHeader) ? $http_response->getHeaderLine(self::ETagHeader) : null;
-        return new EventUpdatedResponse
-        (
+        return new EventUpdatedResponse(
             $uid,
             $etag,
             $resource_url,
-            (string)$http_response->getBody(),
+            (string) $http_response->getBody(),
             $http_response->getStatusCode()
         );
     }
@@ -406,16 +396,14 @@ 
     public function deleteEvent($calendar_url, $uid, $etag = null)
     {
         $http_response = $this->makeRequest(
-            RequestFactory::createDeleteRequest
-            (
+            RequestFactory::createDeleteRequest(
                 $calendar_url.$uid.self::SchedulingInformationSuffix,
                 $etag
             )
         );
 
-        return new EventDeletedResponse
-        (
-            (string)$http_response->getBody(), $http_response->getStatusCode()
+        return new EventDeletedResponse(
+            (string) $http_response->getBody(), $http_response->getStatusCode()
         );
     }
 
@@ -424,15 +412,14 @@ 
      * @return string
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function getEventVCardBy($event_url){
+    public function getEventVCardBy($event_url) {
         $http_response = $this->makeRequest(
-            RequestFactory::createGetRequest
-            (
+            RequestFactory::createGetRequest(
                 $event_url
             )
         );
 
-        $ical = (string)$http_response->getBody();
+        $ical = (string) $http_response->getBody();
         return $ical;
     }
 
@@ -445,17 +432,15 @@ 
     public function getEventsBy($calendar_url, array $events_urls)
     {
         $http_response = $this->makeRequest(
-            RequestFactory::createReportRequest
-            (
+            RequestFactory::createReportRequest(
                 $calendar_url,
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarMultiGetRequestType, [$events_urls])->getContent()
             )
         );
 
-        return new ResourceCollectionResponse
-        (
+        return new ResourceCollectionResponse(
             $this->server_url,
-            (string)$http_response->getBody(),
+            (string) $http_response->getBody(),
             $http_response->getStatusCode()
         );
     }
@@ -470,17 +455,15 @@ 
     {
 
         $http_response = $this->makeRequest(
-            RequestFactory::createReportRequest
-            (
+            RequestFactory::createReportRequest(
                 $calendar_url,
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarQueryRequestType, [$filter])->getContent()
             )
         );
 
-        return new ResourceCollectionResponse
-        (
+        return new ResourceCollectionResponse(
             $this->server_url,
-            (string)$http_response->getBody(),
+            (string) $http_response->getBody(),
             $http_response->getStatusCode()
         );
     }
@@ -494,16 +477,14 @@ 
     public function deleteCalendar($calendar_url, $etag = null)
     {
         $http_response = $this->makeRequest(
-            RequestFactory::createDeleteRequest
-            (
+            RequestFactory::createDeleteRequest(
                 $calendar_url,
                 $etag
             )
         );
 
-        return new CalendarDeletedResponse
-        (
-            (string)$http_response->getBody(), $http_response->getStatusCode()
+        return new CalendarDeletedResponse(
+            (string) $http_response->getBody(), $http_response->getStatusCode()
         );
     }
 }

src/Facade/Responses/UserPrincipalSingleResponse.php

Spacing +3 added lines, -3 removed lines

@@ -22,11 +22,11 @@
      * @return string
      */
     public function getPrincipalUrl() {
-        $url = isset($this->found_props['current-user-principal']) &&  isset($this->found_props['current-user-principal']['href']) ?
+        $url = isset($this->found_props['current-user-principal']) && isset($this->found_props['current-user-principal']['href']) ?
             $this->server_url.$this->found_props['current-user-principal']['href'] : null;
         // check on not found one ( issue on caldav icloud imp)
-        if(empty($url))
-            $url =  isset($this->not_found_props['current-user-principal']) &&  isset($this->not_found_props['current-user-principal']['href']) ?
+        if (empty($url))
+            $url = isset($this->not_found_props['current-user-principal']) && isset($this->not_found_props['current-user-principal']['href']) ?
                 $this->server_url.$this->not_found_props['current-user-principal']['href'] : null;
         return $url;
     }

Braces +3 added lines, -2 removed lines

@@ -25,9 +25,10 @@
         $url = isset($this->found_props['current-user-principal']) &&  isset($this->found_props['current-user-principal']['href']) ?
             $this->server_url.$this->found_props['current-user-principal']['href'] : null;
         // check on not found one ( issue on caldav icloud imp)
-        if(empty($url))
-            $url =  isset($this->not_found_props['current-user-principal']) &&  isset($this->not_found_props['current-user-principal']['href']) ?
+        if(empty($url)) {
+                    $url =  isset($this->not_found_props['current-user-principal']) &&  isset($this->not_found_props['current-user-principal']['href']) ?
                 $this->server_url.$this->not_found_props['current-user-principal']['href'] : null;
+        }
         return $url;
     }
 }
\ No newline at end of file