From 433c0160b6e1fb558216447b49d09c8efeecd6ce Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 5 Apr 2016 16:23:01 +0200 Subject: Move OC\Core and OC\Settings to composer autoloader --- core/Application.php | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++ core/application.php | 143 --------------------------------------------------- 2 files changed, 143 insertions(+), 143 deletions(-) create mode 100644 core/Application.php delete mode 100644 core/application.php (limited to 'core') diff --git a/core/Application.php b/core/Application.php new file mode 100644 index 00000000000..30376ee4f2e --- /dev/null +++ b/core/Application.php @@ -0,0 +1,143 @@ + + * @author Lukas Reschke + * @author Morris Jobke + * @author Roeland Jago Douma + * @author Thomas Müller + * @author Victor Dubiniuk + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see + * + */ + +namespace OC\Core; + +use OC\AppFramework\Utility\SimpleContainer; +use OC\AppFramework\Utility\TimeFactory; +use \OCP\AppFramework\App; +use OC\Core\Controller\LostController; +use OC\Core\Controller\UserController; +use OC\Core\Controller\AvatarController; +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); + + $container = $this->getContainer(); + + /** + * Controllers + */ + $container->registerService('LostController', function(SimpleContainer $c) { + return new LostController( + $c->query('AppName'), + $c->query('Request'), + $c->query('URLGenerator'), + $c->query('UserManager'), + $c->query('Defaults'), + $c->query('L10N'), + $c->query('Config'), + $c->query('SecureRandom'), + $c->query('DefaultEmailAddress'), + $c->query('IsEncryptionEnabled'), + $c->query('Mailer'), + $c->query('TimeFactory') + ); + }); + $container->registerService('UserController', function(SimpleContainer $c) { + return new UserController( + $c->query('AppName'), + $c->query('Request'), + $c->query('UserManager'), + $c->query('Defaults') + ); + }); + $container->registerService('AvatarController', function(SimpleContainer $c) { + return new AvatarController( + $c->query('AppName'), + $c->query('Request'), + $c->query('AvatarManager'), + $c->query('Cache'), + $c->query('L10N'), + $c->query('UserManager'), + $c->query('UserSession'), + $c->query('UserFolder'), + $c->query('Logger') + ); + }); + + /** + * Core class wrappers + */ + $container->registerService('IsEncryptionEnabled', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getEncryptionManager()->isEnabled(); + }); + $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('AvatarManager', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getAvatarManager(); + }); + $container->registerService('UserSession', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getUserSession(); + }); + $container->registerService('Cache', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getCache(); + }); + $container->registerService('UserFolder', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getUserFolder(); + }); + $container->registerService('Defaults', function() { + return new \OC_Defaults; + }); + $container->registerService('Mailer', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getMailer(); + }); + $container->registerService('Logger', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getLogger(); + }); + $container->registerService('TimeFactory', function(SimpleContainer $c) { + return new TimeFactory(); + }); + $container->registerService('DefaultEmailAddress', function() { + return Util::getDefaultEmailAddress('lostpassword-noreply'); + }); + } + +} diff --git a/core/application.php b/core/application.php deleted file mode 100644 index 30376ee4f2e..00000000000 --- a/core/application.php +++ /dev/null @@ -1,143 +0,0 @@ - - * @author Lukas Reschke - * @author Morris Jobke - * @author Roeland Jago Douma - * @author Thomas Müller - * @author Victor Dubiniuk - * - * @copyright Copyright (c) 2016, ownCloud, Inc. - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see - * - */ - -namespace OC\Core; - -use OC\AppFramework\Utility\SimpleContainer; -use OC\AppFramework\Utility\TimeFactory; -use \OCP\AppFramework\App; -use OC\Core\Controller\LostController; -use OC\Core\Controller\UserController; -use OC\Core\Controller\AvatarController; -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); - - $container = $this->getContainer(); - - /** - * Controllers - */ - $container->registerService('LostController', function(SimpleContainer $c) { - return new LostController( - $c->query('AppName'), - $c->query('Request'), - $c->query('URLGenerator'), - $c->query('UserManager'), - $c->query('Defaults'), - $c->query('L10N'), - $c->query('Config'), - $c->query('SecureRandom'), - $c->query('DefaultEmailAddress'), - $c->query('IsEncryptionEnabled'), - $c->query('Mailer'), - $c->query('TimeFactory') - ); - }); - $container->registerService('UserController', function(SimpleContainer $c) { - return new UserController( - $c->query('AppName'), - $c->query('Request'), - $c->query('UserManager'), - $c->query('Defaults') - ); - }); - $container->registerService('AvatarController', function(SimpleContainer $c) { - return new AvatarController( - $c->query('AppName'), - $c->query('Request'), - $c->query('AvatarManager'), - $c->query('Cache'), - $c->query('L10N'), - $c->query('UserManager'), - $c->query('UserSession'), - $c->query('UserFolder'), - $c->query('Logger') - ); - }); - - /** - * Core class wrappers - */ - $container->registerService('IsEncryptionEnabled', function(SimpleContainer $c) { - return $c->query('ServerContainer')->getEncryptionManager()->isEnabled(); - }); - $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('AvatarManager', function(SimpleContainer $c) { - return $c->query('ServerContainer')->getAvatarManager(); - }); - $container->registerService('UserSession', function(SimpleContainer $c) { - return $c->query('ServerContainer')->getUserSession(); - }); - $container->registerService('Cache', function(SimpleContainer $c) { - return $c->query('ServerContainer')->getCache(); - }); - $container->registerService('UserFolder', function(SimpleContainer $c) { - return $c->query('ServerContainer')->getUserFolder(); - }); - $container->registerService('Defaults', function() { - return new \OC_Defaults; - }); - $container->registerService('Mailer', function(SimpleContainer $c) { - return $c->query('ServerContainer')->getMailer(); - }); - $container->registerService('Logger', function(SimpleContainer $c) { - return $c->query('ServerContainer')->getLogger(); - }); - $container->registerService('TimeFactory', function(SimpleContainer $c) { - return new TimeFactory(); - }); - $container->registerService('DefaultEmailAddress', function() { - return Util::getDefaultEmailAddress('lostpassword-noreply'); - }); - } - -} -- cgit v1.2.3