Merge branch '2.7' into 2.8

Conflicts: best_practices/forms.rst
gregfriedrice · Dec 31, 2015 · ddd3478 · ddd3478
2 parents 3a7624f + 86901d8
commit ddd3478
Show file tree

Hide file tree

Showing 15 changed files with 478 additions and 50 deletions.
diff --git a/best_practices/forms.rst b/best_practices/forms.rst
@@ -47,11 +47,17 @@ form in its own PHP class::
         }
     }
 
+.. best-practice::
+
+    Put the form type classes in the ``AppBundle\Form`` namespace, unless you
+    use other custom form classes like data transformers.
+
 To use the class, use ``createForm`` and pass the fully qualified class name::
 
-    use AppBundle\Form\PostType;
     // ...
+    use AppBundle\Form\PostType;
 
+    // ...
     public function newAction(Request $request)
     {
         $post = new Post();

diff --git a/book/validation.rst b/book/validation.rst
@@ -644,7 +644,7 @@ this method must return ``true``:
         AppBundle\Entity\Author:
             getters:
                 passwordLegal:
-                    - 'True': { message: 'The password cannot match your first name' }
+                    - 'IsTrue': { message: 'The password cannot match your first name' }
 
     .. code-block:: xml
 
@@ -656,7 +656,7 @@ this method must return ``true``:
 
             <class name="AppBundle\Entity\Author">
                 <getter property="passwordLegal">
-                    <constraint name="True">
+                    <constraint name="IsTrue">
                         <option name="message">The password cannot match your first name</option>
                     </constraint>
                 </getter>
@@ -954,7 +954,7 @@ username and the password are different only if all other validation passes
                 - Strict
             getters:
                 passwordLegal:
-                    - 'True':
+                    - 'IsTrue':
                         message: 'The password cannot match your username'
                         groups: [Strict]
             properties:
@@ -981,7 +981,7 @@ username and the password are different only if all other validation passes
                 </property>
 
                 <getter property="passwordLegal">
-                    <constraint name="True">
+                    <constraint name="IsTrue">
                         <option name="message">The password cannot match your username</option>
                         <option name="groups">
                             <value>Strict</value>

diff --git a/contributing/code/_api_tagging.rst.inc b/contributing/code/_api_tagging.rst.inc
diff --git a/contributing/code/bc.rst b/contributing/code/bc.rst
@@ -74,8 +74,6 @@ backwards compatibility promise:
 | Add a default value to an argument            | Yes                         |
 +-----------------------------------------------+-----------------------------+
 
-.. include:: _api_tagging.rst.inc
-
 Using our Classes
 ~~~~~~~~~~~~~~~~~
 
@@ -134,8 +132,6 @@ covered by our backwards compatibility promise:
 | Access a private property (via Reflection)    | No                          |
 +-----------------------------------------------+-----------------------------+
 
-.. include:: _api_tagging.rst.inc
-
 Working on Symfony Code
 -----------------------
 

diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst
@@ -50,6 +50,18 @@ example containing most features described below:
             $this->fooBar = $this->transformText($dummy);
         }
 
+        /**
+         * @return string
+         *
+         * @deprecated
+         */
+        public function someDeprecatedMethod()
+        {
+            @trigger_error(sprintf('The %s() method is deprecated since version 2.8 and will be removed in 3.0. Use Acme\Baz::someMethod() instead.', __METHOD__), E_USER_DEPRECATED);
+
+            return Baz::someMethod();
+        }
+
         /**
          * Transforms the input given as first argument.
          *
@@ -151,7 +163,11 @@ Structure
 * Use parentheses when instantiating classes regardless of the number of
   arguments the constructor has;
 
-* Exception message strings should be concatenated using :phpfunction:`sprintf`.
+* Exception and error message strings should be concatenated using :phpfunction:`sprintf`.
+
+* Calls to :phpfunction:`trigger_error` with type ``E_USER_DEPRECATED`` should be
+  switched to opt-in via ``@`` operator.
+  Read more at :ref:`contributing-code-conventions-deprecations`;
 
 Naming Conventions
 ------------------

diff --git a/cookbook/console/index.rst b/cookbook/console/index.rst
@@ -6,6 +6,7 @@ Console
 
     console_command
     usage
+    style
     command_in_controller
     sending_emails
     logging
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ Console @@
         console_command
         usage
+        style
         command_in_controller
         sending_emails
         logging
@@ Expand Down @@