Merge branch '2.7' into 2.8

weaverryan · weaverryan · commit 510c6d8ed1b3 · 2017-11-12T15:48:00.000-05:00
* 2.7: Added Best Practice guideline for partials/include Backporting #8600 Move `schema_filter` option to the correct place Fix typo in "advanced ACL concepts"
diff --git a/best_practices/templates.rst b/best_practices/templates.rst
@@ -53,6 +53,15 @@ scattered through lots of bundles.
 
     Use lowercased snake_case for directory and template names.
 
+.. best-practice::
+
+    Use a prefixed underscore for partial templates in template names.
+
+You often want to reuse template code using the ``include`` function to avoid
+redundant code. To determine those partials easily in the filesystem you should
+prefix partials and any other template without HTML body or ``extends`` tag
+with a single underscore.
+
 Twig Extensions
 ---------------
 
diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst
@@ -190,9 +190,10 @@ Naming Conventions
 
 * Use namespaces for all classes;
 
-* Prefix abstract classes with ``Abstract``. Please note some early Symfony classes
-  do not follow this convention and have not been renamed for backward compatibility
-  reasons. However all new abstract classes must follow this naming convention;
+* Prefix all abstract classes with ``Abstract`` except PHPUnit ``*TestCase``.
+  Please note some early Symfony classes do not follow this convention and
+  have not been renamed for backward compatibility reasons. However all new
+  abstract classes must follow this naming convention;
 
 * Suffix interfaces with ``Interface``;
 
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
@@ -22,9 +22,7 @@ Full Default Configuration
                     some_custom_type:
                         class:                Acme\HelloBundle\MyCustomType
                         commented:            true
-                # If defined, all the tables whose names match this regular expression are ignored
-                # by the schema tool (in this example, any table name starting with `wp_`)
-                #schema_filter:               '/^(?!wp_)/'
+                
 
                 connections:
                     # A collection of different named connections (e.g. default, conn2, etc)
@@ -77,6 +75,11 @@ Full Default Configuration
                         mapping_types:
                             # an array of mapping types
                             name:                 []
+                            
+                        # If defined, only the tables whose names match this regular expression are managed
+                        # by the schema tool (in this example, any table name not starting with `wp_`)
+                        #schema_filter:               '/^(?!wp_)/'
+                        
                         slaves:
 
                             # a collection of named slave connections (e.g. slave1, slave2)
diff --git a/security/acl_advanced.rst b/security/acl_advanced.rst
@@ -174,7 +174,7 @@ After invocation providers also allow to modify, or filter the domain object
 before it is returned.
 
 Due to current limitations of the PHP language, there are no
-post-authorization capabilities build into the core Security component.
+post-authorization capabilities built into the core Security component.
 However, there is an experimental JMSSecurityExtraBundle_ which adds these
 capabilities. See its documentation for further information on how this is
 accomplished.
