Skip to content

Commit fcd2b30

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: Revert fix factory-service new syntax Fix values class references Fix spelling of Composer
2 parents 177b027 + 776fa1a commit fcd2b30

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
@@ -762,8 +762,8 @@ needed objects and values. It is an instance of
762762
The available attributes are:
763763

764764
* ``app.user``, a PHP object representing the current user;
765-
* ``app.request``, a :class:``Symfony\\Component\\HttpFoundation\\Request`` object;
766-
* ``app.session``, a :class:``Symfony\\Component\\HttpFoundation\\Session\\Session`` object;
765+
* ``app.request``, a :class:`Symfony\\Component\\HttpFoundation\\Request` object;
766+
* ``app.session``, a :class:`Symfony\\Component\\HttpFoundation\\Session\\Session` object;
767767
* ``app.environment``, a string with the name of the execution environment;
768768
* ``app.debug``, a boolean telling whether the debug mode is enabled in the app;
769769
* ``app.security`` (deprecated as of 2.6).

service_container/factories.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Configuration of the service container then looks like this:
101101
app.newsletter_manager:
102102
class: AppBundle\Email\NewsletterManager
103103
# call a method on the specified factory service
104-
factory: 'app.newsletter_manager_factory::createNewsletterManager'
104+
factory: 'app.newsletter_manager_factory:createNewsletterManager'
105105
106106
.. code-block:: xml
107107
@@ -155,7 +155,7 @@ Configuration of the service container then looks like this:
155155
156156
app.newsletter_manager:
157157
# new syntax
158-
factory: 'app.newsletter_manager_factory::createNewsletterManager'
158+
factory: 'app.newsletter_manager_factory:createNewsletterManager'
159159
# old syntax
160160
factory: ['@app.newsletter_manager_factory', createNewsletterManager]
161161

0 commit comments

Comments
 (0)