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 811c4be

Browse filesBrowse files
javiereguiluzjaviereguiluz
committed
Merge branch '2.7' into 2.8
* 2.7: Fixed the priority of the sticky locale example Fixed the types of some options in Collection constraint Update finder.rst Handler formatter example was using wrong defined service Update doctrine.rst Add example for Finder::exclude Update form_csrf_caching.rst do never fetch private services from the container
2 parents 8f9f7ff + 0fbd650 commit 811c4be
Copy full SHA for 811c4be

File tree

7 files changed

+16
-10
lines changed
Filter options

7 files changed

+16
-10
lines changed

‎components/finder.rst

Copy file name to clipboardExpand all lines: components/finder.rst
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ Each pattern has to resolve to at least one directory path.
103103
Exclude directories from matching with the
104104
:method:`Symfony\\Component\\Finder\\Finder::exclude` method::
105105

106+
// directories passed as argument must be relative to the ones defined with the in() method
106107
$finder->in(__DIR__)->exclude('ruby');
107108

108109
.. versionadded:: 2.3

‎http_cache/form_csrf_caching.rst

Copy file name to clipboardExpand all lines: http_cache/form_csrf_caching.rst
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ Another option would be to load the form via an uncached AJAX request, but
3636
cache the rest of the HTML response.
3737

3838
Or you can even load just the CSRF token with an AJAX request and replace the
39-
form field value with it.
39+
form field value with it. Take a look at :doc:`hinclude.js </templating/hinclude>`
40+
for a nice solution.
4041

4142
.. _`Cross-site request forgery`: http://en.wikipedia.org/wiki/Cross-site_request_forgery
4243
.. _`Security CSRF Component`: https://github.com/symfony/security-csrf

‎logging/processors.rst

Copy file name to clipboardExpand all lines: logging/processors.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ using a processor.
7171
type: stream
7272
path: '%kernel.logs_dir%/%kernel.environment%.log'
7373
level: debug
74-
formatter: app.logger.session_request_processor
74+
formatter: monolog.formatter.session_request
7575
7676
.. code-block:: xml
7777
@@ -106,7 +106,7 @@ using a processor.
106106
type="stream"
107107
path="%kernel.logs_dir%/%kernel.environment%.log"
108108
level="debug"
109-
formatter="app.logger.session_request_processor"
109+
formatter="monolog.formatter.session_request"
110110
/>
111111
</monolog:config>
112112
</container>
@@ -132,7 +132,7 @@ using a processor.
132132
'type' => 'stream',
133133
'path' => '%kernel.logs_dir%/%kernel.environment%.log',
134134
'level' => 'debug',
135-
'formatter' => 'app.logger.session_request_processor',
135+
'formatter' => 'monolog.formatter.session_request',
136136
),
137137
),
138138
));

‎reference/configuration/doctrine.rst

Copy file name to clipboardExpand all lines: reference/configuration/doctrine.rst
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@ Full Default Configuration
3131
port: ~
3232
user: root
3333
password: ~
34+
# charset of the database
3435
charset: ~
36+
# charset and collation of the tables. Not inherited from database
37+
default_table_options:
38+
charset: ~
39+
collate: ~
3540
path: ~
3641
memory: ~
3742

‎reference/constraints/Collection.rst

Copy file name to clipboardExpand all lines: reference/constraints/Collection.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ error will be returned. If set to ``true``, extra fields are ok.
314314
extraFieldsMessage
315315
~~~~~~~~~~~~~~~~~~
316316

317-
**type**: ``boolean`` **default**: ``This field was not expected.``
317+
**type**: ``string`` **default**: ``This field was not expected.``
318318

319319
The message shown if `allowExtraFields`_ is false and an extra field is
320320
detected.
@@ -332,7 +332,7 @@ option are not present in the underlying collection.
332332
missingFieldsMessage
333333
~~~~~~~~~~~~~~~~~~~~
334334

335-
**type**: ``boolean`` **default**: ``This field is missing.``
335+
**type**: ``string`` **default**: ``This field is missing.``
336336

337337
The message shown if `allowMissingFields`_ is false and one or more fields
338338
are missing from the underlying collection.

‎service_container/alias_private.rst

Copy file name to clipboardExpand all lines: service_container/alias_private.rst
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,11 @@ What makes private services special is that, if they are only injected once,
5757
they are converted from services to inlined instantiations (e.g. ``new PrivateThing()``).
5858
This increases the container's performance.
5959

60-
Now that the service is private, you *should not* fetch the service directly
60+
Now that the service is private, you *must not* fetch the service directly
6161
from the container::
6262

6363
$container->get('foo');
6464

65-
This *may or may not work*, depending on if the service could be inlined.
6665
Simply said: A service can be marked as private if you do not want to access
6766
it directly from your code.
6867

‎session/locale_sticky_session.rst

Copy file name to clipboardExpand all lines: session/locale_sticky_session.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ how you determine the desired locale from the request::
5454
public static function getSubscribedEvents()
5555
{
5656
return array(
57-
// must be registered after the default Locale listener
58-
KernelEvents::REQUEST => array(array('onKernelRequest', 15)),
57+
// must be registered before (i.e. with a higher priority than) the default Locale listener
58+
KernelEvents::REQUEST => array(array('onKernelRequest', 20)),
5959
);
6060
}
6161
}

0 commit comments

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