smarcet / CalDAVClient

src/Facade/CalDavClient.php

Braces +1 added lines, -2 removed lines

@@ -143,8 +143,7 @@
                 'auth'    => [$this->user, $this->password, $this->authtype],
                 'timeout' => $this->timeout
             ]);
-        }
-        catch (ClientException $ex){
+        } catch (ClientException $ex){
             switch($ex->getCode()){
                 case 401:
                     throw new UserUnAuthorizedException();

Spacing +39 added lines, -58 removed lines

@@ -141,15 +141,15 @@ 
      * @return mixed|\Psr\Http\Message\ResponseInterface
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    private function makeRequest(Request $http_request){
-        try{
+    private function makeRequest(Request $http_request) {
+        try {
             return $this->client->send($http_request, [
                 'auth'    => [$this->user, $this->password, $this->authtype],
                 'timeout' => $this->timeout
             ]);
         }
-        catch (ClientException $ex){
-            switch($ex->getCode()){
+        catch (ClientException $ex) {
+            switch ($ex->getCode()) {
                 case 401:
                     throw new UserUnAuthorizedException();
                     break;
@@ -179,9 +179,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);
             }
         }
@@ -195,14 +195,13 @@ 
     public function getUserPrincipal()
     {
         $http_response = $this->makeRequest(
-            RequestFactory::createPropFindRequest
-            (
+            RequestFactory::createPropFindRequest(
                 $this->server_url,
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::PrincipalRequestType)->getContent()
             )
         );
 
-        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());
     }
 
     /**
@@ -212,14 +211,13 @@ 
     public function getCalendarHome($principal_url)
     {
         $http_response = $this->makeRequest(
-            RequestFactory::createPropFindRequest
-            (
+            RequestFactory::createPropFindRequest(
                 $principal_url,
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarHomeRequestType)->getContent()
             )
         );
 
-        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());
     }
 
     /**
@@ -233,10 +231,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()
             )
@@ -252,14 +249,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());
     }
 
     /**
@@ -269,15 +265,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());
     }
 
 
@@ -290,14 +285,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());
     }
 
     /**
@@ -310,19 +304,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()
         );
     }
@@ -338,20 +330,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()
         );
     }
@@ -365,16 +355,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()
         );
     }
 
@@ -382,15 +370,14 @@ 
      * @param string $event_url
      * @return string
      */
-    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;
     }
 
@@ -402,17 +389,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()
         );
     }
@@ -426,17 +411,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()
         );
     }
@@ -449,16 +432,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/Requests/CalendarQueryRequest.php

Spacing +3 added lines, -3 removed lines

@@ -58,11 +58,11 @@ 
         $filter = [];
         $props  = [];
 
-        if($this->filter->useGetETags()){
+        if ($this->filter->useGetETags()) {
             $props['{DAV:}getetag'] = '';
         }
 
-        if($this->filter->useGetCalendarData()){
+        if ($this->filter->useGetCalendarData()) {
             $props['{urn:ietf:params:xml:ns:caldav}calendar-data'] = '';
         }
 
@@ -89,7 +89,7 @@ 
             ];
         }
 
-        $nodes =  [
+        $nodes = [
             '{DAV:}prop' => [
                 $props
             ],

src/Facade/Requests/AbstractPropFindWebDAVRequest.php

Spacing +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
         ];
 
         $elements = [];
-        foreach( $this->properties as $val ) {
-            $elements[] = [  $val => "" ];
+        foreach ($this->properties as $val) {
+            $elements[] = [$val => ""];
         }
         return $service->write('{DAV:}propfind',
             [

src/Facade/Responses/UserPrincipalSingleResponse.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      * @return string
      */
     public function getPrincipalUrl() {
-        return isset($this->found_props['current-user-principal']) &&  isset($this->found_props['current-user-principal']['href']) ?
+        return 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;
     }
 }
\ No newline at end of file

src/Facade/Responses/AbstractCalDAVResponse.php

Spacing +10 added lines, -10 removed lines

@@ -42,14 +42,14 @@ 
      * @param string|null $body
      * @param int $code
      */
-    public function __construct($server_url = null, $body = null, $code = HttpResponse::HttpCodeOk )
+    public function __construct($server_url = null, $body = null, $code = HttpResponse::HttpCodeOk)
     {
         parent::__construct($body, $code);
         $this->server_url = $server_url;
-        if(!empty($this->body)) {
+        if (!empty($this->body)) {
             $this->stripped = $this->stripNamespacesFromTags($this->body);
-            $this->xml     =  simplexml_load_string($this->stripped);
-            if($this->xml === FALSE)
+            $this->xml     = simplexml_load_string($this->stripped);
+            if ($this->xml === FALSE)
                 throw new XMLResponseParseException();
             $this->content = $this->toAssocArray($this->xml);
 
@@ -61,7 +61,7 @@ 
     {
     }
 
-    protected function setContent($content){
+    protected function setContent($content) {
         $this->content = $content;
     }
 
@@ -94,13 +94,13 @@ 
         $nameSpaceDefRegEx = '(\S+)=["\']?((?:.(?!["\']?\s+(?:\S+)=|[>"\']))+.)["\']?';
 
         // Cycle through each namespace and remove it from the XML string
-        foreach( $toRemove as $remove ) {
+        foreach ($toRemove as $remove) {
             // First remove the namespace from the opening of the tag
-            $xml = str_replace('<' . $remove . ':', '<', $xml);
+            $xml = str_replace('<'.$remove.':', '<', $xml);
             // Now remove the namespace from the closing of the tag
-            $xml = str_replace('</' . $remove . ':', '</', $xml);
+            $xml = str_replace('</'.$remove.':', '</', $xml);
             // This XML uses the name space with CommentText, so remove that too
-            $xml = str_replace($remove . ':commentText', 'commentText', $xml);
+            $xml = str_replace($remove.':commentText', 'commentText', $xml);
             // Complete the pattern for RegEx to remove this namespace declaration
             $pattern = "/xmlns:{$remove}{$nameSpaceDefRegEx}/";
             // Remove the actual namespace declaration using the Pattern
@@ -124,7 +124,7 @@ 
     /**
      * @return bool
      */
-    protected function isValid(){
+    protected function isValid() {
         return isset($this->content['response']);
     }
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -49,8 +49,9 @@
         if(!empty($this->body)) {
             $this->stripped = $this->stripNamespacesFromTags($this->body);
             $this->xml     =  simplexml_load_string($this->stripped);
-            if($this->xml === FALSE)
-                throw new XMLResponseParseException();
+            if($this->xml === FALSE) {
+                            throw new XMLResponseParseException();
+            }
             $this->content = $this->toAssocArray($this->xml);
 
             $this->parse();

src/Facade/Responses/CalendarSyncInfoResponse.php

Spacing +9 added lines, -9 removed lines

@@ -22,24 +22,24 @@ 
     /**
      * @return string|null
      */
-    public function getSyncToken(){
-        return isset($this->content['sync-token'])? $this->content['sync-token'] : null;
+    public function getSyncToken() {
+        return isset($this->content['sync-token']) ? $this->content['sync-token'] : null;
     }
 
     /**
      * @return bool
      */
-    public function hasAvailableChanges(){
+    public function hasAvailableChanges() {
         return count($this->responses) > 0;
     }
 
     /**
      * @return ETagEntityResponse[]
      */
-    public function getUpdates(){
+    public function getUpdates() {
         $res = [];
-        foreach ($this->responses as $entity){
-            if($entity instanceof ETagEntityResponse && $entity->getStatus() != HttpResponse::HttpOKStatus) continue;
+        foreach ($this->responses as $entity) {
+            if ($entity instanceof ETagEntityResponse && $entity->getStatus() != HttpResponse::HttpOKStatus) continue;
                 $res[] = $entity;
         }
         return $res;
@@ -48,10 +48,10 @@ 
     /**
      * @return ETagEntityResponse[]
      */
-    public function getDeletes(){
+    public function getDeletes() {
         $res = [];
-        foreach ($this->responses as $entity){
-            if($entity instanceof ETagEntityResponse && $entity->getStatus() != HttpResponse::HttpNotFoundStatus) continue;
+        foreach ($this->responses as $entity) {
+            if ($entity instanceof ETagEntityResponse && $entity->getStatus() != HttpResponse::HttpNotFoundStatus) continue;
                 $res[] = $entity;
         }
         return $res;

Braces +6 added lines, -2 removed lines

@@ -39,7 +39,9 @@ 
     public function getUpdates(){
         $res = [];
         foreach ($this->responses as $entity){
-            if($entity instanceof ETagEntityResponse && $entity->getStatus() != HttpResponse::HttpOKStatus) continue;
+            if($entity instanceof ETagEntityResponse && $entity->getStatus() != HttpResponse::HttpOKStatus) {
+                continue;
+            }
                 $res[] = $entity;
         }
         return $res;
@@ -51,7 +53,9 @@ 
     public function getDeletes(){
         $res = [];
         foreach ($this->responses as $entity){
-            if($entity instanceof ETagEntityResponse && $entity->getStatus() != HttpResponse::HttpNotFoundStatus) continue;
+            if($entity instanceof ETagEntityResponse && $entity->getStatus() != HttpResponse::HttpNotFoundStatus) {
+                continue;
+            }
                 $res[] = $entity;
         }
         return $res;

src/Facade/Requests/CalendarQueryFilter.php

Spacing +2 added lines, -2 removed lines

@@ -46,14 +46,14 @@
      * @param DateTime $from
      * @param DateTime $to
      */
-    public function __construct($get_etags = true, $get_calendar_data = false, DateTime $from = null,  DateTime $to = null)
+    public function __construct($get_etags = true, $get_calendar_data = false, DateTime $from = null, DateTime $to = null)
     {
         $this->get_etags         = $get_etags;
         $this->get_calendar_data = $get_calendar_data;
         $this->from              = $from;
         $this->to                = $to;
 
-        if(!is_null($this->from) && !is_null($this->to) && $this->from > $this->to)
+        if (!is_null($this->from) && !is_null($this->to) && $this->from > $this->to)
             throw new \InvalidArgumentException("from should be lower than to param");
     }
 

Braces +3 added lines, -2 removed lines

@@ -53,8 +53,9 @@
         $this->from              = $from;
         $this->to                = $to;
 
-        if(!is_null($this->from) && !is_null($this->to) && $this->from > $this->to)
-            throw new \InvalidArgumentException("from should be lower than to param");
+        if(!is_null($this->from) && !is_null($this->to) && $this->from > $this->to) {
+                    throw new \InvalidArgumentException("from should be lower than to param");
+        }
     }
 
     /**

src/Facade/Responses/GetCalendarResponse.php

Spacing +4 added lines, -4 removed lines

@@ -22,11 +22,11 @@ 
     /**
      * @return string
      */
-    public function getDisplayName(){
+    public function getDisplayName() {
         return isset($this->found_props['displayname']) ? $this->found_props['displayname'] : null;
     }
 
-    public function getResourceType(){
+    public function getResourceType() {
         return isset($this->found_props['resourcetype']) ? $this->found_props['resourcetype'] : null;
     }
 
@@ -34,14 +34,14 @@ 
      * @see https://tools.ietf.org/html/rfc6578
      * @return string
      */
-    public function getSyncToken(){
+    public function getSyncToken() {
         return isset($this->found_props['sync-token']) ? $this->found_props['sync-token'] : null;
     }
 
     /**
      * @return string
      */
-    public function getCTag(){
+    public function getCTag() {
         return isset($this->found_props['getctag']) ? $this->found_props['getctag'] : null;
     }
 

src/Facade/Responses/GetCalendarsResponse.php

Spacing +4 added lines, -4 removed lines

@@ -30,13 +30,13 @@
      * @param string $type
      * @return array
      */
-    public function getResponseByType($type){
+    public function getResponseByType($type) {
         $responses = [];
 
-        foreach ($this->getResponses() as $response){
-            if(!$response instanceof GetCalendarResponse) continue;
+        foreach ($this->getResponses() as $response) {
+            if (!$response instanceof GetCalendarResponse) continue;
             $resource_types = $response->getResourceType();
-            if(in_array($type, array_keys($resource_types))) $responses[] = $response;
+            if (in_array($type, array_keys($resource_types))) $responses[] = $response;
         }
 
         return $responses;

Braces +6 added lines, -2 removed lines

@@ -34,9 +34,13 @@
         $responses = [];
 
         foreach ($this->getResponses() as $response){
-            if(!$response instanceof GetCalendarResponse) continue;
+            if(!$response instanceof GetCalendarResponse) {
+                continue;
+            }
             $resource_types = $response->getResourceType();
-            if(in_array($type, array_keys($resource_types))) $responses[] = $response;
+            if(in_array($type, array_keys($resource_types))) {
+                $responses[] = $response;
+            }
         }
 
         return $responses;