Skip to content

Commit 0ab9925

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '4.4' into 5.2
* 4.4: Show logs from php-builder [minor] Use correct code block Be consistent how we open XML dom
2 parents c975d5d + dfbc46b commit 0ab9925

40 files changed

+95
-91
lines changed

‎.github/workflows/ci.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ jobs:
7373
working-directory: _build
7474
run: php build.php -vvv
7575

76+
- name: Show log file
77+
if: ${{ always() }}
78+
run: cat _build/logs.txt || true
79+
7680
doctor-rst:
7781
name: Lint (DOCtor-RST)
7882

‎bundles/configuration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ can add some configuration that looks like this:
6464
.. code-block:: xml
6565
6666
<!-- config/packages/acme_social.xml -->
67-
<?xml version="1.0" ?>
67+
<?xml version="1.0" encoding="UTF-8" ?>
6868
<container xmlns="http://symfony.com/schema/dic/services"
6969
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7070
xmlns:acme-social="http://example.org/schema/dic/acme_social"
@@ -412,7 +412,7 @@ Assuming the XSD file is called ``hello-1.0.xsd``, the schema location will be
412412
.. code-block:: xml
413413
414414
<!-- config/packages/acme_hello.xml -->
415-
<?xml version="1.0" ?>
415+
<?xml version="1.0" encoding="UTF-8" ?>
416416
<container xmlns="http://symfony.com/schema/dic/services"
417417
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
418418
xmlns:acme-hello="http://acme_company.com/schema/dic/hello"

‎components/dependency_injection/compilation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ The XML version of the config would then look like this:
197197

198198
.. code-block:: xml
199199
200-
<?xml version="1.0" ?>
200+
<?xml version="1.0" encoding="UTF-8" ?>
201201
<container xmlns="http://symfony.com/schema/dic/services"
202202
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
203203
xmlns:acme_demo="http://www.example.com/symfony/schema/"

‎components/dom_crawler.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Consider the XML below:
122122

123123
.. code-block:: xml
124124
125-
<?xml version="1.0" encoding="UTF-8"?>
125+
<?xml version="1.0" encoding="UTF-8" ?>
126126
<entry
127127
xmlns="http://www.w3.org/2005/Atom"
128128
xmlns:media="http://search.yahoo.com/mrss/"

‎components/serializer.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ Then, create your groups definition:
346346
347347
.. code-block:: xml
348348
349-
<?xml version="1.0" ?>
349+
<?xml version="1.0" encoding="UTF-8" ?>
350350
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
351351
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
352352
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
@@ -720,7 +720,7 @@ defines a ``Person`` entity with a ``firstName`` property:
720720
721721
.. code-block:: xml
722722
723-
<?xml version="1.0" ?>
723+
<?xml version="1.0" encoding="UTF-8" ?>
724724
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
725725
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
726726
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
@@ -1007,7 +1007,7 @@ For example, take an object normalized as following::
10071007

10081008
The ``XmlEncoder`` will encode this object like that::
10091009

1010-
<?xml version="1.0"?>
1010+
<?xml version="1.0" encoding="UTF-8" ?>
10111011
<response>
10121012
<foo>1</foo>
10131013
<foo>2</foo>
@@ -1293,7 +1293,7 @@ Here, we set it to 2 for the ``$child`` property:
12931293
12941294
.. code-block:: xml
12951295
1296-
<?xml version="1.0" ?>
1296+
<?xml version="1.0" encoding="UTF-8" ?>
12971297
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
12981298
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
12991299
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
@@ -1622,7 +1622,7 @@ and ``BitBucketCodeRepository`` classes:
16221622
16231623
.. code-block:: xml
16241624
1625-
<?xml version="1.0" ?>
1625+
<?xml version="1.0" encoding="UTF-8" ?>
16261626
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
16271627
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16281628
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping

‎configuration/override_dir_structure.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ for multiple directories):
122122
.. code-block:: xml
123123
124124
<!-- config/packages/twig.xml -->
125-
<?xml version="1.0" ?>
125+
<?xml version="1.0" encoding="UTF-8" ?>
126126
<container xmlns="http://symfony.com/schema/dic/services"
127127
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
128128
xmlns:twig="http://symfony.com/schema/dic/twig"
@@ -164,7 +164,7 @@ configuration option to define your own translations directory (use :ref:`framew
164164
.. code-block:: xml
165165
166166
<!-- config/packages/translation.xml -->
167-
<?xml version="1.0" ?>
167+
<?xml version="1.0" encoding="UTF-8" ?>
168168
<container xmlns="http://symfony.com/schema/dic/services"
169169
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
170170
xmlns:twig="http://symfony.com/schema/dic/twig"

‎create_framework/unit_testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ using `PHPUnit`_. Create a PHPUnit configuration file in
1313

1414
.. code-block:: xml
1515
16-
<?xml version="1.0" encoding="UTF-8"?>
16+
<?xml version="1.0" encoding="UTF-8" ?>
1717
<phpunit
1818
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1919
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.1/phpunit.xsd"

‎doctrine/events.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ with the ``doctrine.event_listener`` tag:
176176
.. code-block:: xml
177177
178178
<!-- config/services.xml -->
179-
<?xml version="1.0" ?>
179+
<?xml version="1.0" encoding="UTF-8" ?>
180180
<container xmlns="http://symfony.com/schema/dic/services"
181181
xmlns:doctrine="http://symfony.com/schema/dic/doctrine">
182182
<services>
@@ -289,7 +289,7 @@ with the ``doctrine.orm.entity_listener`` tag:
289289
.. code-block:: xml
290290
291291
<!-- config/services.xml -->
292-
<?xml version="1.0" ?>
292+
<?xml version="1.0" encoding="UTF-8" ?>
293293
<container xmlns="http://symfony.com/schema/dic/services"
294294
xmlns:doctrine="http://symfony.com/schema/dic/doctrine">
295295
<services>
@@ -433,7 +433,7 @@ with the ``doctrine.event_subscriber`` tag:
433433
.. code-block:: xml
434434
435435
<!-- config/services.xml -->
436-
<?xml version="1.0" ?>
436+
<?xml version="1.0" encoding="UTF-8" ?>
437437
<container xmlns="http://symfony.com/schema/dic/services"
438438
xmlns:doctrine="http://symfony.com/schema/dic/doctrine">
439439
<services>
@@ -478,7 +478,7 @@ can do it in the service configuration:
478478
.. code-block:: xml
479479
480480
<!-- config/services.xml -->
481-
<?xml version="1.0" ?>
481+
<?xml version="1.0" encoding="UTF-8" ?>
482482
<container xmlns="http://symfony.com/schema/dic/services"
483483
xmlns:doctrine="http://symfony.com/schema/dic/doctrine">
484484
<services>

‎doctrine/multiple_entity_managers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ The following configuration code shows how you can configure two entity managers
7171
.. code-block:: xml
7272
7373
<!-- config/packages/doctrine.xml -->
74-
<?xml version="1.0" encoding="UTF-8"?>
74+
<?xml version="1.0" encoding="UTF-8" ?>
7575
<container xmlns="http://symfony.com/schema/dic/services"
7676
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7777
xmlns:doctrine="http://symfony.com/schema/dic/doctrine"

‎forms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ object.
538538
.. code-block:: xml
539539
540540
<!-- config/validator/validation.xml -->
541-
<?xml version="1.0" encoding="UTF-8"?>
541+
<?xml version="1.0" encoding="UTF-8" ?>
542542
<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
543543
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
544544
xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping

‎reference/configuration/security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ application:
398398
.. code-block:: xml
399399
400400
<!-- config/packages/security.xml -->
401-
<?xml version="1.0" encoding="UTF-8"?>
401+
<?xml version="1.0" encoding="UTF-8" ?>
402402
<srv:container xmlns="http://symfony.com/schema/dic/security"
403403
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
404404
xmlns:srv="http://symfony.com/schema/dic/services"

‎reference/forms/types/options/preferred_choices.rst.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ when rendering the field:
5858

5959
{{ form_widget(form.publishAt, { 'separator': '=====' }) }}
6060

61-
.. code-block:: php
61+
.. code-block:: html+php
6262

6363
<?= $view['form']->widget($form['publishAt'], [
6464
'separator' => '=====',

‎routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2614,7 +2614,7 @@ method) or globally with these configuration parameters:
26142614
.. code-block:: xml
26152615
26162616
<!-- config/services.xml -->
2617-
<?xml version="1.0" encoding="UTF-8"?>
2617+
<?xml version="1.0" encoding="UTF-8" ?>
26182618
<container xmlns="http://symfony.com/schema/dic/services"
26192619
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
26202620
xsi:schemaLocation="http://symfony.com/schema/dic/services

‎routing/custom_route_loader.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ Now define a service for the ``ExtraLoader``:
309309
.. code-block:: xml
310310
311311
<!-- config/services.xml -->
312-
<?xml version="1.0" ?>
312+
<?xml version="1.0" encoding="UTF-8" ?>
313313
<container xmlns="http://symfony.com/schema/dic/services"
314314
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
315315
xsi:schemaLocation="http://symfony.com/schema/dic/services

‎security.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Fortunately, the ``make:user`` command already configured one for you in your
159159
.. code-block:: xml
160160
161161
<!-- config/packages/security.xml -->
162-
<?xml version="1.0" encoding="UTF-8"?>
162+
<?xml version="1.0" encoding="UTF-8" ?>
163163
<srv:container xmlns="http://symfony.com/schema/dic/security"
164164
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
165165
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -227,7 +227,7 @@ command will pre-configure this for you:
227227
.. code-block:: xml
228228
229229
<!-- config/packages/security.xml -->
230-
<?xml version="1.0" encoding="UTF-8"?>
230+
<?xml version="1.0" encoding="UTF-8" ?>
231231
<srv:container xmlns="http://symfony.com/schema/dic/security"
232232
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
233233
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -351,7 +351,7 @@ important section is ``firewalls``:
351351
.. code-block:: xml
352352
353353
<!-- config/packages/security.xml -->
354-
<?xml version="1.0" encoding="UTF-8"?>
354+
<?xml version="1.0" encoding="UTF-8" ?>
355355
<srv:container xmlns="http://symfony.com/schema/dic/security"
356356
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
357357
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -683,7 +683,7 @@ start with ``/admin``, you can:
683683
.. code-block:: xml
684684
685685
<!-- config/packages/security.xml -->
686-
<?xml version="1.0" encoding="UTF-8"?>
686+
<?xml version="1.0" encoding="UTF-8" ?>
687687
<srv:container xmlns="http://symfony.com/schema/dic/security"
688688
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
689689
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -761,7 +761,7 @@ the list and stops when it finds the first match:
761761
.. code-block:: xml
762762
763763
<!-- config/packages/security.xml -->
764-
<?xml version="1.0" encoding="UTF-8"?>
764+
<?xml version="1.0" encoding="UTF-8" ?>
765765
<srv:container xmlns="http://symfony.com/schema/dic/security"
766766
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
767767
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -1032,7 +1032,7 @@ To enable logging out, activate the ``logout`` config parameter under your fire
10321032
.. code-block:: xml
10331033
10341034
<!-- config/packages/security.xml -->
1035-
<?xml version="1.0" encoding="UTF-8"?>
1035+
<?xml version="1.0" encoding="UTF-8" ?>
10361036
<srv:container xmlns="http://symfony.com/schema/dic/security"
10371037
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10381038
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -1251,7 +1251,7 @@ rules by creating a role hierarchy:
12511251
.. code-block:: xml
12521252
12531253
<!-- config/packages/security.xml -->
1254-
<?xml version="1.0" encoding="UTF-8"?>
1254+
<?xml version="1.0" encoding="UTF-8" ?>
12551255
<srv:container xmlns="http://symfony.com/schema/dic/security"
12561256
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
12571257
xmlns:srv="http://symfony.com/schema/dic/services"

‎security/access_control.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Take the following ``access_control`` entries as an example:
5555
.. code-block:: xml
5656
5757
<!-- config/packages/security.xml -->
58-
<?xml version="1.0" encoding="UTF-8"?>
58+
<?xml version="1.0" encoding="UTF-8" ?>
5959
<srv:container xmlns="http://symfony.com/schema/dic/security"
6060
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6161
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -250,7 +250,7 @@ pattern so that it is only accessible by requests from the local server itself:
250250
.. code-block:: xml
251251
252252
<!-- config/packages/security.xml -->
253-
<?xml version="1.0" encoding="UTF-8"?>
253+
<?xml version="1.0" encoding="UTF-8" ?>
254254
<srv:container xmlns="http://symfony.com/schema/dic/security"
255255
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
256256
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -339,7 +339,7 @@ key:
339339
.. code-block:: xml
340340
341341
<!-- config/packages/security.xml -->
342-
<?xml version="1.0" encoding="UTF-8"?>
342+
<?xml version="1.0" encoding="UTF-8" ?>
343343
<srv:container xmlns="http://symfony.com/schema/dic/security"
344344
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
345345
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -417,7 +417,7 @@ access those URLs via a specific port. This could be useful for example for
417417
.. code-block:: xml
418418
419419
<!-- config/packages/security.xml -->
420-
<?xml version="1.0" encoding="UTF-8"?>
420+
<?xml version="1.0" encoding="UTF-8" ?>
421421
<srv:container xmlns="http://symfony.com/schema/dic/security"
422422
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
423423
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -470,7 +470,7 @@ the user will be redirected to ``https``:
470470
.. code-block:: xml
471471
472472
<!-- config/packages/security.xml -->
473-
<?xml version="1.0" encoding="UTF-8"?>
473+
<?xml version="1.0" encoding="UTF-8" ?>
474474
<srv:container xmlns="http://symfony.com/schema/dic/security"
475475
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
476476
xmlns:srv="http://symfony.com/schema/dic/services"

‎security/access_denied_handler.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Now, configure this service ID as the entry point for the firewall:
7373
.. code-block:: xml
7474
7575
<!-- config/packages/security.xml -->
76-
<?xml version="1.0" encoding="UTF-8"?>
76+
<?xml version="1.0" encoding="UTF-8" ?>
7777
<srv:container xmlns="http://symfony.com/schema/dic/security"
7878
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7979
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -150,7 +150,7 @@ configure it under your firewall:
150150
.. code-block:: xml
151151
152152
<!-- config/packages/security.xml -->
153-
<?xml version="1.0" encoding="UTF-8"?>
153+
<?xml version="1.0" encoding="UTF-8" ?>
154154
<srv:container xmlns="http://symfony.com/schema/dic/security"
155155
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
156156
xmlns:srv="http://symfony.com/schema/dic/services"

‎security/auth_providers.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ To support HTTP Basic authentication, add the ``http_basic`` key to your firewal
5050
.. code-block:: xml
5151
5252
<!-- config/packages/security.xml -->
53-
<?xml version="1.0" encoding="UTF-8"?>
53+
<?xml version="1.0" encoding="UTF-8" ?>
5454
<srv:container xmlns="http://symfony.com/schema/dic/security"
5555
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5656
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -118,7 +118,7 @@ Enable the x509 authentication for a particular firewall in the security configu
118118
.. code-block:: xml
119119
120120
<!-- config/packages/security.xml -->
121-
<?xml version="1.0" encoding="UTF-8"?>
121+
<?xml version="1.0" encoding="UTF-8" ?>
122122
<srv:container xmlns="http://symfony.com/schema/dic/security"
123123
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
124124
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -199,7 +199,7 @@ corresponding firewall in your security configuration:
199199
.. code-block:: xml
200200
201201
<!-- config/packages/security.xml -->
202-
<?xml version="1.0" ?>
202+
<?xml version="1.0" encoding="UTF-8" ?>
203203
<srv:container xmlns="http://symfony.com/schema/dic/security"
204204
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
205205
xmlns:srv="http://symfony.com/schema/dic/services"

‎security/custom_authentication_provider.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ You are finished! You can now define parts of your app as under WSSE protection.
484484
.. code-block:: xml
485485
486486
<!-- config/packages/security.xml -->
487-
<?xml version="1.0" encoding="UTF-8"?>
487+
<?xml version="1.0" encoding="UTF-8" ?>
488488
<srv:container xmlns="http://symfony.com/schema/dic/security"
489489
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
490490
xmlns:srv="http://symfony.com/schema/dic/services"
@@ -566,7 +566,7 @@ in order to put it to use::
566566

567567
// src/DependencyInjection/Security/Factory/WsseFactory.php
568568
namespace App\DependencyInjection\Security\Factory;
569-
569+
570570
use App\Security\Authentication\Provider\WsseProvider;
571571

572572
class WsseFactory implements SecurityFactoryInterface
@@ -610,7 +610,7 @@ set to any desirable value per firewall.
610610
.. code-block:: xml
611611
612612
<!-- config/packages/security.xml -->
613-
<?xml version="1.0" encoding="UTF-8"?>
613+
<?xml version="1.0" encoding="UTF-8" ?>
614614
<srv:container xmlns="http://symfony.com/schema/dic/security"
615615
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
616616
xmlns:srv="http://symfony.com/schema/dic/services"

0 commit comments

Comments
 (0)