Merge branch '5.1' into 5.2

javiereguiluz · javiereguiluz · commit f15031e167aa · 2020-11-15T10:24:30.000+01:00
* 5.1:
  [Validator] Remove extra space
  [Validator] Remove empty line from annotation
  Enhancement: Add new rule "string_replacement"
  Minor
  Use integer type instead of int &amp; boolean instead of bool
  Replace bool by boolean
  Use integer typehint instead int
  Tweak
  Fix a typo on Messenger handler results example
  Tweak
  Throw Exception if twig variable is not found
  add html extension to snake_case recommendation examples
  Minor: Fix namespace
  Minor: Fix namespace
  Update mailer.rst
  Use int type instead integer
  Remove simple quotes in config/routes/annotations.yaml
diff --git a/.doctor-rst.yaml b/.doctor-rst.yaml
@@ -34,6 +34,7 @@ rules:
     short_array_syntax: ~
     space_between_label_and_link_in_doc: ~
     space_between_label_and_link_in_ref: ~
+    string_replacement: ~
     typo: ~
     unused_links: ~
     use_deprecated_directive_instead_of_versionadded: ~
diff --git a/mailer.rst b/mailer.rst
@@ -623,7 +623,7 @@ arguments to the filter:
 
 .. code-block:: html+twig
 
-    {% apply inline_css(source('@css/email.css')) %}
+    {% apply inline_css(source('@styles/email.css')) %}
         <h1>Welcome {{ username }}!</h1>
         {# ... #}
     {% endapply %}
diff --git a/messenger/handler_results.rst b/messenger/handler_results.rst
@@ -62,7 +62,7 @@ handler is registered. The ``HandleTrait`` can be used in any class that has a
         }
 
         // Creating such a method is optional, but allows type-hinting the result
-        private function query(ListItemsQuery $query): ListItemsResult
+        private function query(ListItemsQuery $query): ListItemsQueryResult
         {
             return $this->handle($query);
         }
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -860,7 +860,7 @@ outgoing network interface.
 buffer
 ......
 
-**type**: ``bool`` | ``Closure``
+**type**: ``boolean`` | ``Closure``
 
 Buffering the response means that you can access its content multiple times
 without performing the request again. Buffering is enabled by default when the
@@ -3045,7 +3045,7 @@ Name of the workflow you want to create.
 audit_trail
 """""""""""
 
-**type**: ``bool``
+**type**: ``boolean``
 
 If set to ``true``, the :class:`Symfony\\Component\\Workflow\\EventListener\\AuditTrailListener`
 will be enabled.
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
@@ -294,7 +294,7 @@ no specific character is passed as argument to the ``number_format`` filter.
 optimizations
 ~~~~~~~~~~~~~
 
-**type**: ``int`` **default**: ``-1``
+**type**: ``integer`` **default**: ``-1``
 
 Twig includes an extension called ``optimizer`` which is enabled by default in
 Symfony applications. This extension analyzes the templates to optimize them
@@ -358,6 +358,8 @@ the directory defined in the :ref:`default_path option <config-twig-default-path
 
 Read more about :ref:`template directories and namespaces <templates-namespaces>`.
 
+.. _config-twig-strict-variables:
+
 strict_variables
 ~~~~~~~~~~~~~~~~
 
diff --git a/reference/constraints/AtLeastOneOf.rst b/reference/constraints/AtLeastOneOf.rst
@@ -163,7 +163,7 @@ has to be satisfied in order for the validation to succeed.
 includeInternalMessages
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-**type**: ``bool`` **default**: ``true``
+**type**: ``boolean`` **default**: ``true``
 
 If set to ``true``, the message that is shown if the validation fails,
 will include the list of messages for the internal constraints. See option
diff --git a/reference/constraints/DivisibleBy.rst b/reference/constraints/DivisibleBy.rst
@@ -39,7 +39,6 @@ The following constraints ensure that:
 
         class Item
         {
-
             /**
              * @Assert\DivisibleBy(0.25)
              */
diff --git a/reference/constraints/Hostname.rst b/reference/constraints/Hostname.rst
@@ -122,7 +122,7 @@ Parameter        Description
 ``requireTld``
 ~~~~~~~~~~~~~~
 
-**type**: ``bool`` **default**: ``true``
+**type**: ``boolean`` **default**: ``true``
 
 By default, hostnames are considered valid only when they are fully qualified
 and include their TLDs (top-level domain names). For instance, ``example.com``
diff --git a/reference/constraints/Isbn.rst b/reference/constraints/Isbn.rst
@@ -37,7 +37,7 @@ on an object that will contain an ISBN.
             /**
              * @Assert\Isbn(
              *     type = "isbn10",
-             *     message = "This value is not  valid."
+             *     message = "This value is not valid."
              * )
              */
             protected $isbn;
@@ -51,7 +51,7 @@ on an object that will contain an ISBN.
                 isbn:
                     - Isbn:
                         type: isbn10
-                        message: This value is not  valid.
+                        message: This value is not valid.
 
     .. code-block:: xml
 
@@ -65,7 +65,7 @@ on an object that will contain an ISBN.
                 <property name="isbn">
                     <constraint name="Isbn">
                         <option name="type">isbn10</option>
-                        <option name="message">This value is not  valid.</option>
+                        <option name="message">This value is not valid.</option>
                     </constraint>
                 </property>
             </class>
diff --git a/reference/constraints/NotBlank.rst b/reference/constraints/NotBlank.rst
@@ -85,7 +85,7 @@ Options
 allowNull
 ~~~~~~~~~
 
-**type**: ``bool`` **default**: ``false``
+**type**: ``boolean`` **default**: ``false``
 
 If set to ``true``, ``null`` values are considered valid and won't trigger a
 constraint violation.
diff --git a/reference/constraints/Traverse.rst b/reference/constraints/Traverse.rst
@@ -146,7 +146,7 @@ The ``groups`` option is not available for this constraint.
 ``traverse``
 ~~~~~~~~~~~~
 
-**type**: ``bool`` **default**: ``true``
+**type**: ``boolean`` **default**: ``true``
 
 Instances of ``\Traversable`` are traversed by default, use this option to
 disable validating:
diff --git a/reference/forms/types/color.rst b/reference/forms/types/color.rst
@@ -49,7 +49,7 @@ Field Options
 html5
 ~~~~~
 
-**type**: ``bool`` **default**: ``false``
+**type**: ``boolean`` **default**: ``false``
 
 .. versionadded:: 5.1
 
diff --git a/reference/forms/types/options/help_html.rst.inc b/reference/forms/types/options/help_html.rst.inc
@@ -1,7 +1,7 @@
 help_html
 ~~~~~~~~~
 
-**type**: ``bool`` **default**: ``false``
+**type**: ``boolean`` **default**: ``false``
 
 By default, the contents of the ``help`` option are escaped before rendering
 them in the template. Set this option to ``true`` to not escape them, which is
diff --git a/reference/forms/types/options/label_html.rst.inc b/reference/forms/types/options/label_html.rst.inc
@@ -1,7 +1,7 @@
 ``label_html``
 ~~~~~~~~~~~~~~
 
-**type**: ``bool`` **default**: ``false``
+**type**: ``boolean`` **default**: ``false``
 
 .. versionadded:: 5.1
 
diff --git a/routing.rst b/routing.rst
@@ -47,7 +47,7 @@ This command also creates the following configuration file:
 
     # config/routes/annotations.yaml
     controllers:
-        resource: '../../src/Controller/'
+        resource: ../../src/Controller/
         type: annotation
 
     kernel:
diff --git a/templates.rst b/templates.rst
@@ -118,8 +118,8 @@ Template Naming
 
 Symfony recommends the following for template names:
 
-* Use `snake case`_ for filenames and directories (e.g. ``blog_posts.twig``,
-  ``admin/default_theme/blog/index.twig``, etc.);
+* Use `snake case`_ for filenames and directories (e.g. ``blog_posts.html.twig``,
+  ``admin/default_theme/blog/index.html.twig``, etc.);
 * Define two extensions for filenames (e.g. ``index.html.twig`` or
   ``blog_posts.xml.twig``) being the first extension (``html``, ``xml``, etc.)
   the final format that the template will generate.
@@ -164,7 +164,9 @@ in the following order:
 #. ``$foo->getBar()`` (object and *getter* method);
 #. ``$foo->isBar()`` (object and *isser* method);
 #. ``$foo->hasBar()`` (object and *hasser* method);
-#. If none of the above exists, use ``null``.
+#. If none of the above exists, use ``null`` (or throw a ``Twig\Error\RuntimeError``
+   exception if the :ref:`strict_variables <config-twig-strict-variables>`
+   option is enabled).
 
 This allows to evolve your application code without having to change the
 template code (you can start with array variables for the application proof of

Original file line number	Diff line number	Diff line change
@@ -62,7 +62,7 @@ handler is registered. The ``HandleTrait`` can be used in any class that has a
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// Creating such a method is optional, but allows type-hinting the result`
`65`		`- private function query(ListItemsQuery $query): ListItemsResult`
	`65`	`+ private function query(ListItemsQuery $query): ListItemsQueryResult`
`66`	`66`	`{`
`67`	`67`	`return $this->handle($query);`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ The following constraints ensure that:`
`39`	`39`
`40`	`40`	`class Item`
`41`	`41`	`{`
`42`		`-`
`43`	`42`	`/**`
`44`	`43`	`* @Assert\DivisibleBy(0.25)`
`45`	`44`	`*/`