From 7650261b9fedfb681f2f6afbd8a4d3d87fab10d9 Mon Sep 17 00:00:00 2001
From: Cyril <cyril@joshfire.com>
Date: Mon, 25 Nov 2019 10:56:04 +0100
Subject: [PATCH] Rather use the entity manager as a property

---
 src/Controller/DAVController.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Controller/DAVController.php b/src/Controller/DAVController.php
index 4f2d83b..cb623fa 100644
--- a/src/Controller/DAVController.php
+++ b/src/Controller/DAVController.php
@@ -67,11 +67,11 @@ class DAVController extends AbstractController
     protected $tmpDir;
 
     /**
-     * PDO Wrapped connection.
+     * Doctrine entity manager.
      *
-     * @var \PDO
+     * @var EntityManagerInterface
      */
-    protected $pdo;
+    protected $em;
 
     /**
      * Base URI of the server.
@@ -107,7 +107,7 @@ class DAVController extends AbstractController
         $this->publicDir = $publicDir;
         $this->tmpDir = $tmpDir;
 
-        $this->pdo = $entityManager->getConnection()->getWrappedConnection();
+        $this->em = $entityManager;
         $this->baseUri = $router->generate('dav', ['path' => '']);
 
         $this->basicAuthBackend = $basicAuthBackend;
@@ -125,12 +125,14 @@ class DAVController extends AbstractController
 
     private function initServer()
     {
+        $pdo = $this->em->getConnection()->getWrappedConnection();
+
         /*
          * The backends.
          */
         switch ($this->authMethod) {
             case self::AUTH_DIGEST:
-                $authBackend = new \Sabre\DAV\Auth\Backend\PDO($this->pdo);
+                $authBackend = new \Sabre\DAV\Auth\Backend\PDO($pdo);
                 break;
             case self::AUTH_BASIC:
             default:
@@ -140,7 +142,7 @@ class DAVController extends AbstractController
 
         $authBackend->setRealm($this->authRealm);
 
-        $principalBackend = new \Sabre\DAVACL\PrincipalBackend\PDO($this->pdo);
+        $principalBackend = new \Sabre\DAVACL\PrincipalBackend\PDO($pdo);
 
         /**
          * The directory tree.
@@ -154,11 +156,11 @@ class DAVController extends AbstractController
         ];
 
         if ($this->calDAVEnabled) {
-            $calendarBackend = new \Sabre\CalDAV\Backend\PDO($this->pdo);
+            $calendarBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
             $nodes[] = new \Sabre\CalDAV\CalendarRoot($principalBackend, $calendarBackend);
         }
         if ($this->cardDAVEnabled) {
-            $carddavBackend = new \Sabre\CardDAV\Backend\PDO($this->pdo);
+            $carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo);
             $nodes[] = new \Sabre\CardDAV\AddressBookRoot($principalBackend, $carddavBackend);
         }
         if ($this->webDAVEnabled && $this->tmpDir && $this->publicDir) {
@@ -176,7 +178,7 @@ class DAVController extends AbstractController
         $this->server->addPlugin(new \Sabre\DAVACL\Plugin());
 
         $this->server->addPlugin(new \Sabre\DAV\PropertyStorage\Plugin(
-            new \Sabre\DAV\PropertyStorage\Backend\PDO($this->pdo)
+            new \Sabre\DAV\PropertyStorage\Backend\PDO($pdo)
         ));
 
         // CalDAV plugins