Merge branch 'master' into develop-0.9

1 files changed, 14 insertions, 15 deletions

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 5f7c7ef4..b6277fb3 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -23,8 +23,6 @@
 
 namespace OCA\Polls\AppInfo;
 
-
-use OC\AppFramework\Utility\SimpleContainer;
 use OCA\Polls\Controller\PageController;
 use OCA\Polls\Db\CommentMapper;
 use OCA\Polls\Db\DateMapper;
@@ -34,6 +32,7 @@ use OCA\Polls\Db\ParticipationMapper;
 use OCA\Polls\Db\ParticipationTextMapper;
 use OCA\Polls\Db\TextMapper;
 use OCP\AppFramework\App;
+use OCP\IContainer;
 
 class Application extends App {
 
@@ -50,7 +49,7 @@ class Application extends App {
 		/**
 		 * Controllers
 		 */
-		$container->registerService('PageController', function (SimpleContainer $c) {
+		$container->registerService('PageController', function (IContainer $c) {
 			return new PageController(
 				$c->query('AppName'),
 				$c->query('Request'),
@@ -71,63 +70,63 @@ class Application extends App {
 			);
 		});
 
-		$container->registerService('UserManager', function (SimpleContainer $c) {
+		$container->registerService('UserManager', function (IContainer $c) {
 			return $c->query('ServerContainer')->getUserManager();
 		});
 
-		$container->registerService('GroupManager', function (SimpleContainer $c) {
+		$container->registerService('GroupManager', function (IContainer $c) {
 			return $c->query('ServerContainer')->getGroupManager();
 		});
 
-		$container->registerService('AvatarManager', function (SimpleContainer $c) {
+		$container->registerService('AvatarManager', function (IContainer $c) {
 			return $c->query('ServerContainer')->getAvatarManager();
 		});
 
-		$container->registerService('Logger', function (SimpleContainer $c) {
+		$container->registerService('Logger', function (IContainer $c) {
 			return $c->query('ServerContainer')->getLogger();
 		});
 
-		$container->registerService('L10N', function (SimpleContainer $c) {
+		$container->registerService('L10N', function (IContainer $c) {
 			return $c->query('ServerContainer')->getL10N($c->query('AppName'));
 		});
 
-		$container->registerService('CommentMapper', function (SimpleContainer $c) use ($server) {
+		$container->registerService('CommentMapper', function (IContainer $c) use ($server) {
 			return new CommentMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('DateMapper', function (SimpleContainer $c) use ($server) {
+		$container->registerService('DateMapper', function (IContainer $c) use ($server) {
 			return new DateMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('EventMapper', function (SimpleContainer $c) use ($server) {
+		$container->registerService('EventMapper', function (IContainer $c) use ($server) {
 			return new EventMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('NotificationMapper', function (SimpleContainer $c) use ($server) {
+		$container->registerService('NotificationMapper', function (IContainer $c) use ($server) {
 			return new NotificationMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('ParticipationMapper', function (SimpleContainer $c) use ($server) {
+		$container->registerService('ParticipationMapper', function (IContainer $c) use ($server) {
 			return new ParticipationMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('ParticipationTextMapper', function (SimpleContainer $c) use ($server) {
+		$container->registerService('ParticipationTextMapper', function (IContainer $c) use ($server) {
 			return new ParticipationTextMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('TextMapper', function (SimpleContainer $c) use ($server) {
+		$container->registerService('TextMapper', function (IContainer $c) use ($server) {
 			return new TextMapper(
 				$server->getDatabaseConnection()
 			);