8000 Merge branch '2.6' into 2.7 · symfony/symfony@2b7a150 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2b7a150

Browse files
fabpotfabpot
committed
Merge branch '2.6' into 2.7
* 2.6: [WIP] Made help information of commands more consistent [2.6] Added internal annotation on Descriptor classes Made CLI help consistent Made help information consistent
2 parents b009902 + eabc9b8 commit 2b7a150

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+229
-222
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@ protected function configure()
4040
->setDescription('Installs bundles web assets under a public web directory')
4141
->setHelp(<<<EOT
4242
The <info>%command.name%</info> command installs bundle assets into a given
43-
directory (e.g. the web directory).
43+
directory (e.g. the <comment>web</comment> directory).
4444
45-
<info>php %command.full_name% web</info>
45+
<info>php %command.full_name% web</info>
4646
47-
A "bundles" directory will be created inside the target directory, and the
47+
A "bundles" directory will be created inside the target directory and the
4848
"Resources/public" directory of each bundle will be copied into it.
4949
5050
To create a symlink to each bundle instead of copying its assets, use the
5151
<info>--symlink</info> option (will fall back to hard copies when symbolic links aren't possible:
5252
53-
<info>php %command.full_name% web --symlink</info>
53+
<info>php %command.full_name% web --symlink</info>
5454
5555
To make symlink relative, add the <info>--relative</info> option:
5656
57-
<info>php %command.full_name% web --symlink --relative</info>
57+
<info>php %command.full_name% web --symlink --relative</info>
5858
5959
EOT
6060
)

‎src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ protected function configure()
4141
The <info>%command.name%</info> command clears the application cache for a given environment
4242
and debug mode:
4343
44-
<info>php %command.full_name% --env=dev</info>
45-
<info>php %command.full_name% --env=prod --no-debug</info>
46-
44+
<info>php %command.full_name% --env=dev</info>
45+
<info>php %command.full_name% --env=prod --no-debug</info>
4746
EOF
4847
)
4948
;

‎src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ protected function configure()
3535
'config:debug',
3636
))
3737
->setDefinition(array(
38-
new InputArgument('name', InputArgument::OPTIONAL, 'The Bundle name or the extension alias'),
38+
new InputArgument('name', InputArgument::OPTIONAL, 'The bundle name or the extension alias'),
3939
))
4040
->setDescription('Dumps the current configuration for an extension')
4141
->setHelp(<<<EOF
42-
4342
The <info>%command.name%</info> command dumps the current configuration for an
4443
extension/bundle.
4544

‎src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected function configure()
4848
<info>php %command.full_name% framework</info>
4949
<info>php %command.full_name% FrameworkBundle</info>
5050
51-
With the <info>format</info> option specifies the format of the configuration,
51+
With the <info>--format</info> option specifies the format of the configuration,
5252
this is either <comment>yaml</comment> or <comment>xml</comment>.
5353
When the option is not provided, <comment>yaml</comment> is used.
5454

‎src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,23 @@ protected function configure()
6464
<info>php %command.full_name% validator</info>
6565
6666
By default, private services are hidden. You can display all services by
67-
using the --show-private flag:
67+
using the <info>--show-private</info> flag:
6868
6969
<info>php %command.full_name% --show-private</info>
7070
7171
Use the --tags option to display tagged <comment>public</comment> services grouped by tag:
7272
7373
<info>php %command.full_name% --tags</info>
7474
75-
Find all services with a specific tag by specifying the tag name with the --tag option:
75+
Find all services with a specific tag by specifying the tag name with the <info>--tag</info> option:
7676
7777
<info>php %command.full_name% --tag=form.type</info>
7878
79-
Use the --parameters option to display all parameters:
79+
Use the <info>--parameters</info> option to display all parameters:
8080
8181
<info>php %command.full_name% --parameters</info>
8282
83-
Display a specific parameter by specifying his name with the --parameter option:
83+
Display a specific parameter by specifying his name with the <info>--parameter</info> option:
8484
8585
<info>php %command.full_name% --parameter=kernel.debug</info>
8686

‎src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected function configure()
5353
$this
5454
->setName('router:dump-apache')
5555
->setDefinition(array(
56-
new InputArgument('script_name', InputArgument::OPTIONAL, 'The script name of the application\'s front controller.'),
56+
new InputArgument('script_name', InputArgument::OPTIONAL, 'The script name of the application\'s front controller'),
5757
new InputOption('base-uri', null, InputOption::VALUE_REQUIRED, 'The base URI'),
5858
))
5959
->setDescription('[DEPRECATED] Dumps all routes as Apache rewrite rules')

‎src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ protected function configure()
6464
The <info>%command.name%</info> displays the configured routes:
6565
6666
<info>php %command.full_name%</info>
67-
67+
6868
EOF
6969
)
7070
;

‎src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ protected function configure()
6060
The <info>%command.name%</info> shows which routes match a given request and which don't and for what reason:
6161
6262
<info>php %command.full_name% /foo</info>
63-
or
63+
64+
or
65+
6466
<info>php %command.full_name% /foo --method POST --scheme https --host symfony.com --verbose</info>
6567
6668
EOF

‎src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,23 @@ protected function configure()
4141
->setHelp(<<<EOF
4242
The <info>%command.name%</info> runs PHP's built-in web server:
4343
44-
<info>%command.full_name%</info>
44+
<info>php %command.full_name%</info>
4545
4646
To change the default bind address and the default port use the <info>address</info> argument:
4747
48-
<info>%command.full_name% 127.0.0.1:8080</info>
48+
<info>php %command.full_name% 127.0.0.1:8080</info>
4949
5050
To change the default document root directory use the <info>--docroot</info> option:
5151
52-
<info>%command.full_name% --docroot=htdocs/</info>
52+
<info>php %command.full_name% --docroot=htdocs/</info>
5353
5454
If you have a custom document root directory layout, you can specify your own
5555
router script using the <info>--router</info> option:
5656
57-
<info>%command.full_name% --router=app/config/router.php</info>
57+
<info>php %command.full_name% --router=app/config/router.php</info>
5858
59-
Specifying a router script is required when the used environment is not "dev" or
60-
"prod".
59+
Specifying a router script is required when the used environment is not <comment>"dev"</comment> or
60+
<comment>"prod"</comment>.
6161
6262
See also: http://www.php.net/manual/en/features.commandline.webserver.php
6363

‎src/Symfony/Bundle/FrameworkBundle/Command/ServerStopCommand.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ protected function configure()
3636
->setHelp(<<<EOF
3737
The <info>%command.name%</info> stops PHP's built-in web server:
3838
39-
<info>%command.full_name%</info>
39+
<info>php %command.full_name%</info>
4040
4141
To change the default bind address and the default port use the <info>address</info> argument:
4242
43-
<info>%command.full_name% 127.0.0.1:8080</info>
43+
<info>php %command.full_name% 127.0.0.1:8080</info>
4444
4545
EOF
4646
)

0 commit comments

Comments
 (0)
0