Merge 2.x into master

.travis.yml

@@ -20,6 +20,7 @@ php:
 sudo: false
 
 cache:
+  pip: true
   directories:
     - $HOME/.composer/cache/files
 
@@ -29,6 +30,7 @@ env:
     - SYMFONY_DEPRECATIONS_HELPER=weak
     - TARGET=test
     - UPSTREAM_URL=https://github.com/sonata-project/SonataTranslationBundle.git
+    - XMLLINT_INDENT="    "
 
 matrix:
   fast_finish: true

.travis/before_install_test.sh

@@ -12,7 +12,6 @@ fi
 
 # To be removed when following PR will be merged: https://github.com/travis-ci/travis-build/pull/718
 composer self-update --stable
-composer config --quiet --global github-oauth.github.com $GITHUB_OAUTH_TOKEN
 sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json
 
 if [ "$SYMFONY" != "" ]; then composer require "symfony/symfony:$SYMFONY" --no-update; fi;

.travis/check_relevant_lint.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -ev
 
-RELEVANT_FILES=$(git diff --name-only HEAD upstream/${TRAVIS_BRANCH} -- *.{json})
+RELEVANT_FILES=$(git diff --name-only HEAD upstream/${TRAVIS_BRANCH} -- '*.json' '*.yml' '*.xml' '*.xliff')
 
 if [[ -z ${RELEVANT_FILES} ]]; then echo -n 'KO'; exit 0; fi;

.travis/install_lint.sh

@@ -2,3 +2,5 @@
 set -ev
 
 composer global require sllh/composer-lint:@stable --prefer-dist --no-interaction
+
+gem install yaml-lint

CONTRIBUTING.md

@@ -13,8 +13,11 @@ Thanks for your interest in Sonata projects!
 First, check if you are up to date: is your version still supported, and are
 you using the latest patch version?
 
-If you are not sure this is a bug, consider posting your question on [Stack
-Overflow](http://stackoverflow.com), using one of the sonata tags.
+GitHub Issues is for **issues**, as opposed to question on how to use Sonata.
+If you are not sure this is a bug, or simply want to ask such a question,
+please post your question on [Stack Overflow](http://stackoverflow.com/questions/tagged/sonata),
+using the `sonata` tags.
+
 If you happen to find a bug, we kindly request you report it. However,
 before submitting it, please check the [project documentation available
 online](https://sonata-project.org/bundles/).
@@ -88,8 +91,10 @@ Some rules have to be respected about the test:
   * `@codeCoverageIgnoreStart`
   * `@codeCoverageIgnoreEnd`
 * All test methods should be prefixed by `test`. Example: `public function testItReturnsNull()`.
+* All test method names must be in camel case format.
 * As opposed, the `@test` annotation is prohibited.
 * Most of the time, the test class should have the same name as the targeted class, suffixed by `Test`.
+* The `@expectedException*` annotations are prohibited. Use `PHPUnit_Framework_TestCase::setExpectedException()`.
 
 ### Writing a Pull Request
 

Makefile

@@ -9,6 +9,11 @@ all:
 
 lint:
 	composer validate
+	find . -name '*.yml' -not -path './vendor/*' -not -path './Resources/public/vendor/*' | xargs yaml-lint
+	find . \( -name '*.xml' -or -name '*.xliff' \) \
+		-not -path './vendor/*' -not -path './Resources/public/vendor/*' -type f \
+		-exec xmllint --encode UTF-8 --output '{}' --format '{}' \;
+	git diff --exit-code
 
 test:
 	phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml

Resources/config/block.xml

@@ -1,19 +1,13 @@
-<?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 key="sonata_translation.block.locale_switcher.class">Sonata\TranslationBundle\Block\LocaleSwitcherBlockService</parameter>
     </parameters>
-
     <services>
         <service id="sonata_translation.block.locale_switcher" class="%sonata_translation.block.locale_switcher.class%">
-            <tag name="sonata.block" />
+            <tag name="sonata.block"/>
             <argument>sonata_translation.block.locale_switcher</argument>
-            <argument type="service" id="templating" />
+            <argument type="service" id="templating"/>
         </service>
     </services>
-
 </container>

Resources/config/listener.xml

@@ -1,18 +1,12 @@
-<?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 key="sonata_translation.listener.locale_switcher.class">Sonata\TranslationBundle\EventListener\LocaleSwitcherListener</parameter>
     </parameters>
-
     <services>
         <service id="sonata_translation.listener.locale_switcher" class="%sonata_translation.listener.locale_switcher.class%">
             <tag name="kernel.event_listener" event="sonata.block.event.sonata.admin.edit.form.top" method="onBlock"/>
-            <tag name="kernel.event_listener" event="sonata.block.event.sonata.admin.show.top" method="onBlock"/>                       
+            <tag name="kernel.event_listener" event="sonata.block.event.sonata.admin.show.top" method="onBlock"/>
         </service>
     </services>
-
 </container>

Resources/config/service.xml

@@ -1,15 +1,9 @@
-<?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 key="sonata_translation.checker.translatable.class">Sonata\TranslationBundle\Checker\TranslatableChecker</parameter>
     </parameters>
-
     <services>
-        <service id="sonata_translation.checker.translatable" class="%sonata_translation.checker.translatable.class%" />
+        <service id="sonata_translation.checker.translatable" class="%sonata_translation.checker.translatable.class%"/>
     </services>
-
 </container>

Resources/config/service_gedmo.xml

@@ -1,20 +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 key="sonata_translation.admin.extension.gedmo_translatable.class">Sonata\TranslationBundle\Admin\Extension\Gedmo\TranslatableAdminExtension</parameter>
     </parameters>
-
     <services>
         <service id="sonata_translation.admin.extension.gedmo_translatable" class="%sonata_translation.admin.extension.gedmo_translatable.class%">
-            <tag name="sonata.admin.extension" />
-            <argument type="service" id="sonata_translation.checker.translatable" />
-            <argument type="service" id="sonata_translation.listener.translatable" />
+            <tag name="sonata.admin.extension"/>
+            <argument type="service" id="sonata_translation.checker.translatable"/>
+            <argument type="service" id="sonata_translation.listener.translatable"/>
         </service>
-        <service id="sonata_translation.listener.translatable" alias="stof_doctrine_extensions.listener.translatable" />
+        <service id="sonata_translation.listener.translatable" alias="stof_doctrine_extensions.listener.translatable"/>
     </services>
-
 </container>

Resources/config/service_knplabs.xml

@@ -1,18 +1,12 @@
-<?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 key="sonata_translation.admin.extension.knplabs_translatable.class">Sonata\TranslationBundle\Admin\Extension\Knplabs\TranslatableAdminExtension</parameter>
     </parameters>
-
     <services>
         <service id="sonata_translation.admin.extension.knplabs_translatable" class="%sonata_translation.admin.extension.knplabs_translatable.class%">
-            <tag name="sonata.admin.extension" />
-            <argument type="service" id="sonata_translation.checker.translatable" />
+            <tag name="sonata.admin.extension"/>
+            <argument type="service" id="sonata_translation.checker.translatable"/>
         </service>
     </services>
-
 </container>

Resources/config/service_phpcr.xml

@@ -1,18 +1,12 @@
-<?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 key="sonata_translation.admin.extension.phpcr_translatable.class">Sonata\TranslationBundle\Admin\Extension\Phpcr\TranslatableAdminExtension</parameter>
     </parameters>
-
     <services>
         <service id="sonata_translation.admin.extension.phpcr_translatable" class="%sonata_translation.admin.extension.phpcr_translatable.class%">
-            <tag name="sonata.admin.extension" />
-            <argument type="service" id="sonata_translation.checker.translatable" />
+            <tag name="sonata.admin.extension"/>
+            <argument type="service" id="sonata_translation.checker.translatable"/>
         </service>
     </services>
-
 </container>

Resources/config/twig.xml

@@ -1,18 +1,12 @@
-<?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 key="sonata_translation.twig.sonata_translation_extension.class">Sonata\TranslationBundle\Twig\Extension\SonataTranslationExtension</parameter>
     </parameters>
-
     <services>
         <service id="sonata_translation.twig.sonata_translation_extension" class="%sonata_translation.twig.sonata_translation_extension.class%">
-            <tag name="twig.extension" />
-            <argument type="service" id="sonata_translation.checker.translatable" />
+            <tag name="twig.extension"/>
+            <argument type="service" id="sonata_translation.checker.translatable"/>
         </service>
     </services>
-
 </container>

Resources/translations/SonataTranslationBundle.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="de" 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="de" datatype="plaintext" original="">
         <body>
             <trans-unit id="sonata_translation">
                 <source>sonata_translation</source>

Resources/translations/SonataTranslationBundle.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="sonata_translation">
                 <source>sonata_translation</source>

Resources/translations/SonataTranslationBundle.es.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="sonata_translation">
                 <source>sonata_translation</source>

Resources/translations/SonataTranslationBundle.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="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="sonata_translation">
                 <source>sonata_translation</source>

Resources/translations/SonataTranslationBundle.hu.xliff

@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
     <file source-language="en" target-language="hu" datatype="plaintext" original="SonataTranslationBundle.en.xliff">
         <body>

Resources/translations/SonataTranslationBundle.it.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="sonata_translation">
                 <source>sonata_translation</source>