hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/CLI.php
This commit is contained in:
Romain Neutron
2014-01-07 10:40:47 +01:00
parent a5d815b667 6462b3dbe8
commit c6059c4a00
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/developer
View File

@@ -118,4 +118,4 @@ $cli['console']->addCommands([
new VersionCommand(), new VersionCommand(),
]); ]);
exit($cli->runCLI()); exit(is_int($cli->run()) ? : 1);

10
composer.lock generated
View File

@@ -1692,16 +1692,16 @@
}, },
{ {
"name": "mediavorus/mediavorus", "name": "mediavorus/mediavorus",
"version": "0.4.2", "version": "0.4.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/romainneutron/MediaVorus.git", "url": "https://github.com/romainneutron/MediaVorus.git",
"reference": "b80ab6acd79f69b2040f7915e1393f08f68277fc" "reference": "7cc8c0b8d3440eaff9aa68fff2185216fd72bd75"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/romainneutron/MediaVorus/zipball/b80ab6acd79f69b2040f7915e1393f08f68277fc", "url": "https://api.github.com/repos/romainneutron/MediaVorus/zipball/7cc8c0b8d3440eaff9aa68fff2185216fd72bd75",
"reference": "b80ab6acd79f69b2040f7915e1393f08f68277fc", "reference": "7cc8c0b8d3440eaff9aa68fff2185216fd72bd75",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1749,7 +1749,7 @@
"keywords": [ "keywords": [
"metadata" "metadata"
], ],
"time": "2013-11-28 16:41:54" "time": "2014-01-06 15:45:32"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",

7
lib/Alchemy/Phrasea/CLI.php
View File

@@ -13,6 +13,7 @@ namespace Alchemy\Phrasea;
use Alchemy\Phrasea\Command\CommandInterface; use Alchemy\Phrasea\Command\CommandInterface;
use Alchemy\Phrasea\Core\CLIProvider\TranslationExtractorServiceProvider; use Alchemy\Phrasea\Core\CLIProvider\TranslationExtractorServiceProvider;
use Alchemy\Phrasea\Exception\RuntimeException;
use Symfony\Component\Console; use Symfony\Component\Console;
use Alchemy\Phrasea\Core\CLIProvider\CLIDriversServiceProvider; use Alchemy\Phrasea\Core\CLIProvider\CLIDriversServiceProvider;
use Alchemy\Phrasea\Core\CLIProvider\ComposerSetupServiceProvider; use Alchemy\Phrasea\Core\CLIProvider\ComposerSetupServiceProvider;
@@ -71,6 +72,8 @@ class CLI extends Application
*/ */
public function runCLI($interactive = false) public function runCLI($interactive = false)
{ {
$this->boot();
$app = $this['console']; $app = $this['console'];
if ($interactive) { if ($interactive) {
$app = new Console\Shell($app); $app = new Console\Shell($app);
@@ -81,6 +84,10 @@ class CLI extends Application
public function run(\Symfony\Component\HttpFoundation\Request $request = null) public function run(\Symfony\Component\HttpFoundation\Request $request = null)
{ {
if (null !== $request) {
throw new RuntimeException('Phraseanet Konsole can not run Http Requests.');
}
$this->runCLI(); $this->runCLI();
} }