1 files changed, 50 insertions, 14 deletions

diff --git a/core/application.php b/core/application.php
index 33801847758..c36ab559c27 100644
--- a/core/application.php
+++ b/core/application.php
@@ -10,13 +10,22 @@
 
 namespace OC\Core;
 
+use OC\AppFramework\Utility\SimpleContainer;
 use \OCP\AppFramework\App;
 use OC\Core\LostPassword\Controller\LostController;
 use OC\Core\User\UserController;
+use \OCP\Util;
 
+/**
+ * Class Application
+ *
+ * @package OC\Core
+ */
 class Application extends App {
 
-
+	/**
+	 * @param array $urlParams
+	 */
 	public function __construct(array $urlParams=array()){
 		parent::__construct('core', $urlParams);
 
@@ -25,29 +34,56 @@ class Application extends App {
 		/**
 		 * Controllers
 		 */
-		$container->registerService('LostController', function($c) {
+		$container->registerService('LostController', function(SimpleContainer $c) {
 			return new LostController(
 				$c->query('AppName'),
 				$c->query('Request'),
-				$c->query('ServerContainer')->getURLGenerator(),
-				$c->query('ServerContainer')->getUserManager(),
-				new \OC_Defaults(),
-				$c->query('ServerContainer')->getL10N('core'),
-				$c->query('ServerContainer')->getConfig(),
-				$c->query('ServerContainer')->getUserSession(),
-				\OCP\Util::getDefaultEmailAddress('lostpassword-noreply'),
-				\OC_App::isEnabled('files_encryption')
+				$c->query('URLGenerator'),
+				$c->query('UserManager'),
+				$c->query('Defaults'),
+				$c->query('L10N'),
+				$c->query('Config'),
+				$c->query('SecureRandom'),
+				$c->query('DefaultEmailAddress'),
+				$c->query('IsEncryptionEnabled')
 			);
 		});
-		$container->registerService('UserController', function($c) {
+		$container->registerService('UserController', function(SimpleContainer $c) {
 			return new UserController(
 				$c->query('AppName'),
 				$c->query('Request'),
-				$c->query('ServerContainer')->getUserManager(),
-				new \OC_Defaults()
+				$c->query('UserManager'),
+				$c->query('Defaults')
 			);
 		});
-	}
 
+		/**
+		 * Core class wrappers
+		 */
+		$container->registerService('IsEncryptionEnabled', function() {
+			return \OC_App::isEnabled('files_encryption');
+		});
+		$container->registerService('URLGenerator', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getURLGenerator();
+		});
+		$container->registerService('UserManager', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getUserManager();
+		});
+		$container->registerService('Config', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getConfig();
+		});
+		$container->registerService('L10N', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getL10N('core');
+		});
+		$container->registerService('SecureRandom', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getSecureRandom();
+		});
+		$container->registerService('Defaults', function() {
+			return new \OC_Defaults;
+		});
+		$container->registerService('DefaultEmailAddress', function() {
+			return Util::getDefaultEmailAddress('lostpassword-noreply');
+		});
+	}
 
 }