Merge pull request #51 from nextcloud/psr4

Move classes to PSR-4

3 files changed, 3 insertions, 60 deletions

diff --git a/appinfo/application.php b/appinfo/application.php
deleted file mode 100644
index d0e0f78..0000000
--- a/appinfo/application.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * @author Björn Schießle <schiessle@owncloud.com>
- *
- * @copyright Copyright (c) 2015, 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 <http://www.gnu.org/licenses/>
- *
- */
-
-
-namespace OCA\Files_Texteditor\AppInfo;
-
-use OC\Files\View;
-use OCA\Files_Texteditor\Controller\FileHandlingController;
-use OCP\AppFramework\App;
-use OCP\AppFramework\IAppContainer;
-use Punic\Exception;
-
-class Application extends App {
-
-	/**
-	 * @param array $urlParams
-	 */
-	public function __construct(array $urlParams = array()) {
-		parent::__construct('files_texteditor', $urlParams);
-
-		$container = $this->getContainer();
-		$server = $container->getServer();
-
-		$container->registerService('FileHandlingController', function (IAppContainer $c) use ($server) {
-			$user = $server->getUserSession()->getUser();
-			if ($user) {
-				$uid = $user->getUID();
-			} else {
-				throw new \BadMethodCallException('no user logged in');
-			}
-			return new FileHandlingController(
-				$c->getAppName(),
-				$server->getRequest(),
-				$server->getL10N($c->getAppName()),
-				$server->getLogger(),
-				$server->getUserFolder($uid)
-			);
-		});
-	}
-}
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 07745e6..21911b1 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -7,10 +7,11 @@ More information is available in the text editor documentation.
 	</description>
 	<licence>AGPL</licence>
 	<author>Tom Needham, Björn Schießle</author>
-	<version>2.5.0</version>
+	<version>2.5.1</version>
 	<shipped>true</shipped>
 	<default_enable/>
 	<dependencies>
 		<nextcloud min-version="13" max-version="13" />
 	</dependencies>
+	<namespace>FilesTextEditor</namespace>
 </info>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 4ab756e..c9d91f0 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -20,7 +20,7 @@
  */
 
 
-namespace OCA\Files_Texteditor\AppInfo;
+namespace OCA\FilesTextEditor\AppInfo;
 
 $app = new Application();