Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commita364651

Browse files
committed
Merge remote-tracking branch 'origin/2.7' into 2.7
* origin/2.7: Move `schema_filter` option to the correct place Fix typo in "advanced ACL concepts" Update serializer.rst Fixed a RST link in the main bundles article
2 parents941c31e +2229c1c commita364651

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

‎bundles.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,4 +181,4 @@ Learn more
181181

182182
bundles/*
183183

184-
_`third-party bundles`: https://github.com/search?q=topic%3Asymfony-bundle&type=Repositories
184+
.._`third-party bundles`:https://github.com/search?q=topic%3Asymfony-bundle&type=Repositories

‎components/serializer.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ the middle. This way, Encoders will only deal with turning specific
2121
**formats** into **arrays** and vice versa. The same way, Normalizers
2222
will deal with turning specific **objects** into **arrays** and vice versa.
2323

24-
Serialization is a complicated topic, and while this component may not work
25-
in all cases, it can be a useful tool while developing tools to serialize
26-
and deserialize your objects.
24+
Serialization is a complex topic. This component may not cover all your use cases out of the box,
25+
but it can be useful for developing tools to serialize and deserialize your objects.
2726

2827
Installation
2928
------------

‎reference/configuration/doctrine.rst‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ Full Default Configuration
2222
some_custom_type:
2323
class:Acme\HelloBundle\MyCustomType
2424
commented:true
25-
# If defined, all the tables whose names match this regular expression are ignored
26-
# by the schema tool (in this example, any table name starting with `wp_`)
27-
#schema_filter: '/^(?!wp_)/'
25+
2826
2927
connections:
3028
# A collection of different named connections (e.g. default, conn2, etc)
@@ -77,6 +75,11 @@ Full Default Configuration
7775
mapping_types:
7876
# an array of mapping types
7977
name:[]
78+
79+
# If defined, only the tables whose names match this regular expression are managed
80+
# by the schema tool (in this example, any table name not starting with `wp_`)
81+
#schema_filter: '/^(?!wp_)/'
82+
8083
slaves:
8184
8285
# a collection of named slave connections (e.g. slave1, slave2)

‎security/acl_advanced.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ After invocation providers also allow to modify, or filter the domain object
174174
before it is returned.
175175

176176
Due to current limitations of the PHP language, there are no
177-
post-authorization capabilitiesbuild into the core Security component.
177+
post-authorization capabilitiesbuilt into the core Security component.
178178
However, there is an experimentalJMSSecurityExtraBundle_ which adds these
179179
capabilities. See its documentation for further information on how this is
180180
accomplished.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp