diff --git a/.php_cs b/.php_cs
index 11199d3c..7e1a14bb 100644
--- a/.php_cs
+++ b/.php_cs
@@ -1,28 +1,6 @@
 <?php
-return PhpCsFixer\Config::create()
-    ->setRules([
-        '@Symfony' => true,
-        '@Symfony:risky' => true,
-        'concat_space' => ['spacing' => 'one'],
-        'simplified_null_return' => false,
-        'phpdoc_align' => false,
-        'phpdoc_separation' => false,
-        'phpdoc_to_comment' => false,
-        'cast_spaces' => false,
-        'blank_line_after_opening_tag' => false,
-        'single_blank_line_before_namespace' => false,
-        'phpdoc_annotation_without_dot' => false,
-        'phpdoc_no_alias_tag' => false,
-        'space_after_semicolon' => false,
-        'yoda_style' => false,
-        'no_break_comment' => false,
 
-        // 2019 style updates with cs-fixer 2.14, all above are in sync with kernel
-        '@PHPUnit57Migration:risky' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'static_lambda' => true,
-    ])
-    ->setRiskyAllowed(true)
+return EzSystems\EzPlatformCodeStyle\PhpCsFixer\EzPlatformInternalConfigFactory::build()
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->in(__DIR__)
@@ -32,5 +10,4 @@ return PhpCsFixer\Config::create()
                 'bundle/Resources/init_ini',
             ])
             ->files()->name('*.php')
-    )
-;
+    );
diff --git a/bootstrap.php b/bootstrap.php
index 4e5836bd..466becf7 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -1,12 +1,8 @@
 <?php
+
 /**
- * File containing the bootstrapping of eZ Publish API for unit test use.
- *
- * Setups class loading.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 use eZ\Publish\Core\MVC\Legacy\Kernel as LegacyKernel;
 use eZ\Publish\Core\MVC\Legacy\Kernel\CLIHandler as LegacyKernelCLI;
diff --git a/bundle/Cache/LegacyCachePurger.php b/bundle/Cache/LegacyCachePurger.php
index ff081f46..a9b891a3 100644
--- a/bundle/Cache/LegacyCachePurger.php
+++ b/bundle/Cache/LegacyCachePurger.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyCachePurger class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Cache;
 
diff --git a/bundle/Cache/PersistenceCachePurger.php b/bundle/Cache/PersistenceCachePurger.php
index 0b724c96..4b4ccf50 100644
--- a/bundle/Cache/PersistenceCachePurger.php
+++ b/bundle/Cache/PersistenceCachePurger.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PersistenceCachePurger class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Cache;
 
@@ -179,6 +177,7 @@ public function contentVersion($contentId, $versionNo)
      * Also used when clearing content type meta data cache in admin cache interface (no id).
      *
      * @param int|null $id Purges all contentType cache if null
+     *
      * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentType On invalid $id type
      */
     public function contentType($id = null)
@@ -202,6 +201,7 @@ public function contentType($id = null)
      * In legacy kernel used when editing/removing content type group, so there is always an id.
      *
      * @param int $id
+     *
      * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentType On invalid $id type
      */
     public function contentTypeGroup($id)
@@ -224,6 +224,7 @@ public function contentTypeGroup($id)
      * In legacy kernel used when editing section, so there is always an id.
      *
      * @param int $id
+     *
      * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentType On invalid $id type
      */
     public function section($id)
@@ -283,6 +284,7 @@ public function stateAssign($contentId)
      * In legacy kernel used when clearing meta info cache on users in eZUser, never with id.
      *
      * @param int|null $id Purges all users cache if null
+     *
      * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentType On invalid $id type
      */
     public function user($id = null)
diff --git a/bundle/Cache/Switchable.php b/bundle/Cache/Switchable.php
index 0be515c8..8deadf45 100644
--- a/bundle/Cache/Switchable.php
+++ b/bundle/Cache/Switchable.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
@@ -24,6 +23,7 @@ public function switchOff()
 
     /**
      * Checks if the switch is off.
+     *
      * @return bool
      */
     public function isSwitchedOn()
@@ -33,6 +33,7 @@ public function isSwitchedOn()
 
     /**
      * Checks if the switch is off.
+     *
      * @return bool
      */
     public function isSwitchedOff()
diff --git a/bundle/Cache/SwitchableHttpCachePurger.php b/bundle/Cache/SwitchableHttpCachePurger.php
index 47ecffc9..1acf3624 100644
--- a/bundle/Cache/SwitchableHttpCachePurger.php
+++ b/bundle/Cache/SwitchableHttpCachePurger.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * This file is part of the EzPublishLegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
diff --git a/bundle/Collector/LegacyTemplatesCollector.php b/bundle/Collector/LegacyTemplatesCollector.php
index 0429af60..9a1d62af 100644
--- a/bundle/Collector/LegacyTemplatesCollector.php
+++ b/bundle/Collector/LegacyTemplatesCollector.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Collector;
 
diff --git a/bundle/Collector/TemplateDebugInfo.php b/bundle/Collector/TemplateDebugInfo.php
index 79f902e4..56909e02 100644
--- a/bundle/Collector/TemplateDebugInfo.php
+++ b/bundle/Collector/TemplateDebugInfo.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Collector;
 
diff --git a/bundle/Command/LegacyBundleInstallCommand.php b/bundle/Command/LegacyBundleInstallCommand.php
index a32eaf60..50d8017b 100644
--- a/bundle/Command/LegacyBundleInstallCommand.php
+++ b/bundle/Command/LegacyBundleInstallCommand.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyBundleInstallCommand class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Command;
 
@@ -65,6 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * @param OutputInterface $output
      *
      * @throws \RuntimeException If a target link/directory exists and $options[force] isn't set to true
+     *
      * @return string The resulting link/directory
      */
     protected function linkLegacyExtension($extensionPath, array $options = [], OutputInterface $output)
@@ -135,6 +134,7 @@ protected function linkLegacyExtension($extensionPath, array $options = [], Outp
 
     /**
      * Removes the cwd from $path.
+     *
      * @param string $path
      */
     private function removeCwd($path)
diff --git a/bundle/Command/LegacyConfigurationCommand.php b/bundle/Command/LegacyConfigurationCommand.php
index 7a177892..45e625c2 100644
--- a/bundle/Command/LegacyConfigurationCommand.php
+++ b/bundle/Command/LegacyConfigurationCommand.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyConfigurationCommand class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Command;
 
diff --git a/bundle/Command/LegacyEmbedScriptCommand.php b/bundle/Command/LegacyEmbedScriptCommand.php
index fb463d68..5d9f6996 100644
--- a/bundle/Command/LegacyEmbedScriptCommand.php
+++ b/bundle/Command/LegacyEmbedScriptCommand.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyEmbedScriptCommand class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Command;
 
diff --git a/bundle/Command/LegacyInitCommand.php b/bundle/Command/LegacyInitCommand.php
index fce3566b..1550278f 100644
--- a/bundle/Command/LegacyInitCommand.php
+++ b/bundle/Command/LegacyInitCommand.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * File containing the LegacyInitCommand class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
diff --git a/bundle/Command/LegacySrcSymlinkCommand.php b/bundle/Command/LegacySrcSymlinkCommand.php
index d28d9c2f..8c9c7c25 100644
--- a/bundle/Command/LegacySrcSymlinkCommand.php
+++ b/bundle/Command/LegacySrcSymlinkCommand.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * File containing the LegacySrcSymlinkCommand class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
diff --git a/bundle/Command/LegacyWrapperInstallCommand.php b/bundle/Command/LegacyWrapperInstallCommand.php
index 615ab119..ac77b12c 100644
--- a/bundle/Command/LegacyWrapperInstallCommand.php
+++ b/bundle/Command/LegacyWrapperInstallCommand.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyWrapperInstallCommand class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Command;
 
diff --git a/bundle/Composer/ScriptHandler.php b/bundle/Composer/ScriptHandler.php
index 4cf42c10..8b02a0bb 100644
--- a/bundle/Composer/ScriptHandler.php
+++ b/bundle/Composer/ScriptHandler.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ScriptHandler class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Composer;
 
diff --git a/bundle/Controller.php b/bundle/Controller.php
index 2dd48410..65deb9a8 100644
--- a/bundle/Controller.php
+++ b/bundle/Controller.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle;
 
diff --git a/bundle/Controller/LegacyKernelController.php b/bundle/Controller/LegacyKernelController.php
index abcbf477..986ab8b0 100644
--- a/bundle/Controller/LegacyKernelController.php
+++ b/bundle/Controller/LegacyKernelController.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyKernelController class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 
diff --git a/bundle/Controller/LegacyRestController.php b/bundle/Controller/LegacyRestController.php
index bc738d8b..737fce06 100644
--- a/bundle/Controller/LegacyRestController.php
+++ b/bundle/Controller/LegacyRestController.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyRestController class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 
diff --git a/bundle/Controller/LegacySetupController.php b/bundle/Controller/LegacySetupController.php
index d2aac66a..c08243cc 100644
--- a/bundle/Controller/LegacySetupController.php
+++ b/bundle/Controller/LegacySetupController.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacySetupController class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 
diff --git a/bundle/Controller/LegacyTreeMenuController.php b/bundle/Controller/LegacyTreeMenuController.php
index 89adcfe5..32567b60 100644
--- a/bundle/Controller/LegacyTreeMenuController.php
+++ b/bundle/Controller/LegacyTreeMenuController.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyTreeMenuController class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 
diff --git a/bundle/Controller/PreviewController.php b/bundle/Controller/PreviewController.php
index 7cdf87ec..2deb6e29 100644
--- a/bundle/Controller/PreviewController.php
+++ b/bundle/Controller/PreviewController.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PreviewController class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 
diff --git a/bundle/Controller/WebsiteToolbarController.php b/bundle/Controller/WebsiteToolbarController.php
index 7d1f0ed9..b80803db 100644
--- a/bundle/Controller/WebsiteToolbarController.php
+++ b/bundle/Controller/WebsiteToolbarController.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the WebsiteToolbarController class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 
diff --git a/bundle/DependencyInjection/Compiler/LegacyBundlesPass.php b/bundle/DependencyInjection/Compiler/LegacyBundlesPass.php
index c6d96d0b..896ea645 100644
--- a/bundle/DependencyInjection/Compiler/LegacyBundlesPass.php
+++ b/bundle/DependencyInjection/Compiler/LegacyBundlesPass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyBundlesPass class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 
diff --git a/bundle/DependencyInjection/Compiler/LegacyPass.php b/bundle/DependencyInjection/Compiler/LegacyPass.php
index 3893d63a..8eb47f44 100644
--- a/bundle/DependencyInjection/Compiler/LegacyPass.php
+++ b/bundle/DependencyInjection/Compiler/LegacyPass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyPass class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 
diff --git a/bundle/DependencyInjection/Compiler/LegacySessionPass.php b/bundle/DependencyInjection/Compiler/LegacySessionPass.php
index de3e78be..6c12cd61 100644
--- a/bundle/DependencyInjection/Compiler/LegacySessionPass.php
+++ b/bundle/DependencyInjection/Compiler/LegacySessionPass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish LegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 
diff --git a/bundle/DependencyInjection/Compiler/PageServicePass.php b/bundle/DependencyInjection/Compiler/PageServicePass.php
index 590ee039..8126bb12 100644
--- a/bundle/DependencyInjection/Compiler/PageServicePass.php
+++ b/bundle/DependencyInjection/Compiler/PageServicePass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ LegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 
diff --git a/bundle/DependencyInjection/Compiler/RelatedSiteAccessesCleanupPass.php b/bundle/DependencyInjection/Compiler/RelatedSiteAccessesCleanupPass.php
index 77f05cc8..e5b31cf0 100644
--- a/bundle/DependencyInjection/Compiler/RelatedSiteAccessesCleanupPass.php
+++ b/bundle/DependencyInjection/Compiler/RelatedSiteAccessesCleanupPass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 
diff --git a/bundle/DependencyInjection/Compiler/RememberMeListenerPass.php b/bundle/DependencyInjection/Compiler/RememberMeListenerPass.php
index f5806a22..696d295f 100644
--- a/bundle/DependencyInjection/Compiler/RememberMeListenerPass.php
+++ b/bundle/DependencyInjection/Compiler/RememberMeListenerPass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ LegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 
diff --git a/bundle/DependencyInjection/Compiler/RequestIndexListenerPass.php b/bundle/DependencyInjection/Compiler/RequestIndexListenerPass.php
index 06f52d45..aa666b9d 100644
--- a/bundle/DependencyInjection/Compiler/RequestIndexListenerPass.php
+++ b/bundle/DependencyInjection/Compiler/RequestIndexListenerPass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ LegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 
diff --git a/bundle/DependencyInjection/Compiler/RoutingPass.php b/bundle/DependencyInjection/Compiler/RoutingPass.php
index 03b91536..34a59edf 100644
--- a/bundle/DependencyInjection/Compiler/RoutingPass.php
+++ b/bundle/DependencyInjection/Compiler/RoutingPass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 
diff --git a/bundle/DependencyInjection/Compiler/SecurityListenerPass.php b/bundle/DependencyInjection/Compiler/SecurityListenerPass.php
index 05828529..acf7b29e 100644
--- a/bundle/DependencyInjection/Compiler/SecurityListenerPass.php
+++ b/bundle/DependencyInjection/Compiler/SecurityListenerPass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ LegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 
diff --git a/bundle/DependencyInjection/Compiler/TwigPass.php b/bundle/DependencyInjection/Compiler/TwigPass.php
index da06c104..613572cf 100644
--- a/bundle/DependencyInjection/Compiler/TwigPass.php
+++ b/bundle/DependencyInjection/Compiler/TwigPass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the TwigPass class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 
diff --git a/bundle/DependencyInjection/Configuration.php b/bundle/DependencyInjection/Configuration.php
index a6a1ed09..cdc8f409 100644
--- a/bundle/DependencyInjection/Configuration.php
+++ b/bundle/DependencyInjection/Configuration.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Configuration class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection;
 
diff --git a/bundle/DependencyInjection/Configuration/LegacyConfigResolver.php b/bundle/DependencyInjection/Configuration/LegacyConfigResolver.php
index 9a0f5b39..45360401 100644
--- a/bundle/DependencyInjection/Configuration/LegacyConfigResolver.php
+++ b/bundle/DependencyInjection/Configuration/LegacyConfigResolver.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyConfigResolver class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Configuration;
 
diff --git a/bundle/DependencyInjection/EzPublishLegacyExtension.php b/bundle/DependencyInjection/EzPublishLegacyExtension.php
index 90efb6f8..09989c49 100644
--- a/bundle/DependencyInjection/EzPublishLegacyExtension.php
+++ b/bundle/DependencyInjection/EzPublishLegacyExtension.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the EzPublishLegacyExtension class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection;
 
diff --git a/bundle/DependencyInjection/Security/SSOFactory.php b/bundle/DependencyInjection/Security/SSOFactory.php
index 5dba2514..b7766693 100644
--- a/bundle/DependencyInjection/Security/SSOFactory.php
+++ b/bundle/DependencyInjection/Security/SSOFactory.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the SSOFactory class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Security;
 
diff --git a/bundle/EventListener/ConfigScopeListener.php b/bundle/EventListener/ConfigScopeListener.php
index 3e1298d2..cfdb215e 100644
--- a/bundle/EventListener/ConfigScopeListener.php
+++ b/bundle/EventListener/ConfigScopeListener.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ConfigScopeListener class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\EventListener;
 
diff --git a/bundle/EventListener/CsrfTokenResponseListener.php b/bundle/EventListener/CsrfTokenResponseListener.php
index d52c88de..65ad7eea 100644
--- a/bundle/EventListener/CsrfTokenResponseListener.php
+++ b/bundle/EventListener/CsrfTokenResponseListener.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ResponseListener class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\EventListener;
 
diff --git a/bundle/EventListener/IndexRequestListener.php b/bundle/EventListener/IndexRequestListener.php
index b13dddc3..a6b22078 100644
--- a/bundle/EventListener/IndexRequestListener.php
+++ b/bundle/EventListener/IndexRequestListener.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the IndexRequestListener class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\EventListener;
 
diff --git a/bundle/EventListener/LegacyKernelListener.php b/bundle/EventListener/LegacyKernelListener.php
index 5ac042bb..d36b2edf 100644
--- a/bundle/EventListener/LegacyKernelListener.php
+++ b/bundle/EventListener/LegacyKernelListener.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyKernelListener class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\EventListener;
 
diff --git a/bundle/EventListener/RequestListener.php b/bundle/EventListener/RequestListener.php
index 7c4556b4..9cfaeade 100644
--- a/bundle/EventListener/RequestListener.php
+++ b/bundle/EventListener/RequestListener.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the RequestListener class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\EventListener;
 
diff --git a/bundle/EventListener/RestListener.php b/bundle/EventListener/RestListener.php
index 197483df..5e6360e5 100644
--- a/bundle/EventListener/RestListener.php
+++ b/bundle/EventListener/RestListener.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the RestListener class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\EventListener;
 
diff --git a/bundle/EventListener/SetupListener.php b/bundle/EventListener/SetupListener.php
index f6a7cefb..662e7652 100644
--- a/bundle/EventListener/SetupListener.php
+++ b/bundle/EventListener/SetupListener.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * This file is part of the legacy-bridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
diff --git a/bundle/Exception/NotFoundHttpException.php b/bundle/Exception/NotFoundHttpException.php
index 6352019c..b995e9de 100644
--- a/bundle/Exception/NotFoundHttpException.php
+++ b/bundle/Exception/NotFoundHttpException.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
 namespace eZ\Bundle\EzPublishLegacyBundle\Exception;
 
 use Symfony\Component\HttpFoundation\Response;
diff --git a/bundle/EzPublishLegacyBundle.php b/bundle/EzPublishLegacyBundle.php
index 032f60f9..bae95228 100644
--- a/bundle/EzPublishLegacyBundle.php
+++ b/bundle/EzPublishLegacyBundle.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the EzPublishLegacy class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle;
 
diff --git a/bundle/Features/Context/Admin/Context.php b/bundle/Features/Context/Admin/Context.php
index 50f36a81..ad453c1d 100644
--- a/bundle/Features/Context/Admin/Context.php
+++ b/bundle/Features/Context/Admin/Context.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Context class for the Legacy Admin interface.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Features\Context\Admin;
 
diff --git a/bundle/Features/Context/Legacy.php b/bundle/Features/Context/Legacy.php
index 3c9ebf1f..5b9d241a 100644
--- a/bundle/Features/Context/Legacy.php
+++ b/bundle/Features/Context/Legacy.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyContext class for Legacy Bundle.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Features\Context;
 
diff --git a/bundle/Features/Context/SetupWizard/Context.php b/bundle/Features/Context/SetupWizard/Context.php
index a7aec905..4658526c 100644
--- a/bundle/Features/Context/SetupWizard/Context.php
+++ b/bundle/Features/Context/SetupWizard/Context.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the SetupWizard Context class for the LegacyBundle.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Features\Context\SetupWizard;
 
diff --git a/bundle/FieldType/Image/IO/IOServiceFactory.php b/bundle/FieldType/Image/IO/IOServiceFactory.php
index c1ca309b..0af5c635 100644
--- a/bundle/FieldType/Image/IO/IOServiceFactory.php
+++ b/bundle/FieldType/Image/IO/IOServiceFactory.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the IOServiceFactory class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\FieldType\Image\IO;
 
@@ -35,7 +33,9 @@ public function __construct(IOServiceInterface $publishedIOService, IOServiceInt
 
     /**
      * Builds the IOService from $class.
+     *
      * @param string $class
+     *
      * @return \eZ\Publish\Core\IO\IOServiceInterface
      */
     public function buildService($class)
diff --git a/bundle/FieldType/Page/PageService.php b/bundle/FieldType/Page/PageService.php
index feb5a023..bccfb5e8 100644
--- a/bundle/FieldType/Page/PageService.php
+++ b/bundle/FieldType/Page/PageService.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PageService class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\FieldType\Page;
 
@@ -18,6 +16,7 @@ class PageService extends CorePageService
      * then add the appropriate prefix ("design:zone/", like in ezpage.tpl legacy template).
      *
      * @param string $layoutIdentifier
+     *
      * @return string
      */
     public function getLayoutTemplate($layoutIdentifier)
diff --git a/bundle/LegacyBundles/LegacyBundleInterface.php b/bundle/LegacyBundles/LegacyBundleInterface.php
index b4ad3706..cd47bb06 100644
--- a/bundle/LegacyBundles/LegacyBundleInterface.php
+++ b/bundle/LegacyBundles/LegacyBundleInterface.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyBundleInterface class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\LegacyBundles;
 
diff --git a/bundle/LegacyBundles/LegacyExtensionsLocator.php b/bundle/LegacyBundles/LegacyExtensionsLocator.php
index 6368fb95..b774b963 100644
--- a/bundle/LegacyBundles/LegacyExtensionsLocator.php
+++ b/bundle/LegacyBundles/LegacyExtensionsLocator.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyExtensionsLocator class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\LegacyBundles;
 
diff --git a/bundle/LegacyBundles/LegacyExtensionsLocatorInterface.php b/bundle/LegacyBundles/LegacyExtensionsLocatorInterface.php
index 2c178fee..6cee0125 100644
--- a/bundle/LegacyBundles/LegacyExtensionsLocatorInterface.php
+++ b/bundle/LegacyBundles/LegacyExtensionsLocatorInterface.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyExtensionsLocatorInterface interface.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\LegacyBundles;
 
@@ -16,6 +14,7 @@ interface LegacyExtensionsLocatorInterface
      * Returns the path to legacy extensions within $path.
      *
      * @param string $path directory path
+     *
      * @return array An array of path to legacy extensions
      */
     public function getExtensionDirectories($path);
@@ -24,6 +23,7 @@ public function getExtensionDirectories($path);
      * Returns the list of legacy extension names in $bundle.
      *
      * @param BundleInterface $bundle
+     *
      * @return array An array of legacy extensions names
      */
     public function getExtensionNames(BundleInterface $bundle);
diff --git a/bundle/LegacyMapper/Configuration.php b/bundle/LegacyMapper/Configuration.php
index 1f37cc4b..4187ec49 100644
--- a/bundle/LegacyMapper/Configuration.php
+++ b/bundle/LegacyMapper/Configuration.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Configuration class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\LegacyMapper;
 
diff --git a/bundle/LegacyMapper/LegacyBundles.php b/bundle/LegacyMapper/LegacyBundles.php
index bd67aba4..896eddfe 100644
--- a/bundle/LegacyMapper/LegacyBundles.php
+++ b/bundle/LegacyMapper/LegacyBundles.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyBundles class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\LegacyMapper;
 
diff --git a/bundle/LegacyMapper/Security.php b/bundle/LegacyMapper/Security.php
index 4bc37cf7..45f65f54 100644
--- a/bundle/LegacyMapper/Security.php
+++ b/bundle/LegacyMapper/Security.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Security class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\LegacyMapper;
 
diff --git a/bundle/LegacyMapper/Session.php b/bundle/LegacyMapper/Session.php
index 8e6c3ad3..73bb1c23 100644
--- a/bundle/LegacyMapper/Session.php
+++ b/bundle/LegacyMapper/Session.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Session class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\LegacyMapper;
 
diff --git a/bundle/LegacyMapper/SiteAccess.php b/bundle/LegacyMapper/SiteAccess.php
index 016b820f..b0a08a9e 100644
--- a/bundle/LegacyMapper/SiteAccess.php
+++ b/bundle/LegacyMapper/SiteAccess.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the SiteAccess class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\LegacyMapper;
 
@@ -122,6 +120,7 @@ public function onBuildKernelWebHandler(PreBuildKernelWebHandlerEvent $event)
 
     /**
      * Returns an array with all the components of the fragment_path option.
+     *
      * @return array
      */
     protected function getFragmentPathItems()
diff --git a/bundle/LegacyResponse.php b/bundle/LegacyResponse.php
index 28ceee8d..c3cc2f0e 100644
--- a/bundle/LegacyResponse.php
+++ b/bundle/LegacyResponse.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyResponse class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle;
 
diff --git a/bundle/LegacyResponse/LegacyResponseManager.php b/bundle/LegacyResponse/LegacyResponseManager.php
index 8d72ae6a..99e45ceb 100644
--- a/bundle/LegacyResponse/LegacyResponseManager.php
+++ b/bundle/LegacyResponse/LegacyResponseManager.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyResponseManager class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\LegacyResponse;
 
@@ -66,6 +64,7 @@ public function __construct(EngineInterface $templateEngine, ConfigResolverInter
      *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedException
+     *
      * @return \eZ\Bundle\EzPublishLegacyBundle\LegacyResponse
      */
     public function generateResponseFromModuleResult(ezpKernelResult $result)
@@ -118,6 +117,7 @@ public function generateResponseFromModuleResult(ezpKernelResult $result)
      * Typically checks if $moduleResult['pagelayout'] is set or if current request is using /layout/set/ route.
      *
      * @param ezpKernelResult $result
+     *
      * @return bool
      */
     public function legacyResultHasLayout(ezpKernelResult $result)
diff --git a/bundle/Rest/ResponseWriter.php b/bundle/Rest/ResponseWriter.php
index 4473f83c..81dc7a9d 100644
--- a/bundle/Rest/ResponseWriter.php
+++ b/bundle/Rest/ResponseWriter.php
@@ -1,5 +1,7 @@
 <?php
+
 /**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Rest;
diff --git a/bundle/Routing/DefaultRouter.php b/bundle/Routing/DefaultRouter.php
index a7f941a2..9e97d7bf 100644
--- a/bundle/Routing/DefaultRouter.php
+++ b/bundle/Routing/DefaultRouter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Routing;
 
diff --git a/bundle/Routing/FallbackRouter.php b/bundle/Routing/FallbackRouter.php
index fc38a6ae..f4315a1f 100644
--- a/bundle/Routing/FallbackRouter.php
+++ b/bundle/Routing/FallbackRouter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the FallbackRouter class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Routing;
 
diff --git a/bundle/Routing/UrlGenerator.php b/bundle/Routing/UrlGenerator.php
index b329fe57..91446628 100644
--- a/bundle/Routing/UrlGenerator.php
+++ b/bundle/Routing/UrlGenerator.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the UrlGenerator class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Routing;
 
diff --git a/bundle/Security/RememberMeListener.php b/bundle/Security/RememberMeListener.php
index 49b674b6..bd837700 100644
--- a/bundle/Security/RememberMeListener.php
+++ b/bundle/Security/RememberMeListener.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ LegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Security;
 
diff --git a/bundle/Security/SecurityListener.php b/bundle/Security/SecurityListener.php
index d4678f32..65384648 100644
--- a/bundle/Security/SecurityListener.php
+++ b/bundle/Security/SecurityListener.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Security;
 
diff --git a/bundle/SetupWizard/ConfigurationConverter.php b/bundle/SetupWizard/ConfigurationConverter.php
index fc168b5a..8f158e19 100644
--- a/bundle/SetupWizard/ConfigurationConverter.php
+++ b/bundle/SetupWizard/ConfigurationConverter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ConfigurationConverter class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\SetupWizard;
 
@@ -43,6 +41,7 @@ public function __construct(LegacyConfigResolver $legacyResolver, \Closure $lega
 
     /**
      * Converts from legacy settings to an array dumpable to ezpublish.yml.
+     *
      * @param string $sitePackage Name of the chosen install package
      * @param string $adminSiteaccess Name of the admin siteaccess
      *
@@ -427,6 +426,7 @@ protected function resolveUriMatching($siteaccessSettings)
 
     /**
      * Parses Legacy HostMatching settings to a matching array.
+     *
      * @param mixed[] $siteaccessSettings
      *
      * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentException
diff --git a/bundle/SetupWizard/ConfigurationDumper.php b/bundle/SetupWizard/ConfigurationDumper.php
index 2c68a981..52bfaad3 100644
--- a/bundle/SetupWizard/ConfigurationDumper.php
+++ b/bundle/SetupWizard/ConfigurationDumper.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the legacy ConfigurationDumper class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\SetupWizard;
 
diff --git a/bundle/Tests/Cache/PersistenceCachePurgerTest.php b/bundle/Tests/Cache/PersistenceCachePurgerTest.php
index 9c93b9fa..0877a48f 100644
--- a/bundle/Tests/Cache/PersistenceCachePurgerTest.php
+++ b/bundle/Tests/Cache/PersistenceCachePurgerTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PersistenceCachePurgeTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\Cache;
 
@@ -217,6 +215,7 @@ public function testClearOneContent()
     /**
      * @param $locationId
      * @param $contentId
+     *
      * @return \eZ\Publish\SPI\Persistence\Content\Location
      */
     private function buildLocation($locationId, $contentId)
diff --git a/bundle/Tests/Cache/SwitchableHttpCachePurgerTest.php b/bundle/Tests/Cache/SwitchableHttpCachePurgerTest.php
index 5309594b..988d20f1 100644
--- a/bundle/Tests/Cache/SwitchableHttpCachePurgerTest.php
+++ b/bundle/Tests/Cache/SwitchableHttpCachePurgerTest.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
diff --git a/bundle/Tests/Controller/PreviewControllerTest.php b/bundle/Tests/Controller/PreviewControllerTest.php
index 3a20a9c1..a397f496 100644
--- a/bundle/Tests/Controller/PreviewControllerTest.php
+++ b/bundle/Tests/Controller/PreviewControllerTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PreviewControllerTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\Controller;
 
diff --git a/bundle/Tests/DependencyInjection/Compiler/LegacyBundlesPassTest.php b/bundle/Tests/DependencyInjection/Compiler/LegacyBundlesPassTest.php
index 23647b12..cfde34a9 100644
--- a/bundle/Tests/DependencyInjection/Compiler/LegacyBundlesPassTest.php
+++ b/bundle/Tests/DependencyInjection/Compiler/LegacyBundlesPassTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the AddFieldTypePassTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\DependencyInjection\Compiler;
 
diff --git a/bundle/Tests/DependencyInjection/Configuration/LegacyConfigResolverTest.php b/bundle/Tests/DependencyInjection/Configuration/LegacyConfigResolverTest.php
index a4697444..c308be0f 100644
--- a/bundle/Tests/DependencyInjection/Configuration/LegacyConfigResolverTest.php
+++ b/bundle/Tests/DependencyInjection/Configuration/LegacyConfigResolverTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyConfigResolverTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\DependencyInjection\Configuration;
 
diff --git a/bundle/Tests/DependencyInjection/EzPublishLegacyExtensionTest.php b/bundle/Tests/DependencyInjection/EzPublishLegacyExtensionTest.php
index eb86f992..6ef87571 100644
--- a/bundle/Tests/DependencyInjection/EzPublishLegacyExtensionTest.php
+++ b/bundle/Tests/DependencyInjection/EzPublishLegacyExtensionTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the EzPublishLegacyExtensionTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\DependencyInjection;
 
diff --git a/bundle/Tests/EventListener/ConfigScopeListenerTest.php b/bundle/Tests/EventListener/ConfigScopeListenerTest.php
index b955bfaf..f1e1ce87 100644
--- a/bundle/Tests/EventListener/ConfigScopeListenerTest.php
+++ b/bundle/Tests/EventListener/ConfigScopeListenerTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ConfigScopeListenerTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\EventListener;
 
diff --git a/bundle/Tests/EventListener/RequestListenerTest.php b/bundle/Tests/EventListener/RequestListenerTest.php
index 7832a53e..f13b2ef2 100644
--- a/bundle/Tests/EventListener/RequestListenerTest.php
+++ b/bundle/Tests/EventListener/RequestListenerTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the RequestListenerTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\EventListener;
 
diff --git a/bundle/Tests/EventListener/SetupListenerTest.php b/bundle/Tests/EventListener/SetupListenerTest.php
index f6479084..a58e06a1 100644
--- a/bundle/Tests/EventListener/SetupListenerTest.php
+++ b/bundle/Tests/EventListener/SetupListenerTest.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * This file is part of the legacy-bridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
@@ -99,6 +98,7 @@ public function testOnKernelRequestSetup()
 
     /**
      * @param string $uri
+     *
      * @return \Symfony\Component\HttpKernel\Event\GetResponseEvent
      */
     private function createEvent($uri = null, $requestType = HttpKernelInterface::MASTER_REQUEST)
diff --git a/bundle/Tests/FieldType/Page/PageServiceTest.php b/bundle/Tests/FieldType/Page/PageServiceTest.php
index 88a9066e..14580343 100644
--- a/bundle/Tests/FieldType/Page/PageServiceTest.php
+++ b/bundle/Tests/FieldType/Page/PageServiceTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PageServiceTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\FieldType\Page;
 
diff --git a/bundle/Tests/LegacyBundles/LegacyExtensionsLocatorTest.php b/bundle/Tests/LegacyBundles/LegacyExtensionsLocatorTest.php
index db1b6c2c..9fcb5406 100644
--- a/bundle/Tests/LegacyBundles/LegacyExtensionsLocatorTest.php
+++ b/bundle/Tests/LegacyBundles/LegacyExtensionsLocatorTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyExtensionsLocatorTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\LegacyBundles;
 
diff --git a/bundle/Tests/LegacyMapper/SecurityTest.php b/bundle/Tests/LegacyMapper/SecurityTest.php
index c62a8c6a..ebfc909c 100644
--- a/bundle/Tests/LegacyMapper/SecurityTest.php
+++ b/bundle/Tests/LegacyMapper/SecurityTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the SecurityTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\LegacyMapper;
 
diff --git a/bundle/Tests/LegacyMapper/SessionTest.php b/bundle/Tests/LegacyMapper/SessionTest.php
index 5e2fcd5a..96e82aa9 100644
--- a/bundle/Tests/LegacyMapper/SessionTest.php
+++ b/bundle/Tests/LegacyMapper/SessionTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the SessionTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\LegacyMapper;
 
diff --git a/bundle/Tests/LegacyMapper/SiteAccessTest.php b/bundle/Tests/LegacyMapper/SiteAccessTest.php
index b8737a1f..556721d8 100644
--- a/bundle/Tests/LegacyMapper/SiteAccessTest.php
+++ b/bundle/Tests/LegacyMapper/SiteAccessTest.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * File containing the SiteAccessTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
diff --git a/bundle/Tests/LegacyResponse/LegacyResponseManagerTest.php b/bundle/Tests/LegacyResponse/LegacyResponseManagerTest.php
index 8caf313f..b9b1f88a 100644
--- a/bundle/Tests/LegacyResponse/LegacyResponseManagerTest.php
+++ b/bundle/Tests/LegacyResponse/LegacyResponseManagerTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyResponseManagerTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\LegacyResponse;
 
diff --git a/bundle/Tests/Routing/DefaultRouterTest.php b/bundle/Tests/Routing/DefaultRouterTest.php
index 8793ce6e..dc3df11e 100644
--- a/bundle/Tests/Routing/DefaultRouterTest.php
+++ b/bundle/Tests/Routing/DefaultRouterTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\Routing\DefaultRouterTest;
 
diff --git a/bundle/Tests/Security/SecurityListenerTest.php b/bundle/Tests/Security/SecurityListenerTest.php
index 53d30ab6..4d6c3dcc 100644
--- a/bundle/Tests/Security/SecurityListenerTest.php
+++ b/bundle/Tests/Security/SecurityListenerTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\Security;
 
diff --git a/bundle/Tests/SetupWizard/ConfigurationConverterTest.php b/bundle/Tests/SetupWizard/ConfigurationConverterTest.php
index 6fbc7786..d74d640a 100644
--- a/bundle/Tests/SetupWizard/ConfigurationConverterTest.php
+++ b/bundle/Tests/SetupWizard/ConfigurationConverterTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ConfigurationConverterTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\SetupWizard;
 
diff --git a/bundle/Tests/SetupWizard/ConfigurationDumperTest.php b/bundle/Tests/SetupWizard/ConfigurationDumperTest.php
index 45078511..d354f4b0 100644
--- a/bundle/Tests/SetupWizard/ConfigurationDumperTest.php
+++ b/bundle/Tests/SetupWizard/ConfigurationDumperTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ConfigurationDumperTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\SetupWizard;
 
diff --git a/bundle/Tests/SiteAccess/LegacyMapperTest.php b/bundle/Tests/SiteAccess/LegacyMapperTest.php
index 8277baf9..0945a796 100644
--- a/bundle/Tests/SiteAccess/LegacyMapperTest.php
+++ b/bundle/Tests/SiteAccess/LegacyMapperTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyMapperTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Tests\SiteAccess;
 
diff --git a/composer.json b/composer.json
index 10b2c826..a8234d6a 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,8 @@
         "twig/twig": "^1.35 || ^2.5"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "v2.14.2",
+        "friendsofphp/php-cs-fixer": "^2.16.2",
+        "ezsystems/ezplatform-code-style": "^0.1",
         "ezsystems/ezplatform-http-cache": "~0.9",
         "matthiasnoback/symfony-dependency-injection-test": "^2.3",
         "phpunit/phpunit": "^6.5",
diff --git a/mvc/Event/PostBuildKernelEvent.php b/mvc/Event/PostBuildKernelEvent.php
index 9f714ea6..c56df77b 100644
--- a/mvc/Event/PostBuildKernelEvent.php
+++ b/mvc/Event/PostBuildKernelEvent.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PostBuildKernelWebHandlerEvent class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Event;
 
diff --git a/mvc/Event/PreBuildKernelEvent.php b/mvc/Event/PreBuildKernelEvent.php
index a8e24c17..c04339c0 100644
--- a/mvc/Event/PreBuildKernelEvent.php
+++ b/mvc/Event/PreBuildKernelEvent.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PreBuildKernelEvent class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Event;
 
diff --git a/mvc/Event/PreBuildKernelWebHandlerEvent.php b/mvc/Event/PreBuildKernelWebHandlerEvent.php
index 5c6ebb1c..c42edc3f 100644
--- a/mvc/Event/PreBuildKernelWebHandlerEvent.php
+++ b/mvc/Event/PreBuildKernelWebHandlerEvent.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PreBuildKernelWebHandlerEvent class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Event;
 
diff --git a/mvc/Event/PreResetLegacyKernelEvent.php b/mvc/Event/PreResetLegacyKernelEvent.php
index e5f91660..c24cef94 100644
--- a/mvc/Event/PreResetLegacyKernelEvent.php
+++ b/mvc/Event/PreResetLegacyKernelEvent.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PreBuildKernelEvent class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Event;
 
diff --git a/mvc/EventListener/APIContentExceptionListener.php b/mvc/EventListener/APIContentExceptionListener.php
index b6601744..93eebf91 100644
--- a/mvc/EventListener/APIContentExceptionListener.php
+++ b/mvc/EventListener/APIContentExceptionListener.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the APIExceptionListener class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\EventListener;
 
diff --git a/mvc/Image/AliasCleaner.php b/mvc/Image/AliasCleaner.php
index acd15d55..e4acea3b 100644
--- a/mvc/Image/AliasCleaner.php
+++ b/mvc/Image/AliasCleaner.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the AliasCleaner class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Image;
 
diff --git a/mvc/Image/AliasGenerator.php b/mvc/Image/AliasGenerator.php
index 0c395f9a..d07c4535 100644
--- a/mvc/Image/AliasGenerator.php
+++ b/mvc/Image/AliasGenerator.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the image AliasGenerator class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Image;
 
diff --git a/mvc/Kernel.php b/mvc/Kernel.php
index a8c6f364..4ec971de 100644
--- a/mvc/Kernel.php
+++ b/mvc/Kernel.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyKernel class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy;
 
@@ -38,6 +36,7 @@ class Kernel extends ezpKernel
 
     /**
      * Directory where kernel was originally running from.
+     *
      * @see self::runCallback()
      *
      * @var string
@@ -130,11 +129,11 @@ public function run()
      * @param bool $postReinitialize Default is true.
      *                               If set to false, the kernel environment will not be reinitialized.
      *                               This can be useful to optimize several calls to the kernel within the same context.
-     *
      * @param bool|null $formTokenEnable Force ezxFormToken to be enabled or disabled, use system settings when null
      *
      * @throws \RuntimeException
      * @throws \Exception
+     *
      * @return mixed The result of the callback
      */
     public function runCallback(\Closure $callback, $postReinitialize = true, $formTokenEnable = null)
diff --git a/mvc/Kernel/CLIHandler.php b/mvc/Kernel/CLIHandler.php
index 2e321aed..611fc7fc 100644
--- a/mvc/Kernel/CLIHandler.php
+++ b/mvc/Kernel/CLIHandler.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the CLIHandler class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Kernel;
 
@@ -147,6 +145,7 @@ private function sessionInit()
      * @param bool $postReinitialize Default is true.
      *                               If set to false, the kernel environment will not be reinitialized.
      *                               This can be useful to optimize several calls to the kernel within the same context.
+     *
      * @return mixed The result of the callback
      */
     public function runCallback(\Closure $callback, $postReinitialize = true)
diff --git a/mvc/Kernel/Loader.php b/mvc/Kernel/Loader.php
index 9d526f8b..7dcfad05 100644
--- a/mvc/Kernel/Loader.php
+++ b/mvc/Kernel/Loader.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the legacy kernel Loader class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Kernel;
 
diff --git a/mvc/Kernel/URIHelper.php b/mvc/Kernel/URIHelper.php
index 7198158e..4f71f1b6 100644
--- a/mvc/Kernel/URIHelper.php
+++ b/mvc/Kernel/URIHelper.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the WebHandler class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Kernel;
 
diff --git a/mvc/LegacyEvents.php b/mvc/LegacyEvents.php
index 47000516..b43c42ae 100644
--- a/mvc/LegacyEvents.php
+++ b/mvc/LegacyEvents.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyEvents class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy;
 
diff --git a/mvc/LegacyKernelAware.php b/mvc/LegacyKernelAware.php
index 8b472f98..35521caa 100644
--- a/mvc/LegacyKernelAware.php
+++ b/mvc/LegacyKernelAware.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyKernelAware interface.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy;
 
diff --git a/mvc/Security/Firewall/LoginCleanupListener.php b/mvc/Security/Firewall/LoginCleanupListener.php
index 4cf1046a..194317bf 100644
--- a/mvc/Security/Firewall/LoginCleanupListener.php
+++ b/mvc/Security/Firewall/LoginCleanupListener.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the InteractiveLoginListener class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Security\Firewall;
 
diff --git a/mvc/Security/Firewall/SSOListener.php b/mvc/Security/Firewall/SSOListener.php
index 0bf2429a..e49c47ca 100644
--- a/mvc/Security/Firewall/SSOListener.php
+++ b/mvc/Security/Firewall/SSOListener.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the SSOListener class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Security\Firewall;
 
diff --git a/mvc/Security/LegacyToken.php b/mvc/Security/LegacyToken.php
index a865fc6f..be5cfda7 100644
--- a/mvc/Security/LegacyToken.php
+++ b/mvc/Security/LegacyToken.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ LegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Security;
 
diff --git a/mvc/Security/Voter/VoterDecorator.php b/mvc/Security/Voter/VoterDecorator.php
index 363432f8..2527e6bc 100644
--- a/mvc/Security/Voter/VoterDecorator.php
+++ b/mvc/Security/Voter/VoterDecorator.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ LegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Security\Voter;
 
diff --git a/mvc/Session/LegacySessionProxy.php b/mvc/Session/LegacySessionProxy.php
index ec2932e6..cf9c9910 100644
--- a/mvc/Session/LegacySessionProxy.php
+++ b/mvc/Session/LegacySessionProxy.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish LegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Session;
 
diff --git a/mvc/Session/LegacySessionStorage.php b/mvc/Session/LegacySessionStorage.php
index 50941f11..e3631344 100644
--- a/mvc/Session/LegacySessionStorage.php
+++ b/mvc/Session/LegacySessionStorage.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish LegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Session;
 
diff --git a/mvc/SignalSlot/AbstractLegacyObjectStateSlot.php b/mvc/SignalSlot/AbstractLegacyObjectStateSlot.php
index 321b1935..57e1bab2 100644
--- a/mvc/SignalSlot/AbstractLegacyObjectStateSlot.php
+++ b/mvc/SignalSlot/AbstractLegacyObjectStateSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\AbstractLegacyObjectStateSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/AbstractLegacySlot.php b/mvc/SignalSlot/AbstractLegacySlot.php
index b89916ef..1533898a 100644
--- a/mvc/SignalSlot/AbstractLegacySlot.php
+++ b/mvc/SignalSlot/AbstractLegacySlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the AbstractLegacySlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyAssignSectionSlot.php b/mvc/SignalSlot/LegacyAssignSectionSlot.php
index 3ada3f7c..70da21c7 100644
--- a/mvc/SignalSlot/LegacyAssignSectionSlot.php
+++ b/mvc/SignalSlot/LegacyAssignSectionSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\AssignSectionSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyAssignUserToUserGroupSlot.php b/mvc/SignalSlot/LegacyAssignUserToUserGroupSlot.php
index d78b9560..79f03f39 100644
--- a/mvc/SignalSlot/LegacyAssignUserToUserGroupSlot.php
+++ b/mvc/SignalSlot/LegacyAssignUserToUserGroupSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyAssignUserToUserGroupSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyCopyContentSlot.php b/mvc/SignalSlot/LegacyCopyContentSlot.php
index 0dfd3c90..1eecc46c 100644
--- a/mvc/SignalSlot/LegacyCopyContentSlot.php
+++ b/mvc/SignalSlot/LegacyCopyContentSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\CopyContentSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyCreateLanguageSlot.php b/mvc/SignalSlot/LegacyCreateLanguageSlot.php
index f9856fbe..e47445ef 100644
--- a/mvc/SignalSlot/LegacyCreateLanguageSlot.php
+++ b/mvc/SignalSlot/LegacyCreateLanguageSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyCreateLanguageSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyCreateLocationSlot.php b/mvc/SignalSlot/LegacyCreateLocationSlot.php
index 32bc288d..cdc23629 100644
--- a/mvc/SignalSlot/LegacyCreateLocationSlot.php
+++ b/mvc/SignalSlot/LegacyCreateLocationSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\CreateLocationSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyCreateObjectStateGroupSlot.php b/mvc/SignalSlot/LegacyCreateObjectStateGroupSlot.php
index f70ec144..4e45e58d 100644
--- a/mvc/SignalSlot/LegacyCreateObjectStateGroupSlot.php
+++ b/mvc/SignalSlot/LegacyCreateObjectStateGroupSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\LegacyCreateObjectStateGroupSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyCreateObjectStateSlot.php b/mvc/SignalSlot/LegacyCreateObjectStateSlot.php
index bf367731..b73b0f9e 100644
--- a/mvc/SignalSlot/LegacyCreateObjectStateSlot.php
+++ b/mvc/SignalSlot/LegacyCreateObjectStateSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\LegacyCreateObjectStateSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyCreateUserSlot.php b/mvc/SignalSlot/LegacyCreateUserSlot.php
index 0f4fde17..97325772 100644
--- a/mvc/SignalSlot/LegacyCreateUserSlot.php
+++ b/mvc/SignalSlot/LegacyCreateUserSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyCreateUserSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyDeleteContentSlot.php b/mvc/SignalSlot/LegacyDeleteContentSlot.php
index af8e408f..3c1a5fda 100644
--- a/mvc/SignalSlot/LegacyDeleteContentSlot.php
+++ b/mvc/SignalSlot/LegacyDeleteContentSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\DeleteContentSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyDeleteLanguageSlot.php b/mvc/SignalSlot/LegacyDeleteLanguageSlot.php
index 429032f2..42c752d5 100644
--- a/mvc/SignalSlot/LegacyDeleteLanguageSlot.php
+++ b/mvc/SignalSlot/LegacyDeleteLanguageSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyDeleteLanguageSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyDeleteLocationSlot.php b/mvc/SignalSlot/LegacyDeleteLocationSlot.php
index cc8be9f3..8bd4024d 100644
--- a/mvc/SignalSlot/LegacyDeleteLocationSlot.php
+++ b/mvc/SignalSlot/LegacyDeleteLocationSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\DeleteLocationSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyDeleteObjectStateGroupSlot.php b/mvc/SignalSlot/LegacyDeleteObjectStateGroupSlot.php
index 6652f4de..8cc95a4e 100644
--- a/mvc/SignalSlot/LegacyDeleteObjectStateGroupSlot.php
+++ b/mvc/SignalSlot/LegacyDeleteObjectStateGroupSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\LegacyDeleteObjectStateGroupSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyDeleteObjectStateSlot.php b/mvc/SignalSlot/LegacyDeleteObjectStateSlot.php
index 4288c0ec..24850bd5 100644
--- a/mvc/SignalSlot/LegacyDeleteObjectStateSlot.php
+++ b/mvc/SignalSlot/LegacyDeleteObjectStateSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\LegacyDeleteObjectStateSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyDeleteVersionSlot.php b/mvc/SignalSlot/LegacyDeleteVersionSlot.php
index 253cf87b..81f5a530 100644
--- a/mvc/SignalSlot/LegacyDeleteVersionSlot.php
+++ b/mvc/SignalSlot/LegacyDeleteVersionSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\DeleteVersionSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyDisableLanguageSlot.php b/mvc/SignalSlot/LegacyDisableLanguageSlot.php
index 62716f47..a0f4795d 100644
--- a/mvc/SignalSlot/LegacyDisableLanguageSlot.php
+++ b/mvc/SignalSlot/LegacyDisableLanguageSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyDisableLanguageSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyEnableLanguageSlot.php b/mvc/SignalSlot/LegacyEnableLanguageSlot.php
index b43f3b4f..af901bcb 100644
--- a/mvc/SignalSlot/LegacyEnableLanguageSlot.php
+++ b/mvc/SignalSlot/LegacyEnableLanguageSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyEnableLanguageSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyHideLocationSlot.php b/mvc/SignalSlot/LegacyHideLocationSlot.php
index b524488f..6f3a0f0d 100644
--- a/mvc/SignalSlot/LegacyHideLocationSlot.php
+++ b/mvc/SignalSlot/LegacyHideLocationSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\HideLocationSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyMoveSubtreeSlot.php b/mvc/SignalSlot/LegacyMoveSubtreeSlot.php
index 40350f7a..78453ae1 100644
--- a/mvc/SignalSlot/LegacyMoveSubtreeSlot.php
+++ b/mvc/SignalSlot/LegacyMoveSubtreeSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\MoveSubtreeSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyPublishContentTypeDraftSlot.php b/mvc/SignalSlot/LegacyPublishContentTypeDraftSlot.php
index b0c7cfdf..e346289c 100644
--- a/mvc/SignalSlot/LegacyPublishContentTypeDraftSlot.php
+++ b/mvc/SignalSlot/LegacyPublishContentTypeDraftSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\PublishContentTypeDraft class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyPublishVersionSlot.php b/mvc/SignalSlot/LegacyPublishVersionSlot.php
index f3023736..c1b9d66c 100644
--- a/mvc/SignalSlot/LegacyPublishVersionSlot.php
+++ b/mvc/SignalSlot/LegacyPublishVersionSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\PublishVersionSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacySetContentStateSlot.php b/mvc/SignalSlot/LegacySetContentStateSlot.php
index 76c1934e..4bf7c1bd 100644
--- a/mvc/SignalSlot/LegacySetContentStateSlot.php
+++ b/mvc/SignalSlot/LegacySetContentStateSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\SetContentStateSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacySetPriorityOfObjectStateSlot.php b/mvc/SignalSlot/LegacySetPriorityOfObjectStateSlot.php
index 41bdd511..80d985eb 100644
--- a/mvc/SignalSlot/LegacySetPriorityOfObjectStateSlot.php
+++ b/mvc/SignalSlot/LegacySetPriorityOfObjectStateSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\LegacySetPriorityOfObjectStateSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacySwapLocationSlot.php b/mvc/SignalSlot/LegacySwapLocationSlot.php
index 10787225..f592ecf6 100644
--- a/mvc/SignalSlot/LegacySwapLocationSlot.php
+++ b/mvc/SignalSlot/LegacySwapLocationSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\SwapLocationSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyUnassignUserFromUserGroupSlot.php b/mvc/SignalSlot/LegacyUnassignUserFromUserGroupSlot.php
index 8beb8f0f..a04f8892 100644
--- a/mvc/SignalSlot/LegacyUnassignUserFromUserGroupSlot.php
+++ b/mvc/SignalSlot/LegacyUnassignUserFromUserGroupSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyUnassignUserFromUserGroupSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyUnhideLocationSlot.php b/mvc/SignalSlot/LegacyUnhideLocationSlot.php
index b63f88ce..dd7849b7 100644
--- a/mvc/SignalSlot/LegacyUnhideLocationSlot.php
+++ b/mvc/SignalSlot/LegacyUnhideLocationSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\UnhideLocationSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyUpdateLanguageNameSlot.php b/mvc/SignalSlot/LegacyUpdateLanguageNameSlot.php
index 077ae527..0f2de03e 100644
--- a/mvc/SignalSlot/LegacyUpdateLanguageNameSlot.php
+++ b/mvc/SignalSlot/LegacyUpdateLanguageNameSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyUpdateLanguageNameSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyUpdateLocationSlot.php b/mvc/SignalSlot/LegacyUpdateLocationSlot.php
index fca4c2af..a97f2f32 100644
--- a/mvc/SignalSlot/LegacyUpdateLocationSlot.php
+++ b/mvc/SignalSlot/LegacyUpdateLocationSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\UpdateLocationSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyUpdateObjectStateGroupSlot.php b/mvc/SignalSlot/LegacyUpdateObjectStateGroupSlot.php
index 31ebd28f..73d13651 100644
--- a/mvc/SignalSlot/LegacyUpdateObjectStateGroupSlot.php
+++ b/mvc/SignalSlot/LegacyUpdateObjectStateGroupSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\LegacyUpdateObjectStateGroupSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyUpdateObjectStateSlot.php b/mvc/SignalSlot/LegacyUpdateObjectStateSlot.php
index ed8a25a8..bfea60e0 100644
--- a/mvc/SignalSlot/LegacyUpdateObjectStateSlot.php
+++ b/mvc/SignalSlot/LegacyUpdateObjectStateSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Legacy\LegacyUpdateObjectStateSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/SignalSlot/LegacyUpdateUserSlot.php b/mvc/SignalSlot/LegacyUpdateUserSlot.php
index 6b0e6a4e..4ad9be42 100644
--- a/mvc/SignalSlot/LegacyUpdateUserSlot.php
+++ b/mvc/SignalSlot/LegacyUpdateUserSlot.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyUpdateUserSlot class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\SignalSlot;
 
diff --git a/mvc/Templating/Adapter/BlockAdapter.php b/mvc/Templating/Adapter/BlockAdapter.php
index 1f3ce1eb..9ec70fb6 100644
--- a/mvc/Templating/Adapter/BlockAdapter.php
+++ b/mvc/Templating/Adapter/BlockAdapter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the BlockAdapter class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Adapter;
 
diff --git a/mvc/Templating/Adapter/DefinitionBasedAdapter.php b/mvc/Templating/Adapter/DefinitionBasedAdapter.php
index 5468f092..68e833ac 100644
--- a/mvc/Templating/Adapter/DefinitionBasedAdapter.php
+++ b/mvc/Templating/Adapter/DefinitionBasedAdapter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the DefinitionBasedAdapter class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Adapter;
 
diff --git a/mvc/Templating/Adapter/ValueObjectAdapter.php b/mvc/Templating/Adapter/ValueObjectAdapter.php
index 02d1a5f2..285e6071 100644
--- a/mvc/Templating/Adapter/ValueObjectAdapter.php
+++ b/mvc/Templating/Adapter/ValueObjectAdapter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ValueObjectAdapter class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Adapter;
 
diff --git a/mvc/Templating/Adapter/ZoneAdapter.php b/mvc/Templating/Adapter/ZoneAdapter.php
index f7c93d7a..ce5ea712 100644
--- a/mvc/Templating/Adapter/ZoneAdapter.php
+++ b/mvc/Templating/Adapter/ZoneAdapter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ZoneAdapter class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Adapter;
 
diff --git a/mvc/Templating/Converter/ApiContentConverter.php b/mvc/Templating/Converter/ApiContentConverter.php
index 00bcacf7..b4ae754f 100644
--- a/mvc/Templating/Converter/ApiContentConverter.php
+++ b/mvc/Templating/Converter/ApiContentConverter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ApiContentConverter class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Converter;
 
diff --git a/mvc/Templating/Converter/DelegatingConverter.php b/mvc/Templating/Converter/DelegatingConverter.php
index ed644c4b..fcf9986e 100644
--- a/mvc/Templating/Converter/DelegatingConverter.php
+++ b/mvc/Templating/Converter/DelegatingConverter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the DelegatingConverter class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Converter;
 
diff --git a/mvc/Templating/Converter/GenericConverter.php b/mvc/Templating/Converter/GenericConverter.php
index 74573191..612eeb28 100644
--- a/mvc/Templating/Converter/GenericConverter.php
+++ b/mvc/Templating/Converter/GenericConverter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the GenericConverter class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Converter;
 
diff --git a/mvc/Templating/Converter/MultipleObjectConverter.php b/mvc/Templating/Converter/MultipleObjectConverter.php
index db522b5e..8b436568 100644
--- a/mvc/Templating/Converter/MultipleObjectConverter.php
+++ b/mvc/Templating/Converter/MultipleObjectConverter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the MultipleObjectConverter class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Converter;
 
diff --git a/mvc/Templating/Converter/ObjectConverter.php b/mvc/Templating/Converter/ObjectConverter.php
index bc9ee970..f5e7d05f 100644
--- a/mvc/Templating/Converter/ObjectConverter.php
+++ b/mvc/Templating/Converter/ObjectConverter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ObjectConverter interface.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Converter;
 
diff --git a/mvc/Templating/Converter/PagePartsConverter.php b/mvc/Templating/Converter/PagePartsConverter.php
index 9222ef1c..0f535a71 100644
--- a/mvc/Templating/Converter/PagePartsConverter.php
+++ b/mvc/Templating/Converter/PagePartsConverter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PagePartsConverter class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Converter;
 
diff --git a/mvc/Templating/GlobalHelper.php b/mvc/Templating/GlobalHelper.php
index ed8140cd..bc4998d2 100644
--- a/mvc/Templating/GlobalHelper.php
+++ b/mvc/Templating/GlobalHelper.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the GlobalHelper class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating;
 
diff --git a/mvc/Templating/LegacyAdapter.php b/mvc/Templating/LegacyAdapter.php
index 2394042b..dca17d51 100644
--- a/mvc/Templating/LegacyAdapter.php
+++ b/mvc/Templating/LegacyAdapter.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyAdapter class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating;
 
diff --git a/mvc/Templating/LegacyCompatible.php b/mvc/Templating/LegacyCompatible.php
index cc03c08d..cd51f8cd 100644
--- a/mvc/Templating/LegacyCompatible.php
+++ b/mvc/Templating/LegacyCompatible.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyCompatible interface.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating;
 
diff --git a/mvc/Templating/LegacyEngine.php b/mvc/Templating/LegacyEngine.php
index 7c9ecdfa..1e5978df 100644
--- a/mvc/Templating/LegacyEngine.php
+++ b/mvc/Templating/LegacyEngine.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyEngine class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating;
 
diff --git a/mvc/Templating/LegacyFormulaLoader.php b/mvc/Templating/LegacyFormulaLoader.php
index 910a6282..94292af5 100644
--- a/mvc/Templating/LegacyFormulaLoader.php
+++ b/mvc/Templating/LegacyFormulaLoader.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyFormulaLoader class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating;
 
diff --git a/mvc/Templating/LegacyHelper.php b/mvc/Templating/LegacyHelper.php
index d856a31e..63b2da1d 100644
--- a/mvc/Templating/LegacyHelper.php
+++ b/mvc/Templating/LegacyHelper.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyHelper class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating;
 
diff --git a/mvc/Templating/Tests/Adapter/DefinitionBasedAdapterTest.php b/mvc/Templating/Tests/Adapter/DefinitionBasedAdapterTest.php
index 164c2d87..ec3cd870 100644
--- a/mvc/Templating/Tests/Adapter/DefinitionBasedAdapterTest.php
+++ b/mvc/Templating/Tests/Adapter/DefinitionBasedAdapterTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the DefinitionBasedAdapterTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Tests\Adapter;
 
diff --git a/mvc/Templating/Tests/Adapter/ValueObjectAdapterTest.php b/mvc/Templating/Tests/Adapter/ValueObjectAdapterTest.php
index 9670106f..befce2fd 100644
--- a/mvc/Templating/Tests/Adapter/ValueObjectAdapterTest.php
+++ b/mvc/Templating/Tests/Adapter/ValueObjectAdapterTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ValueObjectAdapterTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Tests\Adapter;
 
diff --git a/mvc/Templating/Tests/Converter/PagePartsConverterTest.php b/mvc/Templating/Tests/Converter/PagePartsConverterTest.php
index c5e5fcda..cb06d584 100644
--- a/mvc/Templating/Tests/Converter/PagePartsConverterTest.php
+++ b/mvc/Templating/Tests/Converter/PagePartsConverterTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PagePartsConverterTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Tests\Converter;
 
diff --git a/mvc/Templating/Tests/GlobalHelperTest.php b/mvc/Templating/Tests/GlobalHelperTest.php
index 91796109..3377b585 100644
--- a/mvc/Templating/Tests/GlobalHelperTest.php
+++ b/mvc/Templating/Tests/GlobalHelperTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the GlobalHelperTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Tests;
 
diff --git a/mvc/Templating/Tests/LegacyEngineTest.php b/mvc/Templating/Tests/LegacyEngineTest.php
index 88d05107..6a1da212 100644
--- a/mvc/Templating/Tests/LegacyEngineTest.php
+++ b/mvc/Templating/Tests/LegacyEngineTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyEngineTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Tests;
 
diff --git a/mvc/Templating/Tests/Twig/EnvironmentTest.php b/mvc/Templating/Tests/Twig/EnvironmentTest.php
index 1943ae5f..9c10eefd 100644
--- a/mvc/Templating/Tests/Twig/EnvironmentTest.php
+++ b/mvc/Templating/Tests/Twig/EnvironmentTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the TwigEnvironmentTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Tests\Twig;
 
diff --git a/mvc/Templating/Tests/Twig/LoaderStringTest.php b/mvc/Templating/Tests/Twig/LoaderStringTest.php
index 0c948f5a..c4412cd1 100644
--- a/mvc/Templating/Tests/Twig/LoaderStringTest.php
+++ b/mvc/Templating/Tests/Twig/LoaderStringTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LoaderStringTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Tests\Twig;
 
diff --git a/mvc/Templating/Tests/Twig/TemplateTest.php b/mvc/Templating/Tests/Twig/TemplateTest.php
index add73397..f844a20a 100644
--- a/mvc/Templating/Tests/Twig/TemplateTest.php
+++ b/mvc/Templating/Tests/Twig/TemplateTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the TemplateTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Tests\Twig;
 
diff --git a/mvc/Templating/Twig/Environment.php b/mvc/Templating/Twig/Environment.php
index 42958555..aad36cae 100644
--- a/mvc/Templating/Twig/Environment.php
+++ b/mvc/Templating/Twig/Environment.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Twig Environment class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Twig;
 
diff --git a/mvc/Templating/Twig/Extension/LegacyExtension.php b/mvc/Templating/Twig/Extension/LegacyExtension.php
index 63ed20cb..e55b65ad 100644
--- a/mvc/Templating/Twig/Extension/LegacyExtension.php
+++ b/mvc/Templating/Twig/Extension/LegacyExtension.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyExtension class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Twig\Extension;
 
diff --git a/mvc/Templating/Twig/Extension/LegacyRuntime.php b/mvc/Templating/Twig/Extension/LegacyRuntime.php
index 1aa10de1..dd0741b2 100644
--- a/mvc/Templating/Twig/Extension/LegacyRuntime.php
+++ b/mvc/Templating/Twig/Extension/LegacyRuntime.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyExtension class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Twig\Extension;
 
diff --git a/mvc/Templating/Twig/LoaderString.php b/mvc/Templating/Twig/LoaderString.php
index dbe7e70a..e92eb39c 100644
--- a/mvc/Templating/Twig/LoaderString.php
+++ b/mvc/Templating/Twig/LoaderString.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LoaderString class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Twig;
 
diff --git a/mvc/Templating/Twig/Template.php b/mvc/Templating/Twig/Template.php
index 23ef50b0..f9fb4c1c 100644
--- a/mvc/Templating/Twig/Template.php
+++ b/mvc/Templating/Twig/Template.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Template class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Templating\Twig;
 
diff --git a/mvc/Tests/Event/PostBuildKernelEventTest.php b/mvc/Tests/Event/PostBuildKernelEventTest.php
index bfb1a18c..845f10a9 100644
--- a/mvc/Tests/Event/PostBuildKernelEventTest.php
+++ b/mvc/Tests/Event/PostBuildKernelEventTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PostBuildKernelEventTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Tests\Event;
 
diff --git a/mvc/Tests/Event/PreBuildKernelEventTest.php b/mvc/Tests/Event/PreBuildKernelEventTest.php
index af1060dc..f9915f8d 100644
--- a/mvc/Tests/Event/PreBuildKernelEventTest.php
+++ b/mvc/Tests/Event/PreBuildKernelEventTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PreBuildKernelEventTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Tests\Event;
 
diff --git a/mvc/Tests/Event/PreBuildKernelWebHandlerEventTest.php b/mvc/Tests/Event/PreBuildKernelWebHandlerEventTest.php
index e0123a91..19ece5a9 100644
--- a/mvc/Tests/Event/PreBuildKernelWebHandlerEventTest.php
+++ b/mvc/Tests/Event/PreBuildKernelWebHandlerEventTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PreBuildKernelWebHandlerEventTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Tests\Event;
 
diff --git a/mvc/Tests/Image/AliasCleanerTest.php b/mvc/Tests/Image/AliasCleanerTest.php
index b3273aed..b15bb20d 100644
--- a/mvc/Tests/Image/AliasCleanerTest.php
+++ b/mvc/Tests/Image/AliasCleanerTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the AliasCleanerTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Tests\Image;
 
diff --git a/mvc/Tests/KernelTest.php b/mvc/Tests/KernelTest.php
index e07df664..c41c121c 100644
--- a/mvc/Tests/KernelTest.php
+++ b/mvc/Tests/KernelTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Kernel class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Tests;
 
diff --git a/mvc/Tests/LegacyBasedTestCase.php b/mvc/Tests/LegacyBasedTestCase.php
index f2d520fd..eb4d1936 100644
--- a/mvc/Tests/LegacyBasedTestCase.php
+++ b/mvc/Tests/LegacyBasedTestCase.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyBasedTestCase class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Tests;
 
diff --git a/mvc/Tests/Security/SSOListenerTest.php b/mvc/Tests/Security/SSOListenerTest.php
index fc9460c0..18736612 100644
--- a/mvc/Tests/Security/SSOListenerTest.php
+++ b/mvc/Tests/Security/SSOListenerTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the SSOListenerTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Tests\Security;
 
diff --git a/mvc/Tests/SignalSlot/LegacySlotsTest.php b/mvc/Tests/SignalSlot/LegacySlotsTest.php
index 868dacb5..67621d7f 100644
--- a/mvc/Tests/SignalSlot/LegacySlotsTest.php
+++ b/mvc/Tests/SignalSlot/LegacySlotsTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing a test class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Tests\SignalSlot;
 
diff --git a/mvc/Tests/URIHelperTest.php b/mvc/Tests/URIHelperTest.php
index ffb47654..7a7acedf 100644
--- a/mvc/Tests/URIHelperTest.php
+++ b/mvc/Tests/URIHelperTest.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the URIFixerTest class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\Tests;
 
diff --git a/mvc/View/Provider.php b/mvc/View/Provider.php
index c399654f..75f6de73 100644
--- a/mvc/View/Provider.php
+++ b/mvc/View/Provider.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the Provider abstract class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\View;
 
diff --git a/mvc/View/Provider/Block.php b/mvc/View/Provider/Block.php
index 245b03f5..397fc5e8 100644
--- a/mvc/View/Provider/Block.php
+++ b/mvc/View/Provider/Block.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the View\Provider\Block class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\View\Provider;
 
diff --git a/mvc/View/Provider/Content.php b/mvc/View/Provider/Content.php
index 8a957346..052d5580 100644
--- a/mvc/View/Provider/Content.php
+++ b/mvc/View/Provider/Content.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the View\Provider\Content class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\View\Provider;
 
diff --git a/mvc/View/Provider/Location.php b/mvc/View/Provider/Location.php
index 2ff30436..82f0dcda 100644
--- a/mvc/View/Provider/Location.php
+++ b/mvc/View/Provider/Location.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the View\Provider\Location class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\View\Provider;
 
diff --git a/mvc/View/TwigContentViewLayoutDecorator.php b/mvc/View/TwigContentViewLayoutDecorator.php
index 300d1946..cd9c0368 100644
--- a/mvc/View/TwigContentViewLayoutDecorator.php
+++ b/mvc/View/TwigContentViewLayoutDecorator.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the TwigLayoutDecorator class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Publish\Core\MVC\Legacy\View;