Merge branch '4.0'

* 4.0: (33 commits)
  Fix YAML identation
  Update rendering.rst
  Update formatter.rst
  remove part about adding extension
  Add "allowed_classes" argument for unserialize()
  Removed another unneeded closing block name
  Fix little typo
  fix indentation
  fix versionadded directive
  Fix a method reference value
  Fix "class_exists" PHP function URL
  Removed another unneeded closing block name
  add missing ";"
  Fix little typo
  Remove faulty PHP code blocks
  Fix typo in method setETag. Correct method name is setEtag
  Add kernel to list of excluded registered services
  Changes after code review
  Changes after code review
  Changes after code review
  ...

Author: xabbuh

components/cache/psr6_psr16_adapters.rst

@@ -37,7 +37,7 @@ instead. No problem! The Cache component provides the
 this use-case::
 
     use Symfony\Component\Cache\Simple\FilesystemCache;
-    use Symfony\Component\Cache\Adapter\SimpleCacheAdapter
+    use Symfony\Component\Cache\Adapter\SimpleCacheAdapter;
 
     // the PSR-16 cache object that you want to use
     $psr16Cache = new FilesystemCache();

components/intl.rst

@@ -48,17 +48,6 @@ replace the intl classes:
 
 Composer automatically exposes these classes in the global namespace.
 
-If you don't use Composer but the
-:doc:`Symfony ClassLoader component </components/class_loader>`,
-you need to expose them manually by adding the following lines to your autoload
-code::
-
-    if (!function_exists('intl_is_failure')) {
-        require '/path/to/Icu/Resources/stubs/functions.php';
-
-        $loader->registerPrefixFallback('/path/to/Icu/Resources/stubs');
-    }
-
 Writing and Reading Resource Bundles
 ------------------------------------
 

configuration/front_controllers_and_kernel.rst

@@ -83,7 +83,7 @@ you must implement them all:
 :method:`Symfony\\Component\\HttpKernel\\KernelInterface::registerBundles`
     It must return an array of all bundles needed to run the application.
 
-:method:`Symfony\\Bundle\\FrameworkBundle\\Kernel\\MicroKernelTrait:configureRoutes`
+:method:`Symfony\\Bundle\\FrameworkBundle\\Kernel\\MicroKernelTrait::configureRoutes`
     It adds individual routes or collections of routes to the application (for
     example loading the routes defined in some config file).
 

contributing/community/review-comments.rst

@@ -43,16 +43,18 @@ that, but swearing/cursing and name calling doesn't really encourage anyone to
 help you. Take a deep breath, count to 10 and try to *clearly* explain what problems
 you encounter.
 
-Gender-neutral Pronouns
------------------------
+Inclusive Language
+------------------
 
-While not "formally" required, it's better to use gender-neutral pronouns.
-Unless someone "indicated" their pronouns, use "they", "them" instead of
-"he", "she", "his", "hers", "his/hers", "he/she", etc.
+In an effort to be inclusive to a wide group of people, it's recommended to
+use personal pronouns that don't suggest a particular gender. Unless someone
+has stated their pronouns, use "they", "them" instead of "he", "she", "his",
+"hers", "his/hers", "he/she", etc.
 
-Try to avoid using wording that may be considered excluding and needlessly gendered,
-like for example words that have a male base. For example we recommend to use other
-words like "folks", "team", "everyone" in place of "guys".
+Try to avoid using wording that may be considered excluding, needlessly gendered
+(e.g. words that have a male or female base), racially motivated or singles out
+a particular group in society. For example, it's recommended to use words like
+"folks", "team", "everyone" instead of "guys", "ladies", "yanks", etc.
 
 Giving Positive Feedback
 ------------------------

controller.rst

@@ -182,7 +182,7 @@ method renders a template **and** puts that content into a ``Response``
 object for you::
 
     // renders templates/lucky/number.html.twig
-    return $this->render('lucky/number.html.twig', array('name' => $name));
+    return $this->render('lucky/number.html.twig', array('number' => $number));
 
 Templating and Twig are explained more in the
 :doc:`Creating and Using Templates article </templating>`.
@@ -308,7 +308,7 @@ use:
 
     $ php bin/console make:crud Product
 
-.. versionadded::
+.. versionadded:: 1.2
     The ``make:crud`` command was introduced in MakerBundle 1.2.
 
 .. index::

doctrine.rst

@@ -272,7 +272,7 @@ knows that the first migration was already executed earlier. Behind the scenes,
 automatically manages a ``migration_versions`` table to track this.
 
 Each time you make a change to your schema, run these two commands to generate the
-migration and then execute it. Be sure to commit the migration files and run execute
+migration and then execute it. Be sure to commit the migration files and execute
 them when you deploy.
 
 .. _doctrine-generating-getters-and-setters:
@@ -316,7 +316,7 @@ then go to the Code -> Generate menu and select "Getters and Setters"::
 
 .. tip::
 
-    Typically you won't need a ``setId()`` method: Doctrine will set this for you
+    Typically you won't need a ``setId()`` method: Doctrine will set the ID
     automatically.
 
 Persisting Objects to the Database

form/bootstrap4.rst

@@ -16,7 +16,7 @@ template which other templates extend from):
     {% endblock %}
     {% block head_js %}
         <!-- Copy JavaScript from https://getbootstrap.com/docs/4.0/getting-started/introduction/#js -->
-    {% endblock head %}
+    {% endblock %}
 
 If your application uses modern front-end practices, it's better to use
 :doc:`Webpack Encore </frontend>` and follow :doc:`this tutorial </frontend/encore/bootstrap>`
@@ -75,7 +75,7 @@ If you prefer to apply the Bootstrap styles on a form to form basis, include the
     {% block body %}
         <h1>User Sign Up:</h1>
         {{ form(form) }}
-    {% endblock body %}
+    {% endblock %}
 
 Accessibility
 -------------

form/rendering.rst

@@ -21,7 +21,7 @@ of code. Of course, you'll usually need much more flexibility when rendering:
 
     .. code-block:: html+php
 
-        <!-- templates/default/newAction.html.php -->
+        <!-- templates/default/new.html.php -->
         <?php echo $view['form']->start($form) ?>
             <?php echo $view['form']->errors($form) ?>
 

frontend/encore/server-data.rst

@@ -16,13 +16,18 @@ Fetch this in JavaScript:
 
 .. code-block:: javascript
 
-    // jquery isn't required, but makes things simple
-    var $ = require('jquery');
-
-    $(document).ready(function() {
-        var isAuthenticated = $('.js-user-rating').data('is-authenticated');
+    document.addEventListener('DOMContentLoaded', function() {
+        var userRating = document.querySelector('.js-user-rating');
+        var isAuthenticated = userRating.dataset.isAuthenticated;
     });
 
+.. note::
+
+    When `accessing data attributes from JavaScript`_, the attribute names are
+    converted from dash-style to camelCase. For example, ``data-is-authenticated``
+    becomes ``isAuthenticated`` and ``data-number-of-reviews`` becomes
+    ``numberOfReviews``.
+
 There is no size limit for the value of the ``data-`` attributes, so you can
 store any content. In Twig, use the ``html_attr`` escaping strategy to avoid messing
 with HTML attributes. For example, if your ``User`` object has some ``getProfileData()``
@@ -33,3 +38,5 @@ method that returns an array, you could do the following:
     <div data-user-profile="{{ app.user ? app.user.profileData|json_encode|e('html_attr') : '' }}">
         <!-- ... -->
     </div>
+
+.. _`accessing data attributes from JavaScript`: https://developer.mozilla.org/en-US/docs/Learn/HTML/Howto/Use_data_attributes

http_cache/validation.rst

@@ -200,7 +200,7 @@ exposing a simple and efficient pattern::
 
             // create a Response with an ETag and/or a Last-Modified header
             $response = new Response();
-            $response->setETag($article->computeETag());
+            $response->setEtag($article->computeETag());
             $response->setLastModified($article->getPublishedAt());
 
             // Set response as public. Otherwise it will be private by default.