summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-05-11 13:50:25 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-05-11 13:50:37 +0200
commitd40e66ddb78b0e16b033eab5af768358a44ade27 (patch)
tree18c93dc2ce732e75dd275082adecbdc3974ffc82
parentd90fc440eb1175fc7ab59813eba676c0f8423473 (diff)
use standard layout for container
-rw-r--r--appinfo/app.php4
-rw-r--r--appinfo/application.php (renamed from app/news.php)4
-rw-r--r--appinfo/routes.php4
-rw-r--r--backgroundjob/task.php4
-rw-r--r--hooks/user.php4
5 files changed, 10 insertions, 10 deletions
diff --git a/appinfo/app.php b/appinfo/app.php
index e355fee38..1cc9994ae 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -11,9 +11,9 @@
* @copyright Bernhard Posselt 2012, 2014
*/
-namespace OCA\News\App;
+namespace OCA\News\AppInfo;
-$container = new News();
+$container = new Application();
$config = $container->getAppConfig();
$config->loadConfig(__DIR__ . '/app.json');
diff --git a/app/news.php b/appinfo/application.php
index 61459f982..351f9fd12 100644
--- a/app/news.php
+++ b/appinfo/application.php
@@ -11,7 +11,7 @@
* @copyright Bernhard Posselt 2012, 2014
*/
-namespace OCA\News\App;
+namespace OCA\News\AppInfo;
use \OC\Files\View;
use \OCP\AppFramework\App;
@@ -66,7 +66,7 @@ if(!class_exists('\SimplePie')) {
}
-class News extends App {
+class Application extends App {
public function __construct(array $urlParams=array()){
parent::__construct('news', $urlParams);
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 235b0fb10..ed2b4b88b 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -15,9 +15,9 @@ namespace OCA\News;
use \OCP\AppFramework\App;
-use \OCA\News\App\News;
+use \OCA\News\AppInfo\Application;
-$application = new News();
+$application = new Application();
$application->registerRoutes($this, array('routes' => array(
// page
array('name' => 'page#index', 'url' => '/', 'verb' => 'GET'),
diff --git a/backgroundjob/task.php b/backgroundjob/task.php
index 5ea9c6a7d..a7ffc3e8c 100644
--- a/backgroundjob/task.php
+++ b/backgroundjob/task.php
@@ -14,14 +14,14 @@
namespace OCA\News\BackgroundJob;
-use \OCA\News\App\News;
+use \OCA\News\AppInfo\Application;
class Task {
static public function run() {
- $app = new News();
+ $app = new Application();
$container = $app->getContainer();
// make it possible to turn off cron updates if you use an external
diff --git a/hooks/user.php b/hooks/user.php
index cbacbbf6a..9191b5fa9 100644
--- a/hooks/user.php
+++ b/hooks/user.php
@@ -13,7 +13,7 @@
namespace OCA\News\Hooks;
-use \OCA\News\App\News;
+use \OCA\News\AppInfo\Application;
class User {
@@ -22,7 +22,7 @@ class User {
public static function deleteUser($params) {
$userId = $params['uid'];
- $app = new News();
+ $app = new Application();
$container = $app->getContainer();
// order is important!