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

‎email/spool.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ this spool, use the following configuration:
4545
http://symfony.com/schema/dic/swiftmailer https://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
4646
4747
<swiftmailer:config>
48-
<swiftmailer:spool type="memory" />
48+
<swiftmailer:spool type="memory"/>
4949
</swiftmailer:config>
5050
</container>
5151

‎form/form_collections.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ you will learn about next!).
496496
<!-- ... -->
497497
<one-to-many field="tags" target-entity="Tag">
498498
<cascade>
499-
<cascade-persist />
499+
<cascade-persist/>
500500
</cascade>
501501
</one-to-many>
502502
</entity>

‎form/form_dependencies.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ manually and tag it with ``form.type``:
123123
<services>
124124
<service id="App\Form\TaskType">
125125
<argument type="service" id="doctrine.orm.entity_manager"/>
126-
<tag name="form.type" />
126+
<tag name="form.type"/>
127127
</service>
128128
</services>
129129
</container>

‎forms.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,10 @@ object.
356356
357357
<class name="App\Entity\Task">
358358
<property name="task">
359-
<constraint name="NotBlank" />
359+
<constraint name="NotBlank"/>
360360
</property>
361361
<property name="dueDate">
362-
<constraint name="NotBlank" />
362+
<constraint name="NotBlank"/>
363363
<constraint name="Type">\DateTime</constraint>
364364
</property>
365365
</class>

‎http_cache/esi.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ as this is the only useful one outside of Akamai context:
2727
<!-- ... some content -->
2828

2929
<!-- Embed the content of another page here -->
30-
<esi:include src="http://..." />
30+
<esi:include src="http://..."/>
3131

3232
<!-- ... more content -->
3333
</body>
@@ -81,7 +81,7 @@ First, to use ESI, be sure to enable it in your application configuration:
8181
8282
<framework:config>
8383
<!-- ... -->
84-
<framework:esi enabled="true" />
84+
<framework:esi enabled="true"/>
8585
</framework:config>
8686
</container>
8787
@@ -211,7 +211,7 @@ that must be enabled in your configuration:
211211
212212
<!-- ... -->
213213
<framework:config>
214-
<framework:fragment path="/_fragment" />
214+
<framework:fragment path="/_fragment"/>
215215
</framework:config>
216216
</container>
217217

‎logging/formatter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ configure your handler to use it:
4040
https://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
4141
4242
<services>
43-
<service id="Monolog\Formatter\JsonFormatter" />
43+
<service id="Monolog\Formatter\JsonFormatter"/>
4444
</services>
4545
4646
<!-- config/packages/prod/monolog.xml (and/or config/packages/dev/monolog.xml) -->

‎logging/monolog_email.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ You can adjust the time period using the ``time`` option:
167167
<monolog:handler name="deduplicated"
168168
type="deduplication"
169169
time="10"
170-
handler="swift" />
170+
handler="swift"/>
171171
172172
.. code-block:: php
173173

‎reference/configuration/debug.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ destination for dumps. Typically, you would set this to ``php://stderr``:
9090
https://symfony.com/schema/dic/services/services-1.0.xsd
9191
http://symfony.com/schema/dic/debug https://symfony.com/schema/dic/debug/debug-1.0.xsd">
9292
93-
<debug:config dump-destination="php://stderr" />
93+
<debug:config dump-destination="php://stderr"/>
9494
</container>
9595
9696
.. code-block:: php

‎reference/configuration/doctrine.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ directory instead:
325325
326326
<doctrine:config>
327327
<doctrine:orm auto-mapping="true">
328-
<mapping name="AppBundle" dir="SomeResources/config/doctrine" type="xml" />
328+
<mapping name="AppBundle" dir="SomeResources/config/doctrine" type="xml"/>
329329
</doctrine:orm>
330330
</doctrine:config>
331331
</container>

‎reference/constraints/All.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ entry in that array:
6262
<property name="favoriteColors">
6363
<constraint name="All">
6464
<option name="constraints">
65-
<constraint name="NotBlank" />
65+
<constraint name="NotBlank"/>
6666
<constraint name="Length">
6767
<option name="min">5</option>
6868
</constraint>

‎reference/constraints/Bic.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ will contain a Business Identifier Code (BIC).
5959
6060
<class name="App\Entity\Transaction">
6161
<property name="businessIdentifierCode">
62-
<constraint name="Bic" />
62+
<constraint name="Bic"/>
6363
</property>
6464
</class>
6565
</constraint-mapping>

‎reference/constraints/Blank.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ of an ``Author`` class were blank, you could do the following:
6363
6464
<class name="App\Entity\Author">
6565
<property name="firstName">
66-
<constraint name="Blank" />
66+
<constraint name="Blank"/>
6767
</property>
6868
</class>
6969
</constraint-mapping>

‎reference/constraints/Collection.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ following:
112112
<constraint name="Collection">
113113
<option name="fields">
114114
<value key="personal_email">
115-
<constraint name="Email" />
115+
<constraint name="Email"/>
116116
</value>
117117
<value key="short_bio">
118-
<constraint name="NotBlank" />
118+
<constraint name="NotBlank"/>
119119
<constraint name="Length">
120120
<option name="max">100</option>
121121
<option name="maxMessage">Your short bio is too long!</option>
@@ -238,13 +238,13 @@ you can do the following:
238238
<option name="fields">
239239
<value key="personal_email">
240240
<constraint name="Required">
241-
<constraint name="NotBlank" />
242-
<constraint name="Email" />
241+
<constraint name="NotBlank"/>
242+
<constraint name="Email"/>
243243
</constraint>
244244
</value>
245245
<value key="alternate_email">
246246
<constraint name="Optional">
247-
<constraint name="Email" />
247+
<constraint name="Email"/>
248248
</constraint>
249249
</value>
250250
</option>

‎reference/constraints/Country.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Basic Usage
5050
5151
<class name="App\Entity\User">
5252
<property name="country">
53-
<constraint name="Country" />
53+
<constraint name="Country"/>
5454
</property>
5555
</class>
5656
</constraint-mapping>

‎reference/constraints/Currency.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ a valid currency, you could do the following:
5353
5454
<class name="App\Entity\Order">
5555
<property name="currency">
56-
<constraint name="Currency" />
56+
<constraint name="Currency"/>
5757
</property>
5858
</class>
5959
</constraint-mapping>

‎reference/constraints/Date.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Basic Usage
5252
5353
<class name="App\Entity\Author">
5454
<property name="birthday">
55-
<constraint name="Date" />
55+
<constraint name="Date"/>
5656
</property>
5757
</class>
5858
</constraint-mapping>

‎reference/constraints/DateTime.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Basic Usage
5353
5454
<class name="App\Entity\Author">
5555
<property name="createdAt">
56-
<constraint name="DateTime" />
56+
<constraint name="DateTime"/>
5757
</property>
5858
</class>
5959
</constraint-mapping>

‎reference/constraints/Ip.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Basic Usage
5353
5454
<class name="App\Entity\Author">
5555
<property name="ipAddress">
56-
<constraint name="Ip" />
56+
<constraint name="Ip"/>
5757
</property>
5858
</class>
5959
</constraint-mapping>

‎reference/constraints/IsNull.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ of an ``Author`` class exactly equal to ``null``, you could do the following:
5757
5858
<class name="App\Entity\Author">
5959
<property name="firstName">
60-
<constraint name="IsNull" />
60+
<constraint name="IsNull"/>
6161
</property>
6262
</class>
6363
</constraint-mapping>

‎reference/constraints/Issn.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Basic Usage
5353
5454
<class name="App\Entity\Journal">
5555
<property name="issn">
56-
<constraint name="Issn" />
56+
<constraint name="Issn"/>
5757
</property>
5858
</class>
5959
</constraint-mapping>

‎reference/constraints/Language.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Basic Usage
5151
5252
<class name="App\Entity\User">
5353
<property name="preferredLanguage">
54-
<constraint name="Language" />
54+
<constraint name="Language"/>
5555
</property>
5656
</class>
5757
</constraint-mapping>

0 commit comments

Comments
 (0)