Skip to content
This repository has been archived by the owner on Jul 22, 2022. It is now read-only.

Commit

Permalink
Apply XML lint (#384)
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Jun 8, 2016
1 parent e6a0930 commit 9ad8028
Show file tree
Hide file tree
Showing 16 changed files with 96 additions and 169 deletions.
16 changes: 4 additions & 12 deletions Resources/config/block.xml
@@ -1,22 +1,14 @@
<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">

<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">
<parameters>
<parameter id="sonata_admin_doctrine_phpcr.tree_block.defaults" type="collection"/>
</parameters>

<services>
<service id="sonata_admin_doctrine_phpcr.tree_block"
class="Sonata\DoctrinePHPCRAdminBundle\Block\TreeBlockService">
<service id="sonata_admin_doctrine_phpcr.tree_block" class="Sonata\DoctrinePHPCRAdminBundle\Block\TreeBlockService">
<tag name="sonata.block"/>

<argument>sonata_admin_doctrine_phpcr.tree_block</argument>
<argument type="service" id="templating"/>
<argument>%sonata_admin_doctrine_phpcr.tree_block.defaults%</argument>
</service>
</services>

</container>
</container>
59 changes: 22 additions & 37 deletions Resources/config/doctrine_phpcr.xml
@@ -1,65 +1,50 @@
<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">

<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>

<service id="sonata.admin.manager.doctrine_phpcr" class="Sonata\DoctrinePHPCRAdminBundle\Model\ModelManager">
<argument type="service" id="doctrine_phpcr.odm.default_document_manager" />
<argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
</service>

<!-- FormBuilder -->
<service id="sonata.admin.builder.doctrine_phpcr_form" class="Sonata\DoctrinePHPCRAdminBundle\Builder\FormContractor">
<argument type="service" id="form.factory" />
<argument type="service" id="form.factory"/>
</service>

<!-- ListBuilder -->
<service id="sonata.admin.builder.doctrine_phpcr_list" class="Sonata\DoctrinePHPCRAdminBundle\Builder\ListBuilder" >
<argument type="service" id="sonata.admin.guesser.doctrine_phpcr_list_chain" />
<argument />
<service id="sonata.admin.builder.doctrine_phpcr_list" class="Sonata\DoctrinePHPCRAdminBundle\Builder\ListBuilder">
<argument type="service" id="sonata.admin.guesser.doctrine_phpcr_list_chain"/>
<argument/>
</service>

<service id="sonata.admin.guesser.doctrine_phpcr_list" class="Sonata\DoctrinePHPCRAdminBundle\Guesser\TypeGuesser">
<argument type="service" id="doctrine_phpcr" />
<tag name="sonata.admin.guesser.doctrine_phpcr_list" />
<argument type="service" id="doctrine_phpcr"/>
<tag name="sonata.admin.guesser.doctrine_phpcr_list"/>
</service>

<service id="sonata.admin.guesser.doctrine_phpcr_list_chain" class="Sonata\AdminBundle\Guesser\TypeGuesserChain">
<argument />
<argument/>
</service>

<!-- ShowBuilder -->
<service id="sonata.admin.builder.doctrine_phpcr_show" class="Sonata\DoctrinePHPCRAdminBundle\Builder\ShowBuilder" >
<argument type="service" id="sonata.admin.guesser.doctrine_phpcr_show_chain" />
<argument />
<service id="sonata.admin.builder.doctrine_phpcr_show" class="Sonata\DoctrinePHPCRAdminBundle\Builder\ShowBuilder">
<argument type="service" id="sonata.admin.guesser.doctrine_phpcr_show_chain"/>
<argument/>
</service>

<service id="sonata.admin.guesser.doctrine_phpcr_show" class="Sonata\DoctrinePHPCRAdminBundle\Guesser\TypeGuesser">
<argument type="service" id="doctrine_phpcr" />
<tag name="sonata.admin.guesser.doctrine_phpcr_show" />
<argument type="service" id="doctrine_phpcr"/>
<tag name="sonata.admin.guesser.doctrine_phpcr_show"/>
</service>

<service id="sonata.admin.guesser.doctrine_phpcr_show_chain" class="Sonata\AdminBundle\Guesser\TypeGuesserChain">
<argument />
<argument/>
</service>

<!-- DatagridBuilder guesser -->
<service id="sonata.admin.builder.doctrine_phpcr_datagrid" class="Sonata\DoctrinePHPCRAdminBundle\Builder\DatagridBuilder">
<argument type="service" id="form.factory" />
<argument type="service" id="sonata.admin.builder.filter.factory" />
<argument type="service" id="sonata.admin.guesser.doctrine_phpcr_datagrid_chain" />
<argument type="service" id="form.factory"/>
<argument type="service" id="sonata.admin.builder.filter.factory"/>
<argument type="service" id="sonata.admin.guesser.doctrine_phpcr_datagrid_chain"/>
<argument>%form.type_extension.csrf.enabled%</argument>
</service>

<service id="sonata.admin.guesser.doctrine_phpcr_datagrid" class="Sonata\DoctrinePHPCRAdminBundle\Guesser\FilterTypeGuesser">
<argument type="service" id="doctrine_phpcr" />
<tag name="sonata.admin.guesser.doctrine_phpcr_datagrid" />
<argument type="service" id="doctrine_phpcr"/>
<tag name="sonata.admin.guesser.doctrine_phpcr_datagrid"/>
</service>

<service id="sonata.admin.guesser.doctrine_phpcr_datagrid_chain" class="Sonata\AdminBundle\Guesser\TypeGuesserChain">
<argument />
<argument/>
</service>
</services>
</container>
38 changes: 12 additions & 26 deletions Resources/config/doctrine_phpcr_filter_types.xml
@@ -1,47 +1,33 @@
<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">

<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="sonata.admin.doctrine_phpcr.filter.type.boolean" class="Sonata\DoctrinePHPCRAdminBundle\Filter\BooleanFilter">
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_boolean" />
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_boolean"/>
</service>

<service id="sonata.admin.doctrine_phpcr.filter.type.callback" class="Sonata\DoctrinePHPCRAdminBundle\Filter\CallbackFilter">
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_callback" />
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_callback"/>
</service>

<service id="sonata.admin.doctrine_phpcr.filter.type.choice" class="Sonata\DoctrinePHPCRAdminBundle\Filter\ChoiceFilter">
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_choice" />
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_choice"/>
</service>

<service id="sonata.admin.doctrine_phpcr_form.filter.type.choice" class="Sonata\DoctrinePHPCRAdminBundle\Form\Type\Filter\ChoiceType">
<tag name="form.type" alias="doctrine_phpcr_type_filter_choice" />

<argument type="service" id="translator" />
<tag name="form.type" alias="doctrine_phpcr_type_filter_choice"/>
<argument type="service" id="translator"/>
</service>

<service id="sonata.admin.doctrine_phpcr.filter.type.model" class="Sonata\DoctrinePHPCRAdminBundle\Filter\ModelFilter">
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_model" />
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_model"/>
</service>

<service id="sonata.admin.doctrine_phpcr.filter.type.string" class="Sonata\DoctrinePHPCRAdminBundle\Filter\StringFilter">
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_string" />
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_string"/>
</service>

<service id="sonata.admin.doctrine_phpcr.filter.type.number" class="Sonata\DoctrinePHPCRAdminBundle\Filter\NumberFilter">
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_number" />
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_number"/>
</service>

<service id="sonata.admin.doctrine_phpcr.filter.type.date" class="Sonata\DoctrinePHPCRAdminBundle\Filter\DateFilter">
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_date" />
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_date"/>
</service>

<service id="sonata.admin.doctrine_phpcr.filter.type.nodename" class="Sonata\DoctrinePHPCRAdminBundle\Filter\NodeNameFilter">
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_nodename" />
<tag name="sonata.admin.filter.type" alias="doctrine_phpcr_nodename"/>
</service>
</services>

</container>
22 changes: 7 additions & 15 deletions Resources/config/doctrine_phpcr_form_types.xml
@@ -1,28 +1,20 @@
<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">

<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="sonata.admin.doctrine_phpcr.form.type.phpcr_odm_tree" class="Sonata\DoctrinePHPCRAdminBundle\Form\Type\TreeModelType">
<tag name="form.type" alias="doctrine_phpcr_odm_tree" />
<tag name="form.type" alias="doctrine_phpcr_odm_tree"/>
<call method="setDefaults">
<argument>%sonata_admin_doctrine_phpcr.tree_block.defaults%</argument>
</call>
<call method="setTree">
<argument type="service" id="sonata.admin.doctrine_phpcr.phpcr_odm_tree" />
<argument type="service" id="sonata.admin.doctrine_phpcr.phpcr_odm_tree"/>
</call>
</service>

<service id="sonata.admin.doctrine_phpcr.form.type.phpcr_odm_tree_manager" class="Sonata\DoctrinePHPCRAdminBundle\Form\Type\TreeManagerType">
<tag name="form.type" alias="doctrine_phpcr_odm_tree_manager" />
<tag name="form.type" alias="doctrine_phpcr_odm_tree_manager"/>
</service>

<service id="sonata.admin.doctrine_phpcr.form.collection_type_extension" class="Sonata\DoctrinePHPCRAdminBundle\Form\Extension\CollectionTypeExtension"
>
<tag name="form.type_extension" alias="sonata_type_collection" />
<service id="sonata.admin.doctrine_phpcr.form.collection_type_extension" class="Sonata\DoctrinePHPCRAdminBundle\Form\Extension\CollectionTypeExtension">
<tag name="form.type_extension" alias="sonata_type_collection"/>
</service>
</services>

</container>
12 changes: 3 additions & 9 deletions Resources/config/form.xml
@@ -1,14 +1,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 http://symfony.com/schema/dic/services/services-1.0.xsd">

<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="sonata.admin.doctrine_phpcr.form.type.choice_field_mask" class="Sonata\DoctrinePHPCRAdminBundle\Form\Type\ChoiceFieldMaskType">
<tag name="form.type" alias="choice_field_mask" />
<tag name="form.type" alias="choice_field_mask"/>
</service>
</services>

</container>

11 changes: 3 additions & 8 deletions Resources/config/route.xml
@@ -1,11 +1,6 @@
<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">

<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="sonata.admin.route.path_info_slashes" class="Sonata\DoctrinePHPCRAdminBundle\Route\PathInfoBuilderSlashes" />
<service id="sonata.admin.route.path_info_slashes" class="Sonata\DoctrinePHPCRAdminBundle\Route\PathInfoBuilderSlashes"/>
</services>
</container>

9 changes: 2 additions & 7 deletions Resources/config/routing/tree.xml
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

<routes xmlns="http://symfony.com/schema/routing"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">

<?xml version="1.0" encoding="UTF-8"?>
<routes xmlns="http://symfony.com/schema/routing" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
<route id="sonata_admin_tree" pattern="/tree">
<default key="_controller">SonataDoctrinePHPCRAdminBundle:Tree:index</default>
</route>

</routes>
27 changes: 10 additions & 17 deletions Resources/config/tree.xml
@@ -1,23 +1,18 @@
<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">

<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>

<service id="sonata.admin.doctrine_phpcr.tree_controller"
class="Sonata\DoctrinePHPCRAdminBundle\Controller\TreeController">
<argument type="service" id="sonata.admin.doctrine_phpcr.phpcr_odm_tree" />
<service id="sonata.admin.doctrine_phpcr.tree_controller" class="Sonata\DoctrinePHPCRAdminBundle\Controller\TreeController">
<argument type="service" id="sonata.admin.doctrine_phpcr.phpcr_odm_tree"/>
<argument/>
<argument>%sonata_admin_doctrine_phpcr.tree_block.defaults%</argument>
<argument>%sonata_admin_doctrine_phpcr.tree_confirm_move%</argument>
<call method="setContainer"><argument type="service" id="service_container"/></call>
<call method="setContainer">
<argument type="service" id="service_container"/>
</call>
</service>

<service id="sonata.admin.doctrine_phpcr.phpcr_odm_tree" class="Sonata\DoctrinePHPCRAdminBundle\Tree\PhpcrOdmTree">
<tag name="cmf.tree" alias="phpcr_odm_tree" />
<argument type="service" id="doctrine_phpcr.odm.default_document_manager" />
<tag name="cmf.tree" alias="phpcr_odm_tree"/>
<argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
<argument type="service" id="sonata.admin.manager.doctrine_phpcr"/>
<argument type="service" id="sonata.admin.pool"/>
<argument type="service" id="translator"/>
Expand All @@ -26,7 +21,5 @@
<argument/>
<argument/>
</service>

</services>

</container>
</container>
11 changes: 3 additions & 8 deletions Resources/config/twig.xml
@@ -1,13 +1,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 http://symfony.com/schema/dic/services/services-1.0.xsd">

<?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 http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="sonata.admin.twig.doctrine_phpcr_extension" class="Sonata\DoctrinePHPCRAdminBundle\Twig\Extension\SonataDoctrinePHPCRAdminExtension">
<tag name="twig.extension"/>
</service>
</services>

</container>
</container>
8 changes: 4 additions & 4 deletions Resources/translations/SonataDoctrinePHPCRAdmin.cs.xliff
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" datatype="plaintext" original="" >
<?xml version="1.0" encoding="UTF-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" datatype="plaintext" original="">
<body>
<trans-unit id="content_tree">
<source>content_tree</source>
Expand All @@ -27,5 +27,5 @@
<target>alespoň</target>
</trans-unit>
</body>
</file>
</file>
</xliff>
8 changes: 4 additions & 4 deletions Resources/translations/SonataDoctrinePHPCRAdmin.de.xliff
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" datatype="plaintext" original="" >
<?xml version="1.0" encoding="UTF-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" datatype="plaintext" original="">
<body>
<trans-unit id="content_tree">
<source>content_tree</source>
Expand Down Expand Up @@ -31,5 +31,5 @@
<target>(nicht editierbar)</target>
</trans-unit>
</body>
</file>
</file>
</xliff>
10 changes: 5 additions & 5 deletions Resources/translations/SonataDoctrinePHPCRAdmin.en.xliff
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" datatype="plaintext" original="" >
<?xml version="1.0" encoding="UTF-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" datatype="plaintext" original="">
<body>
<trans-unit id="content_tree">
<source>content_tree</source>
Expand Down Expand Up @@ -33,7 +33,7 @@
<trans-unit id="label_type_contains_words">
<source>label_type_contains_words</source>
<target>contains words</target>
</trans-unit>
</trans-unit>
</body>
</file>
</file>
</xliff>
8 changes: 4 additions & 4 deletions Resources/translations/SonataDoctrinePHPCRAdmin.fr.xliff
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="fr" datatype="plaintext" original="" >
<?xml version="1.0" encoding="UTF-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="fr" datatype="plaintext" original="">
<body>
<trans-unit id="content_tree">
<source>content_tree</source>
Expand Down Expand Up @@ -31,5 +31,5 @@
<target>(Non éditable)</target>
</trans-unit>
</body>
</file>
</file>
</xliff>

0 comments on commit 9ad8028

Please sign in to comment.