Skip to content

Commit 104e842

Browse files
committed
Merge remote-tracking branch 'origin/2.2' into 2.2
2 parents 83f7038 + ecbeae8 commit 104e842

File tree

5 files changed

+22
-7
lines changed

5 files changed

+22
-7
lines changed

book/validation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ and then the groups in the group sequence are validated in order.
814814
.. tip::
815815

816816
Group sequences cannot contain the group ``Default``, as this would create
817-
a loop. Instead, use the group ``{ClassName}`` (e.g. ``User``) instead.
817+
a loop. Instead, use the group ``{ClassName}`` (e.g. ``User``).
818818

819819
For example, suppose you have a ``User`` class and want to validate that the
820820
username and the password are different only if all other validation passes

contributing/documentation/overview.rst

+2-4
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,9 @@ Creating a Pull Request
5858
Following the example, the pull request will default to be between your
5959
``improving_foo_and_bar`` branch and the ``symfony-docs`` ``master`` branch.
6060

61-
.. image:: /images/docs-pull-request.png
62-
:align: center
63-
6461
If you have made your changes based on the 2.2 branch then you need to change
65-
the base branch to be 2.2 on the preview page:
62+
the base branch to be 2.2 on the preview page by clicking the ``edit`` button
63+
on the top left:
6664

6765
.. image:: /images/docs-pull-request-change-base.png
6866
:align: center

cookbook/console/console_command.rst

+19-2
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,25 @@ instead of
104104

105105
$command = $application->find('demo:greet');
106106
$commandTester = new CommandTester($command);
107-
$commandTester->execute(array('command' => $command->getName()));
107+
$commandTester->execute(
108+
array(
109+
'command' => $command->getName(),
110+
'name' => 'Fabien',
111+
'--yell' => true,
112+
)
113+
);
108114

109115
$this->assertRegExp('/.../', $commandTester->getDisplay());
110116

111117
// ...
112118
}
113119
}
114120

121+
.. note::
122+
123+
In the specific case above, the ``name`` parameter and the ``--yell`` option are not
124+
mandatory for the command to work well, but they are shown for the example.
125+
115126
To be able to use the fully set up service container for your console tests
116127
you can extend your test from
117128
:class:`Symfony\\Bundle\\FrameworkBundle\\Test\\WebTestCase`::
@@ -133,7 +144,13 @@ you can extend your test from
133144

134145
$command = $application->find('demo:greet');
135146
$commandTester = new CommandTester($command);
136-
$commandTester->execute(array('command' => $command->getName()));
147+
$commandTester->execute(
148+
array(
149+
'command' => $command->getName(),
150+
'name' => 'Fabien',
151+
'--yell' => true,
152+
)
153+
);
137154

138155
$this->assertRegExp('/.../', $commandTester->getDisplay());
139156

2.45 KB
Loading

images/docs-pull-request.png

-27.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)