Merge branch '2.7' into 2.8

* 2.7:
  doc(http_foundation.rst): Fix code error which used create() instead of constructor method.
  Follow the same code style in docblock annotations

Author: weaverryan

best_practices/business-logic.rst

@@ -257,7 +257,7 @@ looking for mapping information:
          *      mappedBy="post",
          *      orphanRemoval=true
          * )
-         * @ORM\OrderBy({"publishedAt" = "ASC"})
+         * @ORM\OrderBy({"publishedAt"="ASC"})
          */
         private $comments;
 

best_practices/controllers.rst

@@ -166,7 +166,7 @@ manually. In our application, we have this situation in ``CommentController``:
 .. code-block:: php
 
     /**
-     * @Route("/comment/{postSlug}/new", name = "comment_new")
+     * @Route("/comment/{postSlug}/new", name="comment_new")
      */
     public function newAction(Request $request, $postSlug)
     {
@@ -192,8 +192,8 @@ flexible:
     use Symfony\Component\HttpFoundation\Request;
 
     /**
-     * @Route("/comment/{postSlug}/new", name = "comment_new")
-     * @ParamConverter("post", options={"mapping": {"postSlug": "slug"}})
+     * @Route("/comment/{postSlug}/new", name="comment_new")
+     * @ParamConverter("post", options={"mapping"={"postSlug"="slug"}})
      */
     public function newAction(Request $request, Post $post)
     {

components/http_foundation.rst

@@ -300,7 +300,7 @@ PHP callable that is able to create an instance of your ``Request`` class::
         array $server = array(),
         $content = null
     ) {
-        return SpecialRequest::create(
+        return new SpecialRequest(
             $query,
             $request,
             $attributes,

reference/constraints/All.rst

@@ -35,7 +35,7 @@ entry in that array:
             /**
              * @Assert\All({
              *     @Assert\NotBlank,
-             *     @Assert\Length(min = 5)
+             *     @Assert\Length(min=5)
              * })
              */
              protected $favoriteColors = array();

reference/constraints/Choice.rst

@@ -52,7 +52,7 @@ If your valid choice list is simple, you can pass them in directly via the
             protected $city;
 
             /**
-             * @Assert\Choice(choices = {"fiction", "non-fiction"}, message = "Choose a valid genre.")
+             * @Assert\Choice(choices={"fiction", "non-fiction"}, message="Choose a valid genre.")
              */
             protected $genre;
         }
@@ -159,7 +159,7 @@ constraint.
         class Author
         {
             /**
-             * @Assert\Choice(callback = "getGenres")
+             * @Assert\Choice(callback="getGenres")
              */
             protected $genre;
         }
@@ -224,7 +224,7 @@ you can pass the class name and the method as an array.
         class Author
         {
             /**
-             * @Assert\Choice(callback = {"Util", "getGenres"})
+             * @Assert\Choice(callback={"Util", "getGenres"})
              */
             protected $genre;
         }

reference/constraints/IsTrue.rst

@@ -55,7 +55,7 @@ Then you can constrain this method with ``IsTrue``.
             protected $token;
 
             /**
-             * @Assert\IsTrue(message = "The token is invalid")
+             * @Assert\IsTrue(message="The token is invalid")
              */
             public function isTokenValid()
             {

reference/constraints/Luhn.rst

@@ -34,7 +34,7 @@ will contain a credit card number.
         class Transaction
         {
             /**
-             * @Assert\Luhn(message = "Please check your credit card number.")
+             * @Assert\Luhn(message="Please check your credit card number.")
              */
             protected $cardNumber;
         }

reference/constraints/Valid.rst

@@ -65,7 +65,7 @@ stores an ``Address`` instance in the ``$address`` property.
 
             /**
              * @Assert\NotBlank
-             * @Assert\Length(max = 5)
+             * @Assert\Length(max=5)
              */
             protected $zipCode;
         }
@@ -79,7 +79,7 @@ stores an ``Address`` instance in the ``$address`` property.
         {
             /**
              * @Assert\NotBlank
-             * @Assert\Length(min = 4)
+             * @Assert\Length(min=4)
              */
             protected $firstName;
 

routing.rst

@@ -179,7 +179,7 @@ To fix this, add a *requirement* that the ``{page}`` wildcard can *only* match n
         class BlogController extends Controller
         {
             /**
-             * @Route("/blog/{page}", name="blog_list", requirements={"page": "\d+"})
+             * @Route("/blog/{page}", name="blog_list", requirements={"page"="\d+"})
              */
             public function listAction($page)
             {
@@ -277,7 +277,7 @@ So how can you make ``blog_list`` once again match when the user visits
         class BlogController extends Controller
         {
             /**
-             * @Route("/blog/{page}", name="blog_list", requirements={"page": "\d+"})
+             * @Route("/blog/{page}", name="blog_list", requirements={"page"="\d+"})
              */
             public function listAction($page = 1)
             {

routing/optional_placeholders.rst

@@ -135,7 +135,7 @@ This is done by including it in the ``defaults`` collection:
         // ...
 
         /**
-         * @Route("/blog/{page}", defaults={"page" = 1})
+         * @Route("/blog/{page}", defaults={"page"=1})
          */
         public function indexAction($page)
         {

routing/requirements.rst

@@ -21,7 +21,7 @@ a routing ``{wildcard}`` to only match some regular expression:
         class BlogController extends Controller
         {
             /**
-             * @Route("/blog/{page}", name="blog_list", requirements={"page": "\d+"})
+             * @Route("/blog/{page}", name="blog_list", requirements={"page"="\d+"})
              */
             public function listAction($page)
             {
@@ -97,8 +97,8 @@ URL:
         class MainController extends Controller
         {
             /**
-             * @Route("/{_locale}", defaults={"_locale": "en"}, requirements={
-             *     "_locale": "en|fr"
+             * @Route("/{_locale}", defaults={"_locale"="en"}, requirements={
+             *     "_locale"="en|fr"
              * })
              */
             public function homepageAction($_locale)

templating/formats.rst

@@ -51,7 +51,7 @@ be configured so that ``/about-us`` sets the request format to ``html`` while
 special ``_format`` placeholder in your route definition::
 
     /**
-     * @Route("/{slug}.{_format}", defaults={"_format": "html"})
+     * @Route("/{slug}.{_format}", defaults={"_format"="html"})
      */
     public function showAction(Request $request, $slug)
     {

validation.rst

@@ -642,7 +642,7 @@ this method must return ``true``:
         class Author
         {
             /**
-             * @Assert\IsTrue(message = "The password cannot match your first name")
+             * @Assert\IsTrue(message="The password cannot match your first name")
              */
             public function isPasswordLegal()
             {

validation/severity.rst

@@ -35,17 +35,17 @@ Use the ``payload`` option to configure the error level for each constraint:
         class User
         {
             /**
-             * @Assert\NotBlank(payload = {"severity" = "error"})
+             * @Assert\NotBlank(payload={"severity"="error"})
              */
             protected $username;
 
             /**
-             * @Assert\NotBlank(payload = {"severity" = "error"})
+             * @Assert\NotBlank(payload={"severity"="error"})
              */
             protected $password;
 
             /**
-             * @Assert\Iban(payload = {"severity" = "warning"})
+             * @Assert\Iban(payload={"severity"="warning"})
              */
             protected $bankAccountNumber;
         }

validation/translations.rst

@@ -33,7 +33,7 @@ property is not empty, add the following:
         class Author
         {
             /**
-             * @Assert\NotBlank(message = "author.name.not_blank")
+             * @Assert\NotBlank(message="author.name.not_blank")
              */
             public $name;
         }