Merge branch '3.4' into 4.0

* 3.4:
  Create an index page for the new Code of Conduct section
  Revert fix factory-service new syntax
  Fix values class references
  Fix spelling of Composer

Author: javiereguiluz

components/using_components.rst

@@ -31,7 +31,7 @@ whatever component you want.
 
 .. tip::
 
-    `Install composer`_ if you don't have it already present on your system.
+    `Install Composer`_ if you don't have it already present on your system.
     Depending on how you install, you may end up with a ``composer.phar``
     file in your directory. In that case, no worries! Just run
     ``php composer.phar require symfony/finder``.
@@ -65,4 +65,4 @@ documentation to find out more about how to use it.
 And have fun!
 
 .. _Composer: https://getcomposer.org
-.. _Install composer: https://getcomposer.org/download/
+.. _Install Composer: https://getcomposer.org/download/

contributing/code_of_conduct/code_of_conduct.rst

@@ -0,0 +1,92 @@
+Code of Conduct
+===============
+
+Our Pledge
+----------
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnic origin, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance,
+religion, or sexual identity and orientation.
+
+Our Standards
+-------------
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+Our Responsibilities
+--------------------
+
+:doc:`Enforcement team members </contributing/code_of_conduct/enforcement_team>`
+are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Enforcement team members have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+Scope
+-----
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by enforcement team members.
+
+Enforcement
+-----------
+
+Instances of abusive, harassing, or otherwise unacceptable behavior
+:doc:`may be reported </contributing/code_of_conduct/reporting_guidelines>`
+by contacting the :doc:`enforcement team members </contributing/code_of_conduct/enforcement_team>`.
+All complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The enforcement team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Enforcement team members who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by the
+:doc:`core team </contributing/code/core_team>`.
+
+Attribution
+-----------
+
+This Code of Conduct is adapted from the `Contributor Covenant`_, version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+Related Documents
+-----------------
+
+.. toctree::
+    :maxdepth: 1
+
+    reporting_guidelines
+    enforcement_team
+    concrete_example_document
+
+.. _Contributor Covenant: https://www.contributor-covenant.org

contributing/code_of_conduct/index.rst

@@ -1,92 +1,10 @@
 Code of Conduct
 ===============
 
-Our Pledge
-----------
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnic origin, gender identity and expression, level of experience,
-education, socio-economic status, nationality, personal appearance,
-religion, or sexual identity and orientation.
-
-Our Standards
--------------
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-Our Responsibilities
---------------------
-
-:doc:`Enforcement team members </contributing/code_of_conduct/enforcement_team>`
-are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Enforcement team members have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-Scope
------
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by enforcement team members.
-
-Enforcement
------------
-
-Instances of abusive, harassing, or otherwise unacceptable behavior
-:doc:`may be reported </contributing/code_of_conduct/reporting_guidelines>`
-by contacting the :doc:`enforcement team members </contributing/code_of_conduct/enforcement_team>`.
-All complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The enforcement team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Enforcement team members who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by the
-:doc:`core team </contributing/code/core_team>`.
-
-Attribution
------------
-
-This Code of Conduct is adapted from the `Contributor Covenant`_, version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-Related Documents
------------------
-
 .. toctree::
-    :maxdepth: 1
+    :maxdepth: 2
 
+    code_of_conduct
     reporting_guidelines
     enforcement_team
     concrete_example_document
-
-.. _Contributor Covenant: https://www.contributor-covenant.org

contributing/map.rst.inc

@@ -1,3 +1,10 @@
+* **Code of Conduct**
+
+  * :doc:`/contributing/code_of_conduct/code_of_conduct`
+  * :doc:`/contributing/code_of_conduct/reporting_guidelines`
+  * :doc:`/contributing/code_of_conduct/enforcement_team`
+  * :doc:`/contributing/code_of_conduct/concrete_example_document`
+
 * **Code**
 
   * :doc:`Bugs </contributing/code/bugs>`

reference/twig_reference.rst

@@ -735,8 +735,8 @@ needed objects and values. It is an instance of
 The available attributes are:
 
 * ``app.user``, a PHP object representing the current user;
-* ``app.request``, a :class:``Symfony\\Component\\HttpFoundation\\Request`` object;
-* ``app.session``, a :class:``Symfony\\Component\\HttpFoundation\\Session\\Session`` object;
+* ``app.request``, a :class:`Symfony\\Component\\HttpFoundation\\Request` object;
+* ``app.session``, a :class:`Symfony\\Component\\HttpFoundation\\Session\\Session` object;
 * ``app.environment``, a string with the name of the execution environment;
 * ``app.debug``, a boolean telling whether the debug mode is enabled in the app;
 * ``app.token``, a :class:`Symfony\\Component\\Security\\Core\\Authentication\\Token\\TokenInterface`

service_container/factories.rst

@@ -105,7 +105,7 @@ Configuration of the service container then looks like this:
 
             App\Email\NewsletterManager:
                 # call a method on the specified factory service
-                factory: 'App\Email\NewsletterManagerFactory::createNewsletterManager'
+                factory: 'App\Email\NewsletterManagerFactory:createNewsletterManager'
 
     .. code-block:: xml
 
@@ -154,7 +154,7 @@ Configuration of the service container then looks like this:
         # config/services.yaml
         App\Email\NewsletterManager:
             # new syntax
-            factory: 'App\Email\NewsletterManagerFactory::createNewsletterManager'
+            factory: 'App\Email\NewsletterManagerFactory:createNewsletterManager'
             # old syntax
             factory: ['@App\Email\NewsletterManagerFactory', createNewsletterManager]