Merge pull request #158 from heiglandreas/hotfix/calendar

Fixes calendar-use with PHP7 and VEvent4.0

Author: heiglandreas

composer.json

@@ -9,7 +9,7 @@
          "org_heigl/mailproxy" :              "~1.0@stable",
          "org_heigl/hybridauth" :             "dev-feature/multipleProviders",
          "org_heigl/geolocation" :            "~1.0@stable",
-         "sabre/vobject" :                    "~3.0@stable",
+         "sabre/vobject" :                    "dev-master",
          "monolog/monolog" :                  "~1.9@stable",
          "willdurand/geocoder" :              "~2.4@stable",
          "zendframework/zendservice-twitter": "~2.1@stable",

src/module/Phpug/src/Phpug/Api/v1/CalendarController.php

@@ -68,7 +68,7 @@ public function listAction()
         $calendar = new VObject\Component\VCalendar();
         $affectedUGs = $this->findGroupsWithinRangeAndDistance();
         foreach ($result as $cal) {
-            if (! $cal->getGRoup()) {
+            if (! $cal->getGroup()) {
                 continue;
             }
 
@@ -78,7 +78,7 @@ public function listAction()
 
             try {
                 $ical = VObject\Reader::read($cal->getCache());
-                foreach ($ical->children as $event) {
+                foreach ($ical->children() as $event) {
                     if (!$event instanceof VObject\Component\VEvent) {
                         continue;
                     }

src/module/Phpug/src/Phpug/Entity/Grouptype.php

@@ -32,8 +32,6 @@
 
 namespace Phpug\Entity;
 
-use Zend\XmlRpc\Value\String;
-
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM
 ;

src/module/Phpug/src/Phpug/View/Helper/DateRangePrinter.php

@@ -49,7 +49,7 @@ class DateRangePrinter extends AbstractHelper
      *
      * @return string
      */
-    public function __invoke(\DateTime $start, \DateTime $end, $format = null, \DateTimeZone $timezone = null, $separator = ' - ')
+    public function __invoke(\DateTimeInterface $start, \DateTimeInterface $end, $format = null, \DateTimeZone $timezone = null, $separator = ' - ')
     {
         if (null !== $timezone) {
             $start->setTimezone($timezone);

src/module/Phpug/src/Phpug/Wrapper/SabreVCalendarWrapper.php

@@ -64,7 +64,7 @@ public function getEvents(\DateInterval $interval)
         $return = array();
         try {
             $this->object->expand($now, $then);
-            foreach ($this->object->children as $item) {
+            foreach ($this->object->children() as $item) {
                 if (! $item instanceof VEvent) {
                     continue;
                 }