diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged 2.0

Browse Source
This commit is contained in:
Fabien Potencier 2011-12-28 20:44:29 +01:00
commit cab70f4083
24 changed files with 80 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
check_cs
View File

@ -94,7 +94,9 @@ foreach ($finder as $file) {
}
// [Structure] elseif, not else if
$new = preg_replace('/} else if \(/', '} elseif (', $new);
if ('twig' !== $file->getExtension()) {
$new = preg_replace('/} else if \(/', '} elseif (', $new);
}
if ($new != $old) {
$count++;

3
src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css
View File

@ -50,6 +50,9 @@ button {
font-weight: bold;
}
caption {
margin-bottom: 7px;
}
table, tr, th, td {
border-collapse: collapse;
border: 1px solid #d0dbb3;

10
src/Symfony/Component/Console/Application.php
View File

@ -827,7 +827,7 @@ class Application
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', InputOption::VALUE_NONE, 'Increase verbosity of messages.'),
new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this program version.'),
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.'),
@ -896,6 +896,14 @@ class Application
return sprintf('%s, %s%s', $abbrevs[0], $abbrevs[1], count($abbrevs) > 2 ? sprintf(' and %d more', count($abbrevs) - 2) : '');
}
/**
* Returns the namespace part of the command name.
*
* @param string $name The full name of the command
* @param string $limit The maximum number of parts of the namespace
*
* @return string The namespace of the command
*/
private function extractNamespace($name, $limit = null)
{
$parts = explode(':', $name);

6
src/Symfony/Component/Console/Formatter/OutputFormatter.php
View File

@ -32,7 +32,7 @@ class OutputFormatter implements OutputFormatterInterface
* Initializes console output formatter.
*
* @param Boolean $decorated Whether this formatter should actually decorate strings
* @param array $styles Array of "name => FormatterStyle" instance
* @param array $styles Array of "name => FormatterStyle" instances
*
* @api
*/
@ -53,7 +53,7 @@ class OutputFormatter implements OutputFormatterInterface
/**
* Sets the decorated flag.
*
* @param Boolean $decorated Whether to decorated the messages or not
* @param Boolean $decorated Whether to decorate the messages or not
*
* @api
*/
@ -108,6 +108,8 @@ class OutputFormatter implements OutputFormatterInterface
*
* @return OutputFormatterStyleInterface
*
* @throws \InvalidArgumentException When style isn't defined
*
* @api
*/
public function getStyle($name)

2
src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php
View File

@ -23,7 +23,7 @@ interface OutputFormatterInterface
/**
* Sets the decorated flag.
*
* @param Boolean $decorated Whether to decorated the messages or not
* @param Boolean $decorated Whether to decorate the messages or not
*
* @api
*/

11
src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
View File

@ -79,6 +79,8 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
*
* @param string $color color name
*
* @throws \InvalidArgumentException When the color name isn't defined
*
* @api
*/
public function setForeground($color = null)
@ -105,6 +107,8 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
*
* @param string $color color name
*
* @throws \InvalidArgumentException When the color name isn't defined
*
* @api
*/
public function setBackground($color = null)
@ -131,6 +135,8 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
*
* @param string $option option name
*
* @throws \InvalidArgumentException When the option name isn't defined
*
* @api
*/
public function setOption($option)
@ -152,6 +158,9 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
* Unsets some specific style option.
*
* @param string $option option name
*
* @throws \InvalidArgumentException When the option name isn't defined
*
*/
public function unsetOption($option)
{
@ -170,7 +179,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
}
/**
* Set multiple style options at once.
* Sets multiple style options at once.
*
* @param array $options
*/

2
src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php
View File

@ -55,7 +55,7 @@ interface OutputFormatterStyleInterface
function unsetOption($option);
/**
* Set multiple style options at once.
* Sets multiple style options at once.
*
* @param array $options
*/

18
src/Symfony/Component/Console/Helper/DialogHelper.php
View File

@ -25,11 +25,13 @@ class DialogHelper extends Helper
/**
* Asks a question to the user.
*
* @param OutputInterface $output
* @param OutputInterface $output An Output instance
* @param string|array $question The question to ask
* @param string $default The default answer if none is given by the user
*
* @return string The user answer
*
* @throws \RuntimeException If there is no data to read in the input stream
*/
public function ask(OutputInterface $output, $question, $default = null)
{
@ -47,9 +49,9 @@ class DialogHelper extends Helper
/**
* Asks a confirmation to the user.
*
* The question will be asked until the user answer by nothing, yes, or no.
* The question will be asked until the user answers by nothing, yes, or no.
*
* @param OutputInterface $output
* @param OutputInterface $output An Output instance
* @param string|array $question The question to ask
* @param Boolean $default The default answer if the user enters nothing
*
@ -76,15 +78,15 @@ class DialogHelper extends Helper
* validated data when the data is valid and throw an exception
* otherwise.
*
* @param OutputInterface $output
* @param string|array $question
* @param OutputInterface $output An Output instance
* @param string|array $question The question to ask
* @param callback $validator A PHP callback
* @param integer $attempts Max number of times to ask before giving up (false by default, which means infinite)
* @param integer $attempts Max number of times to ask before giving up (false by default, which means infinite)
* @param string $default The default answer if none is given by the user
*
* @return mixed
*
* @throws \Exception When any of the validator returns an error
* @throws \Exception When any of the validators return an error
*/
public function askAndValidate(OutputInterface $output, $question, $validator, $attempts = false, $default = null)
{
@ -128,7 +130,7 @@ class DialogHelper extends Helper
}
/**
* Returns the helper's canonical name
* Returns the helper's canonical name.
*/
public function getName()
{

4
src/Symfony/Component/Console/Helper/FormatterHelper.php
View File

@ -66,7 +66,7 @@ class FormatterHelper extends Helper
}
/**
* Returns the length of a string, uses mb_strlen if it is available.
* Returns the length of a string, using mb_strlen if it is available.
*
* @param string $string The string to check its length
*
@ -86,7 +86,7 @@ class FormatterHelper extends Helper
}
/**
* Returns the helper's canonical name
* Returns the helper's canonical name.
*
* @return string The canonical name of the helper
*/

2
src/Symfony/Component/Console/Helper/HelperSet.php
View File

@ -24,6 +24,8 @@ class HelperSet
private $command;
/**
* Constructor.
*
* @param Helper[] $helpers An array of helper.
*/
public function __construct(array $helpers = array())

10
src/Symfony/Component/Console/Input/ArgvInput.php
View File

@ -25,7 +25,7 @@ namespace Symfony\Component\Console\Input;
* $input = new ArgvInput($_SERVER['argv']);
*
* If you pass it yourself, don't forget that the first element of the array
* is the name of the running program.
* is the name of the running application.
*
* When passing an argument to the constructor, be sure that it respects
* the same rules as the argv one. It's almost always better to use the
@ -57,7 +57,7 @@ class ArgvInput extends Input
$argv = $_SERVER['argv'];
}
// strip the program name
// strip the application name
array_shift($argv);
$this->tokens = $argv;
@ -253,10 +253,10 @@ class ArgvInput extends Input
}
/**
* Returns true if the raw parameters (not parsed) contains a value.
* Returns true if the raw parameters (not parsed) contain a value.
*
* This method is to be used to introspect the input parameters
* before it has been validated. It must be used carefully.
* before they have been validated. It must be used carefully.
*
* @param string|array $values The value(s) to look for in the raw parameters (can be an array)
*
@ -279,7 +279,7 @@ class ArgvInput extends Input
* Returns the value of a raw option (not parsed).
*
* This method is to be used to introspect the input parameters
* before it has been validated. It must be used carefully.
* before they have been validated. It must be used carefully.
*
* @param string|array $values The value(s) to look for in the raw parameters (can be an array)
* @param mixed $default The default value to return if no result is found

8
src/Symfony/Component/Console/Input/ArrayInput.php
View File

@ -58,10 +58,10 @@ class ArrayInput extends Input
}
/**
* Returns true if the raw parameters (not parsed) contains a value.
* Returns true if the raw parameters (not parsed) contain a value.
*
* This method is to be used to introspect the input parameters
* before it has been validated. It must be used carefully.
* before they have been validated. It must be used carefully.
*
* @param string|array $values The values to look for in the raw parameters (can be an array)
*
@ -88,7 +88,7 @@ class ArrayInput extends Input
* Returns the value of a raw option (not parsed).
*
* This method is to be used to introspect the input parameters
* before it has been validated. It must be used carefully.
* before they have been validated. It must be used carefully.
*
* @param string|array $values The value(s) to look for in the raw parameters (can be an array)
* @param mixed $default The default value to return if no result is found
@ -132,7 +132,7 @@ class ArrayInput extends Input
* @param string $shortcut The short option key
* @param mixed $value The value for the option
*
* @throws \RuntimeException When option given doesn't exist
* @throws \InvalidArgumentException When option given doesn't exist
*/
private function addShortOption($shortcut, $value)
{

8
src/Symfony/Component/Console/Input/InputDefinition.php
View File

@ -86,7 +86,7 @@ class InputDefinition
}
/**
* Add an array of InputArgument objects.
* Adds an array of InputArgument objects.
*
* @param InputArgument[] $arguments An array of InputArgument objects
*
@ -102,7 +102,7 @@ class InputDefinition
}
/**
* Add an InputArgument object.
* Adds an InputArgument object.
*
* @param InputArgument $argument An InputArgument object
*
@ -237,7 +237,7 @@ class InputDefinition
}
/**
* Add an array of InputOption objects.
* Adds an array of InputOption objects.
*
* @param InputOption[] $options An array of InputOption objects
*
@ -251,7 +251,7 @@ class InputDefinition
}
/**
* Add an InputOption object.
* Adds an InputOption object.
*
* @param InputOption $option An InputOption object
*

14
src/Symfony/Component/Console/Input/InputInterface.php
View File

@ -26,10 +26,10 @@ interface InputInterface
function getFirstArgument();
/**
* Returns true if the raw parameters (not parsed) contains a value.
* Returns true if the raw parameters (not parsed) contain a value.
*
* This method is to be used to introspect the input parameters
* before it has been validated. It must be used carefully.
* before they have been validated. It must be used carefully.
*
* @param string|array $values The values to look for in the raw parameters (can be an array)
*
@ -41,7 +41,7 @@ interface InputInterface
* Returns the value of a raw option (not parsed).
*
* This method is to be used to introspect the input parameters
* before it has been validated. It must be used carefully.
* before they have been validated. It must be used carefully.
*
* @param string|array $values The value(s) to look for in the raw parameters (can be an array)
* @param mixed $default The default value to return if no result is found
@ -58,7 +58,7 @@ interface InputInterface
function bind(InputDefinition $definition);
/**
* Validate if arguments given are correct.
* Validates if arguments given are correct.
*
* Throws an exception when not enough arguments are given.
*
@ -74,7 +74,7 @@ interface InputInterface
function getArguments();
/**
* Get argument by name.
* Gets argument by name.
*
* @param string $name The name of the argument
*
@ -83,12 +83,14 @@ interface InputInterface
function getArgument($name);
/**
* Returns all the given options merged with the default values.
*
* @return array
*/
function getOptions();
/**
* Get an option by name.
* Gets an option by name.
*
* @param string $name The name of the option
*

6
src/Symfony/Component/Console/Input/InputOption.php
View File

@ -79,7 +79,7 @@ class InputOption
}
/**
* Returns the shortcut.
* Returns the option shortcut.
*
* @return string The shortcut
*/
@ -89,7 +89,7 @@ class InputOption
}
/**
* Returns the name.
* Returns the option name.
*
* @return string The name
*/
@ -142,6 +142,8 @@ class InputOption
* Sets the default value.
*
* @param mixed $default The default value
*
* @throws \LogicException When incorrect default value is given
*/
public function setDefault($default = null)
{

4
src/Symfony/Component/Console/Output/Output.php
View File

@ -17,7 +17,7 @@ use Symfony\Component\Console\Formatter\OutputFormatter;
/**
* Base class for output classes.
*
* There is three level of verbosity:
* There are three levels of verbosity:
*
* * normal: no option passed (normal output - information)
* * verbose: -v (more output - debug)
@ -79,7 +79,7 @@ abstract class Output implements OutputInterface
/**
* Sets the decorated flag.
*
* @param Boolean $decorated Whether to decorated the messages or not
* @param Boolean $decorated Whether to decorate the messages or not
*
* @api
*/

2
src/Symfony/Component/Console/Output/OutputInterface.php
View File

@ -74,7 +74,7 @@ interface OutputInterface
/**
* Sets the decorated flag.
*
* @param Boolean $decorated Whether to decorated the messages or not
* @param Boolean $decorated Whether to decorate the messages or not
*
* @api
*/

2
tests/Symfony/Tests/Component/Console/Fixtures/application_astext1.txt
View File

@ -7,7 +7,7 @@
<info>--help</info> <info>-h</info> Display this help message.
<info>--quiet</info> <info>-q</info> Do not output any message.
<info>--verbose</info> <info>-v</info> Increase verbosity of messages.
<info>--version</info> <info>-V</info> Display this program version.
<info>--version</info> <info>-V</info> Display this application version.
<info>--ansi</info> Force ANSI output.
<info>--no-ansi</info> Disable ANSI output.
<info>--no-interaction</info> <info>-n</info> Do not ask any interactive question.

2
tests/Symfony/Tests/Component/Console/Fixtures/application_astext2.txt
View File

@ -7,7 +7,7 @@
<info>--help</info> <info>-h</info> Display this help message.
<info>--quiet</info> <info>-q</info> Do not output any message.
<info>--verbose</info> <info>-v</info> Increase verbosity of messages.
<info>--version</info> <info>-V</info> Display this program version.
<info>--version</info> <info>-V</info> Display this application version.
<info>--ansi</info> Force ANSI output.
<info>--no-ansi</info> Disable ANSI output.
<info>--no-interaction</info> <info>-n</info> Do not ask any interactive question.

2
tests/Symfony/Tests/Component/Console/Fixtures/application_gethelp.txt
View File

@ -7,7 +7,7 @@
<info>--help</info> <info>-h</info> Display this help message.
<info>--quiet</info> <info>-q</info> Do not output any message.
<info>--verbose</info> <info>-v</info> Increase verbosity of messages.
<info>--version</info> <info>-V</info> Display this program version.
<info>--version</info> <info>-V</info> Display this application version.
<info>--ansi</info> Force ANSI output.
<info>--no-ansi</info> Disable ANSI output.
<info>--no-interaction</info> <info>-n</info> Do not ask any interactive question.

2
tests/Symfony/Tests/Component/Console/Fixtures/application_run1.txt
View File

@ -7,7 +7,7 @@ Options:
--help -h Display this help message.
--quiet -q Do not output any message.
--verbose -v Increase verbosity of messages.
--version -V Display this program version.
--version -V Display this application version.
--ansi Force ANSI output.
--no-ansi Disable ANSI output.
--no-interaction -n Do not ask any interactive question.

2
tests/Symfony/Tests/Component/Console/Fixtures/application_run2.txt
View File

@ -10,7 +10,7 @@ Options:
--help (-h) Display this help message.
--quiet (-q) Do not output any message.
--verbose (-v) Increase verbosity of messages.
--version (-V) Display this program version.
--version (-V) Display this application version.
--ansi Force ANSI output.
--no-ansi Disable ANSI output.
--no-interaction (-n) Do not ask any interactive question.

2
tests/Symfony/Tests/Component/Console/Fixtures/command_astext.txt
View File

@ -9,7 +9,7 @@
<info>--help</info> (-h) Display this help message.
<info>--quiet</info> (-q) Do not output any message.
<info>--verbose</info> (-v) Increase verbosity of messages.
<info>--version</info> (-V) Display this program version.
<info>--version</info> (-V) Display this application version.
<info>--ansi</info> Force ANSI output.
<info>--no-ansi</info> Disable ANSI output.
<info>--no-interaction</info> (-n) Do not ask any interactive question.

2
tests/Symfony/Tests/Component/Console/Fixtures/command_asxml.txt
View File

@ -23,7 +23,7 @@
<description>Increase verbosity of messages.</description>
</option>
<option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
<description>Display this program version.</description>
<description>Display this application version.</description>
</option>
<option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
<description>Force ANSI output.</description>