Skip to content

Commit 79e00fe

Browse files
wouterjwouterj
committed
Merge branch '3.4' into 4.2
* 3.4: remove space before self closing xml tag
2 parents 746baa2 + 855f64a commit 79e00fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+120
-120
lines changed

‎bundles/configuration.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ as integration of other related components:
3434
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
3535
3636
<framework:config>
37-
<framework:form />
37+
<framework:form/>
3838
</framework:config>
3939
</container>
4040
@@ -72,7 +72,7 @@ can add some configuration that looks like this:
7272
https://symfony.com/schema/dic/services/services-1.0.xsd">
7373
7474
<acme-social:config>
75-
<acme-social:twitter client-id="123" client-secret="your_secret" />
75+
<acme-social:twitter client-id="123" client-secret="your_secret"/>
7676
</acme-social:config>
7777
7878
<!-- ... -->

‎bundles/prepend_extension.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ registered and the ``entity_manager_name`` setting for ``acme_hello`` is set to
128128
<acme-something:entity-manager-name>non_default</acme-something:entity-manager-name>
129129
</acme-something:config>
130130
131-
<acme-other:config use-acme-goodbye="false" />
131+
<acme-other:config use-acme-goodbye="false"/>
132132
133133
</container>
134134

‎components/config/definition.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ Or the following XML configuration:
288288

289289
.. code-block:: xml
290290
291-
<connection table="symfony" user="root" password="null" />
292-
<connection table="foo" user="root" password="pa$$" />
291+
<connection table="symfony" user="root" password="null"/>
292+
<connection table="foo" user="root" password="pa$$"/>
293293
294294
The processed configuration is::
295295

@@ -357,9 +357,9 @@ same YAML configuration shown before or the following XML configuration:
357357
.. code-block:: xml
358358
359359
<connection name="sf_connection"
360-
table="symfony" user="root" password="null" />
360+
table="symfony" user="root" password="null"/>
361361
<connection name="default"
362-
table="foo" user="root" password="pa$$" />
362+
table="foo" user="root" password="pa$$"/>
363363
364364
In both cases, the processed configuration maintains the ``sf_connection`` and
365365
``default`` keys::
@@ -483,7 +483,7 @@ and in XML:
483483
.. code-block:: xml
484484
485485
<!-- entries-per-page: This value is only used for the search results page. -->
486-
<config entries-per-page="25" />
486+
<config entries-per-page="25"/>
487487
488488
Optional Sections
489489
-----------------

‎components/dependency_injection.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ config files:
282282
283283
<service id="newsletter_manager" class="NewsletterManager">
284284
<call method="setMailer">
285-
<argument type="service" id="mailer" />
285+
<argument type="service" id="mailer"/>
286286
</call>
287287
</service>
288288
</services>

‎components/dom_crawler.rst‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -236,16 +236,16 @@ Adding the Content
236236

237237
The crawler supports multiple ways of adding the content::
238238

239-
$crawler = new Crawler('<html><body /></html>');
239+
$crawler = new Crawler('<html><body/></html>');
240240

241-
$crawler->addHtmlContent('<html><body /></html>');
242-
$crawler->addXmlContent('<root><node /></root>');
241+
$crawler->addHtmlContent('<html><body/></html>');
242+
$crawler->addXmlContent('<root><node/></root>');
243243

244-
$crawler->addContent('<html><body /></html>');
245-
$crawler->addContent('<root><node /></root>', 'text/xml');
244+
$crawler->addContent('<html><body/></html>');
245+
$crawler->addContent('<root><node/></root>', 'text/xml');
246246

247-
$crawler->add('<html><body /></html>');
248-
$crawler->add('<root><node /></root>');
247+
$crawler->add('<html><body/></html>');
248+
$crawler->add('<root><node/></root>');
249249

250250
.. note::
251251

@@ -263,7 +263,7 @@ to interact with native :phpclass:`DOMDocument`, :phpclass:`DOMNodeList`
263263
and :phpclass:`DOMNode` objects::
264264

265265
$domDocument = new \DOMDocument();
266-
$domDocument->loadXml('<root><node /><node /></root>');
266+
$domDocument->loadXml('<root><node/><node/></root>');
267267
$nodeList = $domDocument->getElementsByTagName('node');
268268
$node = $domDocument->getElementsByTagName('node')->item(0);
269269

@@ -464,9 +464,9 @@ You can virtually set and get values on the form::
464464
To work with multi-dimensional fields::
465465

466466
<form>
467-
<input name="multi[]" />
468-
<input name="multi[]" />
469-
<input name="multi[dimensional]" />
467+
<input name="multi[]"/>
468+
<input name="multi[]"/>
469+
<input name="multi[dimensional]"/>
470470
</form>
471471

472472
Pass an array of values::

‎components/form.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ done by passing a special form "view" object to your template (notice the
519519
{{ form_start(form) }}
520520
{{ form_widget(form) }}
521521

522-
<input type="submit" />
522+
<input type="submit"/>
523523
{{ form_end(form) }}
524524

525525
.. image:: /_images/form/simple-form.png

‎components/serializer.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ Here, we set it to 2 for the ``$child`` property:
996996
https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
997997
>
998998
<class name="Acme\MyObj">
999-
<attribute name="child" max-depth="2" />
999+
<attribute name="child" max-depth="2"/>
10001000
</class>
10011001
</serializer>
10021002
@@ -1143,7 +1143,7 @@ The array keys beginning with ``@`` are considered XML attributes::
11431143
// is encoded as follows:
11441144
// <?xml version="1.0"?>
11451145
// <response>
1146-
// <foo bar="value" />
1146+
// <foo bar="value"/>
11471147
// </response>
11481148

11491149
Use the special ``#`` key to define the data of a node::

‎create_framework/http_kernel_httpkernelinterface.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ page as being the content of a sub-request call:
158158
159159
This is the content of your page
160160
161-
Is 2012 a leap year? <esi:include src="/leapyear/2012" />
161+
Is 2012 a leap year? <esi:include src="/leapyear/2012"/>
162162
163163
Some other content
164164

‎doctrine/lifecycle_callbacks.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ the current date, only when the entity is first persisted (i.e. inserted):
6363
<entity name="App\Entity\Product">
6464
<!-- ... -->
6565
<lifecycle-callbacks>
66-
<lifecycle-callback type="prePersist" method="setCreatedAtValue" />
66+
<lifecycle-callback type="prePersist" method="setCreatedAtValue"/>
6767
</lifecycle-callbacks>
6868
</entity>
6969
</doctrine-mapping>

‎email/dev_environment.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You can disable sending email by setting the ``disable_delivery`` option to
3939
https://symfony.com/schema/dic/services/services-1.0.xsd
4040
http://symfony.com/schema/dic/swiftmailer https://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
4141
42-
<swiftmailer:config disable-delivery="true" />
42+
<swiftmailer:config disable-delivery="true"/>
4343
</container>
4444
4545
.. code-block:: php

0 commit comments

Comments
 (0)