Skip to content

Commit

Permalink
Merge branch '4.4' into 5.2
Browse files Browse the repository at this point in the history
* 4.4:
  Show logs from php-builder
  [minor] Use correct code block
  Be consistent how we open XML dom
  • Loading branch information
javiereguiluz committed Apr 17, 2021
2 parents c975d5d + dfbc46b commit 0ab9925
Show file tree
Hide file tree
Showing 40 changed files with 95 additions and 91 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ jobs:
working-directory: _build
run: php build.php -vvv

- name: Show log file
if: ${{ always() }}
run: cat _build/logs.txt || true

doctor-rst:
name: Lint (DOCtor-RST)

Expand Down
4 changes: 2 additions & 2 deletions bundles/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ can add some configuration that looks like this:
.. code-block:: xml
<!-- config/packages/acme_social.xml -->
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:acme-social="http://example.org/schema/dic/acme_social"
Expand Down Expand Up @@ -412,7 +412,7 @@ Assuming the XSD file is called ``hello-1.0.xsd``, the schema location will be
.. code-block:: xml
<!-- config/packages/acme_hello.xml -->
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:acme-hello="http://acme_company.com/schema/dic/hello"
Expand Down
2 changes: 1 addition & 1 deletion components/dependency_injection/compilation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ The XML version of the config would then look like this:

.. code-block:: xml
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:acme_demo="http://www.example.com/symfony/schema/"
Expand Down
2 changes: 1 addition & 1 deletion components/dom_crawler.rst
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Consider the XML below:

.. code-block:: xml
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<entry
xmlns="http://www.w3.org/2005/Atom"
xmlns:media="http://search.yahoo.com/mrss/"
Expand Down
10 changes: 5 additions & 5 deletions components/serializer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ Then, create your groups definition:
.. code-block:: xml
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
Expand Down Expand Up @@ -720,7 +720,7 @@ defines a ``Person`` entity with a ``firstName`` property:
.. code-block:: xml
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
Expand Down Expand Up @@ -1007,7 +1007,7 @@ For example, take an object normalized as following::

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

<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8" ?>
<response>
<foo>1</foo>
<foo>2</foo>
Expand Down Expand Up @@ -1293,7 +1293,7 @@ Here, we set it to 2 for the ``$child`` property:
.. code-block:: xml
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
Expand Down Expand Up @@ -1622,7 +1622,7 @@ and ``BitBucketCodeRepository`` classes:
.. code-block:: xml
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
Expand Down
4 changes: 2 additions & 2 deletions configuration/override_dir_structure.rst
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ for multiple directories):
.. code-block:: xml
<!-- config/packages/twig.xml -->
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:twig="http://symfony.com/schema/dic/twig"
Expand Down Expand Up @@ -164,7 +164,7 @@ configuration option to define your own translations directory (use :ref:`framew
.. code-block:: xml
<!-- config/packages/translation.xml -->
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:twig="http://symfony.com/schema/dic/twig"
Expand Down
2 changes: 1 addition & 1 deletion create_framework/unit_testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ using `PHPUnit`_. Create a PHPUnit configuration file in

.. code-block:: xml
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.1/phpunit.xsd"
Expand Down
8 changes: 4 additions & 4 deletions doctrine/events.rst
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ with the ``doctrine.event_listener`` tag:
.. code-block:: xml
<!-- config/services.xml -->
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:doctrine="http://symfony.com/schema/dic/doctrine">
<services>
Expand Down Expand Up @@ -289,7 +289,7 @@ with the ``doctrine.orm.entity_listener`` tag:
.. code-block:: xml
<!-- config/services.xml -->
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:doctrine="http://symfony.com/schema/dic/doctrine">
<services>
Expand Down Expand Up @@ -433,7 +433,7 @@ with the ``doctrine.event_subscriber`` tag:
.. code-block:: xml
<!-- config/services.xml -->
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:doctrine="http://symfony.com/schema/dic/doctrine">
<services>
Expand Down Expand Up @@ -478,7 +478,7 @@ can do it in the service configuration:
.. code-block:: xml
<!-- config/services.xml -->
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:doctrine="http://symfony.com/schema/dic/doctrine">
<services>
Expand Down
2 changes: 1 addition & 1 deletion doctrine/multiple_entity_managers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ The following configuration code shows how you can configure two entity managers
.. code-block:: xml
<!-- config/packages/doctrine.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
Expand Down
2 changes: 1 addition & 1 deletion forms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ object.
.. code-block:: xml
<!-- config/validator/validation.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
Expand Down
2 changes: 1 addition & 1 deletion reference/configuration/security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ application:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/options/preferred_choices.rst.inc
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ when rendering the field:

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

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

<?= $view['form']->widget($form['publishAt'], [
'separator' => '=====',
Expand Down
2 changes: 1 addition & 1 deletion routing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2614,7 +2614,7 @@ method) or globally with these configuration parameters:
.. code-block:: xml
<!-- config/services.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services
Expand Down
2 changes: 1 addition & 1 deletion routing/custom_route_loader.rst
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ Now define a service for the ``ExtraLoader``:
.. code-block:: xml
<!-- config/services.xml -->
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services
Expand Down
14 changes: 7 additions & 7 deletions security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Fortunately, the ``make:user`` command already configured one for you in your
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -227,7 +227,7 @@ command will pre-configure this for you:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -351,7 +351,7 @@ important section is ``firewalls``:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -683,7 +683,7 @@ start with ``/admin``, you can:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -761,7 +761,7 @@ the list and stops when it finds the first match:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -1032,7 +1032,7 @@ To enable logging out, activate the ``logout`` config parameter under your fire
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -1251,7 +1251,7 @@ rules by creating a role hierarchy:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down
10 changes: 5 additions & 5 deletions security/access_control.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Take the following ``access_control`` entries as an example:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -250,7 +250,7 @@ pattern so that it is only accessible by requests from the local server itself:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -339,7 +339,7 @@ key:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -417,7 +417,7 @@ access those URLs via a specific port. This could be useful for example for
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -470,7 +470,7 @@ the user will be redirected to ``https``:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down
4 changes: 2 additions & 2 deletions security/access_denied_handler.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Now, configure this service ID as the entry point for the firewall:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -150,7 +150,7 @@ configure it under your firewall:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down
6 changes: 3 additions & 3 deletions security/auth_providers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ To support HTTP Basic authentication, add the ``http_basic`` key to your firewal
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -118,7 +118,7 @@ Enable the x509 authentication for a particular firewall in the security configu
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -199,7 +199,7 @@ corresponding firewall in your security configuration:
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down
6 changes: 3 additions & 3 deletions security/custom_authentication_provider.rst
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ You are finished! You can now define parts of your app as under WSSE protection.
.. code-block:: xml
<!-- config/packages/security.xml -->
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<srv:container xmlns="http://symfony.com/schema/dic/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:srv="http://symfony.com/schema/dic/services"
Expand Down Expand Up @@ -566,7 +566,7 @@ in order to put it to use::

// src/DependencyInjection/Security/Factory/WsseFactory.php
namespace App\DependencyInjection\Security\Factory;

use App\Security\Authentication\Provider\WsseProvider;

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

0 comments on commit 0ab9925

Please sign in to comment.