smarcet / CalDAVClient

src/Facade/CalDavClient.php

Spacing +35 added lines, -52 removed lines

@@ -124,15 +124,15 @@ 
      * @param Request $http_request
      * @return mixed|\Psr\Http\Message\ResponseInterface
      */
-    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],
                 'timeout' => $this->timeout
             ]);
         }
-        catch (ClientException $ex){
-            switch($ex->getCode()){
+        catch (ClientException $ex) {
+            switch ($ex->getCode()) {
                 case 401:
                     throw new UserUnAuthorizedException();
                     break;
@@ -160,9 +160,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);
             }
         }
@@ -176,14 +176,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());
     }
 
     /**
@@ -193,14 +192,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());
     }
 
     /**
@@ -212,8 +210,7 @@ 
     public function createCalendar($calendar_home_set, MakeCalendarRequestVO $vo)
     {
         $http_response = $this->makeRequest(
-            RequestFactory::createMakeCalendarRequest
-            (
+            RequestFactory::createMakeCalendarRequest(
                 $calendar_home_set.$vo->getResourceName(),
                 CalDAVRequestFactory::getInstance()->build(CalDAVRequestFactory::CalendarCreateRequestType, [$vo])->getContent()
             )
@@ -229,14 +226,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());
     }
 
     /**
@@ -246,15 +242,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());
     }
 
 
@@ -267,14 +262,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());
     }
 
     /**
@@ -287,19 +281,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()
         );
     }
@@ -315,20 +307,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()
         );
     }
@@ -342,16 +332,14 @@ 
     public function deleteEvent($calendar_url, $uid, $etag)
     {
         $http_response = $this->makeRequest(
-            RequestFactory::createDeleteRequest
-            (
+            RequestFactory::createDeleteRequest(
                 $calendar_url.$uid.self::SchedulingInformationSuffix,
                 $etag
             )
         );
 
-        return new EventDeletedResponse
-        (
-            $this->server_url, (string)$http_response->getBody(), $http_response->getStatusCode()
+        return new EventDeletedResponse(
+            $this->server_url, (string) $http_response->getBody(), $http_response->getStatusCode()
         );
     }
 
@@ -359,15 +347,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;
     }
 
@@ -379,17 +366,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()
         );
     }
@@ -403,17 +388,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()
         );
     }

src/Facade/Requests/EventRequestVO.php

Spacing +4 added lines, -5 removed lines

@@ -94,8 +94,7 @@ 
      * @param string $location_lat
      * @param string $location_lng
      */
-    public function __construct
-    (
+    public function __construct(
         $prod_id,
         $title,
         $description,
@@ -121,7 +120,7 @@ 
         $this->location_lat    = $location_lat;
         $this->location_lng    = $location_lng;
         $this->time_zone       = $time_zone;
-        if(is_null($this->time_zone)){
+        if (is_null($this->time_zone)) {
             $this->time_zone = new DateTimeZone('UTC');
         }
     }
@@ -129,7 +128,7 @@ 
     /**
      * @param string $uid
      */
-    public function setUID($uid){
+    public function setUID($uid) {
         $this->uid = $uid;
     }
 
@@ -216,7 +215,7 @@ 
     /**
      * @return DateTimeZone
      */
-    public function getTimeZone(){
+    public function getTimeZone() {
         return $this->time_zone;
     }
 

src/Facade/Requests/CalendarCreateRequest.php

Spacing +3 added lines, -5 removed lines

@@ -59,17 +59,15 @@
                     'attributes'  => ['name' => 'VEVENT']
                 ]
             ],
-            '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => new Cdata
-            (
-                ICalTimeZoneBuilder::build
-                (
+            '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => new Cdata(
+                ICalTimeZoneBuilder::build(
                     $this->vo->getTimezone(),
                     $this->vo->getDisplayName()
                 )->render()
             )
         ];
 
-        if(!empty($this->vo->getDescription()))
+        if (!empty($this->vo->getDescription()))
             $props['{urn:ietf:params:xml:ns:caldav}calendar-description'] = $this->vo->getDescription();
 
         return $service->write('{urn:ietf:params:xml:ns:caldav}mkcalendar',

Braces +3 added lines, -2 removed lines

@@ -69,8 +69,9 @@
             )
         ];
 
-        if(!empty($this->vo->getDescription()))
-            $props['{urn:ietf:params:xml:ns:caldav}calendar-description'] = $this->vo->getDescription();
+        if(!empty($this->vo->getDescription())) {
+                    $props['{urn:ietf:params:xml:ns:caldav}calendar-description'] = $this->vo->getDescription();
+        }
 
         return $service->write('{urn:ietf:params:xml:ns:caldav}mkcalendar',
             [

src/Facade/Requests/EventCreateRequest.php

Spacing +3 added lines, -3 removed lines

@@ -57,16 +57,16 @@
             ->setDescription(strip_tags($this->vo->getDescription()))
             ->setDescriptionHTML($this->vo->getDescription());
 
-        if($time_zone->getName() == 'UTC'){
+        if ($time_zone->getName() == 'UTC') {
             $event->setUseUtc(true)
                   ->setUseTimezone(false);
         }
-        else{
+        else {
             $event->setUseUtc(false)
                 ->setUseTimezone(true);
         }
 
-        if(!empty($this->vo->getLocationTitle())){
+        if (!empty($this->vo->getLocationTitle())) {
             $geo = sprintf("%s;%s", $this->vo->getLocationLat(), $this->vo->getLocationLng());
             $event->setLocation($this->vo->getLocationTitle(), $this->vo->getLocationTitle(), $geo);
         }

src/Facade/Utils/RequestFactory.php

Indentation +16 added lines, -16 removed lines

@@ -55,28 +55,28 @@
             break;
             case HttpMethods::Put:
             {
-               $etag = $params[0];
-               if(empty($etag)){
-                   return [
-                       Headers::ContentType  => ContentTypes::Calendar,
-                       Headers::IfNotMatch   => '*',
-                   ];
-               }
-               return [
-                   Headers::ContentType  => ContentTypes::Calendar,
-                   Headers::IfMatch      => $etag
-               ];
+                $etag = $params[0];
+                if(empty($etag)){
+                    return [
+                        Headers::ContentType  => ContentTypes::Calendar,
+                        Headers::IfNotMatch   => '*',
+                    ];
+                }
+                return [
+                    Headers::ContentType  => ContentTypes::Calendar,
+                    Headers::IfMatch      => $etag
+                ];
             }
             break;
         }
         return [];
     }
     /**
-    * @param string $url
-    * @param string $body
-    * @param int $depth
-    * @return Request
-    */
+     * @param string $url
+     * @param string $body
+     * @param int $depth
+     * @return Request
+     */
     static public function createPropFindRequest($url , $body, $depth = 1){
         return new Request
         (

Spacing +18 added lines, -25 removed lines

@@ -26,8 +26,8 @@ 
      * @param array $params
      * @return array
      */
-    static private function createHeadersFor($http_method, array $params = []){
-        switch ($http_method){
+    static private function createHeadersFor($http_method, array $params = []) {
+        switch ($http_method) {
             case HttpMethods::PropFind:
             case HttpMethods::Options:
             case HttpMethods::Report:
@@ -56,7 +56,7 @@ 
             case HttpMethods::Put:
             {
                $etag = $params[0];
-               if(empty($etag)){
+               if (empty($etag)) {
                    return [
                        Headers::ContentType  => ContentTypes::Calendar,
                        Headers::IfNotMatch   => '*',
@@ -77,11 +77,10 @@ 
     * @param int $depth
     * @return Request
     */
-    static public function createPropFindRequest($url , $body, $depth = 1){
-        return new Request
-        (
+    static public function createPropFindRequest($url, $body, $depth = 1) {
+        return new Request(
             HttpMethods::PropFind,
-            $url ,
+            $url,
             self::createHeadersFor(HttpMethods::PropFind, [$depth]),
             $body
         );
@@ -92,9 +91,8 @@ 
      * @param string $body
      * @return Request
      */
-    static public function createMakeCalendarRequest($url , $body){
-        return new Request
-        (
+    static public function createMakeCalendarRequest($url, $body) {
+        return new Request(
             HttpMethods::MakeCalendar,
             $url,
             self::createHeadersFor(HttpMethods::MakeCalendar),
@@ -107,9 +105,8 @@ 
      * @param int $depth
      * @return Request
      */
-    static public function createOptionsRequest($url, $depth = 1){
-        return new Request
-        (
+    static public function createOptionsRequest($url, $depth = 1) {
+        return new Request(
             HttpMethods::Options,
             $url,
             self::createHeadersFor(HttpMethods::Options, [$depth])
@@ -122,9 +119,8 @@ 
      * @param int $depth
      * @return Request
      */
-    static public function createReportRequest($url , $body, $depth = 1){
-        return new Request
-        (
+    static public function createReportRequest($url, $body, $depth = 1) {
+        return new Request(
             HttpMethods::Report,
             $url,
             self::createHeadersFor(HttpMethods::Report, [$depth]),
@@ -137,9 +133,8 @@ 
      * @param string $etag
      * @return Request
      */
-    static public function createDeleteRequest($url , $etag){
-        return new Request
-        (
+    static public function createDeleteRequest($url, $etag) {
+        return new Request(
             HttpMethods::Delete,
             $url,
             self::createHeadersFor(HttpMethods::Delete, [$etag])
@@ -150,9 +145,8 @@ 
      * @param string $url
      * @return Request
      */
-    static public function createGetRequest($url){
-        return new Request
-        (
+    static public function createGetRequest($url) {
+        return new Request(
             HttpMethods::Get,
             $url,
             self::createHeadersFor(HttpMethods::Get)
@@ -165,9 +159,8 @@ 
      * @param string $etag
      * @return Request
      */
-    static public function createPutRequest($url, $body, $etag = null){
-        return new Request
-        (
+    static public function createPutRequest($url, $body, $etag = null) {
+        return new Request(
             HttpMethods::Put,
             $url,
             self::createHeadersFor(HttpMethods::Put, [$etag]),

src/Facade/Utils/ICalTimeZoneBuilder.php

Spacing +26 added lines, -31 removed lines

@@ -31,11 +31,11 @@ 
      * @param DateTimeZone $time_zone
      * @return array
      */
-    private static function calculateTimeRangeForTransitions(DateTimeZone $time_zone){
+    private static function calculateTimeRangeForTransitions(DateTimeZone $time_zone) {
 
         $now           = new  DateTime('now', $time_zone);
         $year          = $now->format('Y');
-        return [new DateTime('1/1/'.$year, $time_zone),  new DateTime('1/1/'.($year + 1), $time_zone)];
+        return [new DateTime('1/1/'.$year, $time_zone), new DateTime('1/1/'.($year + 1), $time_zone)];
     }
 
     /**
@@ -43,11 +43,11 @@ 
      * @param int $former_offset
      * @return DateTime
      */
-    private static function convertStartDateFromUTC2Local(array $trans, $former_offset){
+    private static function convertStartDateFromUTC2Local(array $trans, $former_offset) {
         $dt     = new DateTime($trans['time'], new DateTimeZone('UTC'));
         $hours  = abs($former_offset);
         // START TIME IS ON UTC and should be converted to local using former offset
-        if($former_offset >= 0 )
+        if ($former_offset >= 0)
             $dt->add(new DateInterval("PT{$hours}H"));
         else
             $dt->sub(new DateInterval("PT{$hours}H"));
@@ -59,12 +59,11 @@ 
      * @param DateTime $dt
      * @return RecurrenceRule
      */
-    private static function calculateRecurrenceRule(DateTime $dt){
-        $r_rule        = new RecurrenceRule();
+    private static function calculateRecurrenceRule(DateTime $dt) {
+        $r_rule = new RecurrenceRule();
         $r_rule->setFreq(RecurrenceRule::FREQ_YEARLY);
         $r_rule->setByMonth(intval($dt->format('m')));
-        $r_rule->setByDay
-        (
+        $r_rule->setByDay(
             self::translate2ByDay($dt)
         );
         return $r_rule;
@@ -74,7 +73,7 @@ 
      * @param $offset
      * @return string
      */
-    private static function calculateOffsetFrom($offset){
+    private static function calculateOffsetFrom($offset) {
         return sprintf('%s%02d%02d', $offset >= 0 ? '+' : '-', abs($offset), abs(($offset - floor($offset)) * 60));
     }
 
@@ -82,7 +81,7 @@ 
      * @param  $offset
      * @return string
      */
-    private static function calculateOffsetTo($offset){
+    private static function calculateOffsetTo($offset) {
         return sprintf('%s%02d%02d', $offset >= 0 ? '+' : '-', abs($offset), abs(($offset - floor($offset)) * 60));
     }
     /**
@@ -91,7 +90,7 @@ 
      * @param bool $with_calendar_envelope
      * @return Calendar|Timezone
      */
-    public static function build(DateTimeZone $time_zone, $calendar_prod_id, $with_calendar_envelope = true){
+    public static function build(DateTimeZone $time_zone, $calendar_prod_id, $with_calendar_envelope = true) {
 
         // get all transitions for one current year and next
         list($start_range, $end_range) = self::calculateTimeRangeForTransitions($time_zone);
@@ -111,11 +110,11 @@ 
 
             // daylight saving time definition
             if ($trans['isdst']) {
-                $current_time_zone_rule = new TimezoneRule(TimezoneRule::TYPE_DAYLIGHT);;
+                $current_time_zone_rule = new TimezoneRule(TimezoneRule::TYPE_DAYLIGHT); ;
             }
             // standard time definition
             else {
-                $current_time_zone_rule = new TimezoneRule(TimezoneRule::TYPE_STANDARD);;
+                $current_time_zone_rule = new TimezoneRule(TimezoneRule::TYPE_STANDARD); ;
             }
 
             if ($current_time_zone_rule) {
@@ -136,7 +135,7 @@ 
             }
 
         }
-        if($with_calendar_envelope) {
+        if ($with_calendar_envelope) {
             $vCalendar = new Calendar(sprintf("'-//%s//EN'", $calendar_prod_id));
             $vCalendar->setTimezone($vTimezone);
             return $vCalendar;
@@ -156,25 +155,25 @@ 
      * @param DateTime $dt)
      * @return string
      */
-    private static function translate2ByDay(DateTime $dt){
-        $day_name = substr(strtoupper($dt->format('D')), 0,2);
+    private static function translate2ByDay(DateTime $dt) {
+        $day_name = substr(strtoupper($dt->format('D')), 0, 2);
         $ordinals = ['first', 'second', 'third', 'fourth', 'last'];
         $day_nbr  = 0;
         $is_last  = false;
 
-        foreach($ordinals as $idx => $ord){
+        foreach ($ordinals as $idx => $ord) {
             $dt_n = self::buildOrdinalDateTime($ord, $dt);
-            if($dt_n->format('Y-m-d') == $dt->format('Y-m-d')){
-                $day_nbr = $idx  + 1;
-                if($ord == 'last'){
+            if ($dt_n->format('Y-m-d') == $dt->format('Y-m-d')) {
+                $day_nbr = $idx + 1;
+                if ($ord == 'last') {
                     $is_last = true;
-                    $day_nbr  = 1;
+                    $day_nbr = 1;
                 }
                 break;
             }
         }
 
-        return sprintf('%s%s%s', $is_last? '-':'', $day_nbr, $day_name);
+        return sprintf('%s%s%s', $is_last ? '-' : '', $day_nbr, $day_name);
     }
 
     /**
@@ -182,15 +181,11 @@ 
      * @param DateTime $dt
      * @return DateTime
      */
-    private static function buildOrdinalDateTime($ord, DateTime $dt){
-        return new DateTime
-        (
-            date
-            ("Y-m-d",
-                strtotime
-                (
-                    sprintf
-                    (
+    private static function buildOrdinalDateTime($ord, DateTime $dt) {
+        return new DateTime(
+            date("Y-m-d",
+                strtotime(
+                    sprintf(
                         self::GetOrdinalDayQuery,
                         $ord,
                         $dt->format('l'),

Braces +5 added lines, -4 removed lines

@@ -47,10 +47,11 @@
         $dt     = new DateTime($trans['time'], new DateTimeZone('UTC'));
         $hours  = abs($former_offset);
         // START TIME IS ON UTC and should be converted to local using former offset
-        if($former_offset >= 0 )
-            $dt->add(new DateInterval("PT{$hours}H"));
-        else
-            $dt->sub(new DateInterval("PT{$hours}H"));
+        if($former_offset >= 0 ) {
+                    $dt->add(new DateInterval("PT{$hours}H"));
+        } else {
+                    $dt->sub(new DateInterval("PT{$hours}H"));
+        }
 
         return $dt;
     }