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

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c09ffff

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '2.7' into 2.8
* 2.7: Fix "payload" usage Update custom_authentication_provider.rst Add a note about correct cfg value server_version for MariaDB Fixes year in license Fixed a minor RST syntax issue fix YAML code block indentation
2 parents c9fd224 + 3b41eeb commit c09ffff

File tree

6 files changed

+21
-15
lines changed

6 files changed

+21
-15
lines changed

‎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

‎reference/configuration/doctrine.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,11 @@ The following block shows all possible configuration keys:
362362
your database server version (use ``postgres -V`` or ``psql -V`` command
363363
to find your PostgreSQL version and ``mysql -V`` to get your MySQL
364364
version).
365-
366-
Always wrap the server version number with quotes to parse it as a string
365+
366+
  If you are running a MariaDB database, you must prefix the ``server_version``
367+
value with ``mariadb-`` (e.g. ``server_version: mariadb-10.2.12``).
368+
369+
  Always wrap the server version number with quotes to parse it as a string
367370
instead of a float number. Otherwise, the floating-point representation
368371
issues can make your version be considered a different number (e.g. ``5.6``
369372
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);

‎service_container/lazy_services.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,15 @@ You can mark the service as ``lazy`` by manipulating its definition:
5050

5151
.. code-block:: yaml
5252
53+
# app/config/services.yml
5354
services:
54-
app.twig_extension:
55-
class: AppBundle\Twig\AppExtension
56-
lazy: true
55+
app.twig_extension:
56+
class: AppBundle\Twig\AppExtension
57+
lazy: true
5758
5859
.. code-block:: xml
5960
61+
<!-- app/config/services.xml -->
6062
<?xml version="1.0" encoding="UTF-8" ?>
6163
<container xmlns="http://symfony.com/schema/dic/services"
6264
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -70,6 +72,7 @@ You can mark the service as ``lazy`` by manipulating its definition:
7072
7173
.. code-block:: php
7274
75+
// app/config/services.php
7376
use AppBundle\Twig\AppExtension;
7477
7578
$container->register('app.twig_extension', AppExtension::class)

‎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)
0