From 7efb4630b8d7c32834a4dcd4888a64f7f2fbf2c8 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Sat, 27 Nov 2010 10:56:55 -0600 Subject: [PATCH] [Command] Changing the InputOption::PARAMETER_* constants to InputOption::VALUE_* to more accurately reflect that these constants refer to the value or lack of value assigned to a particular option (e.g. --verbose or --em=doctrine). To keep language consistent, three methods were changed in InputOption: * `InputOption::acceptParameter()` -> `InputOption::acceptValue()` * `InputOption::isParameterRequired()` -> InputOption::isValueRequired()` * `InputOption::isParameterOptional()` -> `InputOption::isValueOptional()` The InputDefinition::asXml() method was also modified to update the `accept_value` and `is_value_required` attributes. --- .../ClearMetadataCacheDoctrineCommand.php | 2 +- .../ClearQueryCacheDoctrineCommand.php | 2 +- .../ClearResultCacheDoctrineCommand.php | 2 +- .../Command/ConvertMappingDoctrineCommand.php | 2 +- .../Command/CreateDatabaseDoctrineCommand.php | 2 +- .../Command/CreateSchemaDoctrineCommand.php | 2 +- .../Command/DropDatabaseDoctrineCommand.php | 2 +- .../Command/DropSchemaDoctrineCommand.php | 2 +- ...nsureProductionSettingsDoctrineCommand.php | 2 +- .../GenerateEntitiesDoctrineCommand.php | 4 +- .../Command/GenerateEntityDoctrineCommand.php | 4 +- .../GenerateProxiesDoctrineCommand.php | 2 +- .../Command/ImportMappingDoctrineCommand.php | 2 +- .../LoadDataFixturesDoctrineCommand.php | 6 +- .../Command/RunDqlDoctrineCommand.php | 2 +- .../Command/RunSqlDoctrineCommand.php | 2 +- .../Command/UpdateSchemaDoctrineCommand.php | 2 +- .../Command/MigrationsDiffDoctrineCommand.php | 4 +- .../MigrationsExecuteDoctrineCommand.php | 4 +- .../MigrationsGenerateDoctrineCommand.php | 4 +- .../MigrationsMigrateDoctrineCommand.php | 4 +- .../MigrationsStatusDoctrineCommand.php | 4 +- .../MigrationsVersionDoctrineCommand.php | 4 +- .../CreateSchemaDoctrineODMCommand.php | 2 +- .../Command/DropSchemaDoctrineODMCommand.php | 2 +- .../LoadDataFixturesDoctrineODMCommand.php | 6 +- .../Command/AssetsInstallCommand.php | 2 +- .../FrameworkBundle/Console/Application.php | 2 +- src/Symfony/Component/Console/Application.php | 12 +-- .../Component/Console/Command/Command.php | 4 +- .../Component/Console/Command/HelpCommand.php | 2 +- .../Component/Console/Command/ListCommand.php | 2 +- .../Component/Console/Input/ArgvInput.php | 10 +-- .../Component/Console/Input/ArrayInput.php | 4 +- .../Console/Input/InputDefinition.php | 12 +-- .../Component/Console/Input/InputOption.php | 52 ++++++------- .../Console/Fixtures/application_asxml1.txt | 4 +- .../Console/Fixtures/command_asxml.txt | 12 +-- .../Console/Fixtures/definition_asxml.txt | 4 +- .../Component/Console/Input/ArgvInputTest.php | 58 +++++++------- .../Console/Input/ArrayInputTest.php | 6 +- .../Console/Input/InputDefinitionTest.php | 26 +++---- .../Console/Input/InputOptionTest.php | 78 +++++++++---------- .../Component/Console/Input/InputTest.php | 2 +- 44 files changed, 184 insertions(+), 184 deletions(-) diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/ClearMetadataCacheDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/ClearMetadataCacheDoctrineCommand.php index 88fecdc0dc..62d5bef09d 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/ClearMetadataCacheDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/ClearMetadataCacheDoctrineCommand.php @@ -31,7 +31,7 @@ class ClearMetadataCacheDoctrineCommand extends MetadataCommand $this ->setName('doctrine:cache:clear-metadata') ->setDescription('Clear all metadata cache for a entity manager.') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ->setHelp(<<doctrine:cache:clear-metadata command clears all metadata cache for the default entity manager: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/ClearQueryCacheDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/ClearQueryCacheDoctrineCommand.php index eef95a2c0c..88a767cf43 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/ClearQueryCacheDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/ClearQueryCacheDoctrineCommand.php @@ -31,7 +31,7 @@ class ClearQueryCacheDoctrineCommand extends QueryCommand $this ->setName('doctrine:cache:clear-query') ->setDescription('Clear all query cache for a entity manager.') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ->setHelp(<<doctrine:cache:clear-query command clears all query cache for the default entity manager: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/ClearResultCacheDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/ClearResultCacheDoctrineCommand.php index 91666ff9f5..5c59ac4437 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/ClearResultCacheDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/ClearResultCacheDoctrineCommand.php @@ -31,7 +31,7 @@ class ClearResultCacheDoctrineCommand extends ResultCommand $this ->setName('doctrine:cache:clear-result') ->setDescription('Clear result cache for a entity manager.') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ->setHelp(<<doctrine:cache:clear-result command clears all result cache for the default entity manager: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/ConvertMappingDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/ConvertMappingDoctrineCommand.php index 5038ab818c..a412df5bc4 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/ConvertMappingDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/ConvertMappingDoctrineCommand.php @@ -32,7 +32,7 @@ class ConvertMappingDoctrineCommand extends ConvertMappingCommand parent::configure(); $this ->setName('doctrine:mapping:convert') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ->setHelp(<<doctrine:mapping:convert command converts mapping information between supported formats: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php index 788d3fa0c3..74a9c441c1 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php @@ -34,7 +34,7 @@ class CreateDatabaseDoctrineCommand extends DoctrineCommand $this ->setName('doctrine:database:create') ->setDescription('Create the configured databases.') - ->addOption('connection', null, InputOption::PARAMETER_OPTIONAL, 'The connection to use for this command.') + ->addOption('connection', null, InputOption::VALUE_OPTIONAL, 'The connection to use for this command.') ->setHelp(<<doctrine:database:create command creates the default connections database: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/CreateSchemaDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/CreateSchemaDoctrineCommand.php index ff0ab201e9..e5ee50a0f6 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/CreateSchemaDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/CreateSchemaDoctrineCommand.php @@ -32,7 +32,7 @@ class CreateSchemaDoctrineCommand extends CreateCommand $this ->setName('doctrine:schema:create') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ->setHelp(<<doctrine:schema:create command creates the default entity managers schema: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php index 30f9fe1b21..3be5160d33 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php @@ -34,7 +34,7 @@ class DropDatabaseDoctrineCommand extends DoctrineCommand $this ->setName('doctrine:database:drop') ->setDescription('Drop the configured databases.') - ->addOption('connection', null, InputOption::PARAMETER_OPTIONAL, 'The connection to use for this command.') + ->addOption('connection', null, InputOption::VALUE_OPTIONAL, 'The connection to use for this command.') ->setHelp(<<doctrine:database:drop command drops the default connections database: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/DropSchemaDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/DropSchemaDoctrineCommand.php index f34ecb11a3..27ab314ed5 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/DropSchemaDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/DropSchemaDoctrineCommand.php @@ -32,7 +32,7 @@ class DropSchemaDoctrineCommand extends DropCommand $this ->setName('doctrine:schema:drop') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ->setHelp(<<doctrine:schema:drop command drops the default entity managers schema: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/EnsureProductionSettingsDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/EnsureProductionSettingsDoctrineCommand.php index fabe8504a9..fbd01ad710 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/EnsureProductionSettingsDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/EnsureProductionSettingsDoctrineCommand.php @@ -32,7 +32,7 @@ class EnsureProductionSettingsDoctrineCommand extends EnsureProductionSettingsCo $this ->setName('doctrine:ensure-production-settings') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ->setHelp(<<doctrine:cache:clear-metadata command clears all metadata cache for the default entity manager: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php index f33582427f..2f8be083c9 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php @@ -32,8 +32,8 @@ class GenerateEntitiesDoctrineCommand extends DoctrineCommand $this ->setName('doctrine:generate:entities') ->setDescription('Generate entity classes and method stubs from your mapping information.') - ->addOption('bundle', null, InputOption::PARAMETER_OPTIONAL, 'The bundle to initialize the entity or entities in.') - ->addOption('entity', null, InputOption::PARAMETER_OPTIONAL, 'The entity class to initialize (requires bundle parameter).') + ->addOption('bundle', null, InputOption::VALUE_OPTIONAL, 'The bundle to initialize the entity or entities in.') + ->addOption('entity', null, InputOption::VALUE_OPTIONAL, 'The entity class to initialize (requires bundle parameter).') ->setHelp(<<doctrine:generate:entities command generates entity classes and method stubs from your mapping information: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php index ca592f198e..ab1c341fd2 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php @@ -35,8 +35,8 @@ class GenerateEntityDoctrineCommand extends DoctrineCommand ->setDescription('Generate a new Doctrine entity inside a bundle.') ->addArgument('bundle', null, InputArgument::REQUIRED, 'The bundle to initialize the entity in.') ->addArgument('entity', null, InputArgument::REQUIRED, 'The entity class to initialize.') - ->addOption('mapping-type', null, InputOption::PARAMETER_OPTIONAL, 'The mapping type to to use for the entity.') - ->addOption('fields', null, InputOption::PARAMETER_OPTIONAL, 'The fields to create with the new entity.') + ->addOption('mapping-type', null, InputOption::VALUE_OPTIONAL, 'The mapping type to to use for the entity.') + ->addOption('fields', null, InputOption::VALUE_OPTIONAL, 'The fields to create with the new entity.') ->setHelp(<<doctrine:generate:entity task initializes a new Doctrine entity inside a bundle: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateProxiesDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateProxiesDoctrineCommand.php index 8ec8f9ec2f..43788edac9 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateProxiesDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateProxiesDoctrineCommand.php @@ -32,7 +32,7 @@ class GenerateProxiesDoctrineCommand extends GenerateProxiesCommand $this ->setName('doctrine:generate:proxies') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ->setHelp(<<doctrine:generate:proxies command generates proxy classes for your entities: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php index d82da66722..a54846e3a9 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php @@ -37,7 +37,7 @@ class ImportMappingDoctrineCommand extends DoctrineCommand ->setName('doctrine:mapping:import') ->addArgument('bundle', InputArgument::REQUIRED, 'The bundle to import the mapping information to.') ->addArgument('mapping-type', InputArgument::OPTIONAL, 'The mapping type to export the imported mapping information to.') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ->setDescription('Import mapping information from an existing database.') ->setHelp(<<doctrine:mapping:import command imports mapping information from an existing database: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/LoadDataFixturesDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/LoadDataFixturesDoctrineCommand.php index 207a112801..976fc5ba89 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/LoadDataFixturesDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/LoadDataFixturesDoctrineCommand.php @@ -37,9 +37,9 @@ class LoadDataFixturesDoctrineCommand extends DoctrineCommand $this ->setName('doctrine:data:load') ->setDescription('Load data fixtures to your database.') - ->addOption('fixtures', null, InputOption::PARAMETER_OPTIONAL | InputOption::PARAMETER_IS_ARRAY, 'The directory or file to load data fixtures from.') - ->addOption('append', null, InputOption::PARAMETER_OPTIONAL, 'Whether or not to append the data fixtures.', false) - ->addOption('em', null, InputOption::PARAMETER_REQUIRED, 'The entity manager to use for this command.') + ->addOption('fixtures', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The directory or file to load data fixtures from.') + ->addOption('append', null, InputOption::VALUE_OPTIONAL, 'Whether or not to append the data fixtures.', false) + ->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command.') ->setHelp(<<doctrine:data:load command loads data fixtures from your bundles: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/RunDqlDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/RunDqlDoctrineCommand.php index ce7525cc36..1f80aaf068 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/RunDqlDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/RunDqlDoctrineCommand.php @@ -32,7 +32,7 @@ class RunDqlDoctrineCommand extends RunDqlCommand $this ->setName('doctrine:query:dql') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ->setHelp(<<doctrine:query:dql command executes the given DQL query and outputs the results: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/RunSqlDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/RunSqlDoctrineCommand.php index 1de745862b..c4fd1ea00c 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/RunSqlDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/RunSqlDoctrineCommand.php @@ -32,7 +32,7 @@ class RunSqlDoctrineCommand extends RunSqlCommand $this ->setName('doctrine:query:sql') - ->addOption('connection', null, InputOption::PARAMETER_OPTIONAL, 'The connection to use for this command.') + ->addOption('connection', null, InputOption::VALUE_OPTIONAL, 'The connection to use for this command.') ->setHelp(<<doctrine:query:sql command executes the given DQL query and outputs the results: diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/UpdateSchemaDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/UpdateSchemaDoctrineCommand.php index 64e9725716..3ea7787768 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/UpdateSchemaDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/UpdateSchemaDoctrineCommand.php @@ -32,7 +32,7 @@ class UpdateSchemaDoctrineCommand extends UpdateCommand $this ->setName('doctrine:schema:update') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ->setHelp(<<doctrine:schema:update command updates the default entity managers schema: diff --git a/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsDiffDoctrineCommand.php b/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsDiffDoctrineCommand.php index 16b600cbb1..7ecedd42fc 100644 --- a/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsDiffDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsDiffDoctrineCommand.php @@ -31,8 +31,8 @@ class MigrationsDiffDoctrineCommand extends DiffCommand $this ->setName('doctrine:migrations:diff') - ->addOption('bundle', null, InputOption::PARAMETER_REQUIRED, 'The bundle to load migrations configuration from.') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('bundle', null, InputOption::VALUE_REQUIRED, 'The bundle to load migrations configuration from.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ; } diff --git a/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsExecuteDoctrineCommand.php b/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsExecuteDoctrineCommand.php index c3373aaf87..cf0de8d90e 100644 --- a/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsExecuteDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsExecuteDoctrineCommand.php @@ -30,8 +30,8 @@ class MigrationsExecuteDoctrineCommand extends ExecuteCommand $this ->setName('doctrine:migrations:execute') - ->addOption('bundle', null, InputOption::PARAMETER_REQUIRED, 'The bundle to load migrations configuration from.') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('bundle', null, InputOption::VALUE_REQUIRED, 'The bundle to load migrations configuration from.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ; } diff --git a/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsGenerateDoctrineCommand.php b/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsGenerateDoctrineCommand.php index eda9a36917..cf0fa60cde 100644 --- a/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsGenerateDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsGenerateDoctrineCommand.php @@ -30,8 +30,8 @@ class MigrationsGenerateDoctrineCommand extends GenerateCommand $this ->setName('doctrine:migrations:generate') - ->addOption('bundle', null, InputOption::PARAMETER_REQUIRED, 'The bundle to load migrations configuration from.') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('bundle', null, InputOption::VALUE_REQUIRED, 'The bundle to load migrations configuration from.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ; } diff --git a/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsMigrateDoctrineCommand.php b/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsMigrateDoctrineCommand.php index b05c5b2ae3..b4444f8da8 100644 --- a/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsMigrateDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsMigrateDoctrineCommand.php @@ -30,8 +30,8 @@ class MigrationsMigrateDoctrineCommand extends MigrateCommand $this ->setName('doctrine:migrations:migrate') - ->addOption('bundle', null, InputOption::PARAMETER_REQUIRED, 'The bundle to load migrations configuration from.') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('bundle', null, InputOption::VALUE_REQUIRED, 'The bundle to load migrations configuration from.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ; } diff --git a/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsStatusDoctrineCommand.php b/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsStatusDoctrineCommand.php index 7a1b54511b..60fa7737a6 100644 --- a/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsStatusDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsStatusDoctrineCommand.php @@ -30,8 +30,8 @@ class MigrationsStatusDoctrineCommand extends StatusCommand $this ->setName('doctrine:migrations:status') - ->addOption('bundle', null, InputOption::PARAMETER_REQUIRED, 'The bundle to load migrations configuration from.') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('bundle', null, InputOption::VALUE_REQUIRED, 'The bundle to load migrations configuration from.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ; } diff --git a/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsVersionDoctrineCommand.php b/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsVersionDoctrineCommand.php index c8d94ce0e8..418541f33e 100644 --- a/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsVersionDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsVersionDoctrineCommand.php @@ -30,8 +30,8 @@ class MigrationsVersionDoctrineCommand extends VersionCommand $this ->setName('doctrine:migrations:version') - ->addOption('bundle', null, InputOption::PARAMETER_REQUIRED, 'The bundle to load migrations configuration from.') - ->addOption('em', null, InputOption::PARAMETER_OPTIONAL, 'The entity manager to use for this command.') + ->addOption('bundle', null, InputOption::VALUE_REQUIRED, 'The bundle to load migrations configuration from.') + ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.') ; } diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/CreateSchemaDoctrineODMCommand.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/CreateSchemaDoctrineODMCommand.php index 25e87e2428..eff2445bd3 100644 --- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/CreateSchemaDoctrineODMCommand.php +++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/CreateSchemaDoctrineODMCommand.php @@ -22,7 +22,7 @@ class CreateSchemaDoctrineODMCommand extends CreateCommand $this ->setName('doctrine:mongodb:schema:create') - ->addOption('dm', null, InputOption::PARAMETER_REQUIRED, 'The document manager to use for this command.') + ->addOption('dm', null, InputOption::VALUE_REQUIRED, 'The document manager to use for this command.') ->setHelp(<<doctrine:mongodb:schema:create command creates the default document manager's schema: diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/DropSchemaDoctrineODMCommand.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/DropSchemaDoctrineODMCommand.php index 3c49e0f8af..9effac3811 100644 --- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/DropSchemaDoctrineODMCommand.php +++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/DropSchemaDoctrineODMCommand.php @@ -22,7 +22,7 @@ class DropSchemaDoctrineODMCommand extends DropCommand $this ->setName('doctrine:mongodb:schema:drop') - ->addOption('dm', null, InputOption::PARAMETER_REQUIRED, 'The document manager to use for this command.') + ->addOption('dm', null, InputOption::VALUE_REQUIRED, 'The document manager to use for this command.') ->setHelp(<<doctrine:mongodb:schema:drop command drops the default document manager's schema: diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/LoadDataFixturesDoctrineODMCommand.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/LoadDataFixturesDoctrineODMCommand.php index 1a1aa22261..5cda5bce76 100644 --- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/LoadDataFixturesDoctrineODMCommand.php +++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/LoadDataFixturesDoctrineODMCommand.php @@ -37,9 +37,9 @@ class LoadDataFixturesDoctrineODMCommand extends DoctrineODMCommand $this ->setName('doctrine:mongodb:data:load') ->setDescription('Load data fixtures to your database.') - ->addOption('fixtures', null, InputOption::PARAMETER_OPTIONAL | InputOption::PARAMETER_IS_ARRAY, 'The directory or file to load data fixtures from.') - ->addOption('append', null, InputOption::PARAMETER_OPTIONAL, 'Whether or not to append the data fixtures.', false) - ->addOption('dm', null, InputOption::PARAMETER_REQUIRED, 'The document manager to use for this command.') + ->addOption('fixtures', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The directory or file to load data fixtures from.') + ->addOption('append', null, InputOption::VALUE_OPTIONAL, 'Whether or not to append the data fixtures.', false) + ->addOption('dm', null, InputOption::VALUE_REQUIRED, 'The document manager to use for this command.') ->setHelp(<<doctrine:mongodb:data:load command loads data fixtures from your bundles: diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php index 80349f473f..a5e7236d77 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php @@ -34,7 +34,7 @@ class AssetsInstallCommand extends Command ->setDefinition(array( new InputArgument('target', InputArgument::REQUIRED, 'The target directory'), )) - ->addOption('symlink', null, InputOption::PARAMETER_NONE, 'Symlinks the assets instead of copying it') + ->addOption('symlink', null, InputOption::VALUE_NONE, 'Symlinks the assets instead of copying it') ->setName('assets:install') ; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php index afe6fa18c3..422f526285 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php @@ -35,7 +35,7 @@ class Application extends BaseApplication parent::__construct('Symfony', Kernel::VERSION.' - '.$kernel->getName()); - $this->definition->addOption(new InputOption('--shell', '-s', InputOption::PARAMETER_NONE, 'Launch the shell.')); + $this->definition->addOption(new InputOption('--shell', '-s', InputOption::VALUE_NONE, 'Launch the shell.')); if (!$this->kernel->isBooted()) { $this->kernel->boot(); diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index 6fdb5947ed..7db8f1a860 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -80,12 +80,12 @@ class Application $this->definition = new InputDefinition(array( new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'), - new InputOption('--help', '-h', InputOption::PARAMETER_NONE, 'Display this help message.'), - new InputOption('--quiet', '-q', InputOption::PARAMETER_NONE, 'Do not output any message.'), - new InputOption('--verbose', '-v', InputOption::PARAMETER_NONE, 'Increase verbosity of messages.'), - new InputOption('--version', '-V', InputOption::PARAMETER_NONE, 'Display this program version.'), - new InputOption('--ansi', '-a', InputOption::PARAMETER_NONE, 'Force ANSI output.'), - new InputOption('--no-interaction', '-n', InputOption::PARAMETER_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', InputOption::VALUE_NONE, 'Increase verbosity of messages.'), + new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this program version.'), + new InputOption('--ansi', '-a', InputOption::VALUE_NONE, 'Force ANSI output.'), + new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question.'), )); } diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php index 5f04baa54c..3777d9617c 100644 --- a/src/Symfony/Component/Console/Command/Command.php +++ b/src/Symfony/Component/Console/Command/Command.php @@ -236,9 +236,9 @@ class Command * * @param string $name The option name * @param string $shortcut The shortcut (can be null) - * @param integer $mode The option mode: self::PARAMETER_REQUIRED, self::PARAMETER_NONE or self::PARAMETER_OPTIONAL + * @param integer $mode The option mode: One of the InputOption::VALUE_* constants * @param string $description A description text - * @param mixed $default The default value (must be null for self::PARAMETER_REQUIRED or self::PARAMETER_NONE) + * @param mixed $default The default value (must be null for InputOption::VALUE_REQUIRED or self::VALUE_NONE) * * @return Command The current instance */ diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php index 3c3c6d7b96..5504832d8b 100644 --- a/src/Symfony/Component/Console/Command/HelpCommand.php +++ b/src/Symfony/Component/Console/Command/HelpCommand.php @@ -37,7 +37,7 @@ class HelpCommand extends Command $this ->setDefinition(array( new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'), - new InputOption('xml', null, InputOption::PARAMETER_NONE, 'To output help as XML'), + new InputOption('xml', null, InputOption::VALUE_NONE, 'To output help as XML'), )) ->setName('help') ->setAliases(array('?')) diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php index f180e41243..a1f77e97c1 100644 --- a/src/Symfony/Component/Console/Command/ListCommand.php +++ b/src/Symfony/Component/Console/Command/ListCommand.php @@ -33,7 +33,7 @@ class ListCommand extends Command $this ->setDefinition(array( new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'), - new InputOption('xml', null, InputOption::PARAMETER_NONE, 'To output help as XML'), + new InputOption('xml', null, InputOption::VALUE_NONE, 'To output help as XML'), )) ->setName('list') ->setDescription('Lists commands') diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php index beb6fc436f..a1ca7a26a8 100644 --- a/src/Symfony/Component/Console/Input/ArgvInput.php +++ b/src/Symfony/Component/Console/Input/ArgvInput.php @@ -88,7 +88,7 @@ class ArgvInput extends Input $name = substr($token, 1); if (strlen($name) > 1) { - if ($this->definition->hasShortcut($name[0]) && $this->definition->getOptionForShortcut($name[0])->acceptParameter()) { + if ($this->definition->hasShortcut($name[0]) && $this->definition->getOptionForShortcut($name[0])->acceptValue()) { // an option with a value (with no space) $this->addShortOption($name[0], substr($name, 1)); } else { @@ -115,7 +115,7 @@ class ArgvInput extends Input } $option = $this->definition->getOptionForShortcut($name[$i]); - if ($option->acceptParameter()) { + if ($option->acceptValue()) { $this->addLongOption($option->getName(), $i === $len - 1 ? null : substr($name, $i + 1)); break; @@ -190,7 +190,7 @@ class ArgvInput extends Input $option = $this->definition->getOption($name); - if (null === $value && $option->acceptParameter()) { + if (null === $value && $option->acceptValue()) { // if option accepts an optional or mandatory argument // let's see if there is one provided $next = array_shift($this->parsed); @@ -202,11 +202,11 @@ class ArgvInput extends Input } if (null === $value) { - if ($option->isParameterRequired()) { + if ($option->isValueRequired()) { throw new \RuntimeException(sprintf('The "--%s" option requires a value.', $name)); } - $value = $option->isParameterOptional() ? $option->getDefault() : true; + $value = $option->isValueOptional() ? $option->getDefault() : true; } $this->options[$name] = $value; diff --git a/src/Symfony/Component/Console/Input/ArrayInput.php b/src/Symfony/Component/Console/Input/ArrayInput.php index 786d3ad715..865e482054 100644 --- a/src/Symfony/Component/Console/Input/ArrayInput.php +++ b/src/Symfony/Component/Console/Input/ArrayInput.php @@ -133,11 +133,11 @@ class ArrayInput extends Input $option = $this->definition->getOption($name); if (null === $value) { - if ($option->isParameterRequired()) { + if ($option->isValueRequired()) { throw new \InvalidArgumentException(sprintf('The "--%s" option requires a value.', $name)); } - $value = $option->isParameterOptional() ? $option->getDefault() : true; + $value = $option->isValueOptional() ? $option->getDefault() : true; } $this->options[$name] = $value; diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php index cc737440dd..bc2e8bcc76 100644 --- a/src/Symfony/Component/Console/Input/InputDefinition.php +++ b/src/Symfony/Component/Console/Input/InputDefinition.php @@ -18,7 +18,7 @@ namespace Symfony\Component\Console\Input; * * $definition = new InputDefinition(array( * new InputArgument('name', InputArgument::REQUIRED), - * new InputOption('foo', 'f', InputOption::PARAMETER_REQUIRED), + * new InputOption('foo', 'f', InputOption::VALUE_REQUIRED), * )); * * @author Fabien Potencier @@ -347,7 +347,7 @@ class InputDefinition $elements = array(); foreach ($this->getOptions() as $option) { $shortcut = $option->getShortcut() ? sprintf('-%s|', $option->getShortcut()) : ''; - $elements[] = sprintf('['.($option->isParameterRequired() ? '%s--%s="..."' : ($option->isParameterOptional() ? '%s--%s[="..."]' : '%s--%s')).']', $shortcut, $option->getName()); + $elements[] = sprintf('['.($option->isValueRequired() ? '%s--%s="..."' : ($option->isValueOptional() ? '%s--%s[="..."]' : '%s--%s')).']', $shortcut, $option->getName()); } foreach ($this->getArguments() as $argument) { @@ -399,7 +399,7 @@ class InputDefinition $text[] = 'Options:'; foreach ($this->getOptions() as $option) { - if ($option->acceptParameter() && null !== $option->getDefault() && (!is_array($option->getDefault()) || count($option->getDefault()))) { + if ($option->acceptValue() && null !== $option->getDefault() && (!is_array($option->getDefault()) || count($option->getDefault()))) { $default = sprintf(' (default: %s)', is_array($option->getDefault()) ? str_replace("\n", '', print_r($option->getDefault(), true)): $option->getDefault()); } else { $default = ''; @@ -450,13 +450,13 @@ class InputDefinition $optionsXML->appendChild($optionXML = $dom->createElement('option')); $optionXML->setAttribute('name', '--'.$option->getName()); $optionXML->setAttribute('shortcut', $option->getShortcut() ? '-'.$option->getShortcut() : ''); - $optionXML->setAttribute('accept_parameter', $option->acceptParameter() ? 1 : 0); - $optionXML->setAttribute('is_parameter_required', $option->isParameterRequired() ? 1 : 0); + $optionXML->setAttribute('accept_value', $option->acceptValue() ? 1 : 0); + $optionXML->setAttribute('is_value_required', $option->isValueRequired() ? 1 : 0); $optionXML->setAttribute('is_multiple', $option->isArray() ? 1 : 0); $optionXML->appendChild($descriptionXML = $dom->createElement('description')); $descriptionXML->appendChild($dom->createTextNode($option->getDescription())); - if ($option->acceptParameter()) { + if ($option->acceptValue()) { $optionXML->appendChild($defaultsXML = $dom->createElement('defaults')); $defaults = is_array($option->getDefault()) ? $option->getDefault() : ($option->getDefault() ? array($option->getDefault()) : array()); foreach ($defaults as $default) { diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php index ca76c826fe..3b22bbe1e5 100644 --- a/src/Symfony/Component/Console/Input/InputOption.php +++ b/src/Symfony/Component/Console/Input/InputOption.php @@ -18,10 +18,10 @@ namespace Symfony\Component\Console\Input; */ class InputOption { - const PARAMETER_NONE = 1; - const PARAMETER_REQUIRED = 2; - const PARAMETER_OPTIONAL = 4; - const PARAMETER_IS_ARRAY = 8; + const VALUE_NONE = 1; + const VALUE_REQUIRED = 2; + const VALUE_OPTIONAL = 4; + const VALUE_IS_ARRAY = 8; protected $name; protected $shortcut; @@ -34,9 +34,9 @@ class InputOption * * @param string $name The option name * @param string $shortcut The shortcut (can be null) - * @param integer $mode The option mode: self::PARAMETER_REQUIRED, self::PARAMETER_NONE or self::PARAMETER_OPTIONAL + * @param integer $mode The option mode: One of the VALUE_* constants * @param string $description A description text - * @param mixed $default The default value (must be null for self::PARAMETER_REQUIRED or self::PARAMETER_NONE) + * @param mixed $default The default value (must be null for self::VALUE_REQUIRED or self::VALUE_NONE) * * @throws \InvalidArgumentException If option mode is invalid or incompatible */ @@ -57,7 +57,7 @@ class InputOption } if (null === $mode) { - $mode = self::PARAMETER_NONE; + $mode = self::VALUE_NONE; } else if (!is_int($mode) || $mode > 15) { throw new \InvalidArgumentException(sprintf('Option mode "%s" is not valid.', $mode)); } @@ -67,8 +67,8 @@ class InputOption $this->mode = $mode; $this->description = $description; - if ($this->isArray() && !$this->acceptParameter()) { - throw new \InvalidArgumentException('Impossible to have an option mode PARAMETER_IS_ARRAY if the option does not accept a parameter.'); + if ($this->isArray() && !$this->acceptValue()) { + throw new \InvalidArgumentException('Impossible to have an option mode VALUE_IS_ARRAY if the option does not accept a value.'); } $this->setDefault($default); @@ -95,43 +95,43 @@ class InputOption } /** - * Returns true if the option accept a parameter. + * Returns true if the option accepts a value. * - * @return Boolean true if parameter mode is not self::PARAMETER_NONE, false otherwise + * @return Boolean true if value mode is not self::VALUE_NONE, false otherwise */ - public function acceptParameter() + public function acceptValue() { - return $this->isParameterRequired() || $this->isParameterOptional(); + return $this->isValueRequired() || $this->isValueOptional(); } /** - * Returns true if the option requires a parameter. + * Returns true if the option requires a value. * - * @return Boolean true if parameter mode is self::PARAMETER_REQUIRED, false otherwise + * @return Boolean true if value mode is self::VALUE_REQUIRED, false otherwise */ - public function isParameterRequired() + public function isValueRequired() { - return self::PARAMETER_REQUIRED === (self::PARAMETER_REQUIRED & $this->mode); + return self::VALUE_REQUIRED === (self::VALUE_REQUIRED & $this->mode); } /** - * Returns true if the option takes an optional parameter. + * Returns true if the option takes an optional value. * - * @return Boolean true if parameter mode is self::PARAMETER_OPTIONAL, false otherwise + * @return Boolean true if value mode is self::VALUE_OPTIONAL, false otherwise */ - public function isParameterOptional() + public function isValueOptional() { - return self::PARAMETER_OPTIONAL === (self::PARAMETER_OPTIONAL & $this->mode); + return self::VALUE_OPTIONAL === (self::VALUE_OPTIONAL & $this->mode); } /** * Returns true if the option can take multiple values. * - * @return Boolean true if mode is self::PARAMETER_IS_ARRAY, false otherwise + * @return Boolean true if mode is self::VALUE_IS_ARRAY, false otherwise */ public function isArray() { - return self::PARAMETER_IS_ARRAY === (self::PARAMETER_IS_ARRAY & $this->mode); + return self::VALUE_IS_ARRAY === (self::VALUE_IS_ARRAY & $this->mode); } /** @@ -141,8 +141,8 @@ class InputOption */ public function setDefault($default = null) { - if (self::PARAMETER_NONE === (self::PARAMETER_NONE & $this->mode) && null !== $default) { - throw new \LogicException('Cannot set a default value when using Option::PARAMETER_NONE mode.'); + if (self::VALUE_NONE === (self::VALUE_NONE & $this->mode) && null !== $default) { + throw new \LogicException('Cannot set a default value when using Option::VALUE_NONE mode.'); } if ($this->isArray()) { @@ -153,7 +153,7 @@ class InputOption } } - $this->default = $this->acceptParameter() ? $default : false; + $this->default = $this->acceptValue() ? $default : false; } /** diff --git a/tests/Symfony/Tests/Component/Console/Fixtures/application_asxml1.txt b/tests/Symfony/Tests/Component/Console/Fixtures/application_asxml1.txt index d08576adf0..db3529493e 100644 --- a/tests/Symfony/Tests/Component/Console/Fixtures/application_asxml1.txt +++ b/tests/Symfony/Tests/Component/Console/Fixtures/application_asxml1.txt @@ -23,7 +23,7 @@ - @@ -50,7 +50,7 @@ - diff --git a/tests/Symfony/Tests/Component/Console/Fixtures/command_asxml.txt b/tests/Symfony/Tests/Component/Console/Fixtures/command_asxml.txt index c555c457f9..1f8765634a 100644 --- a/tests/Symfony/Tests/Component/Console/Fixtures/command_asxml.txt +++ b/tests/Symfony/Tests/Component/Console/Fixtures/command_asxml.txt @@ -13,22 +13,22 @@ - - - - - - diff --git a/tests/Symfony/Tests/Component/Console/Fixtures/definition_asxml.txt b/tests/Symfony/Tests/Component/Console/Fixtures/definition_asxml.txt index e315a03482..4f519044b0 100644 --- a/tests/Symfony/Tests/Component/Console/Fixtures/definition_asxml.txt +++ b/tests/Symfony/Tests/Component/Console/Fixtures/definition_asxml.txt @@ -13,11 +13,11 @@ - -