Skip to content

Remove/update lines causing build failures #8009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions controller/argument_value_resolver.rst
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,12 @@ and adding a priority.
<!-- app/config/services.xml -->
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="'http://www.w3.org/2001/XMLSchema-Instance"
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>
<!-- ... be sure autowiring is enabled -->
<defaults autowire="true" ... />
<defaults autowire="true" />
<!-- ... -->

<service id="AppBundle\ArgumentResolver\UserValueResolver">
Expand Down
2 changes: 1 addition & 1 deletion controller/error_pages.rst
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ In that case, you might want to override one or both of the ``showAction()`` and

<services>
<!-- ... be sure autowiring is enabled -->
<defaults autowire="true" ... />
<defaults autowire="true" />
<!-- ... -->

<service id="AppBundle\Controller\CustomExceptionController" public="true">
Expand Down
2 changes: 1 addition & 1 deletion controller/upload_file.rst
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ Now, register this class as a Doctrine listener:
http://symfony.com/schema/dic/services/services-1.0.xsd">

<!-- ... be sure autowiring is enabled -->
<defaults autowire="true" ... />
<defaults autowire="true" />
<!-- ... -->

<service id="AppBundle\EventListener\BrochureUploaderListener">
Expand Down
2 changes: 1 addition & 1 deletion profiler/data_collector.rst
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,10 @@ to specify a tag that contains the template:

<services>
<service id="AppBundle\DataCollector\RequestCollector" public="false">
<!-- priority="300" -->
<tag name="data_collector"
template="data_collector/template.html.twig"
id="app.request_collector"
<!-- priority="300" -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should now be added as a comment before the tag element

Copy link
Contributor Author

@robfrawley robfrawley Jun 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated as requested.

/>
</service>
</services>
Expand Down
1 change: 0 additions & 1 deletion security/api_key_authentication.rst
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,6 @@ configuration or set it to ``false``:
<firewall name="secured_area"
pattern="^/api"
stateless="false"
...
>
</firewall>
</config>
Expand Down
2 changes: 1 addition & 1 deletion service_container/configurators.rst
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ all the classes are already loaded as services. All you need to do is specify th
http://symfony.com/schema/dic/services/services-1.0.xsd">

<services>
<prototype namespace="AppBundle\" resource="../../src/AppBundle/*" ... />
<prototype namespace="AppBundle\" resource="../../src/AppBundle/*" />

<service id="AppBundle\Mail\NewsletterManager">
<configurator service="AppBundle\Mail\EmailConfigurator" method="configure" />
Expand Down
8 changes: 4 additions & 4 deletions service_container/expression_language.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ to another service: ``AppBundle\Mailer``. One way to do this is with an expressi
# app/config/config.yml
services:
# ...

AppBundle\Mail\MailerConfiguration: ~

AppBundle\Mailer:
arguments: ["@=service('AppBundle\Mail\MailerConfiguration').getMailerMethod()"]
arguments: ["@=service('AppBundle\\Mail\\MailerConfiguration').getMailerMethod()"]

.. code-block:: xml

Expand Down Expand Up @@ -56,7 +56,7 @@ to another service: ``AppBundle\Mailer``. One way to do this is with an expressi
use AppBundle\Mail\MailerConfiguration;
use AppBundle\Mailer;
use Symfony\Component\ExpressionLanguage\Expression;

$container->autowire(AppBundle\Mail\MailerConfiguration::class);

$container->autowire(Mailer::class)
Expand Down