Merge branch '2.7'
* 2.7: [WIP] Made help information of commands more consistent [HttpKernel] deprecated ContainerAwareHttpKernel Deprecate the translator implementation in the Validator component [2.6] Added internal annotation on Descriptor classes Made CLI help consistent Made help information consistent Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php src/Symfony/Component/Validator/composer.json
This commit is contained in:
Fabien Potencier
commit
de6f11d042
|
|
@ -979,6 +979,22 @@ UPGRADE FROM 2.x to 3.0
|
|||
$plural = $violation->getPlural();
|
||||
```
|
||||
|
||||
* The class `Symfony\Component\Validator\DefaultTranslator` was removed. You
|
||||
should use `Symfony\Component\Translation\IdentityTranslator` instead.
|
||||
|
||||
Before:
|
||||
|
||||
```php
|
||||
$translator = new \Symfony\Component\Validator\DefaultTranslator();
|
||||
```
|
||||
|
||||
After:
|
||||
|
||||
```php
|
||||
$translator = new \Symfony\Component\Translation\IdentityTranslator();
|
||||
$translator->setLocale('en');
|
||||
```
|
||||
|
||||
### Yaml
|
||||
|
||||
* The ability to pass file names to `Yaml::parse()` has been removed.
|
||||
|
|
|
|||
|
|
@ -40,21 +40,21 @@ class AssetsInstallCommand extends ContainerAwareCommand
|
|||
->setDescription('Installs bundles web assets under a public web directory')
|
||||
->setHelp(<<<EOT
|
||||
The <info>%command.name%</info> command installs bundle assets into a given
|
||||
directory (e.g. the web directory).
|
||||
directory (e.g. the <comment>web</comment> directory).
|
||||
|
||||
<info>php %command.full_name% web</info>
|
||||
<info>php %command.full_name% web</info>
|
||||
|
||||
A "bundles" directory will be created inside the target directory, and the
|
||||
A "bundles" directory will be created inside the target directory and the
|
||||
"Resources/public" directory of each bundle will be copied into it.
|
||||
|
||||
To create a symlink to each bundle instead of copying its assets, use the
|
||||
<info>--symlink</info> option (will fall back to hard copies when symbolic links aren't possible:
|
||||
|
||||
<info>php %command.full_name% web --symlink</info>
|
||||
<info>php %command.full_name% web --symlink</info>
|
||||
|
||||
To make symlink relative, add the <info>--relative</info> option:
|
||||
|
||||
<info>php %command.full_name% web --symlink --relative</info>
|
||||
<info>php %command.full_name% web --symlink --relative</info>
|
||||
|
||||
EOT
|
||||
)
|
||||
|
|
|
|||
|
|
@ -41,9 +41,8 @@ class CacheClearCommand extends ContainerAwareCommand
|
|||
The <info>%command.name%</info> command clears the application cache for a given environment
|
||||
and debug mode:
|
||||
|
||||
<info>php %command.full_name% --env=dev</info>
|
||||
<info>php %command.full_name% --env=prod --no-debug</info>
|
||||
|
||||
<info>php %command.full_name% --env=dev</info>
|
||||
<info>php %command.full_name% --env=prod --no-debug</info>
|
||||
EOF
|
||||
)
|
||||
;
|
||||
|
|
|
|||
|
|
@ -35,11 +35,10 @@ class ConfigDebugCommand extends AbstractConfigCommand
|
|||
'config:debug',
|
||||
))
|
||||
->setDefinition(array(
|
||||
new InputArgument('name', InputArgument::OPTIONAL, 'The Bundle name or the extension alias'),
|
||||
new InputArgument('name', InputArgument::OPTIONAL, 'The bundle name or the extension alias'),
|
||||
))
|
||||
->setDescription('Dumps the current configuration for an extension')
|
||||
->setHelp(<<<EOF
|
||||
|
||||
The <info>%command.name%</info> command dumps the current configuration for an
|
||||
extension/bundle.
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ Either the extension alias or bundle name can be used:
|
|||
<info>php %command.full_name% framework</info>
|
||||
<info>php %command.full_name% FrameworkBundle</info>
|
||||
|
||||
With the <info>format</info> option specifies the format of the configuration,
|
||||
With the <info>--format</info> option specifies the format of the configuration,
|
||||
this is either <comment>yaml</comment> or <comment>xml</comment>.
|
||||
When the option is not provided, <comment>yaml</comment> is used.
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ To get specific information about a service, specify its name:
|
|||
<info>php %command.full_name% validator</info>
|
||||
|
||||
By default, private services are hidden. You can display all services by
|
||||
using the --show-private flag:
|
||||
using the <info>--show-private</info> flag:
|
||||
|
||||
<info>php %command.full_name% --show-private</info>
|
||||
|
||||
|
|
@ -72,15 +72,15 @@ Use the --tags option to display tagged <comment>public</comment> services group
|
|||
|
||||
<info>php %command.full_name% --tags</info>
|
||||
|
||||
Find all services with a specific tag by specifying the tag name with the --tag option:
|
||||
Find all services with a specific tag by specifying the tag name with the <info>--tag</info> option:
|
||||
|
||||
<info>php %command.full_name% --tag=form.type</info>
|
||||
|
||||
Use the --parameters option to display all parameters:
|
||||
Use the <info>--parameters</info> option to display all parameters:
|
||||
|
||||
<info>php %command.full_name% --parameters</info>
|
||||
|
||||
Display a specific parameter by specifying his name with the --parameter option:
|
||||
Display a specific parameter by specifying his name with the <info>--parameter</info> option:
|
||||
|
||||
<info>php %command.full_name% --parameter=kernel.debug</info>
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ class RouterDebugCommand extends ContainerAwareCommand
|
|||
The <info>%command.name%</info> displays the configured routes:
|
||||
|
||||
<info>php %command.full_name%</info>
|
||||
|
||||
|
||||
EOF
|
||||
)
|
||||
;
|
||||
|
|
|
|||
|
|
@ -60,7 +60,9 @@ class RouterMatchCommand extends ContainerAwareCommand
|
|||
The <info>%command.name%</info> shows which routes match a given request and which don't and for what reason:
|
||||
|
||||
<info>php %command.full_name% /foo</info>
|
||||
or
|
||||
|
||||
or
|
||||
|
||||
<info>php %command.full_name% /foo --method POST --scheme https --host symfony.com --verbose</info>
|
||||
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -41,23 +41,23 @@ class ServerStartCommand extends ServerCommand
|
|||
->setHelp(<<<EOF
|
||||
The <info>%command.name%</info> runs PHP's built-in web server:
|
||||
|
||||
<info>%command.full_name%</info>
|
||||
<info>php %command.full_name%</info>
|
||||
|
||||
To change the default bind address and the default port use the <info>address</info> argument:
|
||||
|
||||
<info>%command.full_name% 127.0.0.1:8080</info>
|
||||
<info>php %command.full_name% 127.0.0.1:8080</info>
|
||||
|
||||
To change the default document root directory use the <info>--docroot</info> option:
|
||||
|
||||
<info>%command.full_name% --docroot=htdocs/</info>
|
||||
<info>php %command.full_name% --docroot=htdocs/</info>
|
||||
|
||||
If you have a custom document root directory layout, you can specify your own
|
||||
router script using the <info>--router</info> option:
|
||||
|
||||
<info>%command.full_name% --router=app/config/router.php</info>
|
||||
<info>php %command.full_name% --router=app/config/router.php</info>
|
||||
|
||||
Specifying a router script is required when the used environment is not "dev" or
|
||||
"prod".
|
||||
Specifying a router script is required when the used environment is not <comment>"dev"</comment> or
|
||||
<comment>"prod"</comment>.
|
||||
|
||||
See also: http://www.php.net/manual/en/features.commandline.webserver.php
|
||||
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@ class ServerStopCommand extends ServerCommand
|
|||
->setHelp(<<<EOF
|
||||
The <info>%command.name%</info> stops PHP's built-in web server:
|
||||
|
||||
<info>%command.full_name%</info>
|
||||
<info>php %command.full_name%</info>
|
||||
|
||||
To change the default bind address and the default port use the <info>address</info> argument:
|
||||
|
||||
<info>%command.full_name% 127.0.0.1:8080</info>
|
||||
<info>php %command.full_name% 127.0.0.1:8080</info>
|
||||
|
||||
EOF
|
||||
)
|
||||
|
|
|
|||
|
|
@ -57,19 +57,19 @@ templates and translation files of a given bundle.
|
|||
|
||||
You can display information about bundle translations in a specific locale:
|
||||
|
||||
<info>php %command.full_name% en AcmeDemoBundle</info>
|
||||
<info>php %command.full_name% en AcmeDemoBundle</info>
|
||||
|
||||
You can also specify a translation domain for the search:
|
||||
|
||||
<info>php %command.full_name% --domain=messages en AcmeDemoBundle</info>
|
||||
<info>php %command.full_name% --domain=messages en AcmeDemoBundle</info>
|
||||
|
||||
You can only display missing messages:
|
||||
|
||||
<info>php %command.full_name% --only-missing en AcmeDemoBundle</info>
|
||||
<info>php %command.full_name% --only-missing en AcmeDemoBundle</info>
|
||||
|
||||
You can only display unused messages:
|
||||
|
||||
<info>php %command.full_name% --only-unused en AcmeDemoBundle</info>
|
||||
<info>php %command.full_name% --only-unused en AcmeDemoBundle</info>
|
||||
|
||||
EOF
|
||||
)
|
||||
|
|
|
|||
|
|
@ -36,30 +36,12 @@ class TranslationUpdateCommand extends ContainerAwareCommand
|
|||
->setDefinition(array(
|
||||
new InputArgument('locale', InputArgument::REQUIRED, 'The locale'),
|
||||
new InputArgument('bundle', InputArgument::OPTIONAL, 'The bundle where to load the messages, defaults to app/Resources folder', null),
|
||||
new InputOption(
|
||||
'prefix', null, InputOption::VALUE_OPTIONAL,
|
||||
'Override the default prefix', '__'
|
||||
),
|
||||
new InputOption(
|
||||
'output-format', null, InputOption::VALUE_OPTIONAL,
|
||||
'Override the default output format', 'yml'
|
||||
),
|
||||
new InputOption(
|
||||
'dump-messages', null, InputOption::VALUE_NONE,
|
||||
'Should the messages be dumped in the console'
|
||||
),
|
||||
new InputOption(
|
||||
'force', null, InputOption::VALUE_NONE,
|
||||
'Should the update be done'
|
||||
),
|
||||
new InputOption(
|
||||
'no-backup', null, InputOption::VALUE_NONE,
|
||||
'Should backup be disabled'
|
||||
),
|
||||
new InputOption(
|
||||
'clean', null, InputOption::VALUE_NONE,
|
||||
'Should clean not found messages'
|
||||
),
|
||||
new InputOption('prefix', null, InputOption::VALUE_OPTIONAL, 'Override the default prefix', '__'),
|
||||
new InputOption('output-format', null, InputOption::VALUE_OPTIONAL, 'Override the default output format', 'yml'),
|
||||
new InputOption('dump-messages', null, InputOption::VALUE_NONE, 'Should the messages be dumped in the console'),
|
||||
new InputOption('force', null, InputOption::VALUE_NONE, 'Should the update be done'),
|
||||
new InputOption('no-backup', null, InputOption::VALUE_NONE, 'Should backup be disabled'),
|
||||
new InputOption('clean', null, InputOption::VALUE_NONE, 'Should clean not found messages'),
|
||||
))
|
||||
->setDescription('Updates the translation file')
|
||||
->setHelp(<<<EOF
|
||||
|
|
@ -69,13 +51,12 @@ When new translation strings are found it can automatically add a prefix to the
|
|||
message.
|
||||
|
||||
Example running against a Bundle (AcmeBundle)
|
||||
<info>php %command.full_name% --dump-messages en AcmeBundle</info>
|
||||
<info>php %command.full_name% --force --prefix="new_" fr AcmeBundle</info>
|
||||
<info>php %command.full_name% --dump-messages en AcmeBundle</info>
|
||||
<info>php %command.full_name% --force --prefix="new_" fr AcmeBundle</info>
|
||||
|
||||
Example running against app messages (app/Resources folder)
|
||||
<info>php %command.full_name% --dump-messages en</info>
|
||||
<info>php %command.full_name% --force --prefix="new_" fr</info>
|
||||
|
||||
<info>php %command.full_name% --dump-messages en</info>
|
||||
<info>php %command.full_name% --force --prefix="new_" fr</info>
|
||||
EOF
|
||||
)
|
||||
;
|
||||
|
|
|
|||
|
|
@ -39,20 +39,20 @@ the first encountered syntax error.
|
|||
|
||||
You can validate the syntax of a file:
|
||||
|
||||
<info>php %command.full_name% filename</info>
|
||||
<info>php %command.full_name% filename</info>
|
||||
|
||||
Or of a whole directory:
|
||||
|
||||
<info>php %command.full_name% dirname</info>
|
||||
<info>php %command.full_name% dirname --format=json</info>
|
||||
<info>php %command.full_name% dirname</info>
|
||||
<info>php %command.full_name% dirname --format=json</info>
|
||||
|
||||
Or all YAML files in a bundle:
|
||||
|
||||
<info>php %command.full_name% @AcmeDemoBundle</info>
|
||||
<info>php %command.full_name% @AcmeDemoBundle</info>
|
||||
|
||||
You can also pass the YAML contents from STDIN:
|
||||
|
||||
<info>cat filename | php %command.full_name%</info>
|
||||
<info>cat filename | php %command.full_name%</info>
|
||||
|
||||
EOF
|
||||
)
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ use Symfony\Component\Routing\RouteCollection;
|
|||
|
||||
/**
|
||||
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
abstract class Descriptor implements DescriptorInterface
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ use Symfony\Component\Routing\RouteCollection;
|
|||
|
||||
/**
|
||||
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class JsonDescriptor extends Descriptor
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ use Symfony\Component\Routing\RouteCollection;
|
|||
|
||||
/**
|
||||
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class MarkdownDescriptor extends Descriptor
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ use Symfony\Component\Routing\RouteCollection;
|
|||
|
||||
/**
|
||||
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class TextDescriptor extends Descriptor
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ use Symfony\Component\Routing\RouteCollection;
|
|||
|
||||
/**
|
||||
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class XmlDescriptor extends Descriptor
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ use Symfony\Component\Console\Helper\DescriptorHelper as BaseDescriptorHelper;
|
|||
|
||||
/**
|
||||
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class DescriptorHelper extends BaseDescriptorHelper
|
||||
{
|
||||
|
|
|
|||
|
|
@ -34,13 +34,13 @@ class InitAclCommand extends ContainerAwareCommand
|
|||
->setHelp(<<<EOF
|
||||
The <info>%command.name%</info> command mounts ACL tables in the database.
|
||||
|
||||
<info>php %command.full_name%</info>
|
||||
<info>php %command.full_name%</info>
|
||||
|
||||
The name of the DBAL connection must be configured in your <info>app/config/security.yml</info> configuration file in the <info>security.acl.connection</info> variable.
|
||||
|
||||
<info>security:
|
||||
acl:
|
||||
connection: default</info>
|
||||
<info>security:
|
||||
acl:
|
||||
connection: default</info>
|
||||
EOF
|
||||
)
|
||||
;
|
||||
|
|
|
|||
|
|
@ -59,20 +59,22 @@ class SetAclCommand extends ContainerAwareCommand
|
|||
The <info>%command.name%</info> command sets ACL.
|
||||
The ACL system must have been initialized with the <info>init:acl</info> command.
|
||||
|
||||
To set <comment>VIEW</comment> and <comment>EDIT</comment> permissions for the user <comment>kevin</comment> on the instance of <comment>Acme\MyClass</comment> having the identifier <comment>42</comment>:
|
||||
To set <comment>VIEW</comment> and <comment>EDIT</comment> permissions for the user <comment>kevin</comment> on the instance of
|
||||
<comment>Acme\MyClass</comment> having the identifier <comment>42</comment>:
|
||||
|
||||
<info>php %command.full_name% --user=Symfony/Component/Security/Core/User/User:kevin VIEW EDIT Acme/MyClass:42</info>
|
||||
<info>php %command.full_name% --user=Symfony/Component/Security/Core/User/User:kevin VIEW EDIT Acme/MyClass:42</info>
|
||||
|
||||
Note that you can use <comment>/</comment> instead of <comment>\\ </comment>for the namespace delimiter to avoid any
|
||||
problem.
|
||||
|
||||
To set permissions for a role, use the <info>--role</info> option:
|
||||
|
||||
<info>php %command.full_name% --role=ROLE_USER VIEW Acme/MyClass:1936</info>
|
||||
<info>php %command.full_name% --role=ROLE_USER VIEW Acme/MyClass:1936</info>
|
||||
|
||||
To set permissions at the class scope, use the <info>--class-scope</info> option:
|
||||
|
||||
<info>php %command.full_name% --class-scope --user=Symfony/Component/Security/Core/User/User:anne OWNER Acme/MyClass:42</info>
|
||||
<info>php %command.full_name% --class-scope --user=Symfony/Component/Security/Core/User/User:anne OWNER Acme/MyClass:42</info>
|
||||
|
||||
EOF
|
||||
)
|
||||
->addArgument('arguments', InputArgument::IS_ARRAY | InputArgument::REQUIRED, 'A list of permissions and object identities (class name and ID separated by a column)')
|
||||
|
|
|
|||
|
|
@ -40,15 +40,15 @@ class DebugCommand extends ContainerAwareCommand
|
|||
The <info>%command.name%</info> command outputs a list of twig functions,
|
||||
filters, globals and tests. Output can be filtered with an optional argument.
|
||||
|
||||
<info>php %command.full_name%</info>
|
||||
<info>php %command.full_name%</info>
|
||||
|
||||
The command lists all functions, filters, etc.
|
||||
|
||||
<info>php %command.full_name% date</info>
|
||||
<info>php %command.full_name% date</info>
|
||||
|
||||
The command lists everything that contains the word date.
|
||||
|
||||
<info>php %command.full_name% --format=json</info>
|
||||
<info>php %command.full_name% --format=json</info>
|
||||
|
||||
The command lists everything in a machine readable json format.
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -56,10 +56,10 @@ class LintCommand extends BaseLintCommand implements ContainerAwareInterface
|
|||
->setHelp(
|
||||
$this->getHelp().<<<EOF
|
||||
|
||||
|
||||
Or all template files in a bundle:
|
||||
|
||||
<info>php %command.full_name% @AcmeDemoBundle</info>
|
||||
<info>php %command.full_name% @AcmeDemoBundle</info>
|
||||
|
||||
EOF
|
||||
)
|
||||
;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ class ExportCommand extends Command
|
|||
->setHelp(<<<EOF
|
||||
The <info>%command.name%</info> command exports a profile to the standard output:
|
||||
|
||||
<info>php %command.full_name% profile_token</info>
|
||||
<info>php %command.full_name% profile_token</info>
|
||||
EOF
|
||||
)
|
||||
;
|
||||
|
|
|
|||
|
|
@ -56,11 +56,11 @@ class ImportCommand extends Command
|
|||
->setHelp(<<<EOF
|
||||
The <info>%command.name%</info> command imports a profile:
|
||||
|
||||
<info>php %command.full_name% profile_filepath</info>
|
||||
<info>php %command.full_name% profile_filepath</info>
|
||||
|
||||
You can also pipe the profile via STDIN:
|
||||
|
||||
<info>cat profile_file | php %command.full_name%</info>
|
||||
<info>cat profile_file | php %command.full_name%</info>
|
||||
EOF
|
||||
)
|
||||
;
|
||||
|
|
|
|||
|
|
@ -922,13 +922,13 @@ 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('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question.'),
|
||||
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'),
|
||||
));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ use Symfony\Component\Console\Command\Command;
|
|||
|
||||
/**
|
||||
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class ApplicationDescription
|
||||
{
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ use Symfony\Component\Console\Output\OutputInterface;
|
|||
|
||||
/**
|
||||
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
abstract class Descriptor implements DescriptorInterface
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ use Symfony\Component\Console\Input\InputOption;
|
|||
* JSON descriptor.
|
||||
*
|
||||
* @author Jean-François Simon <contact@jfsimon.fr>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class JsonDescriptor extends Descriptor
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ use Symfony\Component\Console\Input\InputOption;
|
|||
* Markdown descriptor.
|
||||
*
|
||||
* @author Jean-François Simon <contact@jfsimon.fr>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class MarkdownDescriptor extends Descriptor
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ use Symfony\Component\Console\Input\InputOption;
|
|||
* Text descriptor.
|
||||
*
|
||||
* @author Jean-François Simon <contact@jfsimon.fr>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class TextDescriptor extends Descriptor
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ use Symfony\Component\Console\Input\InputOption;
|
|||
* XML descriptor.
|
||||
*
|
||||
* @author Jean-François Simon <contact@jfsimon.fr>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class XmlDescriptor extends Descriptor
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"commands":[{"name":"help","usage":"help [--xml] [--format=\"...\"] [--raw] [command_name]","description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","aliases":[],"definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output help in other formats","default":"txt"},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message.","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message.","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version.","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output.","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output.","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question.","default":false}}}},{"name":"list","usage":"list [--xml] [--raw] [--format=\"...\"] [namespace]","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n <info>php app\/console list --raw<\/info>","aliases":[],"definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats","default":"txt"}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
|
||||
{"commands":[{"name":"help","usage":"help [--xml] [--format=\"...\"] [--raw] [command_name]","description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","aliases":[],"definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output help in other formats","default":"txt"},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question","default":false}}}},{"name":"list","usage":"list [--xml] [--raw] [--format=\"...\"] [namespace]","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n <info>php app\/console list --raw<\/info>","aliases":[],"definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats","default":"txt"}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Display this help message.
|
||||
* Description: Display this help message
|
||||
* Default: `false`
|
||||
|
||||
**quiet:**
|
||||
|
|
@ -80,7 +80,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Do not output any message.
|
||||
* Description: Do not output any message
|
||||
* Default: `false`
|
||||
|
||||
**verbose:**
|
||||
|
|
@ -90,7 +90,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
|
||||
* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
|
||||
* Default: `false`
|
||||
|
||||
**version:**
|
||||
|
|
@ -100,7 +100,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Display this application version.
|
||||
* Description: Display this application version
|
||||
* Default: `false`
|
||||
|
||||
**ansi:**
|
||||
|
|
@ -110,7 +110,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Force ANSI output.
|
||||
* Description: Force ANSI output
|
||||
* Default: `false`
|
||||
|
||||
**no-ansi:**
|
||||
|
|
@ -120,7 +120,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Disable ANSI output.
|
||||
* Description: Disable ANSI output
|
||||
* Default: `false`
|
||||
|
||||
**no-interaction:**
|
||||
|
|
@ -130,7 +130,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Do not ask any interactive question.
|
||||
* Description: Do not ask any interactive question
|
||||
* Default: `false`
|
||||
|
||||
list
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
[options] command [arguments]
|
||||
|
||||
<comment>Options:</comment>
|
||||
<info>--help</info> (-h) Display this help message.
|
||||
<info>--quiet</info> (-q) Do not output any message.
|
||||
<info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
|
||||
<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.
|
||||
<info>--help</info> (-h) Display this help message
|
||||
<info>--quiet</info> (-q) Do not output any message
|
||||
<info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
|
||||
<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
|
||||
|
||||
<comment>Available commands:</comment>
|
||||
<info>help </info> Displays help for a command
|
||||
|
|
|
|||
|
|
@ -36,25 +36,25 @@
|
|||
<description>To output raw command help</description>
|
||||
</option>
|
||||
<option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this help message.</description>
|
||||
<description>Display this help message</description>
|
||||
</option>
|
||||
<option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not output any message.</description>
|
||||
<description>Do not output any message</description>
|
||||
</option>
|
||||
<option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.</description>
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
|
||||
</option>
|
||||
<option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this application 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>
|
||||
<description>Force ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Disable ANSI output.</description>
|
||||
<description>Disable ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not ask any interactive question.</description>
|
||||
<description>Do not ask any interactive question</description>
|
||||
</option>
|
||||
</options>
|
||||
</command>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -77,7 +77,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Display this help message.
|
||||
* Description: Display this help message
|
||||
* Default: `false`
|
||||
|
||||
**quiet:**
|
||||
|
|
@ -87,7 +87,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Do not output any message.
|
||||
* Description: Do not output any message
|
||||
* Default: `false`
|
||||
|
||||
**verbose:**
|
||||
|
|
@ -97,7 +97,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
|
||||
* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
|
||||
* Default: `false`
|
||||
|
||||
**version:**
|
||||
|
|
@ -107,7 +107,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Display this application version.
|
||||
* Description: Display this application version
|
||||
* Default: `false`
|
||||
|
||||
**ansi:**
|
||||
|
|
@ -117,7 +117,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Force ANSI output.
|
||||
* Description: Force ANSI output
|
||||
* Default: `false`
|
||||
|
||||
**no-ansi:**
|
||||
|
|
@ -127,7 +127,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Disable ANSI output.
|
||||
* Description: Disable ANSI output
|
||||
* Default: `false`
|
||||
|
||||
**no-interaction:**
|
||||
|
|
@ -137,7 +137,7 @@ To display the list of available commands, please use the <info>list</info> comm
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Do not ask any interactive question.
|
||||
* Description: Do not ask any interactive question
|
||||
* Default: `false`
|
||||
|
||||
list
|
||||
|
|
@ -223,7 +223,7 @@ command 1 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Display this help message.
|
||||
* Description: Display this help message
|
||||
* Default: `false`
|
||||
|
||||
**quiet:**
|
||||
|
|
@ -233,7 +233,7 @@ command 1 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Do not output any message.
|
||||
* Description: Do not output any message
|
||||
* Default: `false`
|
||||
|
||||
**verbose:**
|
||||
|
|
@ -243,7 +243,7 @@ command 1 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
|
||||
* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
|
||||
* Default: `false`
|
||||
|
||||
**version:**
|
||||
|
|
@ -253,7 +253,7 @@ command 1 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Display this application version.
|
||||
* Description: Display this application version
|
||||
* Default: `false`
|
||||
|
||||
**ansi:**
|
||||
|
|
@ -263,7 +263,7 @@ command 1 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Force ANSI output.
|
||||
* Description: Force ANSI output
|
||||
* Default: `false`
|
||||
|
||||
**no-ansi:**
|
||||
|
|
@ -273,7 +273,7 @@ command 1 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Disable ANSI output.
|
||||
* Description: Disable ANSI output
|
||||
* Default: `false`
|
||||
|
||||
**no-interaction:**
|
||||
|
|
@ -283,7 +283,7 @@ command 1 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Do not ask any interactive question.
|
||||
* Description: Do not ask any interactive question
|
||||
* Default: `false`
|
||||
|
||||
descriptor:command2
|
||||
|
|
@ -324,7 +324,7 @@ command 2 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Display this help message.
|
||||
* Description: Display this help message
|
||||
* Default: `false`
|
||||
|
||||
**quiet:**
|
||||
|
|
@ -334,7 +334,7 @@ command 2 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Do not output any message.
|
||||
* Description: Do not output any message
|
||||
* Default: `false`
|
||||
|
||||
**verbose:**
|
||||
|
|
@ -344,7 +344,7 @@ command 2 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
|
||||
* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
|
||||
* Default: `false`
|
||||
|
||||
**version:**
|
||||
|
|
@ -354,7 +354,7 @@ command 2 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Display this application version.
|
||||
* Description: Display this application version
|
||||
* Default: `false`
|
||||
|
||||
**ansi:**
|
||||
|
|
@ -364,7 +364,7 @@ command 2 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Force ANSI output.
|
||||
* Description: Force ANSI output
|
||||
* Default: `false`
|
||||
|
||||
**no-ansi:**
|
||||
|
|
@ -374,7 +374,7 @@ command 2 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Disable ANSI output.
|
||||
* Description: Disable ANSI output
|
||||
* Default: `false`
|
||||
|
||||
**no-interaction:**
|
||||
|
|
@ -384,5 +384,5 @@ command 2 help
|
|||
* Accept value: no
|
||||
* Is value required: no
|
||||
* Is multiple: no
|
||||
* Description: Do not ask any interactive question.
|
||||
* Description: Do not ask any interactive question
|
||||
* Default: `false`
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
[options] command [arguments]
|
||||
|
||||
<comment>Options:</comment>
|
||||
<info>--help</info> (-h) Display this help message.
|
||||
<info>--quiet</info> (-q) Do not output any message.
|
||||
<info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
|
||||
<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.
|
||||
<info>--help</info> (-h) Display this help message
|
||||
<info>--quiet</info> (-q) Do not output any message
|
||||
<info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
|
||||
<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
|
||||
|
||||
<comment>Available commands:</comment>
|
||||
<info>alias1 </info> command 1 description
|
||||
|
|
|
|||
|
|
@ -36,25 +36,25 @@
|
|||
<description>To output raw command help</description>
|
||||
</option>
|
||||
<option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this help message.</description>
|
||||
<description>Display this help message</description>
|
||||
</option>
|
||||
<option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not output any message.</description>
|
||||
<description>Do not output any message</description>
|
||||
</option>
|
||||
<option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.</description>
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
|
||||
</option>
|
||||
<option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this application 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>
|
||||
<description>Force ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Disable ANSI output.</description>
|
||||
<description>Disable ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not ask any interactive question.</description>
|
||||
<description>Do not ask any interactive question</description>
|
||||
</option>
|
||||
</options>
|
||||
</command>
|
||||
|
|
@ -109,25 +109,25 @@
|
|||
<arguments/>
|
||||
<options>
|
||||
<option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this help message.</description>
|
||||
<description>Display this help message</description>
|
||||
</option>
|
||||
<option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not output any message.</description>
|
||||
<description>Do not output any message</description>
|
||||
</option>
|
||||
<option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.</description>
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
|
||||
</option>
|
||||
<option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this application 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>
|
||||
<description>Force ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Disable ANSI output.</description>
|
||||
<description>Disable ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not ask any interactive question.</description>
|
||||
<description>Do not ask any interactive question</description>
|
||||
</option>
|
||||
</options>
|
||||
</command>
|
||||
|
|
@ -147,25 +147,25 @@
|
|||
<description></description>
|
||||
</option>
|
||||
<option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this help message.</description>
|
||||
<description>Display this help message</description>
|
||||
</option>
|
||||
<option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not output any message.</description>
|
||||
<description>Do not output any message</description>
|
||||
</option>
|
||||
<option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.</description>
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
|
||||
</option>
|
||||
<option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this application 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>
|
||||
<description>Force ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Disable ANSI output.</description>
|
||||
<description>Disable ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not ask any interactive question.</description>
|
||||
<description>Do not ask any interactive question</description>
|
||||
</option>
|
||||
</options>
|
||||
</command>
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
[options] command [arguments]
|
||||
|
||||
<comment>Options:</comment>
|
||||
<info>--help</info> (-h) Display this help message.
|
||||
<info>--quiet</info> (-q) Do not output any message.
|
||||
<info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
|
||||
<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.
|
||||
<info>--help</info> (-h) Display this help message
|
||||
<info>--quiet</info> (-q) Do not output any message
|
||||
<info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
|
||||
<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
|
||||
|
||||
<comment>Available commands:</comment>
|
||||
<info>afoobar </info> The foo:bar command
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
[options] command [arguments]
|
||||
|
||||
<comment>Options:</comment>
|
||||
<info>--help</info> (-h) Display this help message.
|
||||
<info>--quiet</info> (-q) Do not output any message.
|
||||
<info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
|
||||
<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.
|
||||
<info>--help</info> (-h) Display this help message
|
||||
<info>--quiet</info> (-q) Do not output any message
|
||||
<info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
|
||||
<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
|
||||
|
||||
<comment>Available commands for the "foo" namespace:</comment>
|
||||
<info>foo:bar </info> The foo:bar command
|
||||
|
|
|
|||
|
|
@ -36,25 +36,25 @@
|
|||
<description>To output raw command help</description>
|
||||
</option>
|
||||
<option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this help message.</description>
|
||||
<description>Display this help message</description>
|
||||
</option>
|
||||
<option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not output any message.</description>
|
||||
<description>Do not output any message</description>
|
||||
</option>
|
||||
<option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.</description>
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
|
||||
</option>
|
||||
<option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this application 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>
|
||||
<description>Force ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Disable ANSI output.</description>
|
||||
<description>Disable ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not ask any interactive question.</description>
|
||||
<description>Do not ask any interactive question</description>
|
||||
</option>
|
||||
</options>
|
||||
</command>
|
||||
|
|
@ -108,25 +108,25 @@
|
|||
<arguments/>
|
||||
<options>
|
||||
<option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this help message.</description>
|
||||
<description>Display this help message</description>
|
||||
</option>
|
||||
<option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not output any message.</description>
|
||||
<description>Do not output any message</description>
|
||||
</option>
|
||||
<option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.</description>
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
|
||||
</option>
|
||||
<option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this application 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>
|
||||
<description>Force ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Disable ANSI output.</description>
|
||||
<description>Disable ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not ask any interactive question.</description>
|
||||
<description>Do not ask any interactive question</description>
|
||||
</option>
|
||||
</options>
|
||||
</command>
|
||||
|
|
|
|||
|
|
@ -11,25 +11,25 @@
|
|||
<arguments/>
|
||||
<options>
|
||||
<option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this help message.</description>
|
||||
<description>Display this help message</description>
|
||||
</option>
|
||||
<option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not output any message.</description>
|
||||
<description>Do not output any message</description>
|
||||
</option>
|
||||
<option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.</description>
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
|
||||
</option>
|
||||
<option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this application 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>
|
||||
<description>Force ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Disable ANSI output.</description>
|
||||
<description>Disable ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not ask any interactive question.</description>
|
||||
<description>Do not ask any interactive question</description>
|
||||
</option>
|
||||
</options>
|
||||
</command>
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ Usage:
|
|||
[options] command [arguments]
|
||||
|
||||
Options:
|
||||
--help (-h) Display this help message.
|
||||
--quiet (-q) Do not output any message.
|
||||
--verbose (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
|
||||
--version (-V) Display this application version.
|
||||
--ansi Force ANSI output.
|
||||
--no-ansi Disable ANSI output.
|
||||
--no-interaction (-n) Do not ask any interactive question.
|
||||
--help (-h) Display this help message
|
||||
--quiet (-q) Do not output any message
|
||||
--verbose (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
|
||||
--version (-V) Display this application version
|
||||
--ansi Force ANSI output
|
||||
--no-ansi Disable ANSI output
|
||||
--no-interaction (-n) Do not ask any interactive question
|
||||
|
||||
Available commands:
|
||||
help Displays help for a command
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ Options:
|
|||
--xml To output help as XML
|
||||
--format To output help in other formats (default: "txt")
|
||||
--raw To output raw command help
|
||||
--help (-h) Display this help message.
|
||||
--quiet (-q) Do not output any message.
|
||||
--verbose (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
|
||||
--version (-V) Display this application version.
|
||||
--ansi Force ANSI output.
|
||||
--no-ansi Disable ANSI output.
|
||||
--no-interaction (-n) Do not ask any interactive question.
|
||||
--help (-h) Display this help message
|
||||
--quiet (-q) Do not output any message
|
||||
--verbose (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
|
||||
--version (-V) Display this application version
|
||||
--ansi Force ANSI output
|
||||
--no-ansi Disable ANSI output
|
||||
--no-interaction (-n) Do not ask any interactive question
|
||||
|
||||
Help:
|
||||
The help command displays help for a given command:
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
<info>command </info> The command to execute
|
||||
|
||||
<comment>Options:</comment>
|
||||
<info>--help</info> (-h) Display this help message.
|
||||
<info>--quiet</info> (-q) Do not output any message.
|
||||
<info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
|
||||
<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.
|
||||
<info>--help</info> (-h) Display this help message
|
||||
<info>--quiet</info> (-q) Do not output any message
|
||||
<info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
|
||||
<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
|
||||
|
||||
<comment>Help:</comment>
|
||||
help
|
||||
|
|
|
|||
|
|
@ -14,25 +14,25 @@
|
|||
</arguments>
|
||||
<options>
|
||||
<option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this help message.</description>
|
||||
<description>Display this help message</description>
|
||||
</option>
|
||||
<option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not output any message.</description>
|
||||
<description>Do not output any message</description>
|
||||
</option>
|
||||
<option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.</description>
|
||||
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
|
||||
</option>
|
||||
<option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Display this application 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>
|
||||
<description>Force ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Disable ANSI output.</description>
|
||||
<description>Disable ANSI output</description>
|
||||
</option>
|
||||
<option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
|
||||
<description>Do not ask any interactive question.</description>
|
||||
<description>Do not ask any interactive question</description>
|
||||
</option>
|
||||
</options>
|
||||
</command>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ use Symfony\Component\DependencyInjection\Scope;
|
|||
*
|
||||
* @author Fabien Potencier <fabien@symfony.com>
|
||||
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
|
||||
*
|
||||
* @deprecated since version 2.7, to be removed in 3.0.
|
||||
*/
|
||||
class ContainerAwareHttpKernel extends HttpKernel
|
||||
{
|
||||
|
|
@ -55,8 +57,6 @@ class ContainerAwareHttpKernel extends HttpKernel
|
|||
*/
|
||||
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
|
||||
{
|
||||
$request->headers->set('X-Php-Ob-Level', ob_get_level());
|
||||
|
||||
$this->container->enterScope('request');
|
||||
$this->container->set('request', $request, 'request');
|
||||
|
||||
|
|
|
|||
|
|
@ -62,6 +62,8 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
|
|||
*/
|
||||
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
|
||||
{
|
||||
$request->headers->set('X-Php-Ob-Level', ob_get_level());
|
||||
|
||||
try {
|
||||
return $this->handleRaw($request, $type);
|
||||
} catch (\Exception $e) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,11 @@
|
|||
CHANGELOG
|
||||
=========
|
||||
|
||||
2.7.0
|
||||
-----
|
||||
|
||||
* deprecated `DefaultTranslator` in favor of `Symfony\Component\Translation\IdentityTranslator`
|
||||
|
||||
2.6.0
|
||||
-----
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
|
||||
namespace Symfony\Component\Validator;
|
||||
|
||||
trigger_error('The class '.__NAMESPACE__.'\DefaultTranslator is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Translation\IdentityTranslator instead.', E_USER_DEPRECATED);
|
||||
|
||||
use Symfony\Component\Translation\TranslatorInterface;
|
||||
use Symfony\Component\Validator\Exception\BadMethodCallException;
|
||||
use Symfony\Component\Validator\Exception\InvalidArgumentException;
|
||||
|
|
@ -43,6 +45,8 @@ use Symfony\Component\Validator\Exception\InvalidArgumentException;
|
|||
* {@link \Symfony\Component\Translation\Translator} and can be used in places
|
||||
* where translation is not required by default but should be optional.
|
||||
*
|
||||
* @deprecated since version 2.7, to be removed in 3.0. Use Symfony\Component\Translation\IdentityTranslator instead.
|
||||
*
|
||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||
*/
|
||||
class DefaultTranslator implements TranslatorInterface
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
|
||||
namespace Symfony\Component\Validator\Tests\Validator;
|
||||
|
||||
use Symfony\Component\Translation\IdentityTranslator;
|
||||
use Symfony\Component\Validator\ConstraintValidatorFactory;
|
||||
use Symfony\Component\Validator\Context\LegacyExecutionContextFactory;
|
||||
use Symfony\Component\Validator\DefaultTranslator;
|
||||
use Symfony\Component\Validator\MetadataFactoryInterface;
|
||||
use Symfony\Component\Validator\Validator\LegacyValidator;
|
||||
|
||||
|
|
@ -21,7 +21,10 @@ class LegacyValidator2Dot5ApiTest extends Abstract2Dot5ApiTest
|
|||
{
|
||||
protected function createValidator(MetadataFactoryInterface $metadataFactory, array $objectInitializers = array())
|
||||
{
|
||||
$contextFactory = new LegacyExecutionContextFactory($metadataFactory, new DefaultTranslator());
|
||||
$translator = new IdentityTranslator();
|
||||
$translator->setLocale('en');
|
||||
|
||||
$contextFactory = new LegacyExecutionContextFactory($metadataFactory, $translator);
|
||||
$validatorFactory = new ConstraintValidatorFactory();
|
||||
|
||||
return new LegacyValidator($contextFactory, $metadataFactory, $validatorFactory, $objectInitializers);
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
|
||||
namespace Symfony\Component\Validator\Tests\Validator;
|
||||
|
||||
use Symfony\Component\Translation\IdentityTranslator;
|
||||
use Symfony\Component\Validator\ConstraintValidatorFactory;
|
||||
use Symfony\Component\Validator\Context\LegacyExecutionContextFactory;
|
||||
use Symfony\Component\Validator\DefaultTranslator;
|
||||
use Symfony\Component\Validator\MetadataFactoryInterface;
|
||||
use Symfony\Component\Validator\Validator\LegacyValidator;
|
||||
|
||||
|
|
@ -21,7 +21,10 @@ class LegacyValidatorLegacyApiTest extends AbstractLegacyApiTest
|
|||
{
|
||||
protected function createValidator(MetadataFactoryInterface $metadataFactory, array $objectInitializers = array())
|
||||
{
|
||||
$contextFactory = new LegacyExecutionContextFactory($metadataFactory, new DefaultTranslator());
|
||||
$translator = new IdentityTranslator();
|
||||
$translator->setLocale('en');
|
||||
|
||||
$contextFactory = new LegacyExecutionContextFactory($metadataFactory, $translator);
|
||||
$validatorFactory = new ConstraintValidatorFactory();
|
||||
|
||||
return new LegacyValidator($contextFactory, $metadataFactory, $validatorFactory, $objectInitializers);
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
|
||||
namespace Symfony\Component\Validator\Tests\Validator;
|
||||
|
||||
use Symfony\Component\Translation\IdentityTranslator;
|
||||
use Symfony\Component\Validator\ConstraintValidatorFactory;
|
||||
use Symfony\Component\Validator\Context\ExecutionContextFactory;
|
||||
use Symfony\Component\Validator\DefaultTranslator;
|
||||
use Symfony\Component\Validator\MetadataFactoryInterface;
|
||||
use Symfony\Component\Validator\Validator\RecursiveValidator;
|
||||
|
||||
|
|
@ -21,7 +21,10 @@ class RecursiveValidator2Dot5ApiTest extends Abstract2Dot5ApiTest
|
|||
{
|
||||
protected function createValidator(MetadataFactoryInterface $metadataFactory, array $objectInitializers = array())
|
||||
{
|
||||
$contextFactory = new ExecutionContextFactory(new DefaultTranslator());
|
||||
$translator = new IdentityTranslator();
|
||||
$translator->setLocale('en');
|
||||
|
||||
$contextFactory = new ExecutionContextFactory($translator);
|
||||
$validatorFactory = new ConstraintValidatorFactory();
|
||||
|
||||
return new RecursiveValidator($contextFactory, $metadataFactory, $validatorFactory, $objectInitializers);
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
|
||||
namespace Symfony\Component\Validator\Tests;
|
||||
|
||||
use Symfony\Component\Translation\IdentityTranslator;
|
||||
use Symfony\Component\Validator\Constraints\Valid;
|
||||
use Symfony\Component\Validator\ConstraintValidatorFactory;
|
||||
use Symfony\Component\Validator\DefaultTranslator;
|
||||
use Symfony\Component\Validator\MetadataFactoryInterface;
|
||||
use Symfony\Component\Validator\Tests\Fixtures\Entity;
|
||||
use Symfony\Component\Validator\Tests\Validator\AbstractLegacyApiTest;
|
||||
|
|
@ -23,7 +23,10 @@ class ValidatorTest extends AbstractLegacyApiTest
|
|||
{
|
||||
protected function createValidator(MetadataFactoryInterface $metadataFactory, array $objectInitializers = array())
|
||||
{
|
||||
return new LegacyValidator($metadataFactory, new ConstraintValidatorFactory(), new DefaultTranslator(), 'validators', $objectInitializers);
|
||||
$translator = new IdentityTranslator();
|
||||
$translator->setLocale('en');
|
||||
|
||||
return new LegacyValidator($metadataFactory, new ConstraintValidatorFactory(), $translator, 'validators', $objectInitializers);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ use Doctrine\Common\Annotations\CachedReader;
|
|||
use Doctrine\Common\Annotations\Reader;
|
||||
use Doctrine\Common\Cache\ArrayCache;
|
||||
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
|
||||
use Symfony\Component\Translation\IdentityTranslator;
|
||||
use Symfony\Component\Translation\TranslatorInterface;
|
||||
use Symfony\Component\Validator\Context\ExecutionContextFactory;
|
||||
use Symfony\Component\Validator\Context\LegacyExecutionContextFactory;
|
||||
|
|
@ -387,7 +388,16 @@ class ValidatorBuilder implements ValidatorBuilderInterface
|
|||
}
|
||||
|
||||
$validatorFactory = $this->validatorFactory ?: new ConstraintValidatorFactory($this->propertyAccessor);
|
||||
$translator = $this->translator ?: new DefaultTranslator();
|
||||
$translator = $this->translator;
|
||||
|
||||
if (null === $translator) {
|
||||
$translator = new IdentityTranslator();
|
||||
// Force the locale to be 'en' when no translator is provided rather than relying on the Intl default locale
|
||||
// This avoids depending on Intl or the stub implementation being available. It also ensures that Symfony
|
||||
// validation messages are pluralized properly even when the default locale gets changed because they are in
|
||||
// English.
|
||||
$translator->setLocale('en');
|
||||
}
|
||||
|
||||
if (Validation::API_VERSION_2_4 === $apiVersion) {
|
||||
return new ValidatorV24($metadataFactory, $validatorFactory, $translator, $this->translationDomain, $this->initializers);
|
||||
|
|
|
|||
Reference in New Issue