mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-18 07:23:13 +00:00
Merge branch '3.8'
Conflicts: lib/Alchemy/Phrasea/CLI.php
This commit is contained in:
@@ -118,4 +118,4 @@ $cli['console']->addCommands([
|
||||
new VersionCommand(),
|
||||
]);
|
||||
|
||||
exit($cli->runCLI());
|
||||
exit(is_int($cli->run()) ? : 1);
|
||||
|
10
composer.lock
generated
10
composer.lock
generated
@@ -1692,16 +1692,16 @@
|
||||
},
|
||||
{
|
||||
"name": "mediavorus/mediavorus",
|
||||
"version": "0.4.2",
|
||||
"version": "0.4.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/romainneutron/MediaVorus.git",
|
||||
"reference": "b80ab6acd79f69b2040f7915e1393f08f68277fc"
|
||||
"reference": "7cc8c0b8d3440eaff9aa68fff2185216fd72bd75"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/romainneutron/MediaVorus/zipball/b80ab6acd79f69b2040f7915e1393f08f68277fc",
|
||||
"reference": "b80ab6acd79f69b2040f7915e1393f08f68277fc",
|
||||
"url": "https://api.github.com/repos/romainneutron/MediaVorus/zipball/7cc8c0b8d3440eaff9aa68fff2185216fd72bd75",
|
||||
"reference": "7cc8c0b8d3440eaff9aa68fff2185216fd72bd75",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1749,7 +1749,7 @@
|
||||
"keywords": [
|
||||
"metadata"
|
||||
],
|
||||
"time": "2013-11-28 16:41:54"
|
||||
"time": "2014-01-06 15:45:32"
|
||||
},
|
||||
{
|
||||
"name": "monolog/monolog",
|
||||
|
@@ -13,6 +13,7 @@ namespace Alchemy\Phrasea;
|
||||
|
||||
use Alchemy\Phrasea\Command\CommandInterface;
|
||||
use Alchemy\Phrasea\Core\CLIProvider\TranslationExtractorServiceProvider;
|
||||
use Alchemy\Phrasea\Exception\RuntimeException;
|
||||
use Symfony\Component\Console;
|
||||
use Alchemy\Phrasea\Core\CLIProvider\CLIDriversServiceProvider;
|
||||
use Alchemy\Phrasea\Core\CLIProvider\ComposerSetupServiceProvider;
|
||||
@@ -71,6 +72,8 @@ class CLI extends Application
|
||||
*/
|
||||
public function runCLI($interactive = false)
|
||||
{
|
||||
$this->boot();
|
||||
|
||||
$app = $this['console'];
|
||||
if ($interactive) {
|
||||
$app = new Console\Shell($app);
|
||||
@@ -81,6 +84,10 @@ class CLI extends Application
|
||||
|
||||
public function run(\Symfony\Component\HttpFoundation\Request $request = null)
|
||||
{
|
||||
if (null !== $request) {
|
||||
throw new RuntimeException('Phraseanet Konsole can not run Http Requests.');
|
||||
}
|
||||
|
||||
$this->runCLI();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user