Skip to content

Commit

Permalink
bug #3504 fix include directive so that the contents are really inclu…
Browse files Browse the repository at this point in the history
…ded (xabbuh)

This PR was merged into the 2.4 branch.

Discussion
----------

fix include directive so that the contents are really included

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.4+
| Fixed tickets |

Commits
-------

3090cf2 fix include directive so that the contents are really included
  • Loading branch information
weaverryan committed Feb 3, 2014
2 parents a45fee8 + 3090cf2 commit 272197b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions book/includes/_service_container_my_mailer.rst.inc
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services
http://symfony.com/schema/dic/services/services-1.0.xsd"
>

>
<services>
<service id="my_mailer" class="Acme\HelloBundle\Mailer">
<argument>sendmail</argument>
Expand All @@ -33,4 +32,4 @@
$container->setDefinition('my_mailer', new Definition(
'Acme\HelloBundle\Mailer',
array('sendmail')
));
));
4 changes: 2 additions & 2 deletions book/service_container.rst
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ for you. In order for this to work, you must *teach* the container how to
create the ``Mailer`` service. This is done via configuration, which can
be specified in YAML, XML or PHP:

.. include includes/_service_container_my_mailer.rst.inc
.. include:: includes/_service_container_my_mailer.rst.inc

.. note::

Expand Down Expand Up @@ -643,7 +643,7 @@ which has a ``getMailerMethod()`` method on it, which will return a string
like ``sendmail`` based on some configuration. Remember that the first argument
to the ``my_mailer`` service is the simple string ``sendmail``:

.. include includes/_service_container_my_mailer.rst.inc
.. include:: includes/_service_container_my_mailer.rst.inc

But instead of hardcoding this, how could we get this value from the ``getMailerMethod()``
of the new ``mailer_configuration`` service? One way is to use an expression:
Expand Down

0 comments on commit 272197b

Please sign in to comment.