Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit d7fce7c

Browse filesBrowse files
xabbuhxabbuh
committed
minor #8009 Remove/update lines causing build failures (robfrawley)
This PR was merged into the 3.3 branch. Discussion ---------- Remove/update lines causing build failures This pull request amends the invalid code blocks within the documentation to fix the build errors (both locally and on `platform.sh`). ~~Additionally, this normalizes the dependency installation and build calls executed by both `travis` and `platform.sh` so they both use the same environment to build the documentation. _This is important as currently, often one will fail while the other will succeed; this should not ever happen and they should both either fail or succeed._~~ See #8004 (comment) and #8004 (comment) for the origin story. ~~*Note: This should likely be applied to the `3.3` branch which is where the errors originate, will update the target branch once this is confirmed.*~~ Commits ------- 18ee5e2 fix invalid code lines and remove extra space
2 parents 3db2579 + 18ee5e2 commit d7fce7c
Copy full SHA for d7fce7c

File tree

7 files changed

+10
-11
lines changed
Filter options

7 files changed

+10
-11
lines changed

‎controller/argument_value_resolver.rst

Copy file name to clipboardExpand all lines: controller/argument_value_resolver.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@ and adding a priority.
164164
<!-- app/config/services.xml -->
165165
<?xml version="1.0" encoding="UTF-8" ?>
166166
<container xmlns="http://symfony.com/schema/dic/services"
167-
xmlns:xsi="'http://www.w3.org/2001/XMLSchema-Instance"
167+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-Instance"
168168
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
169169
170170
<services>
171171
<!-- ... be sure autowiring is enabled -->
172-
<defaults autowire="true" ... />
172+
<defaults autowire="true" />
173173
<!-- ... -->
174174
175175
<service id="AppBundle\ArgumentResolver\UserValueResolver">

‎controller/error_pages.rst

Copy file name to clipboardExpand all lines: controller/error_pages.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ In that case, you might want to override one or both of the ``showAction()`` and
291291
292292
<services>
293293
<!-- ... be sure autowiring is enabled -->
294-
<defaults autowire="true" ... />
294+
<defaults autowire="true" />
295295
<!-- ... -->
296296
297297
<service id="AppBundle\Controller\CustomExceptionController" public="true">

‎controller/upload_file.rst

Copy file name to clipboardExpand all lines: controller/upload_file.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ Now, register this class as a Doctrine listener:
396396
http://symfony.com/schema/dic/services/services-1.0.xsd">
397397
398398
<!-- ... be sure autowiring is enabled -->
399-
<defaults autowire="true" ... />
399+
<defaults autowire="true" />
400400
<!-- ... -->
401401
402402
<service id="AppBundle\EventListener\BrochureUploaderListener">

‎profiler/data_collector.rst

Copy file name to clipboardExpand all lines: profiler/data_collector.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,10 @@ to specify a tag that contains the template:
251251
252252
<services>
253253
<service id="AppBundle\DataCollector\RequestCollector" public="false">
254+
<!-- priority="300" -->
254255
<tag name="data_collector"
255256
template="data_collector/template.html.twig"
256257
id="app.request_collector"
257-
<!-- priority="300" -->
258258
/>
259259
</service>
260260
</services>

‎security/api_key_authentication.rst

Copy file name to clipboardExpand all lines: security/api_key_authentication.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,6 @@ configuration or set it to ``false``:
444444
<firewall name="secured_area"
445445
pattern="^/api"
446446
stateless="false"
447-
...
448447
>
449448
</firewall>
450449
</config>

‎service_container/configurators.rst

Copy file name to clipboardExpand all lines: service_container/configurators.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ all the classes are already loaded as services. All you need to do is specify th
151151
http://symfony.com/schema/dic/services/services-1.0.xsd">
152152
153153
<services>
154-
<prototype namespace="AppBundle\" resource="../../src/AppBundle/*" ... />
154+
<prototype namespace="AppBundle\" resource="../../src/AppBundle/*" />
155155
156156
<service id="AppBundle\Mail\NewsletterManager">
157157
<configurator service="AppBundle\Mail\EmailConfigurator" method="configure" />

‎service_container/expression_language.rst

Copy file name to clipboardExpand all lines: service_container/expression_language.rst
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ to another service: ``AppBundle\Mailer``. One way to do this is with an expressi
2424
# app/config/config.yml
2525
services:
2626
# ...
27-
27+
2828
AppBundle\Mail\MailerConfiguration: ~
29-
29+
3030
AppBundle\Mailer:
31-
arguments: ["@=service('AppBundle\Mail\MailerConfiguration').getMailerMethod()"]
31+
arguments: ["@=service('AppBundle\\Mail\\MailerConfiguration').getMailerMethod()"]
3232
3333
.. code-block:: xml
3434
@@ -56,7 +56,7 @@ to another service: ``AppBundle\Mailer``. One way to do this is with an expressi
5656
use AppBundle\Mail\MailerConfiguration;
5757
use AppBundle\Mailer;
5858
use Symfony\Component\ExpressionLanguage\Expression;
59-
59+
6060
$container->autowire(AppBundle\Mail\MailerConfiguration::class);
6161
6262
$container->autowire(Mailer::class)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.