diff options
author | Julius Haertl <jus@bitgrid.net> | 2016-09-05 13:49:06 +0300 |
---|---|---|
committer | Julius Haertl <jus@bitgrid.net> | 2016-09-05 13:49:06 +0300 |
commit | 126b486f622b0fcd184848d342785d5e02a0e0e0 (patch) | |
tree | e20bedd5c054376452aab52342087aac85418ccc | |
parent | 064cb4ae7a3bae3bea9be7b36171817ba4fa4e68 (diff) |
Fix stable9 support and cleanup
-rw-r--r-- | appinfo/app.php | 1 | ||||
-rw-r--r-- | appinfo/autoload.php | 25 | ||||
-rw-r--r-- | controller/appcontroller.php (renamed from lib/Controller/AppController.php) | 0 | ||||
-rw-r--r-- | controller/settingscontroller.php (renamed from lib/Controller/SettingsController.php) | 0 | ||||
-rw-r--r-- | lib/AppInfo/Application.php | 41 | ||||
-rw-r--r-- | service/configservice.php (renamed from lib/Service/ConfigService.php) | 0 | ||||
-rw-r--r-- | tests/bootstrap.php | 1 | ||||
-rw-r--r-- | util.php (renamed from lib/Util.php) | 0 |
8 files changed, 0 insertions, 68 deletions
diff --git a/appinfo/app.php b/appinfo/app.php index 056cc70..acff6b3 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -21,7 +21,6 @@ * */ -$app = new \OCA\AppOrder\AppInfo\Application(); \OCP\Util::addStyle('apporder', 'apporder'); \OCP\Util::addScript('apporder', 'apporder'); \OCP\App::registerAdmin('apporder', 'admin'); diff --git a/appinfo/autoload.php b/appinfo/autoload.php deleted file mode 100644 index 737046e..0000000 --- a/appinfo/autoload.php +++ /dev/null @@ -1,25 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net> - * - * @author Julius Härtl <jus@bitgrid.net> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * 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 - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -namespace OCA\AppOrder\AppInfo; - -use OCP\AppFramework\App; diff --git a/lib/Controller/AppController.php b/controller/appcontroller.php index 426a028..426a028 100644 --- a/lib/Controller/AppController.php +++ b/controller/appcontroller.php diff --git a/lib/Controller/SettingsController.php b/controller/settingscontroller.php index 8c714ba..8c714ba 100644 --- a/lib/Controller/SettingsController.php +++ b/controller/settingscontroller.php diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php deleted file mode 100644 index 9496092..0000000 --- a/lib/AppInfo/Application.php +++ /dev/null @@ -1,41 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net> - * - * @author Julius Härtl <jus@bitgrid.net> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * 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 - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\AppOrder\AppInfo; - -use \OCP\AppFramework\App; -use \OCA\AppOrder\Service\ConfigService; - -class Application extends App { - - public function __construct(array $urlParams = array()) { - parent::__construct('apporder', $urlParams); - $container = $this->getContainer(); - $container->registerService('ConfigService', function($c) { - return new ConfigService( - $c->query('Config'), - $c->query('AppName') - ); - }); - } -} diff --git a/lib/Service/ConfigService.php b/service/configservice.php index 599cd26..599cd26 100644 --- a/lib/Service/ConfigService.php +++ b/service/configservice.php diff --git a/tests/bootstrap.php b/tests/bootstrap.php index aeebd69..9e67e95 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -22,7 +22,6 @@ */ require_once __DIR__.'/../../../tests/bootstrap.php'; -require_once __DIR__.'/../appinfo/autoload.php'; require_once __DIR__.'/../../../lib/base.php'; |