Move dav app to PSR-4 (#24527)

* Move Application to correct namespace and PSR-4 it

* Move dav app to PSR-4

6 files changed, 5 insertions, 174 deletions

diff --git a/apps/dav/appinfo/app.php b/apps/dav/appinfo/app.php
index d85a3583bf1..66b62f35346 100644
--- a/apps/dav/appinfo/app.php
+++ b/apps/dav/appinfo/app.php
@@ -20,7 +20,7 @@
  *
  */
 
-use OCA\Dav\AppInfo\Application;
+use OCA\DAV\AppInfo\Application;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 $app = new Application();
diff --git a/apps/dav/appinfo/application.php b/apps/dav/appinfo/application.php
deleted file mode 100644
index 328f86c877f..00000000000
--- a/apps/dav/appinfo/application.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/**
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @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 <http://www.gnu.org/licenses/>
- *
- */
-namespace OCA\Dav\AppInfo;
-
-use OCA\DAV\CalDAV\BirthdayService;
-use OCA\DAV\CalDAV\CalDavBackend;
-use OCA\DAV\CardDAV\CardDavBackend;
-use OCA\DAV\CardDAV\ContactsManager;
-use OCA\DAV\CardDAV\SyncJob;
-use OCA\DAV\CardDAV\SyncService;
-use OCA\DAV\Connector\Sabre\Principal;
-use OCA\DAV\DAV\GroupPrincipalBackend;
-use OCA\DAV\HookManager;
-use \OCP\AppFramework\App;
-use OCP\AppFramework\IAppContainer;
-use OCP\Contacts\IManager;
-use OCP\IUser;
-use Symfony\Component\EventDispatcher\GenericEvent;
-
-class Application extends App {
-
-	/**
-	 * Application constructor.
-	 *
-	 * @param array $urlParams
-	 */
-	public function __construct (array $urlParams=array()) {
-		parent::__construct('dav', $urlParams);
-
-		$container = $this->getContainer();
-		$container->registerService('ContactsManager', function($c) {
-			/** @var IAppContainer $c */
-			return new ContactsManager(
-				$c->query('CardDavBackend')
-			);
-		});
-
-		$container->registerService('HookManager', function($c) {
-			/** @var IAppContainer $c */
-			return new HookManager(
-				$c->getServer()->getUserManager(),
-				$c->query('SyncService'),
-				$c->query('CalDavBackend'),
-				$c->query('CardDavBackend')
-			);
-		});
-
-		$container->registerService('SyncService', function($c) {
-			/** @var IAppContainer $c */
-			return new SyncService(
-				$c->query('CardDavBackend'),
-				$c->getServer()->getUserManager(),
-				$c->getServer()->getLogger()
-			);
-		});
-
-		$container->registerService('CardDavBackend', function($c) {
-			/** @var IAppContainer $c */
-			$db = $c->getServer()->getDatabaseConnection();
-			$dispatcher = $c->getServer()->getEventDispatcher();
-			$principal = new Principal(
-				$c->getServer()->getUserManager(),
-				$c->getServer()->getGroupManager()
-			);
-			return new CardDavBackend($db, $principal, $dispatcher);
-		});
-
-		$container->registerService('CalDavBackend', function($c) {
-			/** @var IAppContainer $c */
-			$db = $c->getServer()->getDatabaseConnection();
-			$principal = new Principal(
-				$c->getServer()->getUserManager(),
-				$c->getServer()->getGroupManager()
-			);
-			return new CalDavBackend($db, $principal);
-		});
-
-		$container->registerService('BirthdayService', function($c) {
-			/** @var IAppContainer $c */
-			$g = new GroupPrincipalBackend(
-				$c->getServer()->getGroupManager()
-			);
-			return new BirthdayService(
-				$c->query('CalDavBackend'),
-				$c->query('CardDavBackend'),
-				$g
-			);
-		});
-	}
-
-	/**
-	 * @param IManager $contactsManager
-	 * @param string $userID
-	 */
-	public function setupContactsProvider(IManager $contactsManager, $userID) {
-		/** @var ContactsManager $cm */
-		$cm = $this->getContainer()->query('ContactsManager');
-		$cm->setupContactsProvider($contactsManager, $userID);
-	}
-
-	public function registerHooks() {
-		/** @var HookManager $hm */
-		$hm = $this->getContainer()->query('HookManager');
-		$hm->setup();
-
-		$listener = function($event) {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $this->getContainer()->query('BirthdayService');
-				$b->onCardChanged(
-					$event->getArgument('addressBookId'),
-					$event->getArgument('cardUri'),
-					$event->getArgument('cardData')
-				);
-			}
-		};
-
-		$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $listener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $listener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function($event) {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $this->getContainer()->query('BirthdayService');
-				$b->onCardDeleted(
-					$event->getArgument('addressBookId'),
-					$event->getArgument('cardUri')
-				);
-			}
-		});
-	}
-
-	public function getSyncService() {
-		return $this->getContainer()->query('SyncService');
-	}
-
-	public function generateBirthdays() {
-		try {
-			/** @var BirthdayService $migration */
-			$migration = $this->getContainer()->query('BirthdayService');
-			$userManager = $this->getContainer()->getServer()->getUserManager();
-
-			$userManager->callForAllUsers(function($user) use($migration) {
-				/** @var IUser $user */
-				$migration->syncUser($user->getUID());
-			});
-		} catch (\Exception $ex) {
-			$this->getContainer()->getServer()->getLogger()->logException($ex);
-		}
-	}
-}
diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index e2688e2f923..ca456b03089 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -10,6 +10,7 @@
 	<types>
 		<filesystem/>
 	</types>
+	<namespace>DAV</namespace>
 	<public>
 		<webdav>appinfo/v1/publicwebdav.php</webdav>
 	</public>
diff --git a/apps/dav/appinfo/install.php b/apps/dav/appinfo/install.php
index dbb23022b38..8ee55dbbd11 100644
--- a/apps/dav/appinfo/install.php
+++ b/apps/dav/appinfo/install.php
@@ -19,7 +19,7 @@
  *
  */
 
-use OCA\Dav\AppInfo\Application;
+use OCA\DAV\AppInfo\Application;
 
 $app = new Application();
 $app->generateBirthdays();
diff --git a/apps/dav/appinfo/register_command.php b/apps/dav/appinfo/register_command.php
index b3ab25a99e3..6010f594e9b 100644
--- a/apps/dav/appinfo/register_command.php
+++ b/apps/dav/appinfo/register_command.php
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-use OCA\Dav\AppInfo\Application;
+use OCA\DAV\AppInfo\Application;
 use OCA\DAV\Command\CreateAddressBook;
 use OCA\DAV\Command\CreateCalendar;
 use OCA\DAV\Command\SyncBirthdayCalendar;
diff --git a/apps/dav/appinfo/update.php b/apps/dav/appinfo/update.php
index dbb23022b38..8ee55dbbd11 100644
--- a/apps/dav/appinfo/update.php
+++ b/apps/dav/appinfo/update.php
@@ -19,7 +19,7 @@
  *
  */
 
-use OCA\Dav\AppInfo\Application;
+use OCA\DAV\AppInfo\Application;
 
 $app = new Application();
 $app->generateBirthdays();