Merge pull request #1711 from nextcloud/us_move-more-commands-to-info…

….xml [oc] move more commands to info.xml
nextcloud · Oct 12, 2016 · b300ae5 · b300ae5
2 parents 657f1af + 0c57456
commit b300ae5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 107 deletions.
diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml
@@ -30,4 +30,8 @@
 	<settings>
 		<admin>OCA\Encryption\Settings\Admin</admin>
 	</settings>
+	<commands>
+		<command>OCA\Encryption\Command\EnableMasterKey</command>
+		<command>OCA\Encryption\Command\MigrateKeys</command>
+	</commands>
 </info>
diff --git a/apps/encryption/appinfo/register_command.php b/apps/encryption/appinfo/register_command.php
diff --git a/apps/encryption/lib/Command/MigrateKeys.php b/apps/encryption/lib/Command/MigrateKeys.php
@@ -22,42 +22,41 @@
 
 namespace OCA\Encryption\Command;
 
-use OC\DB\Connection;
 use OC\Files\View;
-use OC\User\Manager;
 use OCA\Encryption\Migration;
 use OCP\IConfig;
+use OCP\IDBConnection;
 use OCP\ILogger;
 use OCP\IUserBackend;
+use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class MigrateKeys extends Command {
 
-	/** @var \OC\User\Manager */
+	/** @var IUserManager */
 	private $userManager;
-
 	/** @var View */
 	private $view;
-	/** @var \OC\DB\Connection */
+	/** @var IDBConnection */
 	private $connection;
 	/** @var IConfig */
 	private $config;
 	/** @var  ILogger */
 	private $logger;
 
 	/**
-	 * @param Manager $userManager
+	 * @param IUserManager $userManager
 	 * @param View $view
-	 * @param Connection $connection
+	 * @param IDBConnection $connection
 	 * @param IConfig $config
 	 * @param ILogger $logger
 	 */
-	public function __construct(Manager $userManager,
+	public function __construct(IUserManager $userManager,
 								View $view,
-								Connection $connection,
+								IDBConnection $connection,
 								IConfig $config,
 								ILogger $logger) {
 

diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
@@ -29,4 +29,18 @@
 		<admin>OCA\Files_External\Settings\Admin</admin>
 		<admin-section>OCA\Files_External\Settings\Section</admin-section>
 	</settings>
+
+	<commands>
+		<command>OCA\Files_External\Command\ListCommand</command>
+		<command>OCA\Files_External\Command\Config</command>
+		<command>OCA\Files_External\Command\Option</command>
+		<command>OCA\Files_External\Command\Applicable</command>
+		<command>OCA\Files_External\Command\Import</command>
+		<command>OCA\Files_External\Command\Export</command>
+		<command>OCA\Files_External\Command\Delete</command>
+		<command>OCA\Files_External\Command\Create</command>
+		<command>OCA\Files_External\Command\Backends</command>
+		<command>OCA\Files_External\Command\Verify</command>
+		<command>OCA\Files_External\Command\Notify</command>
+	</commands>
 </info>
diff --git a/apps/files_external/appinfo/register_command.php b/apps/files_external/appinfo/register_command.php