smarcet / CalDAVClient

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");
     }
 

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;

src/Facade/Responses/GetCalendarResponse.php

Spacing +5 added lines, -5 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,21 +34,21 @@ 
      * @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 getETag(){
+    public function getETag() {
         return isset($this->found_props['getetag']) ? $this->found_props['getetag'] : null;
     }
 
     /**
      * @return string
      */
-    public function getCTag(){
+    public function getCTag() {
         return isset($this->found_props['getctag']) ? $this->found_props['getctag'] : null;
     }
 

src/Facade/Utils/RequestFactory.php

Spacing +21 added lines, -29 removed lines

@@ -26,8 +26,8 @@ 
      * @param array $params
      * @return array
      */
-    private static function createHeadersFor($http_method, array $params = []){
-        switch ($http_method){
+    private static function createHeadersFor($http_method, array $params = []) {
+        switch ($http_method) {
             case HttpMethods::PropFind:
             case HttpMethods::Options:
             case HttpMethods::Report:
@@ -38,7 +38,7 @@ 
                 ];
             case HttpMethods::Delete:
                 $etag = $params[0];
-                if(!empty($etag)) {
+                if (!empty($etag)) {
                     return [
                         Headers::IfMatch => $etag,
                     ];
@@ -58,7 +58,7 @@ 
                    Headers::ContentType   => ContentTypes::Calendar,
                ];
 
-               if(!empty($etag)){
+               if (!empty($etag)) {
                    $headers[Headers::IfMatch] = $etag;
                }
 
@@ -72,11 +72,10 @@ 
     * @param int $depth
     * @return Request
     */
-    public static function createPropFindRequest($url , $body, $depth = 1){
-        return new Request
-        (
+    public static function createPropFindRequest($url, $body, $depth = 1) {
+        return new Request(
             HttpMethods::PropFind,
-            $url ,
+            $url,
             self::createHeadersFor(HttpMethods::PropFind, [$depth]),
             $body
         );
@@ -87,9 +86,8 @@ 
      * @param string $body
      * @return Request
      */
-    public static function createMakeCalendarRequest($url , $body){
-        return new Request
-        (
+    public static function createMakeCalendarRequest($url, $body) {
+        return new Request(
             HttpMethods::MakeCalendar,
             $url,
             self::createHeadersFor(HttpMethods::MakeCalendar),
@@ -102,9 +100,8 @@ 
      * @param int $depth
      * @return Request
      */
-    public static function createOptionsRequest($url, $depth = 1){
-        return new Request
-        (
+    public static function createOptionsRequest($url, $depth = 1) {
+        return new Request(
             HttpMethods::Options,
             $url,
             self::createHeadersFor(HttpMethods::Options, [$depth])
@@ -117,9 +114,8 @@ 
      * @param int $depth
      * @return Request
      */
-    public static function createReportRequest($url , $body, $depth = 1){
-        return new Request
-        (
+    public static function createReportRequest($url, $body, $depth = 1) {
+        return new Request(
             HttpMethods::Report,
             $url,
             self::createHeadersFor(HttpMethods::Report, [$depth]),
@@ -132,9 +128,8 @@ 
      * @param string $etag
      * @return Request
      */
-    public static function createDeleteRequest($url , $etag){
-        return new Request
-        (
+    public static function createDeleteRequest($url, $etag) {
+        return new Request(
             HttpMethods::Delete,
             $url,
             self::createHeadersFor(HttpMethods::Delete, [$etag])
@@ -145,9 +140,8 @@ 
      * @param string $url
      * @return Request
      */
-    public static function createGetRequest($url){
-        return new Request
-        (
+    public static function createGetRequest($url) {
+        return new Request(
             HttpMethods::Get,
             $url,
             self::createHeadersFor(HttpMethods::Get)
@@ -160,10 +154,9 @@ 
      * @param string $etag
      * @return Request
      */
-     public static function createPutRequest($url, $body, $etag = null){
+     public static function createPutRequest($url, $body, $etag = null) {
 
-        return new Request
-        (
+        return new Request(
             HttpMethods::Put,
             $url,
             self::createHeadersFor(HttpMethods::Put, [strlen($body), $etag]),
@@ -177,9 +170,8 @@ 
      * @param string $etag
      * @return Request
      */
-    public static function createPostRequest($url, $body, $etag = null){
-        return new Request
-        (
+    public static function createPostRequest($url, $body, $etag = null) {
+        return new Request(
             HttpMethods::Post,
             $url,
             self::createHeadersFor(HttpMethods::Post, [$etag]),

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;
     }

src/Facade/Responses/ETagEntityResponse.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
     /**
      * @return string
      */
-    public function getETag(){
+    public function getETag() {
         return isset($this->found_props['getetag']) ? $this->found_props['getetag'] : null;
     }
 
@@ -30,8 +30,8 @@ 
      */
     public function getStatus()
     {
-        if(isset($this->content['response']['status']))             return $this->content['response']['status'];
-        if(isset($this->content['response']['propstat']['status'])) return $this->content['response']['propstat']['status'];
+        if (isset($this->content['response']['status']))             return $this->content['response']['status'];
+        if (isset($this->content['response']['propstat']['status'])) return $this->content['response']['propstat']['status'];
 
         return null;
     }