Skip to content

Commit 713ad5c

Browse files
committed
Merge branch '3.4' into 4.0
* 3.4: Corrected Bootstrap 4 custom forms example code Added a triling slash Fix "payload" usage Update custom_authentication_provider.rst Add a note about correct cfg value server_version for MariaDB Fixes year in license Update property_info.rst Fixed a minor RST syntax issue Add the true default location fix entry manager variable name fix YAML code block indentation
2 parents ed752a3 + 16faf60 commit 713ad5c

File tree

9 files changed

+24
-21
lines changed

9 files changed

+24
-21
lines changed

components/ldap.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,19 @@ delete existing ones::
118118
'objectClass' => array('inetOrgPerson'),
119119
));
120120

121-
$entityManager = $ldap->getEntryManager();
121+
$entryManager = $ldap->getEntryManager();
122122

123123
// Creating a new entry
124-
$entityManager->add($entry);
124+
$entryManager->add($entry);
125125

126126
// Finding and updating an existing entry
127127
$query = $ldap->query('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))');
128128
$result = $query->execute();
129129
$entry = $result[0];
130130
$entry->setAttribute('email', array('fabpot@symfony.com'));
131-
$entityManager->update($entry);
131+
$entryManager->update($entry);
132132

133133
// Removing an existing entry
134-
$entityManager->remove(new Entry('cn=Test User,dc=symfony,dc=com'));
134+
$entryManager->remove(new Entry('cn=Test User,dc=symfony,dc=com'));
135135

136136
.. _Packagist: https://packagist.org/packages/symfony/ldap

components/property_info.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@ Type::getBuiltInType()
316316
~~~~~~~~~~~~~~~~~~~~~~
317317

318318
The :method:`Type::getBuiltinType() <Symfony\\Component\\PropertyInfo\\Type::getBuiltinType>`
319-
method will return the built-in PHP data type, which can be one of 9 possible
320-
string values: ``array``, ``bool``, ``callable``, ``float``, ``int``, ``null``,
321-
``object``, ``resource`` or ``string``.
319+
method returns the built-in PHP data type, which can be one of these
320+
string values: ``array``, ``bool``, ``callable``, ``float``, ``int``,
321+
``iterable``, ``null``, ``object``, ``resource`` or ``string``.
322322

323323
Constants inside the :class:`Symfony\\Component\\PropertyInfo\\Type`
324324
class, in the form ``Type::BUILTIN_TYPE_*``, are provided for convenience.

contributing/code/core_team.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ Former Core Members
124124
They are no longer part of the Core Team, but we are very grateful for all their
125125
Symfony contributions:
126126

127-
* **Bernhard Schussek** (`webmozart`_);
128-
* **Abdellatif AitBoudad** (`aitboudad`_).
127+
* **Bernhard Schussek** (`webmozart`_);
128+
* **Abdellatif AitBoudad** (`aitboudad`_).
129129

130130
Core Membership Application
131131
~~~~~~~~~~~~~~~~~~~~~~~~~~~

contributing/code/license.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ According to `Wikipedia`_:
1616
The License
1717
-----------
1818

19-
Copyright (c) 2004-2017 Fabien Potencier
19+
Copyright (c) 2004-2018 Fabien Potencier
2020

2121
Permission is hereby granted, free of charge, to any person obtaining a copy
2222
of this software and associated documentation files (the "Software"), to deal

form/bootstrap4.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ and ``checkbox-custom`` respectively.
9797

9898
.. code-block:: html+twig
9999

100-
{{ form_row(form.myRadio, {attr: {class: 'radio-custom'} }) }}
101-
{{ form_row(form.myCheckbox, {attr: {class: 'checkbox-custom'} }) }}
100+
{{ form_row(form.myRadio, {label_attr: {class: 'radio-custom'} }) }}
101+
{{ form_row(form.myCheckbox, {label_attr: {class: 'checkbox-custom'} }) }}
102102

103103
Labels and Errors
104104
-----------------

reference/configuration/doctrine.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,10 @@ The following block shows all possible configuration keys:
372372
to find your PostgreSQL version and ``mysql -V`` to get your MySQL
373373
version).
374374

375-
Always wrap the server version number with quotes to parse it as a string
375+
  If you are running a MariaDB database, you must prefix the ``server_version``
376+
value with ``mariadb-`` (e.g. ``server_version: mariadb-10.2.12``).
377+
378+
  Always wrap the server version number with quotes to parse it as a string
376379
instead of a float number. Otherwise, the floating-point representation
377380
issues can make your version be considered a different number (e.g. ``5.6``
378381
will be rounded as ``5.5999999999999996447286321199499070644378662109375``).

security/custom_authentication_provider.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,17 +131,17 @@ set an authenticated token in the token storage if successful::
131131
{
132132
$request = $event->getRequest();
133133

134-
$wsseRegex = '/UsernameToken Username="([^"]+)", PasswordDigest="([^"]+)", Nonce="([a-zA-Z0-9+\/]+={0,2})", Created="([^"]+)"/';
134+
$wsseRegex = '/UsernameToken Username="(?P<username>[^"]+)", PasswordDigest="(?P<digest>[^"]+)", Nonce="(?P<nonce>[a-zA-Z0-9+\/]+={0,2})", Created="(?P<created>[^"]+)"/';
135135
if (!$request->headers->has('x-wsse') || 1 !== preg_match($wsseRegex, $request->headers->get('x-wsse'), $matches)) {
136136
return;
137137
}
138138

139139
$token = new WsseUserToken();
140-
$token->setUser($matches[1]);
140+
$token->setUser($matches['username']);
141141

142-
$token->digest = $matches[2];
143-
$token->nonce = $matches[3];
144-
$token->created = $matches[4];
142+
$token->digest = $matches['digest'];
143+
$token->nonce = $matches['nonce'];
144+
$token->created = $matches['created'];
145145

146146
try {
147147
$authToken = $this->authenticationManager->authenticate($token);

translation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ Translation Resource/File Names and Locations
377377

378378
Symfony looks for message files (i.e. translations) in the following default locations:
379379

380-
* the ``translations/`` directory;
380+
* the ``translations/`` directory (at the root of the project);
381381

382382
* the ``src/Resources/<bundle name>/translations/`` directory;
383383

validation/severity.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ so that the severity is added as an additional HTML class:
148148
{%- if errors|length > 0 -%}
149149
<ul>
150150
{%- for error in errors -%}
151-
{% if error.cause.constraint.payload.severity is defined %}
152-
{% set severity = error.cause.constraint.payload.severity %}
151+
{% if error.constraint.payload.severity is defined %}
152+
{% set severity = error.constraint.payload.severity %}
153153
{% endif %}
154154
<li{% if severity is defined %} class="{{ severity }}"{% endif %}>{{ error.message }}</li>
155155
{%- endfor -%}

0 commit comments

Comments
 (0)