updated principal membership; updated controller & parameter setting;

composer: suggest the installation of gedmo/doctrine-extension

Author: lduer

Controller/SabreDavController.php

@@ -23,8 +23,8 @@
 /**
  * Class SabreDavController
  */
-class SabreDavController
-{
+class SabreDavController {
+
     /**
      * @var Server
      */
@@ -53,10 +53,9 @@ class SabreDavController
      * @param ContainerInterface $container
      * @param Router $router
      */
-    public function __construct(Server $dav, EventDispatcherInterface $dispatcher,  ContainerInterface $container, RouterInterface $router)
-    {
+    public function __construct(Server $dav, EventDispatcherInterface $dispatcher, ContainerInterface $container, RouterInterface $router) {
         $this->dav = $dav;
-        $this->dav->setBaseUri($router->generate('secotrust_sabre_dav'));
+        $this->dav->setBaseUri($router->generate('secotrust_sabre_dav', array()));
 
         $this->container = $container;
         $this->dispatcher = $dispatcher; // TODO needed?
@@ -67,8 +66,7 @@ public function __construct(Server $dav, EventDispatcherInterface $dispatcher,
      *
      * @return StreamedResponse
      */
-    public function execAction(Request $request)
-    {
+    public function execAction(Request $request) {
         $dav = $this->dav;
         $callback = function () use ($dav) {
             $dav->exec();

DependencyInjection/SecotrustSabreDavExtension.php

@@ -62,6 +62,9 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->setParameter('secotrust.cards_class', $config['settings']['cards_class']);
         $container->setParameter('secotrust.addressbooks_class', $config['settings']['addressbooks_class']);
+        $container->setParameter('secotrust.calendarobjects_class', $config['settings']['calendarobjects_class']);
+        $container->setParameter('secotrust.calendar_class', $config['settings']['calendar_class']);
         $container->setParameter('secotrust.principals_class', $config['settings']['principals_class']);
+        $container->setParameter('secotrust.principalgroups_class', $config['settings']['principalgroups_class']);
     }
 }

SabreDav/PrincipalBackend.php

@@ -334,7 +334,11 @@ function getGroupMembership($principal) {
 
         $principal_data = $this->getPrincipalByPath($principal, true);
 
-        $groupMembership = array($principal['uri']);
+        if (!$principal_data) {
+            return array();
+        }
+        
+        $groupMembership = array($principal);
 
         if ($this->principalgroups_class !== '') {
             foreach ($principal_data->getGroups() as $group) {

composer.json

@@ -28,6 +28,7 @@
     },
     "suggest": {
         "knplabs/knp-gaufrette-bundle": "0.2.*",
+        "gedmo/doctrine-extensions": "~2.3"
     },
     "autoload": {
         "psr-0": { "Secotrust\\Bundle\\SabreDavBundle": "" }