makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12655] Fix coding style

Browse source 
PHPBB3-12655
This commit is contained in:
Tristan Darricau 2014-06-05 00:21:53 +02:00
parent ce104e2c72
commit 012702307b
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/phpbb/console/application.php
View file

@ -13,11 +13,7 @@
namespace phpbb\console; namespace phpbb\console;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\Console\Output\ConsoleOutput;
use Symfony\Component\Console\Output\ConsoleOutputInterface;
use Symfony\Component\Console\Shell; use Symfony\Component\Console\Shell;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
@ -30,6 +26,11 @@ class application extends \Symfony\Component\Console\Application
*/ */
protected $in_shell = false; protected $in_shell = false;
/**
* @var \phpbb\user User object
*/
protected $user;
/** /**
* @param string $name The name of the application * @param string $name The name of the application
* @param string $version The version of the application * @param string $version The version of the application
@ -54,7 +55,7 @@ class application extends \Symfony\Component\Console\Application
{ {
// If we are already in a shell // If we are already in a shell
// we do not want to have the --shell option available // we do not want to have the --shell option available
if($this->in_shell) if ($this->in_shell)
{ {
return parent::getHelp(); return parent::getHelp();
} }
@ -96,9 +97,9 @@ class application extends \Symfony\Component\Console\Application
*/ */
public function doRun(InputInterface $input, OutputInterface $output) public function doRun(InputInterface $input, OutputInterface $output)
{ {
// Run a shell if the --shell (or -s) option is set and if any command name is specified // Run a shell if the --shell (or -s) option is set and if no command name is specified
// Also, we do not want to have the --shell option available if we are already in a shell // Also, we do not want to have the --shell option available if we are already in a shell
if (!$this->in_shell && $this->getCommandName($input) === null && $input->hasParameterOption(array('--shell', '-s')) === true) if (!$this->in_shell && $this->getCommandName($input) === null && $input->hasParameterOption(array('--shell', '-s')))
{ {
$shell = new Shell($this); $shell = new Shell($this);
$this->in_shell = true; $this->in_shell = true;