Skip to content

Commit 2e4fc7f

Browse files
weaverryanweaverryan
committed
minor #4030 enclose YAML strings containing % with quotes (xabbuh)
This PR was merged into the 2.3 branch. Discussion ---------- enclose YAML strings containing % with quotes | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | all | Fixed tickets | #1886, #4029 Thanks @iamdto, did you spot some other occurences in the docs? Commits ------- c1c4bc8 remove "..." from XML element tags dbc02a2 quote YAML strings starting with % or @ characters
2 parents 9520d92 + c1c4bc8 commit 2e4fc7f

File tree

10 files changed

+32
-32
lines changed

10 files changed

+32
-32
lines changed

‎book/forms.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1675,7 +1675,7 @@ file:
16751675
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
16761676
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
16771677
1678-
<framework:config ...>
1678+
<framework:config>
16791679
<framework:templating>
16801680
<framework:form>
16811681
<framework:resource>AcmeTaskBundle:Form</framework:resource>

‎book/http_cache.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -862,13 +862,13 @@ First, to use ESI, be sure to enable it in your application configuration:
862862
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
863863
xmlns:framework="http://symfony.com/schema/dic/symfony"
864864
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
865-
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
865+
http://symfony.com/schema/dic/symfony
866+
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
866867
867-
<framework:config ...>
868+
<framework:config>
868869
<!-- ... -->
869870
<framework:esi enabled="true" />
870871
</framework:config>
871-
872872
</container>
873873
874874
.. code-block:: php

‎book/internals.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ If you enable the web profiler, you also need to mount the profiler routes:
621621
.. code-block:: yaml
622622
623623
_profiler:
624-
resource: @WebProfilerBundle/Resources/config/routing/profiler.xml
624+
resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
625625
prefix: /_profiler
626626
627627
.. code-block:: xml

‎book/service_container.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ the service container gives you a much more appealing option:
629629
</parameters>
630630
631631
<services>
632-
<service id="my_mailer" ...>
632+
<service id="my_mailer">
633633
<!-- ... -->
634634
</service>
635635
<service id="newsletter_manager" class="%newsletter_manager.class%">
@@ -726,7 +726,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
726726
</parameters>
727727
728728
<services>
729-
<service id="my_mailer" ...>
729+
<service id="my_mailer">
730730
<!-- ... -->
731731
</service>
732732
<service id="newsletter_manager" class="%newsletter_manager.class%">
@@ -794,7 +794,7 @@ it exists and do nothing if it doesn't:
794794
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
795795
796796
<services>
797-
<service id="my_mailer" ...>
797+
<service id="my_mailer">
798798
<!-- ... -->
799799
</service>
800800
<service id="newsletter_manager" class="%newsletter_manager.class%">

‎components/dependency_injection/configurators.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ The service config for the above classes would look something like this:
156156
.. code-block:: xml
157157
158158
<services>
159-
<service id="my_mailer" ...>
159+
<service id="my_mailer">
160160
<!-- ... -->
161161
</service>
162162
<service id="email_formatter_manager" class="EmailFormatterManager">

‎cookbook/configuration/using_parameters_in_dic.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Now, examine the results to see this closely:
3636
# true, as expected
3737
3838
my_bundle:
39-
logging: %kernel.debug%
39+
logging: "%kernel.debug%"
4040
# true/false (depends on 2nd parameter of AppKernel),
4141
# as expected, because %kernel.debug% inside configuration
4242
# gets evaluated before being passed to the extension

‎cookbook/form/form_collections.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ we talk about next!).
510510
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
511511
http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
512512
513-
<entity name="Acme\TaskBundle\Entity\Task" ...>
513+
<entity name="Acme\TaskBundle\Entity\Task">
514514
<!-- ... -->
515515
<one-to-many field="tags" target-entity="Tag">
516516
<cascade>
@@ -609,7 +609,7 @@ First, add a "delete this tag" link to each tag form:
609609
jQuery(document).ready(function() {
610610
// Get the ul that holds the collection of tags
611611
$collectionHolder = $('ul.tags');
612-
612+
613613
// add a delete link to all of the existing tag form li elements
614614
$collectionHolder.find('li').each(function() {
615615
addTagFormDeleteLink($(this));
@@ -667,9 +667,9 @@ the relationship between the removed ``Tag`` and ``Task`` object.
667667
is handling the "update" of your Task::
668668

669669
// src/Acme/TaskBundle/Controller/TaskController.php
670-
670+
671671
use Doctrine\Common\Collections\ArrayCollection;
672-
672+
673673
// ...
674674
public function editAction($id, Request $request)
675675
{

‎cookbook/templating/global_variables.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This is possible inside your ``app/config/config.yml`` file:
2020
.. code-block:: xml
2121
2222
<!-- app/config/config.xml -->
23-
<twig:config ...>
23+
<twig:config>
2424
<!-- ... -->
2525
<twig:global key="ga_tracking">UA-xxxxx-x</twig:global>
2626
</twig:config>
@@ -67,7 +67,7 @@ system, which lets you isolate or reuse the value:
6767
.. code-block:: xml
6868
6969
<!-- app/config/config.xml -->
70-
<twig:config ...>
70+
<twig:config>
7171
<twig:global key="ga_tracking">%ga_tracking%</twig:global>
7272
</twig:config>
7373
@@ -111,7 +111,7 @@ This should feel familiar, as it's the same syntax you use in service configurat
111111
.. code-block:: xml
112112
113113
<!-- app/config/config.xml -->
114-
<twig:config ...>
114+
<twig:config>
115115
<!-- ... -->
116116
<twig:global key="user_management">@acme_user.user_management</twig:global>
117117
</twig:config>

‎reference/configuration/doctrine.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ Full default configuration
5959
MultipleActiveResultSets: ~
6060
driver: pdo_mysql
6161
platform_service: ~
62-
logging: %kernel.debug%
63-
profiling: %kernel.debug%
62+
logging: "%kernel.debug%"
63+
profiling: "%kernel.debug%"
6464
driver_class: ~
6565
wrapper_class: ~
6666
options:
@@ -106,7 +106,7 @@ Full default configuration
106106
orm:
107107
default_entity_manager: ~
108108
auto_generate_proxy_classes: false
109-
proxy_dir: %kernel.cache_dir%/doctrine/orm/Proxies
109+
proxy_dir: "%kernel.cache_dir%/doctrine/orm/Proxies"
110110
proxy_namespace: Proxies
111111
# search for the "ResolveTargetEntityListener" class for a cookbook about this
112112
resolve_target_entities: []
@@ -416,7 +416,7 @@ Shortened Configuration Syntax
416416
------------------------------
417417

418418
When you are only using one entity manager, all config options available
419-
can be placed directly under ``doctrine.orm`` config level.
419+
can be placed directly under ``doctrine.orm`` config level.
420420

421421
.. code-block:: yaml
422422

‎reference/configuration/framework.rst‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,19 @@ have installed `PhpStormOpener`_ and use PHPstorm, you will do something like:
103103
104104
framework:
105105
ide: "pstorm://%%f:%%l"
106-
106+
107107
.. code-block:: xml
108-
108+
109109
<?xml version="1.0" charset="UTF-8" ?>
110110
<container xmlns="http://symfony.com/schema/dic/service"
111111
xmlns:framework="http://symfony.com/schema/dic/symfony">
112-
112+
113113
<framework:config ide="pstorm://%%f:%%l" />
114-
114+
115115
</container>
116-
116+
117117
.. code-block:: php
118-
118+
119119
$container->loadFromExtension('framework', array(
120120
'ide' => 'pstorm://%%f:%%l',
121121
));
@@ -536,7 +536,7 @@ Full default Configuration
536536
gc_divisor: ~
537537
gc_probability: ~
538538
gc_maxlifetime: ~
539-
save_path: %kernel.cache_dir%/sessions
539+
save_path: "%kernel.cache_dir%/sessions"
540540
541541
# serializer configuration
542542
serializer:
@@ -545,7 +545,7 @@ Full default Configuration
545545
# templating configuration
546546
templating:
547547
assets_version: ~
548-
assets_version_format: %%s?%%s
548+
assets_version_format: "%%s?%%s"
549549
hinclude_default_template: ~
550550
form:
551551
resources:
@@ -566,7 +566,7 @@ Full default Configuration
566566
# Prototype
567567
name:
568568
version: ~
569-
version_format: %%s?%%s
569+
version_format: "%%s?%%s"
570570
base_urls:
571571
http: []
572572
ssl: []
@@ -586,8 +586,8 @@ Full default Configuration
586586
# annotation configuration
587587
annotations:
588588
cache: file
589-
file_cache_dir: %kernel.cache_dir%/annotations
590-
debug: %kernel.debug%
589+
file_cache_dir: "%kernel.cache_dir%/annotations"
590+
debug: "%kernel.debug%"
591591
592592
.. _`protocol-relative`: http://tools.ietf.org/html/rfc3986#section-4.2
593593
.. _`PhpStormOpener`: https://github.com/pinepain/PhpStormOpener

0 commit comments

Comments
 (0)