E576 Merge branch '2.7' into 2.8 · symfony/symfony-docs@cf17c2c · GitHub
[go: up one dir, main page]
Skip to content

Commit cf17c2c

Browse files
weaverryanweaverryan
committed
Merge branch '2.7' into 2.8
* 2.7: Fix form/validation directory path Fixed an array notation in comment (serializer.rst) [Form] fixed ChoiceType example in CollectionType Fixed a path Added a caution note about REMOTE_USER and user impersonation
2 parents 9b0ec35 + 07e8f68 commit cf17c2c

File tree

5 files changed

+26
-8
lines changed

5 files changed

+26
-8
lines changed

‎components/form/introduction.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,8 @@ Your integration with the Validation component will look something like this::
318318
use Symfony\Component\Validator\Validation;
319319

320320
$vendorDir = realpath(__DIR__.'/../vendor');
321-
$vendorFormDir = $vendorDir.'/symfony/form/Symfony/Component/Form';
322-
$vendorValidatorDir =
323-
$vendorDir.'/symfony/validator/Symfony/Component/Validator';
321+
$vendorFormDir = $vendorDir.'/symfony/form';
322+
$vendorValidatorDir = $vendorDir.'/symfony/validator';
324323

325324
// create the validator - details will vary
326325
$validator = Validation::createValidator();

‎components/serializer.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ You are now able to serialize only attributes in the groups you want::
300300
$serializer = new Serializer(array($normalizer));
301301

302302
$data = $serializer->normalize($obj, null, array('groups' => array('group1')));
303-
// $data = ['foo' => 'foo'];
303+
// $data = array('foo' => 'foo');
304304

305305
$obj2 = $serializer->denormalize(
306306
array('foo' => 'foo', 'bar' => 'bar'),

‎contributing/code/core_team.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,19 @@ Active Core Members
5151
* **Romain Neutron** (`romainneutron`_) can merge into the
5252
Process_ component;
5353

54+
<<<<<<< HEAD
5455
* **Nicolas Grekas** (`nicolas-grekas`_) can merge into the Debug_
5556
component, the VarDumper_ component and the DebugBundle_;
57+
=======
58+
<<<<<<< HEAD
59+
* **Nicolas Grekas** (`nicolas-grekas`_) can merge into the Debug_
60+
component, the VarDumper_ component and the DebugBundle_;
61+
=======
62+
* **Nicolas Grekas** (`nicolas-grekas`_) can merge into the Cache_, Debug_,
63+
Process_, PropertyAccess_, VarDumper_ components, PhpUnitBridge_ and
64+
the DebugBundle_;
65+
>>>>>>> 2.3
66+
>>>>>>> 2.7
5667

5768
* **Christophe Coevoet** (`stof`_) can merge into the BrowserKit_,
5869
Config_, Console_, DependencyInjection_, DomCrawler_, EventDispatcher_,

‎cookbook/security/pre_authenticated.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,10 @@ key in the ``remote_user`` firewall configuration.
148148
Just like for X509 authentication, you will need to configure a "user provider".
149149
See :ref:`the previous note <cookbook-security-pre-authenticated-user-provider-note>`
150150
for more information.
151+
152+
.. caution::
153+
154+
:doc:`User impersonation </cookbook/security/impersonating_user>` is not
155+
compatible with ``REMOTE_USER`` based authentication. The reason is that
156+
impersonation requires the authentication state to be maintained server-side
157+
but ``REMOTE_USER`` information is sent by the browser in each request.

‎reference/forms/types/collection.rst‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,12 @@ type::
300300
'entry_type' => ChoiceType::class,
301301
'entry_options' => array(
302302
'choices' => array(
303-
'nashville' => 'Nashville',
304-
'paris' => 'Paris',
305-
'berlin' => 'Berlin',
306-
'london' => 'London',
303+
'Nashville' => 'nashville',
304+
'Paris' => 'paris',
305+
'Berlin' => 'berlin',
306+
'London' => 'london', 5253
307307
),
308+
'choices_as_values' => true,
308309
),
309310
));
310311

0 commit comments

Comments
 (0)
0