Merge branch 4.0

bin/console

@@ -11,15 +11,22 @@
 
 namespace KonsoleKommander;
 
+use Alchemy\Phrasea\CLI;
+use Alchemy\Phrasea\Command\BuildMissingSubdefs;
 use Alchemy\Phrasea\Command\BuildSubdefs;
+use Alchemy\Phrasea\Command\CheckConfig;
+use Alchemy\Phrasea\Command\Compile\Configuration;
+use Alchemy\Phrasea\Command\CreateCollection;
+use Alchemy\Phrasea\Command\MailTest;
+use Alchemy\Phrasea\Command\Plugin\AddPlugin;
 use Alchemy\Phrasea\Command\Plugin\ListPlugin;
-use Alchemy\Phrasea\Command\Setup\H264ConfigurationDumper;
-use Alchemy\Phrasea\Command\Setup\H264MappingGenerator;
+use Alchemy\Phrasea\Command\Plugin\RemovePlugin;
+use Alchemy\Phrasea\Command\RecordAdd;
+use Alchemy\Phrasea\Command\RescanTechnicalDatas;
 use Alchemy\Phrasea\Command\SearchEngine\Debug\QueryParseCommand;
 use Alchemy\Phrasea\Command\SearchEngine\Debug\QuerySampleCommand;
 use Alchemy\Phrasea\Command\SearchEngine\IndexCreateCommand;
 use Alchemy\Phrasea\Command\SearchEngine\IndexDropCommand;
-use Alchemy\Phrasea\Command\SearchEngine\MappingUpdateCommand;
 use Alchemy\Phrasea\Command\SearchEngine\IndexPopulateCommand;
 use Alchemy\Phrasea\Command\Thesaurus\FindConceptsCommand;
 use Alchemy\Phrasea\Command\WebsocketServer;
@@ -37,17 +44,23 @@ use Alchemy\Phrasea\Command\Plugin\AddPlugin;
 use Alchemy\Phrasea\Command\Plugin\RemovePlugin;
 use Alchemy\Phrasea\Command\CheckConfig;
 use Alchemy\Phrasea\Command\Setup\XSendFileMappingGenerator;
+use Alchemy\Phrasea\Command\SearchEngine\MappingUpdateCommand;
+use Alchemy\Phrasea\Command\Setup\H264ConfigurationDumper;
+use Alchemy\Phrasea\Command\Setup\H264MappingGenerator;
 use Alchemy\Phrasea\Command\Setup\XSendFileConfigurationDumper;
-use Alchemy\Phrasea\Command\Task\SchedulerResumeTasks;
-use Alchemy\Phrasea\Command\Task\SchedulerState;
+use Alchemy\Phrasea\Command\Setup\XSendFileMappingGenerator;
 use Alchemy\Phrasea\Command\Task\SchedulerPauseTasks;
+use Alchemy\Phrasea\Command\Task\SchedulerResumeTasks;
 use Alchemy\Phrasea\Command\Task\SchedulerRun;
+use Alchemy\Phrasea\Command\Task\SchedulerState;
 use Alchemy\Phrasea\Command\Task\TaskList;
 use Alchemy\Phrasea\Command\Task\TaskRun;
 use Alchemy\Phrasea\Command\Task\TaskStart;
-use Alchemy\Phrasea\Command\Task\TaskStop;
 use Alchemy\Phrasea\Command\Task\TaskState;
-use Alchemy\Phrasea\SearchEngine\SearchEngineInterface;
+use Alchemy\Phrasea\Command\Task\TaskStop;
+use Alchemy\Phrasea\Command\Thesaurus\FindConceptsCommand;
+use Alchemy\Phrasea\Command\UpgradeDBDatas;
+use Alchemy\Phrasea\Core\Version;
 
 require_once __DIR__ . '/../lib/autoload.php';
 
@@ -68,11 +81,12 @@ $cli = new CLI("
  This program comes with ABSOLUTELY NO WARRANTY.
  This is free software, and you are welcome to redistribute it
  under certain conditions; type `about:license' for details.\n\n"
-            . ' KONSOLE KOMMANDER', $version->getName() . ' ' . $version->getNumber());
+    . ' KONSOLE KOMMANDER', $version->getName() . ' ' . $version->getNumber());
 
 if (!$cli['phraseanet.configuration-tester']->isInstalled()) {
     throw new \RuntimeException('Phraseanet is not installed, use setup command instead');
 }
+
 if (!$cli['phraseanet.configuration-tester']->isUpToDate()) {
     throw new \RuntimeException('Phraseanet is not up-to-date, use setup command instead');
 }
@@ -132,6 +146,10 @@ $cli->command(new QueryParseCommand());
 $cli->command(new QuerySampleCommand());
 $cli->command(new FindConceptsCommand());
 
+$cli->command($cli['alchemy_worker.commands.run_dispatcher_command']);
+$cli->command($cli['alchemy_worker.commands.run_worker_command']);
+$cli->command($cli['alchemy_worker.commands.show_configuration']);
+
 $cli->loadPlugins();
 
-exit(is_int($cli->run()) ? : 1);
+$cli->run();

bin/developer

@@ -122,4 +122,4 @@ if ($cli['configuration.store']->isSetup()) {
     }
 }
 
-exit(is_int($cli->run()) ? : 1);
+$cli->run();

bin/setup

@@ -79,4 +79,4 @@ $app->command(new CrossDomainGenerator());
 
 $app['phraseanet.setup_mode'] = true;
 
-exit(is_int($app->run()) ? : 1);
+$app->run();