Skip to content

Commit 3e87958

Browse files
committed
Merge branch '2.8' into 3.4
* 2.8: Revert fix factory-service new syntax Fix values class references Fix spelling of Composer
2 parents 0ecf5a2 + fcd2b30 commit 3e87958

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

components/using_components.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ whatever component you want.
3131

3232
.. tip::
3333

34-
`Install composer`_ if you don't have it already present on your system.
34+
`Install Composer`_ if you don't have it already present on your system.
3535
Depending on how you install, you may end up with a ``composer.phar``
3636
file in your directory. In that case, no worries! Just run
3737
``php composer.phar require symfony/finder``.
@@ -78,4 +78,4 @@ documentation to find out more about how to use it.
7878
And have fun!
7979

8080
.. _Composer: https://getcomposer.org
81-
.. _Install composer: https://getcomposer.org/download/
81+
.. _Install Composer: https://getcomposer.org/download/

reference/twig_reference.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,8 +740,8 @@ needed objects and values. It is an instance of
740740
The available attributes are:
741741

742742
* ``app.user``, a PHP object representing the current user;
743-
* ``app.request``, a :class:``Symfony\\Component\\HttpFoundation\\Request`` object;
744-
* ``app.session``, a :class:``Symfony\\Component\\HttpFoundation\\Session\\Session`` object;
743+
* ``app.request``, a :class:`Symfony\\Component\\HttpFoundation\\Request` object;
744+
* ``app.session``, a :class:`Symfony\\Component\\HttpFoundation\\Session\\Session` object;
745745
* ``app.environment``, a string with the name of the execution environment;
746746
* ``app.debug``, a boolean telling whether the debug mode is enabled in the app;
747747
* ``app.token``, a :class:`Symfony\\Component\\Security\\Core\\Authentication\\Token\\TokenInterface`

service_container/factories.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Configuration of the service container then looks like this:
108108
109109
AppBundle\Email\NewsletterManager:
110110
# call a method on the specified factory service
111-
factory: 'AppBundle\Email\NewsletterManagerFactory::createNewsletterManager'
111+
factory: 'AppBundle\Email\NewsletterManagerFactory:createNewsletterManager'
112112
113113
.. code-block:: xml
114114
@@ -160,7 +160,7 @@ Configuration of the service container then looks like this:
160160
161161
AppBundle\Email\NewsletterManager:
162162
# new syntax
163-
factory: 'AppBundle\Email\NewsletterManagerFactory::createNewsletterManager'
163+
factory: 'AppBundle\Email\NewsletterManagerFactory:createNewsletterManager'
164164
# old syntax
165165
factory: ['@AppBundle\Email\NewsletterManagerFactory', createNewsletterManager]
166166

0 commit comments

Comments
 (0)