diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
new file mode 100644
index 000000000..ee0888349
--- /dev/null
+++ b/.github/workflows/lint.yaml
@@ -0,0 +1,65 @@
+on: [push, pull_request]
+
+name: Lint
+
+jobs:
+    php-cs-fixer:
+        name: PHP-CS-Fixer
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v2
+
+            - name: "Run PHP-CS-Fixer"
+              uses: docker://oskarstark/php-cs-fixer-ga:2.16.1
+              with:
+                  args: --ansi --verbose --diff --dry-run
+
+    composer-normalize:
+        name: composer-normalize
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v2
+
+            - name: "Run composer-normalize"
+              uses: docker://localheinz/composer-normalize-action:0.5.2
+              with:
+                  args: --dry-run
+
+    yaml-files:
+        name: YAML files
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v2
+
+            - name: "Install Ruby 2.6"
+              uses: actions/setup-ruby@v1
+              with:
+                  ruby-version: '2.6'
+
+            - run: gem install yaml-lint
+
+            - name: "Linting..."
+              run: make lint-yaml
+
+    xml-files:
+        name: XML files
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v2
+
+            - run: sudo apt-get update && sudo apt-get install libxml2-utils
+
+            - name: "Linting..."
+              run: make lint-xml
diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
new file mode 100644
index 000000000..125108a18
--- /dev/null
+++ b/.github/workflows/qa.yaml
@@ -0,0 +1,15 @@
+on: [push, pull_request]
+name: Quality assurance
+jobs:
+  phpstan:
+    name: PHPStan
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: PHPStan
+        uses: "docker://oskarstark/phpstan-ga"
+        env:
+          CHECK_PLATFORM_REQUIREMENTS: false
+          REQUIRE_DEV: true
+        with:
+          args: analyse
diff --git a/Makefile b/Makefile
index e87d0d743..cabfb52b3 100644
--- a/Makefile
+++ b/Makefile
@@ -76,4 +76,66 @@ build:
 	git stash
 	app/console assets:install web
 	bin/qa_build_git.sh . /home/vagrant/sonata-sandbox-build 2.4 2.4
-	git stash pop
\ No newline at end of file
+	git stash pop
+
+all:
+	@echo "Please choose a task."
+.PHONY: all
+
+lint: lint-composer lint-yaml lint-xml lint-php
+.PHONY: lint
+
+lint-composer:
+	composer validate
+.PHONY: lint-composer
+
+lint-yaml:
+	yaml-lint --ignore-non-yaml-files --quiet --exclude vendor .
+
+.PHONY: lint-yaml
+
+lint-xml:
+	find . \( -name '*.xml' -or -name '*.xliff' \) \
+		-not -path './vendor/*' \
+		-not -path './src/Resources/public/vendor/*' \
+        -not -path './public/*' \
+		| while read xmlFile; \
+	do \
+		XMLLINT_INDENT='    ' xmllint --encode UTF-8 --format "$$xmlFile"|diff - "$$xmlFile"; \
+		if [ $$? -ne 0 ] ;then exit 1; fi; \
+	done
+
+.PHONY: lint-xml
+
+lint-php:
+	php-cs-fixer fix --ansi --verbose --diff --dry-run
+.PHONY: lint-php
+
+cs-fix: cs-fix-php cs-fix-xml
+.PHONY: cs-fix
+
+cs-fix-php:
+	php-cs-fixer fix --verbose
+.PHONY: cs-fix-php
+
+cs-fix-xml:
+	find . \( -name '*.xml' -or -name '*.xliff' \) \
+		-not -path './vendor/*' \
+		-not -path './src/Resources/public/vendor/*' \
+        -not -path './public/*' \
+		| while read xmlFile; \
+	do \
+		XMLLINT_INDENT='    ' xmllint --encode UTF-8 --format "$$xmlFile" --output "$$xmlFile"; \
+	done
+.PHONY: cs-fix-xml
+
+build:
+	mkdir $@
+
+test:
+ifeq ($(shell php --modules|grep --quiet pcov;echo $$?), 0)
+	vendor/bin/simple-phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
+else
+	vendor/bin/simple-phpunit -c phpunit.xml.dist
+endif
+.PHONY: test
diff --git a/build.xml b/build.xml
index b64374a4b..77fd06f5c 100644
--- a/build.xml
+++ b/build.xml
@@ -1,74 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <project name="sonata-sandbox" default="initialize-project" basedir=".">
     <target name="initialize-project">
         <!-- TODO: check for existence of app/config/parameters.yml -->
-
-        <property name="app.uploadsDir" value="./public/uploads/media" />
-        <property name="app.console" value="bin/console" />
-
+        <property name="app.uploadsDir" value="./public/uploads/media"/>
+        <property name="app.console" value="bin/console"/>
         <if>
-            <os family="windows" />
-            <then><property name="app.console" value="bin\console.bat"/></then>
-            <else><property name="app.console" value="bin/console" /></else>
+            <os family="windows"/>
+            <then>
+                <property name="app.console" value="bin\console.bat"/>
+            </then>
+            <else>
+                <property name="app.console" value="bin/console"/>
+            </else>
         </if>
-
-        <echo msg="Preparing ${app.uploadsDir} folder" />
-        <delete dir="${app.uploadsDir}" includeemptydirs="true" failonerror="false" />
-        <mkdir dir="${app.uploadsDir}" />
-
-        <echo msg="Removing any existing cache" />
+        <echo msg="Preparing ${app.uploadsDir} folder"/>
+        <delete dir="${app.uploadsDir}" includeemptydirs="true" failonerror="false"/>
+        <mkdir dir="${app.uploadsDir}"/>
+        <echo msg="Removing any existing cache"/>
         <foreach param="dir" absparam="path" target="delete-dir">
             <fileset dir="./var/cache">
-                <type type="dir" />
-                <depth max="0" min="0" />
+                <type type="dir"/>
+                <depth max="0" min="0"/>
             </fileset>
         </foreach>
-
-        <echo msg="Warming up cache for production environment" /> <!-- TODO: Is this even needed? -->
+        <echo msg="Warming up cache for production environment"/>
+        <!-- TODO: Is this even needed? -->
         <SymfonyConsole console="${app.console}" command="cache:clear" checkReturn="true">
-            <arg name="env" value="prod" />
-            <arg name="no-warmup" />
+            <arg name="env" value="prod"/>
+            <arg name="no-warmup"/>
         </SymfonyConsole>
-
-        <echo msg="Preparing database" />
+        <echo msg="Preparing database"/>
         <SymfonyConsole console="${app.console}" command="doctrine:database:drop" checkReturn="true">
-            <arg name="force" />
-            <arg name="if-exists" />
+            <arg name="force"/>
+            <arg name="if-exists"/>
             <!-- TODO: Fallback to doctrine:schema:drop in case user doesn't have permissions to drop/create databases? -->
         </SymfonyConsole>
-        <SymfonyConsole console="${app.console}" command="doctrine:database:create" checkReturn="true" />
+        <SymfonyConsole console="${app.console}" command="doctrine:database:create" checkReturn="true"/>
         <SymfonyConsole console="${app.console}" command="doctrine:schema:update" checkReturn="true">
-            <arg name="force" />
-            <arg name="dump-sql" />
+            <arg name="force"/>
+            <arg name="dump-sql"/>
         </SymfonyConsole>
         <SymfonyConsole console="${app.console}" command="doctrine:fixtures:load" checkReturn="true">
-            <!--<arg name="verbose" />-->
-            <arg name="no-interaction" />
+            <!--<arg name="verbose"/>-->
+            <arg name="no-interaction"/>
         </SymfonyConsole>
-
-        <echo msg="Preparing sonata news and page bundles" />
-        <SymfonyConsole console="${app.console}" command="sonata:news:sync-comments-count" checkReturn="true" />
+        <echo msg="Preparing sonata news and page bundles"/>
+        <SymfonyConsole console="${app.console}" command="sonata:news:sync-comments-count" checkReturn="true"/>
         <SymfonyConsole console="${app.console}" command="sonata:page:update-core-routes" checkReturn="true">
-            <arg name="site" value="all" />
+            <arg name="site" value="all"/>
         </SymfonyConsole>
         <SymfonyConsole console="${app.console}" command="sonata:page:create-snapshots" checkReturn="true">
-            <arg name="site" value="all" />
+            <arg name="site" value="all"/>
         </SymfonyConsole>
-
-        <echo msg="Preparing ACLs" />
-        <SymfonyConsole console="${app.console}" command="sonata:admin:setup-acl" checkReturn="true" />
-        <SymfonyConsole console="${app.console}" command="sonata:admin:generate-object-acl" checkReturn="true" />
-
+        <echo msg="Preparing ACLs"/>
+        <SymfonyConsole console="${app.console}" command="sonata:admin:setup-acl" checkReturn="true"/>
+        <SymfonyConsole console="${app.console}" command="sonata:admin:generate-object-acl" checkReturn="true"/>
         <!-- TODO: check for existence of yarn|npm -->
-        <echo msg="Generating assets" />
-        <SymfonyConsole console="${app.console}" command="assets:install" checkReturn="true" />
+        <echo msg="Generating assets"/>
+        <SymfonyConsole console="${app.console}" command="assets:install" checkReturn="true"/>
         <!--
-        <SymfonyConsole console="yarn" command="encore dev" checkReturn="true" />
+        <SymfonyConsole console="yarn" command="encore dev" checkReturn="true"/>
         -->
     </target>
-
     <target name="delete-dir" hidden="true">
-        <delete dir="${path}" includeemptydirs="true" failonerror="true" />
+        <delete dir="${path}" includeemptydirs="true" failonerror="true"/>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/composer.json b/composer.json
index 4431053ad..a743b7c80 100644
--- a/composer.json
+++ b/composer.json
@@ -1,24 +1,7 @@
 {
     "name": "sonata-project/sandbox",
     "description": "Sonata Project's sandbox (with ecommerce bundles)",
-
     "license": "MIT",
-
-    "autoload": {
-        "psr-4": {
-            "App\\": "src/",
-            "AppBundle\\": "src/AppBundle",
-            "Sonata\\Bundle\\": "src/Sonata/Bundle"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    },
-
-    "minimum-stability": "stable",
-
     "require": {
         "php": "^7.2",
         "ext-bcmath": "*",
@@ -63,8 +46,10 @@
         "symfony/browser-kit": "^4.2",
         "symfony/debug": "^4.4",
         "symfony/debug-bundle": "^4.4",
+        "symfony/dependency-injection": "^4.4",
         "symfony/flex": "^1.6",
         "symfony/form": "^4.4",
+        "symfony/http-kernel": "^4.4",
         "symfony/monolog-bundle": "^3.1",
         "symfony/polyfill-apcu": "^1.0",
         "symfony/security-acl": "^3.0",
@@ -77,7 +62,15 @@
         "twig/twig": "^2.12.1",
         "willdurand/faker-bundle": "^1.3"
     },
-
+    "replace": {
+        "symfony/polyfill-iconv": "*",
+        "symfony/polyfill-php56": "*",
+        "symfony/polyfill-php70": "*",
+        "symfony/polyfill-php71": "*"
+    },
+    "conflict": {
+        "symfony/symfony": "*"
+    },
     "require-dev": {
         "behat/behat": "^3.4",
         "behat/mink": "^1.7.1",
@@ -86,29 +79,38 @@
         "behat/mink-goutte-driver": "^1.2.1",
         "behat/mink-selenium2-driver": "^1.3.1",
         "phing/phing": "^2.16",
+        "phpstan/phpstan": "^0.12.32",
         "symfony/dotenv": "^4.0",
         "symfony/phpunit-bridge": "^5.1",
         "symfony/profiler-pack": "^1.0"
     },
-
-    "replace": {
-        "symfony/polyfill-iconv": "*",
-        "symfony/polyfill-php71": "*",
-        "symfony/polyfill-php70": "*",
-        "symfony/polyfill-php56": "*"
-    },
     "config": {
         "preferred-install": {
             "*": "dist"
         },
         "sort-packages": true
     },
+    "extra": {
+        "branch-alias": "3.0",
+        "symfony": {
+            "allow-contrib": true,
+            "require": "4.4.*"
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "App\\": "src/",
+            "AppBundle\\": "src/AppBundle",
+            "Sonata\\Bundle\\": "src/Sonata/Bundle"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
+    "minimum-stability": "stable",
     "scripts": {
-        "auto-scripts": {
-            "cache:clear": "symfony-cmd",
-            "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd",
-            "assets:install %PUBLIC_DIR%": "symfony-cmd"
-        },
         "post-install-cmd": [
             "@auto-scripts"
         ],
@@ -118,16 +120,11 @@
         "post-create-project-cmd": [
             "@auto-scripts",
             "php vendor/bin/phing"
-        ]
-    },
-    "conflict": {
-        "symfony/symfony": "*"
-    },
-    "extra": {
-        "branch-alias": "3.0",
-        "symfony": {
-            "allow-contrib": true,
-            "require": "4.4.*"
+        ],
+        "auto-scripts": {
+            "cache:clear": "symfony-cmd",
+            "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd",
+            "assets:install %PUBLIC_DIR%": "symfony-cmd"
         }
     }
 }
diff --git a/config/packages/sonata_admin.yaml b/config/packages/sonata_admin.yaml
index ebd139d04..aa3f0aa14 100644
--- a/config/packages/sonata_admin.yaml
+++ b/config/packages/sonata_admin.yaml
@@ -29,13 +29,13 @@ sonata_admin:
         # default global templates
         # the layout template include javascript/stylesheet to the formatter bundle,
         # if you don't need it use the default one: SonataAdminBundle::standard_layout.html.twig
-        layout:  SonataAdminBundle::standard_layout.html.twig
-        ajax:    SonataAdminBundle::ajax_layout.html.twig
+        layout:  'SonataAdminBundle::standard_layout.html.twig'
+        ajax:    'SonataAdminBundle::ajax_layout.html.twig'
 
         # default value if done set, actions templates, should extends a global templates
-        list:    SonataAdminBundle:CRUD:list.html.twig
-        show:    SonataAdminBundle:CRUD:show.html.twig
-        edit:    SonataAdminBundle:CRUD:edit.html.twig
+        list:    'SonataAdminBundle:CRUD:list.html.twig'
+        show:    'SonataAdminBundle:CRUD:show.html.twig'
+        edit:    'SonataAdminBundle:CRUD:edit.html.twig'
 
     dashboard:
         blocks:
@@ -92,7 +92,7 @@ sonata_admin:
             - { position: left, type: sonata.news.block.recent_comments, settings: { title: Recent Comments, number: 7, mode: admin }}
             - { position: right, type: sonata.order.block.recent_orders, settings: { title: Recent Orders, number: 5, mode: admin }}
             - { position: right, type: sonata.customer.block.recent_customers, settings: { title: Recent Customers, number: 5, mode: admin }}
-            - { position: right, type: sonata.block.service.rss, settings: { title: Sonata Project's Feeds, url: http://sonata-project.org/blog/archive.rss, template: SonataAdminBundle:Block:block_rss_dashboard.html.twig }}
+            - { position: right, type: sonata.block.service.rss, settings: { title: Sonata Project's Feeds, url: 'http://sonata-project.org/blog/archive.rss', template: 'SonataAdminBundle:Block:block_rss_dashboard.html.twig' }}
 
         groups:
             sonata.admin.group.content:
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
new file mode 100644
index 000000000..e79efe06c
--- /dev/null
+++ b/phpstan.neon.dist
@@ -0,0 +1,4 @@
+parameters:
+    level: 1
+    paths:
+        - src/
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 43314689d..cbe255e07 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,7 +9,11 @@
         >
 
     <php>
-        <server name="KERNEL_CLASS" value="App\Kernel" />
+        <server name="KERNEL_CLASS" value="App\Kernel"/>
+
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
+        <env name="SYMFONY_PHPUNIT_REMOVE" value="symfony/yaml"/>
+        <env name="SYMFONY_PHPUNIT_VERSION" value="8.5.0"/>
 
         <!-- ###+ doctrine/doctrine-bundle ### -->
         <!-- Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url -->
diff --git a/src/AppBundle/Resources/config/doctrine/Classification.Category.orm.xml b/src/AppBundle/Resources/config/doctrine/Classification.Category.orm.xml
index 180da4e6f..77ed663b5 100644
--- a/src/AppBundle/Resources/config/doctrine/Classification.Category.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Classification.Category.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Classification\Category"
-        table="classification__category"
-        repository-class="Doctrine\ORM\EntityRepository">
-
+    <entity name="AppBundle\Entity\Classification\Category" table="classification__category" repository-class="Doctrine\ORM\EntityRepository">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Classification.Collection.orm.xml b/src/AppBundle/Resources/config/doctrine/Classification.Collection.orm.xml
index a02f67d86..3a27c8e93 100644
--- a/src/AppBundle/Resources/config/doctrine/Classification.Collection.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Classification.Collection.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Classification\Collection"
-        table="classification__collection"
-        repository-class="Doctrine\ORM\EntityRepository">
-
+    <entity name="AppBundle\Entity\Classification\Collection" table="classification__collection" repository-class="Doctrine\ORM\EntityRepository">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Classification.Context.orm.xml b/src/AppBundle/Resources/config/doctrine/Classification.Context.orm.xml
index fb20ede1d..c7c1dabac 100644
--- a/src/AppBundle/Resources/config/doctrine/Classification.Context.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Classification.Context.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Classification\Context"
-        table="classification__context"
-        repository-class="Doctrine\ORM\EntityRepository">
-
+    <entity name="AppBundle\Entity\Classification\Context" table="classification__context" repository-class="Doctrine\ORM\EntityRepository">
         <id name="id" type="string" column="id">
             <generator strategy="NONE"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Classification.Tag.orm.xml b/src/AppBundle/Resources/config/doctrine/Classification.Tag.orm.xml
index 781b8488c..867cbb390 100644
--- a/src/AppBundle/Resources/config/doctrine/Classification.Tag.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Classification.Tag.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Classification\Tag"
-        table="classification__tag"
-        repository-class="Doctrine\ORM\EntityRepository">
-
+    <entity name="AppBundle\Entity\Classification\Tag" table="classification__tag" repository-class="Doctrine\ORM\EntityRepository">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Comment.Comment.orm.xml b/src/AppBundle/Resources/config/doctrine/Comment.Comment.orm.xml
index 3ab12f59c..0917610d2 100644
--- a/src/AppBundle/Resources/config/doctrine/Comment.Comment.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Comment.Comment.orm.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                  http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="AppBundle\Entity\Comment\Comment" table="comment__comment">
-
         <id name="id" column="id" type="integer">
-            <generator strategy="AUTO" />
+            <generator strategy="AUTO"/>
         </id>
-
     </entity>
-
 </doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Comment.Thread.orm.xml b/src/AppBundle/Resources/config/doctrine/Comment.Thread.orm.xml
index ee9de2357..3a78870b6 100644
--- a/src/AppBundle/Resources/config/doctrine/Comment.Thread.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Comment.Thread.orm.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                  http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="AppBundle\Entity\Comment\Thread" table="comment__thread">
-
-        <id name="id" column="id" type="string" />
-
+        <id name="id" column="id" type="string"/>
     </entity>
-
 </doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.Address.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.Address.orm.xml
index 1ec7b1275..d136cc755 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.Address.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.Address.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\Address"
-        table="customer__address"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\Address" table="customer__address">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.Basket.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.Basket.orm.xml
index 53accebfe..4b2f7f4e9 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.Basket.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.Basket.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\Basket"
-        table="basket__basket"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\Basket" table="basket__basket">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.BasketElement.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.BasketElement.orm.xml
index 69d0b6856..eb5f91c26 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.BasketElement.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.BasketElement.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\BasketElement"
-        table="basket__basket_element"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\BasketElement" table="basket__basket_element">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.Customer.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.Customer.orm.xml
index d9c774bf8..f5a7e4be6 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.Customer.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.Customer.orm.xml
@@ -1,20 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\Customer"
-        table="customer__customer"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\Customer" table="customer__customer">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.Delivery.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.Delivery.orm.xml
index 4051d2df8..f86b5b8bc 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.Delivery.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.Delivery.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\Delivery"
-        table="product__delivery"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\Delivery" table="product__delivery">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.Invoice.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.Invoice.orm.xml
index 79d8feacb..cf7cf1e2d 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.Invoice.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.Invoice.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\Invoice"
-        table="invoice__invoice"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\Invoice" table="invoice__invoice">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.InvoiceElement.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.InvoiceElement.orm.xml
index 520b7b46c..8e3328caa 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.InvoiceElement.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.InvoiceElement.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\InvoiceElement"
-        table="invoice__invoice_element"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\InvoiceElement" table="invoice__invoice_element">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.Order.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.Order.orm.xml
index 52f44356e..7ede35288 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.Order.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.Order.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\Order"
-        table="order__order"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\Order" table="order__order">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.OrderElement.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.OrderElement.orm.xml
index fb147059c..92281c2f0 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.OrderElement.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.OrderElement.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\OrderElement"
-        table="order__order_element"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\OrderElement" table="order__order_element">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.Package.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.Package.orm.xml
index 30dd165b9..c3c4bfe32 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.Package.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.Package.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\Package"
-        table="product__package"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\Package" table="product__package">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.Product.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.Product.orm.xml
index 496e2307f..7d3c1a686 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.Product.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.Product.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\Product"
-        table="product__product"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\Product" table="product__product">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.ProductCategory.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.ProductCategory.orm.xml
index e7da47e74..d5960142e 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.ProductCategory.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.ProductCategory.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\ProductCategory"
-        table="product__product_category"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\ProductCategory" table="product__product_category">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.ProductCollection.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.ProductCollection.orm.xml
index 89a6dea64..7f176ac46 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.ProductCollection.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.ProductCollection.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\ProductCollection"
-        table="product__product_collection"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\ProductCollection" table="product__product_collection">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Commerce.Transaction.orm.xml b/src/AppBundle/Resources/config/doctrine/Commerce.Transaction.orm.xml
index 03d33d9ed..f758798d6 100644
--- a/src/AppBundle/Resources/config/doctrine/Commerce.Transaction.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Commerce.Transaction.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Commerce\Transaction"
-        table="payment__transaction"
-        >
-
+    <entity name="AppBundle\Entity\Commerce\Transaction" table="payment__transaction">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Media.Gallery.orm.xml b/src/AppBundle/Resources/config/doctrine/Media.Gallery.orm.xml
index 451f96535..6684c09eb 100644
--- a/src/AppBundle/Resources/config/doctrine/Media.Gallery.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Media.Gallery.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Media\Gallery"
-        table="media__gallery"
-        >
-
+    <entity name="AppBundle\Entity\Media\Gallery" table="media__gallery">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Media.GalleryHasMedia.orm.xml b/src/AppBundle/Resources/config/doctrine/Media.GalleryHasMedia.orm.xml
index 793c5ce20..2c8a7d263 100644
--- a/src/AppBundle/Resources/config/doctrine/Media.GalleryHasMedia.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Media.GalleryHasMedia.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Media\GalleryHasMedia"
-        table="media__gallery_media"
-        >
-
+    <entity name="AppBundle\Entity\Media\GalleryHasMedia" table="media__gallery_media">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Media.Media.orm.xml b/src/AppBundle/Resources/config/doctrine/Media.Media.orm.xml
index d191a6a91..92753b92c 100644
--- a/src/AppBundle/Resources/config/doctrine/Media.Media.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Media.Media.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Media\Media"
-        table="media__media"
-        >
-
+    <entity name="AppBundle\Entity\Media\Media" table="media__media">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/News.Comment.orm.xml b/src/AppBundle/Resources/config/doctrine/News.Comment.orm.xml
index 06fe9cb4a..c23e26e86 100644
--- a/src/AppBundle/Resources/config/doctrine/News.Comment.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/News.Comment.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\News\Comment"
-        table="news__comment"
-        repository-class="Doctrine\ORM\EntityRepository">
-
+    <entity name="AppBundle\Entity\News\Comment" table="news__comment" repository-class="Doctrine\ORM\EntityRepository">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/News.Post.orm.xml b/src/AppBundle/Resources/config/doctrine/News.Post.orm.xml
index 02e75e9a3..414616826 100644
--- a/src/AppBundle/Resources/config/doctrine/News.Post.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/News.Post.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\News\Post"
-        table="news__post"
-        repository-class="Doctrine\ORM\EntityRepository">
-
+    <entity name="AppBundle\Entity\News\Post" table="news__post" repository-class="Doctrine\ORM\EntityRepository">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Notification.Message.orm.xml b/src/AppBundle/Resources/config/doctrine/Notification.Message.orm.xml
index 4824eee42..766cbc5ae 100644
--- a/src/AppBundle/Resources/config/doctrine/Notification.Message.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Notification.Message.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Notification\Message"
-        table="notification__message"
-        repository-class="Doctrine\ORM\EntityRepository">
-
+    <entity name="AppBundle\Entity\Notification\Message" table="notification__message" repository-class="Doctrine\ORM\EntityRepository">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
 </doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Page.Block.orm.xml b/src/AppBundle/Resources/config/doctrine/Page.Block.orm.xml
index 44846f745..a7cb2cf4c 100644
--- a/src/AppBundle/Resources/config/doctrine/Page.Block.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Page.Block.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Page\Block"
-        table="page__block"
-        repository-class="Doctrine\ORM\EntityRepository">
-
+    <entity name="AppBundle\Entity\Page\Block" table="page__block" repository-class="Doctrine\ORM\EntityRepository">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Page.Page.orm.xml b/src/AppBundle/Resources/config/doctrine/Page.Page.orm.xml
index 5b56e7a9d..8e194537b 100644
--- a/src/AppBundle/Resources/config/doctrine/Page.Page.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Page.Page.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Page\Page"
-        table="page__page"
-        >
-
+    <entity name="AppBundle\Entity\Page\Page" table="page__page">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Page.Site.orm.xml b/src/AppBundle/Resources/config/doctrine/Page.Site.orm.xml
index ab291e7ea..eaf399c0d 100644
--- a/src/AppBundle/Resources/config/doctrine/Page.Site.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Page.Site.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Page\Site"
-        table="page__site"
-        >
-
+    <entity name="AppBundle\Entity\Page\Site" table="page__site">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Page.Snapshot.orm.xml b/src/AppBundle/Resources/config/doctrine/Page.Snapshot.orm.xml
index 54c2d8645..58ba640fb 100644
--- a/src/AppBundle/Resources/config/doctrine/Page.Snapshot.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Page.Snapshot.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Page\Snapshot"
-        table="page__snapshot"
-        >
-
+    <entity name="AppBundle\Entity\Page\Snapshot" table="page__snapshot">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Timeline.Action.orm.xml b/src/AppBundle/Resources/config/doctrine/Timeline.Action.orm.xml
index f3b3ce96e..aab35bb39 100644
--- a/src/AppBundle/Resources/config/doctrine/Timeline.Action.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Timeline.Action.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Timeline\Action"
-        table="timeline__action"
-        repository-class="Doctrine\ORM\EntityRepository">
-
+    <entity name="AppBundle\Entity\Timeline\Action" table="timeline__action" repository-class="Doctrine\ORM\EntityRepository">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Timeline.ActionComponent.orm.xml b/src/AppBundle/Resources/config/doctrine/Timeline.ActionComponent.orm.xml
index 1fb6efada..97e036802 100644
--- a/src/AppBundle/Resources/config/doctrine/Timeline.ActionComponent.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Timeline.ActionComponent.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Timeline\ActionComponent"
-        table="timeline__action_component"
-        repository-class="Doctrine\ORM\EntityRepository">
-
+    <entity name="AppBundle\Entity\Timeline\ActionComponent" table="timeline__action_component" repository-class="Doctrine\ORM\EntityRepository">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Timeline.Component.orm.xml b/src/AppBundle/Resources/config/doctrine/Timeline.Component.orm.xml
index 669ad0319..26efa3a50 100644
--- a/src/AppBundle/Resources/config/doctrine/Timeline.Component.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Timeline.Component.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Timeline\Component"
-        table="timeline__component"
-        repository-class="Doctrine\ORM\EntityRepository">
-
+    <entity name="AppBundle\Entity\Timeline\Component" table="timeline__component" repository-class="Doctrine\ORM\EntityRepository">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Timeline.Timeline.orm.xml b/src/AppBundle/Resources/config/doctrine/Timeline.Timeline.orm.xml
index 8199f891c..f822a66aa 100644
--- a/src/AppBundle/Resources/config/doctrine/Timeline.Timeline.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/Timeline.Timeline.orm.xml
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
          This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
-
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
             xml mapping          : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
-    <entity
-        name="AppBundle\Entity\Timeline\Timeline"
-        table="timeline__timeline"
-        repository-class="Doctrine\ORM\EntityRepository">
-
+    <entity name="AppBundle\Entity\Timeline\Timeline" table="timeline__timeline" repository-class="Doctrine\ORM\EntityRepository">
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
-
     </entity>
-</doctrine-mapping>
\ No newline at end of file
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/User.Group.orm.xml b/src/AppBundle/Resources/config/doctrine/User.Group.orm.xml
index 7a634e40a..43d768ad9 100644
--- a/src/AppBundle/Resources/config/doctrine/User.Group.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/User.Group.orm.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                  http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="AppBundle\Entity\User\Group" table="fos_user_group">
-
         <id name="id" column="id" type="integer">
-            <generator strategy="AUTO" />
+            <generator strategy="AUTO"/>
         </id>
-
     </entity>
-
 </doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/User.User.orm.xml b/src/AppBundle/Resources/config/doctrine/User.User.orm.xml
index 966bcd2e3..d9913e01e 100644
--- a/src/AppBundle/Resources/config/doctrine/User.User.orm.xml
+++ b/src/AppBundle/Resources/config/doctrine/User.User.orm.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                  http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="AppBundle\Entity\User\User" table="fos_user_user">
-
         <id name="id" column="id" type="integer">
-            <generator strategy="AUTO" />
+            <generator strategy="AUTO"/>
         </id>
-
     </entity>
-
 </doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Classification.Category.xml b/src/AppBundle/Resources/config/serializer/Entity.Classification.Category.xml
index 00d4f1322..3a42ce96c 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Classification.Category.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Classification.Category.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Classification\Category" exclusion-policy="all" xml-root-name="category">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Classification.Collection.xml b/src/AppBundle/Resources/config/serializer/Entity.Classification.Collection.xml
index 9b664c80f..86cf27cee 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Classification.Collection.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Classification.Collection.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Classification\Collection" exclusion-policy="all" xml-root-name="collection">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Classification.Context.xml b/src/AppBundle/Resources/config/serializer/Entity.Classification.Context.xml
index cc64016c5..9a587f344 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Classification.Context.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Classification.Context.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Classification\Context" exclusion-policy="all" xml-root-name="context">
-
-        <property xml-attribute-map="true" name="id" type="string" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="string" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Classification.Tag.xml b/src/AppBundle/Resources/config/serializer/Entity.Classification.Tag.xml
index 1f94387d3..fffc3f35e 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Classification.Tag.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Classification.Tag.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Classification\Tag" exclusion-policy="all" xml-root-name="tag">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Comment.Comment.xml b/src/AppBundle/Resources/config/serializer/Entity.Comment.Comment.xml
index be7d39733..f6d6df2d5 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Comment.Comment.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Comment.Comment.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Comment\Comment" exclusion-policy="all" xml-root-name="comment">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Comment.Thread.xml b/src/AppBundle/Resources/config/serializer/Entity.Comment.Thread.xml
index e6146c152..3d08b25ed 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Comment.Thread.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Comment.Thread.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Comment\Thread" exclusion-policy="all" xml-root-name="thread">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Address.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Address.xml
index c6b247281..afa3872a7 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Address.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Address.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\Address" exclusion-policy="all" xml-root-name="address">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Basket.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Basket.xml
index eefcbc79a..f0f09ea8a 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Basket.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Basket.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\Basket" exclusion-policy="all" xml-root-name="basket">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.BasketElement.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.BasketElement.xml
index 77a39becf..ff60d51b2 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.BasketElement.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.BasketElement.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\BasketElement" exclusion-policy="all" xml-root-name="basket_element">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Customer.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Customer.xml
index 723e48309..20fb46881 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Customer.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Customer.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\Customer" exclusion-policy="all" xml-root-name="customer">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Delivery.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Delivery.xml
index b8e31f4c1..a03f8293b 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Delivery.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Delivery.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\Delivery" exclusion-policy="all" xml-root-name="delivery">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Invoice.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Invoice.xml
index 409a77b34..bb790d12b 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Invoice.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Invoice.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\Invoice" exclusion-policy="all" xml-root-name="invoice">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.InvoiceElement.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.InvoiceElement.xml
index 29dfa2ef1..47c29fb2e 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.InvoiceElement.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.InvoiceElement.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\InvoiceElement" exclusion-policy="all" xml-root-name="invoice_element">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Order.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Order.xml
index 7c145b7ec..7b902d2fa 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Order.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Order.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\Order" exclusion-policy="all" xml-root-name="order">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.OrderElement.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.OrderElement.xml
index 1b776db2c..df4f1df4a 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.OrderElement.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.OrderElement.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\OrderElement" exclusion-policy="all" xml-root-name="order_element">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Package.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Package.xml
index 5c6421b06..c4351c139 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Package.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Package.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\Package" exclusion-policy="all" xml-root-name="package">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Product.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Product.xml
index e00fd9aa8..f6ad9b2b5 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Product.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Product.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\Product" exclusion-policy="all" xml-root-name="product" discriminator-field-name="productType">
-
         <!--
             Don't forget to define your Product inheritances here if you want to use them in Sonata API.
         -->
         <discriminator-class value="sonata.ecommerce_demo.product.travel">Sonata\Bundle\DemoBundle\Entity\Travel</discriminator-class>
         <discriminator-class value="sonata.ecommerce_demo.product.goodie">Sonata\Bundle\DemoBundle\Entity\Goodie</discriminator-class>
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.ProductCategory.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.ProductCategory.xml
index 42ea214b2..b0685c507 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.ProductCategory.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.ProductCategory.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\ProductCategory" exclusion-policy="all" xml-root-name="product_category">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.ProductCollection.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.ProductCollection.xml
index 3d3ea578c..6e1431663 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.ProductCollection.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.ProductCollection.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\ProductCollection" exclusion-policy="all" xml-root-name="product_collection">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Transaction.xml b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Transaction.xml
index b34d5cbda..30feeb0a7 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Commerce.Transaction.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Commerce.Transaction.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Commerce\Transaction" exclusion-policy="all" xml-root-name="transaction">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Media.Gallery.xml b/src/AppBundle/Resources/config/serializer/Entity.Media.Gallery.xml
index 44f96856b..56b01256e 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Media.Gallery.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Media.Gallery.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Media\Gallery" exclusion-policy="all" xml-root-name="gallery">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Media.GalleryHasMedia.xml b/src/AppBundle/Resources/config/serializer/Entity.Media.GalleryHasMedia.xml
index fda1344ac..7f53d1b55 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Media.GalleryHasMedia.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Media.GalleryHasMedia.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Media\GalleryHasMedia" exclusion-policy="all" xml-root-name="gallery_has_media">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Media.Media.xml b/src/AppBundle/Resources/config/serializer/Entity.Media.Media.xml
index 2f8f52001..585bed273 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Media.Media.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Media.Media.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Media\Media" exclusion-policy="all" xml-root-name="media">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.News.Comment.xml b/src/AppBundle/Resources/config/serializer/Entity.News.Comment.xml
index ba2d95351..d91ef1f24 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.News.Comment.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.News.Comment.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\News\Comment" exclusion-policy="all" xml-root-name="comment">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.News.Post.xml b/src/AppBundle/Resources/config/serializer/Entity.News.Post.xml
index efd8345d3..3f48423dd 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.News.Post.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.News.Post.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\News\Post" exclusion-policy="all" xml-root-name="post">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Notification.Message.xml b/src/AppBundle/Resources/config/serializer/Entity.Notification.Message.xml
index badf63ccc..41d19a938 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Notification.Message.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Notification.Message.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Notification\Message" exclusion-policy="all" xml-root-name="message">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Page.Block.xml b/src/AppBundle/Resources/config/serializer/Entity.Page.Block.xml
index 832f13e75..a5b2ad195 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Page.Block.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Page.Block.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Page\Block" exclusion-policy="all" xml-root-name="block">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Page.Page.xml b/src/AppBundle/Resources/config/serializer/Entity.Page.Page.xml
index 0f2b4b882..dbdadd8e8 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Page.Page.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Page.Page.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Page\Page" exclusion-policy="all" xml-root-name="page">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Page.Site.xml b/src/AppBundle/Resources/config/serializer/Entity.Page.Site.xml
index dc5be7376..619a86ce4 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Page.Site.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Page.Site.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Page\Site" exclusion-policy="all" xml-root-name="site">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Page.Snapshot.xml b/src/AppBundle/Resources/config/serializer/Entity.Page.Snapshot.xml
index 07341c51f..803f2042d 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Page.Snapshot.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Page.Snapshot.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Page\Snapshot" exclusion-policy="all" xml-root-name="snapshot">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Timeline.Action.xml b/src/AppBundle/Resources/config/serializer/Entity.Timeline.Action.xml
index b5a39c92d..c97b8defb 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Timeline.Action.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Timeline.Action.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Timeline\Action" exclusion-policy="all" xml-root-name="action">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Timeline.ActionComponent.xml b/src/AppBundle/Resources/config/serializer/Entity.Timeline.ActionComponent.xml
index 4935a0b0b..09f1a1b40 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Timeline.ActionComponent.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Timeline.ActionComponent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Timeline\ActionComponent" exclusion-policy="all" xml-root-name="action_component">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Timeline.Component.xml b/src/AppBundle/Resources/config/serializer/Entity.Timeline.Component.xml
index a9672e6c2..166a948e8 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Timeline.Component.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Timeline.Component.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Timeline\Component" exclusion-policy="all" xml-root-name="component">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.Timeline.Timeline.xml b/src/AppBundle/Resources/config/serializer/Entity.Timeline.Timeline.xml
index 190b98580..6a7c4f528 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.Timeline.Timeline.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.Timeline.Timeline.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\Timeline\Timeline" exclusion-policy="all" xml-root-name="timeline">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.User.Group.xml b/src/AppBundle/Resources/config/serializer/Entity.User.Group.xml
index a8d36e4ec..d6485edc1 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.User.Group.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.User.Group.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\User\Group" exclusion-policy="all" xml-root-name="group">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/config/serializer/Entity.User.User.xml b/src/AppBundle/Resources/config/serializer/Entity.User.User.xml
index 41cb1e978..2079393e5 100644
--- a/src/AppBundle/Resources/config/serializer/Entity.User.User.xml
+++ b/src/AppBundle/Resources/config/serializer/Entity.User.User.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="AppBundle\Entity\User\User" exclusion-policy="all" xml-root-name="user">
-
-        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/AppBundle/Resources/translations/SonataProductBundle.en.xliff b/src/AppBundle/Resources/translations/SonataProductBundle.en.xliff
index 367d5162e..047bc9e31 100644
--- a/src/AppBundle/Resources/translations/SonataProductBundle.en.xliff
+++ b/src/AppBundle/Resources/translations/SonataProductBundle.en.xliff
@@ -1,5 +1,5 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
     <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
         <body>
             <trans-unit id="level">
@@ -68,4 +68,4 @@
             </trans-unit>
         </body>
     </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/AppBundle/Resources/translations/SonataProductBundle.fr.xliff b/src/AppBundle/Resources/translations/SonataProductBundle.fr.xliff
index a1ce0de0e..8645c219e 100644
--- a/src/AppBundle/Resources/translations/SonataProductBundle.fr.xliff
+++ b/src/AppBundle/Resources/translations/SonataProductBundle.fr.xliff
@@ -1,5 +1,5 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
     <file source-language="en" target-language="fr" datatype="plaintext" original="file.ext">
         <body>
             <trans-unit id="level">
@@ -68,4 +68,4 @@
             </trans-unit>
         </body>
     </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Sonata/Bundle/DemoBundle/Resources/config/admin.xml b/src/Sonata/Bundle/DemoBundle/Resources/config/admin.xml
index fb96928d0..5d114591c 100644
--- a/src/Sonata/Bundle/DemoBundle/Resources/config/admin.xml
+++ b/src/Sonata/Bundle/DemoBundle/Resources/config/admin.xml
@@ -1,13 +1,11 @@
-<?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.demo.admin.car" class="Sonata\Bundle\DemoBundle\Admin\CarAdmin">
-            <tag name="sonata.admin" manager_type="orm" group="Demo" label="Car" />
-            <argument />
+            <tag name="sonata.admin" manager_type="orm" group="Demo" label="Car"/>
+            <argument/>
             <argument>Sonata\Bundle\DemoBundle\Entity\Car</argument>
-            <argument />
+            <argument/>
             <call method="setSubClasses">
                 <argument type="collection">
                     <argument key="renault">Sonata\Bundle\DemoBundle\Entity\Renault</argument>
@@ -17,30 +15,28 @@
             </call>
         </service>
         <service id="sonata.demo.admin.engine" class="Sonata\Bundle\DemoBundle\Admin\EngineAdmin">
-            <tag name="sonata.admin" manager_type="orm" group="Demo" label="Engine" />
-            <argument />
+            <tag name="sonata.admin" manager_type="orm" group="Demo" label="Engine"/>
+            <argument/>
             <argument>Sonata\Bundle\DemoBundle\Entity\Engine</argument>
-            <argument />
+            <argument/>
         </service>
         <service id="sonata.demo.admin.color" class="Sonata\Bundle\DemoBundle\Admin\ColorAdmin">
-            <tag name="sonata.admin" manager_type="orm" group="Demo" label="Color" />
-            <argument />
+            <tag name="sonata.admin" manager_type="orm" group="Demo" label="Color"/>
+            <argument/>
             <argument>Sonata\Bundle\DemoBundle\Entity\Color</argument>
-            <argument />
+            <argument/>
         </service>
         <service id="sonata.demo.admin.material" class="Sonata\Bundle\DemoBundle\Admin\MaterialAdmin">
-            <tag name="sonata.admin" manager_type="orm" group="Demo" label="Material" />
-            <argument />
+            <tag name="sonata.admin" manager_type="orm" group="Demo" label="Material"/>
+            <argument/>
             <argument>Sonata\Bundle\DemoBundle\Entity\Material</argument>
-            <argument />
+            <argument/>
         </service>
-
         <service id="sonata.demo.admin.inspection" class="Sonata\Bundle\DemoBundle\Admin\InspectionAdmin">
             <tag name="sonata.admin" manager_type="orm" group="Demo" label="Inspection"/>
-            <argument />
+            <argument/>
             <argument>Sonata\Bundle\DemoBundle\Entity\Inspection</argument>
-            <argument />
+            <argument/>
         </service>
     </services>
-
 </container>
diff --git a/src/Sonata/Bundle/DemoBundle/Resources/config/block.xml b/src/Sonata/Bundle/DemoBundle/Resources/config/block.xml
index 193d7f364..1560d4cab 100644
--- a/src/Sonata/Bundle/DemoBundle/Resources/config/block.xml
+++ b/src/Sonata/Bundle/DemoBundle/Resources/config/block.xml
@@ -1,13 +1,11 @@
-<?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.demo.block.newsletter" class="Sonata\Bundle\DemoBundle\Block\NewsletterBlockService" public="true">
-            <tag name="sonata.block" />
+            <tag name="sonata.block"/>
             <argument>sonata.demo.block.newsletter</argument>
-            <argument type="service" id="templating" />
-            <argument type="service" id="form.factory" />
+            <argument type="service" id="templating"/>
+            <argument type="service" id="form.factory"/>
         </service>
         <service id="sonata.demo.block.account" class="Sonata\Bundle\DemoBundle\Block\AccountBlockService">
             <tag name="sonata.block"/>
diff --git a/src/Sonata/Bundle/DemoBundle/Resources/config/delivery.xml b/src/Sonata/Bundle/DemoBundle/Resources/config/delivery.xml
index 1bfa20ece..ec83b079a 100644
--- a/src/Sonata/Bundle/DemoBundle/Resources/config/delivery.xml
+++ b/src/Sonata/Bundle/DemoBundle/Resources/config/delivery.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" ?>
-<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="app.delivery.take_away" class="Sonata\Bundle\DemoBundle\Model\TakeAwayDelivery">
-            <tag name="sonata.delivery.method" />
+            <tag name="sonata.delivery.method"/>
         </service>
     </services>
 </container>
diff --git a/src/Sonata/Bundle/DemoBundle/Resources/config/fixtures.xml b/src/Sonata/Bundle/DemoBundle/Resources/config/fixtures.xml
index 2ccf99fed..483aaadbd 100644
--- a/src/Sonata/Bundle/DemoBundle/Resources/config/fixtures.xml
+++ b/src/Sonata/Bundle/DemoBundle/Resources/config/fixtures.xml
@@ -1,7 +1,5 @@
-<?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_bundle_demo.data_fixtures_orm.load_category_data" class="Sonata\Bundle\DemoBundle\DataFixtures\ORM\LoadCategoryData">
             <tag name="doctrine.fixture.orm"/>
@@ -28,7 +26,7 @@
         </service>
         <service id="sonata_bundle_demo.data_fixtures_orm.load_order_data" class="Sonata\Bundle\DemoBundle\DataFixtures\ORM\LoadOrderData">
             <tag name="doctrine.fixture.orm"/>
-            <argument type="service" id="faker.generator" />
+            <argument type="service" id="faker.generator"/>
             <argument type="service" id="sonata.payment.transformer.invoice"/>
             <argument type="service" id="sonata.product.pool"/>
             <argument type="service" id="parameter_bag"/>
diff --git a/src/Sonata/Bundle/DemoBundle/Resources/config/form.xml b/src/Sonata/Bundle/DemoBundle/Resources/config/form.xml
index b9cbc1878..a8973de16 100644
--- a/src/Sonata/Bundle/DemoBundle/Resources/config/form.xml
+++ b/src/Sonata/Bundle/DemoBundle/Resources/config/form.xml
@@ -1,27 +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.demo.form.type.car" class="Sonata\Bundle\DemoBundle\Form\Type\CarType">
-            <tag name="form.type" alias="sonata_demo_form_type_car" />
-
+            <tag name="form.type" alias="sonata_demo_form_type_car"/>
         </service>
-
         <service id="sonata.demo.form.type.engine" class="Sonata\Bundle\DemoBundle\Form\Type\EngineType">
-            <tag name="form.type" alias="sonata_demo_form_type_engine" />
+            <tag name="form.type" alias="sonata_demo_form_type_engine"/>
         </service>
-
         <service id="sonata.demo.form.type.newsletter" class="Sonata\Bundle\DemoBundle\Form\Type\NewsletterType">
-            <tag name="form.type" alias="sonata_demo_form_type_newsletter" />
+            <tag name="form.type" alias="sonata_demo_form_type_newsletter"/>
         </service>
-
         <!-- TODO: "form.type_extension" tagged services must have the extended type configured using the extended_type/extended-type attribute, none was configured -->
         <!--<service id="sonata.demo.form.type.advanced_rescue_engine" class="Sonata\Bundle\DemoBundle\Form\Extension\RescueEngineTypeExtension">
-             <tag name="form.type_extension" alias="sonata_demo_car" />
+             <tag name="form.type_extension" alias="sonata_demo_car"/>
         </service>-->
     </services>
-
-</container>
\ No newline at end of file
+</container>
diff --git a/src/Sonata/Bundle/DemoBundle/Resources/config/products.xml b/src/Sonata/Bundle/DemoBundle/Resources/config/products.xml
index 3c6b7c5d0..20285f42d 100644
--- a/src/Sonata/Bundle/DemoBundle/Resources/config/products.xml
+++ b/src/Sonata/Bundle/DemoBundle/Resources/config/products.xml
@@ -1,32 +1,21 @@
-<?xml version="1.0" ?>
-
-<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>
-
         <!-- Goodies -->
-
         <service id="sonata.ecommerce_demo.product.goodie.manager" class="Sonata\ProductBundle\Entity\ProductManager">
             <argument>Sonata\Bundle\DemoBundle\Entity\Goodie</argument>
-            <argument type="service" id="doctrine" />
+            <argument type="service" id="doctrine"/>
         </service>
-
         <service id="sonata.ecommerce_demo.product.goodie.type" class="Sonata\Bundle\DemoBundle\Provider\GoodieProductProvider">
-            <argument type="service" id="jms_serializer" />
+            <argument type="service" id="jms_serializer"/>
         </service>
-
         <!-- Travel -->
-
         <service id="sonata.ecommerce_demo.product.travel.manager" class="Sonata\ProductBundle\Entity\ProductManager">
             <argument>Sonata\Bundle\DemoBundle\Entity\Travel</argument>
-            <argument type="service" id="doctrine" />
+            <argument type="service" id="doctrine"/>
         </service>
-
         <service id="sonata.ecommerce_demo.product.travel.type" class="Sonata\Bundle\DemoBundle\Provider\TravelProductProvider">
-            <argument type="service" id="jms_serializer" />
+            <argument type="service" id="jms_serializer"/>
         </service>
-
     </services>
 </container>
diff --git a/src/Sonata/Bundle/DemoBundle/Resources/config/routing/demo.xml b/src/Sonata/Bundle/DemoBundle/Resources/config/routing/demo.xml
index 57536bbc6..0706377f5 100644
--- a/src/Sonata/Bundle/DemoBundle/Resources/config/routing/demo.xml
+++ b/src/Sonata/Bundle/DemoBundle/Resources/config/routing/demo.xml
@@ -1,23 +1,15 @@
-<?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_demo_media" path="/media">
         <default key="_controller">SonataDemoBundle:Demo:media</default>
     </route>
-
     <route id="sonata_demo_car" path="/car">
         <default key="_controller">SonataDemoBundle:Demo:car</default>
     </route>
-
     <route id="sonata_demo_car_rescue" path="/car-rescue-engine">
         <default key="_controller">SonataDemoBundle:Demo:carRescueEngine</default>
     </route>
-
     <route id="sonata_demo_newsletter" path="/newsletter" methods="POST">
         <default key="_controller">SonataDemoBundle:Demo:newsletter</default>
     </route>
-
 </routes>
diff --git a/src/Sonata/Bundle/DemoBundle/Resources/config/serializer/Entity.Goodie.xml b/src/Sonata/Bundle/DemoBundle/Resources/config/serializer/Entity.Goodie.xml
index 686cab334..5f3d821f0 100644
--- a/src/Sonata/Bundle/DemoBundle/Resources/config/serializer/Entity.Goodie.xml
+++ b/src/Sonata/Bundle/DemoBundle/Resources/config/serializer/Entity.Goodie.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="Sonata\Bundle\DemoBundle\Entity\Goodie" exclusion-policy="all" xml-root-name="goodie">
-
     </class>
 </serializer>
diff --git a/src/Sonata/Bundle/DemoBundle/Resources/config/serializer/Entity.Travel.xml b/src/Sonata/Bundle/DemoBundle/Resources/config/serializer/Entity.Travel.xml
index c955c11b2..e2d486a9f 100644
--- a/src/Sonata/Bundle/DemoBundle/Resources/config/serializer/Entity.Travel.xml
+++ b/src/Sonata/Bundle/DemoBundle/Resources/config/serializer/Entity.Travel.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serializer>
     <class name="Sonata\Bundle\DemoBundle\Entity\Travel" exclusion-policy="all" xml-root-name="travel">
-
-        <property name="travellers" type="integer"  expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-        <property name="travelDate" type="DateTime" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-        <property name="travelDays" type="integer"  expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
-
+        <property name="travellers" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
+        <property name="travelDate" type="DateTime" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
+        <property name="travelDays" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search"/>
     </class>
 </serializer>
diff --git a/src/Sonata/Bundle/DemoBundle/Resources/config/validation.xml b/src/Sonata/Bundle/DemoBundle/Resources/config/validation.xml
index cf1375199..5ea5b7506 100644
--- a/src/Sonata/Bundle/DemoBundle/Resources/config/validation.xml
+++ b/src/Sonata/Bundle/DemoBundle/Resources/config/validation.xml
@@ -1,35 +1,25 @@
-<?xml version="1.0" ?>
-<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
-        http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
-
+<?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 http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
     <class name="Sonata\Bundle\DemoBundle\Entity\Engine">
-
         <property name="name">
-            <constraint name="NotBlank" />
+            <constraint name="NotBlank"/>
         </property>
-
         <property name="power">
             <constraint name="Range">
                 <option name="min">1</option>
                 <option name="max">10</option>
             </constraint>
         </property>
-
         <property name="media">
-            <constraint name="Valid" />
+            <constraint name="Valid"/>
         </property>
-
     </class>
-
     <class name="Sonata\Bundle\DemoBundle\Entity\Car">
         <property name="name">
-            <constraint name="NotBlank" />
+            <constraint name="NotBlank"/>
         </property>
         <property name="engine">
-            <constraint name="Valid" />
+            <constraint name="Valid"/>
         </property>
     </class>
-
 </constraint-mapping>
diff --git a/src/Sonata/Bundle/DemoBundle/Resources/translations/SonataDemoBundle.en.xliff b/src/Sonata/Bundle/DemoBundle/Resources/translations/SonataDemoBundle.en.xliff
index ee3c7bd61..005bd8ad3 100644
--- a/src/Sonata/Bundle/DemoBundle/Resources/translations/SonataDemoBundle.en.xliff
+++ b/src/Sonata/Bundle/DemoBundle/Resources/translations/SonataDemoBundle.en.xliff
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-    <file source-language="en" target-language="en" datatype="plaintext"  original="file.ext">
+    <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
         <body>
-        <trans-unit id="sonata.demo.block.newsletter.message">
-            <source>sonata.demo.block.newsletter.message</source>
-            <target>Thank you for your subscription. This is a fake block. We don't keep your e-mail address and don't send newsletters in purpose!</target>
-        </trans-unit>
-        <trans-unit id="sonata.demo.demonstration.message">
-            <source>sonata.demo.demonstration.message</source>
-            <target>Note: this website is a demo of Sonata. Any orders placed on this site will not be processed.</target>
-        </trans-unit>
-        <trans-unit id="sonata_content">
-            <source>sonata_content</source>
-            <target>Content</target>
-        </trans-unit>
+            <trans-unit id="sonata.demo.block.newsletter.message">
+                <source>sonata.demo.block.newsletter.message</source>
+                <target>Thank you for your subscription. This is a fake block. We don't keep your e-mail address and don't send newsletters in purpose!</target>
+            </trans-unit>
+            <trans-unit id="sonata.demo.demonstration.message">
+                <source>sonata.demo.demonstration.message</source>
+                <target>Note: this website is a demo of Sonata. Any orders placed on this site will not be processed.</target>
+            </trans-unit>
+            <trans-unit id="sonata_content">
+                <source>sonata_content</source>
+                <target>Content</target>
+            </trans-unit>
             <trans-unit id="sonata_basket_update_confirmation">
                 <source>sonata_basket_update_confirmation</source>
                 <target>You didn't update your basket, continue to next step?</target>
diff --git a/src/Sonata/Bundle/DemoBundle/Resources/translations/SonataDemoBundle.fr.xliff b/src/Sonata/Bundle/DemoBundle/Resources/translations/SonataDemoBundle.fr.xliff
index fbf5f1a9f..8720b3367 100644
--- a/src/Sonata/Bundle/DemoBundle/Resources/translations/SonataDemoBundle.fr.xliff
+++ b/src/Sonata/Bundle/DemoBundle/Resources/translations/SonataDemoBundle.fr.xliff
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-    <file source-language="fr" target-language="fr" datatype="plaintext"  original="file.ext">
+    <file source-language="fr" target-language="fr" datatype="plaintext" original="file.ext">
         <body>
-        <trans-unit id="sonata.demo.block.newsletter.message">
-            <source>sonata.demo.block.newsletter.message</source>
-            <target>Merci pour votre inscription. Ce bloc est un bloc factice. Nous ne conservons pas vos adresses emails et n'envoyons pas de newsletters</target>
-        </trans-unit>
-        <trans-unit id="sonata.demo.demonstration.message">
-            <source>sonata.demo.demonstration.message</source>
-            <target>Note : Ce site est une démonstration de Sonata. Aucune commande passée sur ce site ne sera traitée.</target>
-        </trans-unit>
-        <trans-unit id="sonata_content">
-            <source>sonata_content</source>
-            <target>Contenu</target>
-        </trans-unit>
-        <trans-unit id="sonata_basket_update_confirmation">
-            <source>sonata_basket_update_confirmation</source>
-            <target>Vous n'avez pas mis-à-jour votre panier, continuer?</target>
-        </trans-unit>
+            <trans-unit id="sonata.demo.block.newsletter.message">
+                <source>sonata.demo.block.newsletter.message</source>
+                <target>Merci pour votre inscription. Ce bloc est un bloc factice. Nous ne conservons pas vos adresses emails et n'envoyons pas de newsletters</target>
+            </trans-unit>
+            <trans-unit id="sonata.demo.demonstration.message">
+                <source>sonata.demo.demonstration.message</source>
+                <target>Note : Ce site est une démonstration de Sonata. Aucune commande passée sur ce site ne sera traitée.</target>
+            </trans-unit>
+            <trans-unit id="sonata_content">
+                <source>sonata_content</source>
+                <target>Contenu</target>
+            </trans-unit>
+            <trans-unit id="sonata_basket_update_confirmation">
+                <source>sonata_basket_update_confirmation</source>
+                <target>Vous n'avez pas mis-à-jour votre panier, continuer?</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Sonata/Bundle/QABundle/Resources/config/routing/qa.xml b/src/Sonata/Bundle/QABundle/Resources/config/routing/qa.xml
index 593dbba24..28f29852b 100644
--- a/src/Sonata/Bundle/QABundle/Resources/config/routing/qa.xml
+++ b/src/Sonata/Bundle/QABundle/Resources/config/routing/qa.xml
@@ -1,13 +1,8 @@
-<?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_page_bundle_inner_controller" path="/qa/page/controller-helper">
         <default key="_controller">SonataQABundle:Page:controllerHelper</default>
     </route>
-
     <route id="sonata_qa_serialize" path="/qa/serialize">
         <default key="_controller">SonataQABundle:Serializer:serialize</default>
     </route>
diff --git a/translations/SonataAdminBundle.en.xliff b/translations/SonataAdminBundle.en.xliff
index 7ed3ba67f..0c9e12f1b 100644
--- a/translations/SonataAdminBundle.en.xliff
+++ b/translations/SonataAdminBundle.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_ecommerce">
                 <source>sonata_ecommerce</source>
diff --git a/translations/SonataAdminBundle.fr.xliff b/translations/SonataAdminBundle.fr.xliff
index e3aac7e36..15121568b 100644
--- a/translations/SonataAdminBundle.fr.xliff
+++ b/translations/SonataAdminBundle.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="SonataAdminBundle.en.xliff" >
+<?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="SonataAdminBundle.en.xliff">
         <body>
             <trans-unit id="sonata_ecommerce">
                 <source>sonata_ecommerce</source>