Skip to content

Navigation Menu

Sign in
Appearance settings

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 cc9db34

Browse filesBrowse files
xabbuhxabbuh
committed
Merge branch '2.7' into 2.8
2 parents 25fe737 + e9b50e4 commit cc9db34
Copy full SHA for cc9db34

File tree

Expand file treeCollapse file tree

6 files changed

+20
-13
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+20
-13
lines changed

‎_theme/_templates/layout.html

Copy file name to clipboardExpand all lines: _theme/_templates/layout.html
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<div id="demo-warning">
4747
<h4>Pull request build</h4>
4848
<p>Each pull request of the Symfony Documentation is automatically deployed and hosted on <a href="https://platform.sh">Platform.sh</a>.<br>
49-
Visit the page on <a href="https://symfony.com/doc/current/{{ pagename }}">symfony.com</a>.</p>
49+
View this page on <a href="https://symfony.com/doc/current/{{ pagename }}">symfony.com</a>.</p>
5050
</div>
5151

5252
{%- include "globaltoc.html" %}

‎book/installation.rst

Copy file name to clipboardExpand all lines: book/installation.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ If there are any issues, correct them now before moving on.
239239
$ rm -rf app/cache/*
240240
$ rm -rf app/logs/*
241241
242-
$ HTTPDUSER=`ps aux | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\ -f1`
242+
$ HTTPDUSER=`ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\ -f1`
243243
$ sudo chmod +a "$HTTPDUSER allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
244244
$ sudo chmod +a "`whoami` allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
245245
@@ -254,7 +254,7 @@ If there are any issues, correct them now before moving on.
254254

255255
.. code-block:: bash
256256
257-
$ HTTPDUSER=`ps aux | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\ -f1`
257+
$ HTTPDUSER=`ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\ -f1`
258258
$ sudo setfacl -R -m u:"$HTTPDUSER":rwX -m u:`whoami`:rwX app/cache app/logs
259259
$ sudo setfacl -dR -m u:"$HTTPDUSER":rwX -m u:`whoami`:rwX app/cache app/logs
260260

‎cookbook/doctrine/pdo_session_storage.rst

Copy file name to clipboardExpand all lines: cookbook/doctrine/pdo_session_storage.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ of your project's data, you can use the connection settings from the
170170
.. code-block:: xml
171171
172172
<service id="session.handler.pdo" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" public="false">
173-
<argument>mysql:host=%database_host%;port=%database_port%;dbname=%database_name%</agruement>
173+
<argument>mysql:host=%database_host%;port=%database_port%;dbname=%database_name%</argument>
174174
<argument type="collection">
175175
<argument key="db_username">%database_user%</argument>
176176
<argument key="db_password">%database_password%</argument>

‎cookbook/email/dev_environment.rst

Copy file name to clipboardExpand all lines: cookbook/email/dev_environment.rst
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ by adding the ``delivery_whitelist`` option:
140140
delivery_whitelist:
141141
# all email addresses matching this regex will *not* be
142142
# redirected to dev@example.com
143-
- "/@specialdomain.com$/"
143+
- "/@specialdomain\.com$/"
144144
145145
# all emails sent to admin@mydomain.com won't
146146
# be redirected to dev@example.com too
147-
- "/^admin@mydomain.com$/"
147+
- "/^admin@mydomain\.com$/"
148148
149149
.. code-block:: xml
150150
@@ -156,10 +156,10 @@ by adding the ``delivery_whitelist`` option:
156156
157157
<swiftmailer:config delivery-address="dev@example.com">
158158
<!-- all email addresses matching this regex will *not* be redirected to dev@example.com -->
159-
<swiftmailer:delivery-whitelist-pattern>/@specialdomain.com$/</swiftmailer:delivery-whitelist-pattern>
159+
<swiftmailer:delivery-whitelist-pattern>/@specialdomain\.com$/</swiftmailer:delivery-whitelist-pattern>
160160
161161
<!-- all emails sent to admin@mydomain.com won't be redirected to dev@example.com too -->
162-
<swiftmailer:delivery-whitelist-pattern>/^admin@mydomain.com$/</swiftmailer:delivery-whitelist-pattern>
162+
<swiftmailer:delivery-whitelist-pattern>/^admin@mydomain\.com$/</swiftmailer:delivery-whitelist-pattern>
163163
</swiftmailer:config>
164164
165165
.. code-block:: php
@@ -170,11 +170,11 @@ by adding the ``delivery_whitelist`` option:
170170
'delivery_whitelist' => array(
171171
// all email addresses matching this regex will *not* be
172172
// redirected to dev@example.com
173-
'/@specialdomain.com$/',
173+
'/@specialdomain\.com$/',
174174
175175
// all emails sent to admin@mydomain.com won't be
176176
// redirected to dev@example.com too
177-
'/^admin@mydomain.com$/',
177+
'/^admin@mydomain\.com$/',
178178
),
179179
));
180180

‎cookbook/templating/namespaced_paths.rst

Copy file name to clipboardExpand all lines: cookbook/templating/namespaced_paths.rst
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,13 @@ directory:
7171
);
7272
));
7373
74+
.. caution::
75+
76+
Prior to 2.8, templates in custom namespaces are not pre-compiled by
77+
Symfony's cache warmup process. They are compiled on demand. This may
78+
cause problems if two simultaneous requests are trying to use the
79+
template for the first time.
80+
7481
The registered namespace is called ``foo_bar``, which refers to the
7582
``vendor/acme/foo-bar/templates`` directory. Assuming there's a file
7683
called ``sidebar.twig`` in that directory, you can use it easily:

‎cookbook/validation/severity.rst

Copy file name to clipboardExpand all lines: cookbook/validation/severity.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ Use the ``payload`` option to configure the error level for each constraint:
3838
class User
3939
{
4040
/**
41-
* @Assert\NotBlank(payload = {severity = "error"})
41+
* @Assert\NotBlank(payload = {"severity" = "error"})
4242
*/
4343
protected $username;
4444
4545
/**
46-
* @Assert\NotBlank(payload = {severity = "error"})
46+
* @Assert\NotBlank(payload = {"severity" = "error"})
4747
*/
4848
protected $password;
4949
5050
/**
51-
* @Assert\Iban(payload = {severity = "warning"})
51+
* @Assert\Iban(payload = {"severity" = "warning"})
5252
*/
5353
protected $bankAccountNumber;
5454
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.