From 0a035175bbe5aba289c62f38b4bcd024db44e8ac Mon Sep 17 00:00:00 2001
From: Tobia De Koninck <tobia@ledfan.be>
Date: Mon, 5 May 2014 17:32:07 +0200
Subject: [PATCH 1/3] Use  instead of

---
 lib/dispatcher.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/dispatcher.php b/lib/dispatcher.php
index 50f1f381..ed13762e 100644
--- a/lib/dispatcher.php
+++ b/lib/dispatcher.php
@@ -80,7 +80,7 @@ class Dispatcher extends MainApp {
 		});
 		$this->container->registerService('GroupController', function(IAppContainer $container) use($appName, $app) {
 			$request = $container->query('Request');
-			$tags = $this->server->getTagManager()->load('contact');
+			$tags = $container->server->getTagManager()->load('contact');
 			return new GroupController($appName, $request, $app, $tags);
 		});
 		$this->container->registerService('ContactController', function(IAppContainer $container) use($appName, $app) {
@@ -89,7 +89,7 @@ class Dispatcher extends MainApp {
 		});
 		$this->container->registerService('ContactPhotoController', function(IAppContainer $container) use($appName, $app) {
 			$request = $container->query('Request');
-			$cache = $this->server->getCache();
+			$cache = $container->server->getCache();
 			return new ContactPhotoController($appName, $request, $app, $cache);
 		});
 		$this->container->registerService('SettingsController', function(IAppContainer $container) use($appName, $app) {
@@ -98,7 +98,7 @@ class Dispatcher extends MainApp {
 		});
 		$this->container->registerService('ImportController', function(IAppContainer $container) use($appName, $app) {
 			$request = $container->query('Request');
-			$cache = $this->server->getCache();
+			$cache = $container->server->getCache();
 			return new ImportController($appName, $request, $app, $cache);
 		});
 		$this->container->registerService('ExportController', function(IAppContainer $container) use($appName, $app) {

From f64ca8af7cf58a46cea0420c09cee6a0ccabb5dd Mon Sep 17 00:00:00 2001
From: Tobia De Koninck <tobia@ledfan.be>
Date: Thu, 8 May 2014 14:25:47 +0200
Subject: [PATCH 2/3] getServer() instead server

---
 lib/dispatcher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dispatcher.php b/lib/dispatcher.php
index ed13762e..e936dba1 100644
--- a/lib/dispatcher.php
+++ b/lib/dispatcher.php
@@ -80,7 +80,7 @@ class Dispatcher extends MainApp {
 		});
 		$this->container->registerService('GroupController', function(IAppContainer $container) use($appName, $app) {
 			$request = $container->query('Request');
-			$tags = $container->server->getTagManager()->load('contact');
+			$tags = $container->getServer()->getTagManager()->load('contact');
 			return new GroupController($appName, $request, $app, $tags);
 		});
 		$this->container->registerService('ContactController', function(IAppContainer $container) use($appName, $app) {

From 7856fc22ef953a7081d182f11eb78700fb1a4025 Mon Sep 17 00:00:00 2001
From: Tobia De Koninck <tobia@ledfan.be>
Date: Thu, 8 May 2014 14:26:57 +0200
Subject: [PATCH 3/3] more getServer() instead server

---
 lib/dispatcher.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dispatcher.php b/lib/dispatcher.php
index e936dba1..1a9c6d09 100644
--- a/lib/dispatcher.php
+++ b/lib/dispatcher.php
@@ -89,7 +89,7 @@ class Dispatcher extends MainApp {
 		});
 		$this->container->registerService('ContactPhotoController', function(IAppContainer $container) use($appName, $app) {
 			$request = $container->query('Request');
-			$cache = $container->server->getCache();
+			$cache = $container->getServer()->getCache();
 			return new ContactPhotoController($appName, $request, $app, $cache);
 		});
 		$this->container->registerService('SettingsController', function(IAppContainer $container) use($appName, $app) {
@@ -98,7 +98,7 @@ class Dispatcher extends MainApp {
 		});
 		$this->container->registerService('ImportController', function(IAppContainer $container) use($appName, $app) {
 			$request = $container->query('Request');
-			$cache = $container->server->getCache();
+			$cache = $container->getServer()->getCache();
 			return new ImportController($appName, $request, $app, $cache);
 		});
 		$this->container->registerService('ExportController', function(IAppContainer $container) use($appName, $app) {