Skip to content

Fix XSD in XML examples #21444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix XSD in XML examples #21444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions bundles/best_practices.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,9 +432,8 @@ The end user can provide values in any configuration file:
<!-- config/services.xml -->
<?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
https://symfony.com/schema/dic/services/services-1.0.xsd"
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd"
>
<parameters>
<parameter key="acme_blog.author.email">[email protected]</parameter>
Expand Down
30 changes: 12 additions & 18 deletions bundles/configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@ as integration of other related components:
<!-- config/packages/framework.xml -->
<?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:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://symfony.com/schema/symfony-1.0.xsd"
>
<framework:config>
<framework:form/>
Expand Down Expand Up @@ -171,10 +169,9 @@ can add some configuration that looks like this:
<!-- config/packages/acme_social.xml -->
<?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:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:acme-social="http://example.org/schema/dic/acme_social"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd"
>
<acme-social:config>
<acme-social:twitter client-id="123"
Expand Down Expand Up @@ -342,9 +339,8 @@ For example, imagine your bundle has the following example config:
<!-- src/config/services.xml -->
<?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
https://symfony.com/schema/dic/services/services-1.0.xsd"
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd"
>
<services>
<service id="acme_social.twitter_client" class="Acme\SocialBundle\TwitterClient">
Expand Down Expand Up @@ -514,20 +510,18 @@ can place it anywhere you like. You should return this path as the base path::
}
}

Assuming the XSD file is called ``hello-1.0.xsd``, the schema location will be
``https://acme_company.com/schema/dic/hello/hello-1.0.xsd``:
Assuming the XSD file is called ``hello-1.0.xsd``, the schema location should be
``https://acme_company.com/schema/hello-1.0.xsd``:

.. code-block:: xml

<!-- config/packages/acme_hello.xml -->
<?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:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:acme-hello="http://acme_company.com/schema/dic/hello"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://acme_company.com/schema/dic/hello
https://acme_company.com/schema/dic/hello/hello-1.0.xsd"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://acme_company.com/schema/hello-1.0.xsd"
>
<acme-hello:config>
<!-- ... -->
Expand Down
5 changes: 2 additions & 3 deletions bundles/override.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,8 @@ to a new validation group:
<!-- config/validator/validation.xml -->
<?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
https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://symfony.com/schema/constraint-mapping-1.0.xsd"
>
<class name="FOS\UserBundle\Model\User">
<property name="plainPassword">
Expand Down
7 changes: 2 additions & 5 deletions bundles/prepend_extension.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,11 @@ registered and the ``entity_manager_name`` setting for ``acme_hello`` is set to
<!-- config/packages/acme_something.xml -->
<?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:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:acme-something="http://example.org/schema/dic/acme_something"
xmlns:acme-other="http://example.org/schema/dic/acme_other"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://example.org/schema/dic/acme_something
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://example.org/schema/dic/acme_something/acme_something-1.0.xsd
http://example.org/schema/dic/acme_other
https://example.org/schema/dic/acme_something/acme_other-1.0.xsd"
>
<acme-something:config use-acme-goodbye="false">
Expand Down
81 changes: 31 additions & 50 deletions cache.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,10 @@ adapter (template) they use by using the ``app`` and ``system`` key like:
<!-- config/packages/cache.xml -->
<?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:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://symfony.com/schema/symfony-1.0.xsd"
>
<framework:config>
<framework:cache
Expand Down Expand Up @@ -144,12 +142,10 @@ Some of these adapters could be configured via shortcuts.
<!-- config/packages/cache.xml -->
<?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:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://symfony.com/schema/symfony-1.0.xsd"
>
<framework:config>
<!-- "directory" attribute is only used with cache.adapter.filesystem -->
Expand Down Expand Up @@ -241,12 +237,10 @@ You can also create more customized pools:
<!-- config/packages/cache.xml -->
<?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:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://symfony.com/schema/symfony-1.0.xsd"
>
<framework:config>
<framework:cache default-memcached-provider="memcached://localhost">
Expand Down Expand Up @@ -361,9 +355,8 @@ with either :class:`Symfony\\Contracts\\Cache\\CacheInterface` or
<!-- config/services.xml -->
<?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
https://symfony.com/schema/dic/services/services-1.0.xsd"
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd"
>
<services>
<!-- ... -->
Expand Down Expand Up @@ -423,12 +416,10 @@ and use that when configuring the pool.
<!-- config/packages/cache.xml -->
<?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:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://symfony.com/schema/symfony-1.0.xsd"
>
<framework:config>
<framework:cache>
Expand Down Expand Up @@ -515,12 +506,10 @@ Symfony stores the item automatically in all the missing pools.
<!-- config/packages/cache.xml -->
<?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:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://symfony.com/schema/symfony-1.0.xsd"
>
<framework:config>
<framework:cache>
Expand Down Expand Up @@ -609,12 +598,10 @@ to enable this feature. This could be added by using the following configuration
<!-- config/packages/cache.xml -->
<?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:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://symfony.com/schema/symfony-1.0.xsd"
>
<framework:config>
<framework:cache>
Expand Down Expand Up @@ -662,12 +649,10 @@ achieved by specifying the adapter.
<!-- config/packages/cache.xml -->
<?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:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://symfony.com/schema/symfony-1.0.xsd"
>
<framework:config>
<framework:cache>
Expand Down Expand Up @@ -819,13 +804,11 @@ Then, register the ``SodiumMarshaller`` service using this key:
<!-- config/packages/cache.xml -->
<?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:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://symfony.com/schema/symfony-1.0.xsd"
>
<!-- ... -->

<services>
Expand Down Expand Up @@ -950,12 +933,10 @@ a message bus to compute values in a worker:
<!-- config/packages/framework.xml -->
<?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:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://symfony.com/schema/symfony-1.0.xsd"
>
<framework:config>
<framework:cache>
Expand Down
1 change: 0 additions & 1 deletion components/config/definition.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,6 @@ The example results in the following:
password=""
memory="false"
>

<!-- prototype -->
<!-- value: Required -->
<parameters
Expand Down
5 changes: 2 additions & 3 deletions components/dependency_injection.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,8 @@ config files:

<?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
https://symfony.com/schema/dic/services/services-1.0.xsd"
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd"
>
<parameters>
<!-- ... -->
Expand Down
5 changes: 2 additions & 3 deletions components/dependency_injection/_imports-parameters-note.rst.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
<!-- config/services.xml -->
<?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
https://symfony.com/schema/dic/services/services-1.0.xsd"
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd"
>
<imports>
<import resource="%kernel.project_dir%/somefile.yaml"/>
Expand Down
10 changes: 4 additions & 6 deletions components/dependency_injection/compilation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,10 @@ The XML version of the config would then look like this:

<?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/schema/dic/acme_demo"
xsi:schemaLocation="http://symfony.com/schema/dic/services
https://symfony.com/schema/dic/services/services-1.0.xsd
http://www.example.com/schema/dic/acme_demo
https://www.example.com/schema/dic/acme_demo/acme_demo-1.0.xsd"
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xmlns:acme-demo="https://example.com/schema/dic/acme_demo"
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
https://example.com/schema/dic/acme_demo/acme_demo-1.0.xsd"
>
<acme-demo:config>
<acme_demo:foo>fooValue</acme_demo:foo>
Expand Down
10 changes: 5 additions & 5 deletions components/phpunit_bridge.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ to register a new `test listener`_ called ``SymfonyTestsListener``:
.. code-block:: xml

<!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<phpunit xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
>

Expand Down Expand Up @@ -201,7 +201,7 @@ message, enclosed with ``/``. For example, with:
.. code-block:: xml

<!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<phpunit xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
>

Expand Down Expand Up @@ -420,7 +420,7 @@ configuration file:
.. code-block:: xml

<!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<phpunit xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
>

Expand Down Expand Up @@ -875,7 +875,7 @@ namespaces in the ``phpunit.xml`` file, as done for example in the
.. code-block:: xml

<!-- https://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<phpunit xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.1/phpunit.xsd"
>

Expand Down Expand Up @@ -1054,7 +1054,7 @@ Add the following configuration to the ``phpunit.xml.dist`` file:
.. code-block:: xml

<!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<phpunit xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
>

Expand Down
Loading
Loading