Merge branch '2.3' into 2.6

* 2.3:
  fixed CS
This commit is contained in:
Fabien Potencier 2015-05-15 15:45:20 +02:00
commit e83db434a2
7 changed files with 24 additions and 12 deletions

View File

@ -921,12 +921,12 @@ class Application
return new InputDefinition(array(
new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'),
new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message'),
new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),
new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'),
new InputOption('--ansi', '', InputOption::VALUE_NONE, 'Force ANSI output'),
new InputOption('--no-ansi', '', InputOption::VALUE_NONE, 'Disable ANSI output'),
new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message'),
new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),
new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'),
new InputOption('--ansi', '', InputOption::VALUE_NONE, 'Force ANSI output'),
new InputOption('--no-ansi', '', InputOption::VALUE_NONE, 'Disable ANSI output'),
new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'),
));
}

View File

@ -19,4 +19,6 @@ namespace Symfony\Component\Validator\Constraints;
*
* @api
*/
class False extends IsFalse {}
class False extends IsFalse
{
}

View File

@ -16,4 +16,6 @@ namespace Symfony\Component\Validator\Constraints;
*
* @api
*/
class FalseValidator extends IsFalseValidator {}
class FalseValidator extends IsFalseValidator
{
}

View File

@ -19,4 +19,6 @@ namespace Symfony\Component\Validator\Constraints;
*
* @api
*/
class Null extends IsNull {}
class Null extends IsNull
{
}

View File

@ -16,4 +16,6 @@ namespace Symfony\Component\Validator\Constraints;
*
* @api
*/
class NullValidator extends IsNullValidator {}
class NullValidator extends IsNullValidator
{
}

View File

@ -19,4 +19,6 @@ namespace Symfony\Component\Validator\Constraints;
*
* @api
*/
class True extends IsTrue {}
class True extends IsTrue
{
}

View File

@ -16,4 +16,6 @@ namespace Symfony\Component\Validator\Constraints;
*
* @api
*/
class TrueValidator extends IsTrueValidator {}
class TrueValidator extends IsTrueValidator
{
}