diff --git a/.php_cs b/.php_cs
index 74cfb3d9..a021ec38 100644
--- a/.php_cs
+++ b/.php_cs
@@ -1,35 +1,13 @@
 <?php
 
-// PHP-CS-Fixer 2.x syntax
-return PhpCsFixer\Config::create()
-    ->setRules([
-        '@Symfony' => true,
-        '@Symfony:risky' => true,
-        'concat_space' => ['spacing' => 'one'],
-        'array_syntax' => false,
-        '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,
-    ])
-    ->setRiskyAllowed(true)
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->in(__DIR__)
-            ->exclude([
-                'spec',
-                'docs',
-                'features',
-                'vendor',
-            ])
-            ->files()->name('*.php')
-    )
-;
+return EzSystems\EzPlatformCodeStyle\PhpCsFixer\EzPlatformInternalConfigFactory::build()->setFinder(
+    PhpCsFixer\Finder::create()
+        ->in(__DIR__)
+        ->exclude([
+            'spec',
+            'docs',
+            'features',
+            'vendor',
+        ])
+        ->files()->name('*.php')
+);
diff --git a/bootstrap.php b/bootstrap.php
index 539f2dff..92dc3a95 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -1,2 +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.
+ */
 require_once __DIR__ . '/vendor/autoload.php';
diff --git a/composer.json b/composer.json
index f8569209..b4d1c5fb 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,8 @@
         "phpunit/phpunit": "^5.7.27 || ^6.5.13",
         "matthiasnoback/symfony-dependency-injection-test": "^1.2.0 || ^2.3.1",
         "phpspec/phpspec": "^3.4.3 || ^4.3.2",
-        "friendsofphp/php-cs-fixer": "~2.7.5",
+        "ezsystems/ezplatform-code-style": "^0.1.0",
+        "friendsofphp/php-cs-fixer": "^2.16.0",
         "memio/spec-gen": "^0.6.2 || ^0.8.5"
     },
     "autoload": {
diff --git a/src/ContextProvider/RoleIdentify.php b/src/ContextProvider/RoleIdentify.php
index ff409c18..356c1cbd 100644
--- a/src/ContextProvider/RoleIdentify.php
+++ b/src/ContextProvider/RoleIdentify.php
@@ -42,8 +42,8 @@ function (Repository $repository) use ($user) {
             }
         );
 
-        $roleIds = array();
-        $limitationValues = array();
+        $roleIds = [];
+        $limitationValues = [];
         /** @var \eZ\Publish\API\Repository\Values\User\UserRoleAssignment $roleAssignment */
         foreach ($roleAssignments as $roleAssignment) {
             $roleId = $roleAssignment->getRole()->id;
@@ -52,7 +52,7 @@ function (Repository $repository) use ($user) {
             // If a limitation is present, store the limitation values by roleId
             if ($limitation !== null) {
                 $limitationValuesKey = sprintf('%s-%s', $roleId, $limitation->getIdentifier());
-                $limitationValues[$limitationValuesKey] = array();
+                $limitationValues[$limitationValuesKey] = [];
                 foreach ($limitation->limitationValues as $value) {
                     $limitationValues[$limitationValuesKey][] = $value;
                 }
diff --git a/src/Controller/InvalidateTokenController.php b/src/Controller/InvalidateTokenController.php
index 04eb347f..90edb531 100644
--- a/src/Controller/InvalidateTokenController.php
+++ b/src/Controller/InvalidateTokenController.php
@@ -31,9 +31,11 @@ class InvalidateTokenController
 
     /**
      * TokenController constructor.
+     *
      * @param ConfigResolverInterface $configResolver
      * @param int $ttl
      * @param TagHandler $tagHandler
+     *
      * @internal param string $invalidatetoken
      */
     public function __construct(ConfigResolverInterface $configResolver, $ttl, TagHandler $tagHandler)
@@ -47,6 +49,7 @@ public function __construct(ConfigResolverInterface $configResolver, $ttl, TagHa
      * Request::isFromTrustedProxy is private in Symfony <3.1, so this is a re-implementation of it.
      *
      * @param Request $request
+     *
      * @return bool
      */
     private function isFromTrustedProxy(Request $request)
@@ -56,6 +59,7 @@ private function isFromTrustedProxy(Request $request)
 
     /**
      * @param Request $request
+     *
      * @return Response
      */
     public function tokenAction(Request $request)
diff --git a/src/DependencyInjection/Compiler/DriverPass.php b/src/DependencyInjection/Compiler/DriverPass.php
index b2861544..f44739d8 100644
--- a/src/DependencyInjection/Compiler/DriverPass.php
+++ b/src/DependencyInjection/Compiler/DriverPass.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 EzSystems\PlatformHttpCacheBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
diff --git a/src/DependencyInjection/Compiler/HttpCachePass.php b/src/DependencyInjection/Compiler/HttpCachePass.php
index 1f583286..94028323 100644
--- a/src/DependencyInjection/Compiler/HttpCachePass.php
+++ b/src/DependencyInjection/Compiler/HttpCachePass.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the HttpCachePass 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/src/DependencyInjection/Compiler/KernelPass.php b/src/DependencyInjection/Compiler/KernelPass.php
index 52d48ffa..295ae85f 100644
--- a/src/DependencyInjection/Compiler/KernelPass.php
+++ b/src/DependencyInjection/Compiler/KernelPass.php
@@ -1,4 +1,5 @@
 <?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.
diff --git a/src/DependencyInjection/Compiler/ResponseTaggersPass.php b/src/DependencyInjection/Compiler/ResponseTaggersPass.php
index 3f155811..a95bf3c8 100644
--- a/src/DependencyInjection/Compiler/ResponseTaggersPass.php
+++ b/src/DependencyInjection/Compiler/ResponseTaggersPass.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 EzSystems\PlatformHttpCacheBundle\DependencyInjection\Compiler;
diff --git a/src/DependencyInjection/ConfigResolver/HttpCacheConfigParser.php b/src/DependencyInjection/ConfigResolver/HttpCacheConfigParser.php
index e70902c7..9c8b5943 100644
--- a/src/DependencyInjection/ConfigResolver/HttpCacheConfigParser.php
+++ b/src/DependencyInjection/ConfigResolver/HttpCacheConfigParser.php
@@ -1,4 +1,5 @@
 <?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.
@@ -30,7 +31,7 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder)
                 ->children()
                     ->arrayNode('purge_servers')
                         ->info('Servers to use for Http PURGE (will NOT be used if ezpublish.http_cache.purge_type is "local").')
-                        ->example(array('http://localhost/', 'http://another.server/'))
+                        ->example(['http://localhost/', 'http://another.server/'])
                         ->requiresAtLeastOneElement()
                         ->prototype('scalar')->end()
                     ->end()
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 1f31bfe4..c6c2394e 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -1,4 +1,5 @@
 <?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.
diff --git a/src/DependencyInjection/EzPlatformHttpCacheExtension.php b/src/DependencyInjection/EzPlatformHttpCacheExtension.php
index 7c07b23b..be90870f 100644
--- a/src/DependencyInjection/EzPlatformHttpCacheExtension.php
+++ b/src/DependencyInjection/EzPlatformHttpCacheExtension.php
@@ -1,4 +1,5 @@
 <?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.
diff --git a/src/EventListener/ConditionallyRemoveVaryHeaderListener.php b/src/EventListener/ConditionallyRemoveVaryHeaderListener.php
index 6634699d..ddab176a 100644
--- a/src/EventListener/ConditionallyRemoveVaryHeaderListener.php
+++ b/src/EventListener/ConditionallyRemoveVaryHeaderListener.php
@@ -31,6 +31,7 @@ class ConditionallyRemoveVaryHeaderListener implements EventSubscriberInterface
 
     /**
      * ConditionallyRemoveVaryHeaderListener constructor.
+     *
      * @param array $routes List of routes which will not have default vary headers
      * @param array $userIdentifierHeaders
      */
@@ -69,8 +70,8 @@ public function onKernelResponse(FilterResponseEvent $event)
      */
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             KernelEvents::RESPONSE => 'onKernelResponse',
-        );
+        ];
     }
 }
diff --git a/src/EventSubscriber/HttpCacheResponseSubscriber.php b/src/EventSubscriber/HttpCacheResponseSubscriber.php
index 15b5a4b0..99679f45 100644
--- a/src/EventSubscriber/HttpCacheResponseSubscriber.php
+++ b/src/EventSubscriber/HttpCacheResponseSubscriber.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 EzSystems\PlatformHttpCacheBundle\EventSubscriber;
diff --git a/src/EventSubscriber/RestKernelViewSubscriber.php b/src/EventSubscriber/RestKernelViewSubscriber.php
index 43d5aa83..857f67ad 100644
--- a/src/EventSubscriber/RestKernelViewSubscriber.php
+++ b/src/EventSubscriber/RestKernelViewSubscriber.php
@@ -1,4 +1,5 @@
 <?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.
diff --git a/src/EventSubscriber/UserContextSubscriber.php b/src/EventSubscriber/UserContextSubscriber.php
index d97d3885..8732c557 100644
--- a/src/EventSubscriber/UserContextSubscriber.php
+++ b/src/EventSubscriber/UserContextSubscriber.php
@@ -1,4 +1,5 @@
 <?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.
diff --git a/src/EventSubscriber/XLocationIdResponseSubscriber.php b/src/EventSubscriber/XLocationIdResponseSubscriber.php
index a5e0c734..3901048e 100644
--- a/src/EventSubscriber/XLocationIdResponseSubscriber.php
+++ b/src/EventSubscriber/XLocationIdResponseSubscriber.php
@@ -1,4 +1,5 @@
 <?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.
diff --git a/src/Proxy/TagAwareStore.php b/src/Proxy/TagAwareStore.php
index 2eee41ce..4e33b8ac 100644
--- a/src/Proxy/TagAwareStore.php
+++ b/src/Proxy/TagAwareStore.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the TagAwareStore 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.
  */
@@ -97,7 +95,7 @@ public function write(Request $request, Response $response)
      */
     private function saveTag($tag, $digest)
     {
-        $path = $this->getTagPath($tag) . DIRECTORY_SEPARATOR . $digest;
+        $path = $this->getTagPath($tag) . \DIRECTORY_SEPARATOR . $digest;
         if (!is_dir(dirname($path)) && false === @mkdir(dirname($path), 0777, true) && !is_dir(dirname($path))) {
             return false;
         }
@@ -152,7 +150,7 @@ function ($id) {return 'location-' . $id;},
                 explode('|', substr($locationId, 1, -1))
             );
         } else {
-            $tags = array('location-' . $locationId);
+            $tags = ['location-' . $locationId];
         }
 
         if (empty($tags)) {
@@ -211,12 +209,12 @@ private function purgeByCacheTag($tag)
      */
     public function getTagPath($tag = null)
     {
-        $path = $this->root . DIRECTORY_SEPARATOR . static::TAG_CACHE_DIR;
+        $path = $this->root . \DIRECTORY_SEPARATOR . static::TAG_CACHE_DIR;
         if ($tag) {
             // Flip the tag so we put id first so it gets sliced into folders.
             // (otherwise we would easily reach inode limits on file system)
             $tag = strrev($tag);
-            $path .= DIRECTORY_SEPARATOR . substr($tag, 0, 2) . DIRECTORY_SEPARATOR . substr($tag, 2, 2) . DIRECTORY_SEPARATOR . substr($tag, 4);
+            $path .= \DIRECTORY_SEPARATOR . substr($tag, 0, 2) . \DIRECTORY_SEPARATOR . substr($tag, 2, 2) . \DIRECTORY_SEPARATOR . substr($tag, 4);
         }
 
         return $path;
diff --git a/src/Proxy/UserContextSubscriber.php b/src/Proxy/UserContextSubscriber.php
index dee9bacc..11728fb6 100644
--- a/src/Proxy/UserContextSubscriber.php
+++ b/src/Proxy/UserContextSubscriber.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the UserContextSubscriber 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/src/ProxyClient/Varnish.php b/src/ProxyClient/Varnish.php
index 6ac508e2..ed31d9b4 100644
--- a/src/ProxyClient/Varnish.php
+++ b/src/ProxyClient/Varnish.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the Varnish 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.
  */
@@ -22,6 +20,6 @@ class Varnish extends FOSVarnish
      */
     protected function getAllowedSchemes()
     {
-        return array('http', 'https');
+        return ['http', 'https'];
     }
 }
diff --git a/src/PurgeClient/LocalPurgeClient.php b/src/PurgeClient/LocalPurgeClient.php
index bad9c08c..b8179499 100644
--- a/src/PurgeClient/LocalPurgeClient.php
+++ b/src/PurgeClient/LocalPurgeClient.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the LocalPurgeClient 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/src/PurgeClient/RepositoryPrefixDecorator.php b/src/PurgeClient/RepositoryPrefixDecorator.php
index 6edd155a..07959a60 100644
--- a/src/PurgeClient/RepositoryPrefixDecorator.php
+++ b/src/PurgeClient/RepositoryPrefixDecorator.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the RepositoryPrefixDecorator 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/src/PurgeClient/VarnishProxyClientFactory.php b/src/PurgeClient/VarnishProxyClientFactory.php
index 93f3fce9..fcb2556f 100644
--- a/src/PurgeClient/VarnishProxyClientFactory.php
+++ b/src/PurgeClient/VarnishProxyClientFactory.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the VarnishProxyClientFactory 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.
  */
@@ -53,7 +51,7 @@ public function __construct(
      */
     public function buildProxyClient(array $servers, $baseUrl)
     {
-        $allServers = array();
+        $allServers = [];
         foreach ($servers as $server) {
             if (!$this->dynamicSettingParser->isDynamicSetting($server)) {
                 $allServers[] = $server;
diff --git a/src/RequestAwarePurger.php b/src/RequestAwarePurger.php
index d661b404..d0c7ba85 100644
--- a/src/RequestAwarePurger.php
+++ b/src/RequestAwarePurger.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the RequestAwarePurger 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.
  */
diff --git a/src/ResponseConfigurator/ConfigurableResponseCacheConfigurator.php b/src/ResponseConfigurator/ConfigurableResponseCacheConfigurator.php
index f73529f5..91fee099 100644
--- a/src/ResponseConfigurator/ConfigurableResponseCacheConfigurator.php
+++ b/src/ResponseConfigurator/ConfigurableResponseCacheConfigurator.php
@@ -1,4 +1,5 @@
 <?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.
@@ -21,6 +22,7 @@ class ConfigurableResponseCacheConfigurator implements ResponseCacheConfigurator
 
     /**
      * True if TTL cache is enabled, false if it is not.
+     *
      * @var bool
      */
     private $enableTtlCache;
diff --git a/src/ResponseConfigurator/ResponseCacheConfigurator.php b/src/ResponseConfigurator/ResponseCacheConfigurator.php
index fb8481ec..b9c30fca 100644
--- a/src/ResponseConfigurator/ResponseCacheConfigurator.php
+++ b/src/ResponseConfigurator/ResponseCacheConfigurator.php
@@ -1,4 +1,5 @@
 <?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.
diff --git a/src/ResponseTagger/Delegator/ContentValueViewTagger.php b/src/ResponseTagger/Delegator/ContentValueViewTagger.php
index e14e910d..f415bd49 100644
--- a/src/ResponseTagger/Delegator/ContentValueViewTagger.php
+++ b/src/ResponseTagger/Delegator/ContentValueViewTagger.php
@@ -1,4 +1,5 @@
 <?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.
diff --git a/src/ResponseTagger/Delegator/DispatcherTagger.php b/src/ResponseTagger/Delegator/DispatcherTagger.php
index afee17d7..898f4a2f 100644
--- a/src/ResponseTagger/Delegator/DispatcherTagger.php
+++ b/src/ResponseTagger/Delegator/DispatcherTagger.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 EzSystems\PlatformHttpCacheBundle\ResponseTagger\Delegator;
 
 use EzSystems\PlatformHttpCacheBundle\ResponseTagger\ResponseTagger;
diff --git a/src/ResponseTagger/Delegator/LocationValueViewTagger.php b/src/ResponseTagger/Delegator/LocationValueViewTagger.php
index 7d533e39..e03f19c3 100644
--- a/src/ResponseTagger/Delegator/LocationValueViewTagger.php
+++ b/src/ResponseTagger/Delegator/LocationValueViewTagger.php
@@ -1,4 +1,5 @@
 <?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.
diff --git a/src/ResponseTagger/ResponseTagger.php b/src/ResponseTagger/ResponseTagger.php
index 1ce6cb05..07ef6596 100644
--- a/src/ResponseTagger/ResponseTagger.php
+++ b/src/ResponseTagger/ResponseTagger.php
@@ -1,4 +1,5 @@
 <?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.
diff --git a/src/ResponseTagger/Value/AbstractValueTagger.php b/src/ResponseTagger/Value/AbstractValueTagger.php
index f681abdf..9eef28c5 100644
--- a/src/ResponseTagger/Value/AbstractValueTagger.php
+++ b/src/ResponseTagger/Value/AbstractValueTagger.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 EzSystems\PlatformHttpCacheBundle\ResponseTagger\Value;
 
 use EzSystems\PlatformHttpCacheBundle\ResponseTagger\ResponseTagger;
diff --git a/src/ResponseTagger/Value/ContentInfoTagger.php b/src/ResponseTagger/Value/ContentInfoTagger.php
index a555b888..d305d6ff 100644
--- a/src/ResponseTagger/Value/ContentInfoTagger.php
+++ b/src/ResponseTagger/Value/ContentInfoTagger.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 EzSystems\PlatformHttpCacheBundle\ResponseTagger\Value;
 
 use eZ\Publish\API\Repository\Values\Content\ContentInfo;
diff --git a/src/ResponseTagger/Value/LocationTagger.php b/src/ResponseTagger/Value/LocationTagger.php
index a9d72cc6..5322a4b3 100644
--- a/src/ResponseTagger/Value/LocationTagger.php
+++ b/src/ResponseTagger/Value/LocationTagger.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 EzSystems\PlatformHttpCacheBundle\ResponseTagger\Value;
 
 use eZ\Publish\API\Repository\Values\Content\Location;
diff --git a/src/SignalSlot/AbstractContentSlot.php b/src/SignalSlot/AbstractContentSlot.php
index 207879cc..c283db91 100644
--- a/src/SignalSlot/AbstractContentSlot.php
+++ b/src/SignalSlot/AbstractContentSlot.php
@@ -1,8 +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/src/SignalSlot/AbstractPublishSlot.php b/src/SignalSlot/AbstractPublishSlot.php
index 5c05a8de..7f8023a5 100644
--- a/src/SignalSlot/AbstractPublishSlot.php
+++ b/src/SignalSlot/AbstractPublishSlot.php
@@ -1,8 +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.
  */
@@ -33,6 +31,7 @@ public function __construct(PurgeClientInterface $purgeClient, Handler $spiLocat
      * Extracts content id from signal.
      *
      * @param Signal $signal
+     *
      * @return mixed
      */
     abstract protected function getContentId(Signal $signal);
diff --git a/src/SignalSlot/AbstractSlot.php b/src/SignalSlot/AbstractSlot.php
index 07f9446b..7c369bac 100644
--- a/src/SignalSlot/AbstractSlot.php
+++ b/src/SignalSlot/AbstractSlot.php
@@ -1,8 +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/src/SignalSlot/AssignUserToUserGroupSlot.php b/src/SignalSlot/AssignUserToUserGroupSlot.php
index 331c9c48..eaff8b22 100644
--- a/src/SignalSlot/AssignUserToUserGroupSlot.php
+++ b/src/SignalSlot/AssignUserToUserGroupSlot.php
@@ -1,8 +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/src/SignalSlot/ContentTypeService/DeleteContentTypeSlot.php b/src/SignalSlot/ContentTypeService/DeleteContentTypeSlot.php
index e93abb02..0757abe5 100644
--- a/src/SignalSlot/ContentTypeService/DeleteContentTypeSlot.php
+++ b/src/SignalSlot/ContentTypeService/DeleteContentTypeSlot.php
@@ -1,8 +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/src/SignalSlot/ContentTypeService/PublishContentTypeSlot.php b/src/SignalSlot/ContentTypeService/PublishContentTypeSlot.php
index 08f2b3f6..68599e01 100644
--- a/src/SignalSlot/ContentTypeService/PublishContentTypeSlot.php
+++ b/src/SignalSlot/ContentTypeService/PublishContentTypeSlot.php
@@ -1,8 +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/src/SignalSlot/CopyContentSlot.php b/src/SignalSlot/CopyContentSlot.php
index 90b16f9c..58d28125 100644
--- a/src/SignalSlot/CopyContentSlot.php
+++ b/src/SignalSlot/CopyContentSlot.php
@@ -1,8 +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/src/SignalSlot/CopySubtreeSlot.php b/src/SignalSlot/CopySubtreeSlot.php
index 44bc0731..a422dcec 100644
--- a/src/SignalSlot/CopySubtreeSlot.php
+++ b/src/SignalSlot/CopySubtreeSlot.php
@@ -1,8 +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/src/SignalSlot/CreateLocationSlot.php b/src/SignalSlot/CreateLocationSlot.php
index d46cf074..0eba92cf 100644
--- a/src/SignalSlot/CreateLocationSlot.php
+++ b/src/SignalSlot/CreateLocationSlot.php
@@ -1,8 +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/src/SignalSlot/CreateUserGroupSlot.php b/src/SignalSlot/CreateUserGroupSlot.php
index 5346749b..0949e4f6 100644
--- a/src/SignalSlot/CreateUserGroupSlot.php
+++ b/src/SignalSlot/CreateUserGroupSlot.php
@@ -1,8 +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/src/SignalSlot/CreateUserSlot.php b/src/SignalSlot/CreateUserSlot.php
index 9d799972..04539f18 100644
--- a/src/SignalSlot/CreateUserSlot.php
+++ b/src/SignalSlot/CreateUserSlot.php
@@ -1,8 +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/src/SignalSlot/DeleteContentSlot.php b/src/SignalSlot/DeleteContentSlot.php
index c8e2fe6c..6dae2f6a 100644
--- a/src/SignalSlot/DeleteContentSlot.php
+++ b/src/SignalSlot/DeleteContentSlot.php
@@ -1,8 +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/src/SignalSlot/DeleteLocationSlot.php b/src/SignalSlot/DeleteLocationSlot.php
index 742f331c..dbfa68eb 100644
--- a/src/SignalSlot/DeleteLocationSlot.php
+++ b/src/SignalSlot/DeleteLocationSlot.php
@@ -1,8 +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/src/SignalSlot/HideLocationSlot.php b/src/SignalSlot/HideLocationSlot.php
index 6be3be91..9614eb03 100644
--- a/src/SignalSlot/HideLocationSlot.php
+++ b/src/SignalSlot/HideLocationSlot.php
@@ -1,8 +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/src/SignalSlot/MoveSubtreeSlot.php b/src/SignalSlot/MoveSubtreeSlot.php
index c5fc8f47..55243156 100644
--- a/src/SignalSlot/MoveSubtreeSlot.php
+++ b/src/SignalSlot/MoveSubtreeSlot.php
@@ -1,8 +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/src/SignalSlot/PublishVersionSlot.php b/src/SignalSlot/PublishVersionSlot.php
index e2df4f5e..43214a77 100644
--- a/src/SignalSlot/PublishVersionSlot.php
+++ b/src/SignalSlot/PublishVersionSlot.php
@@ -1,8 +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/src/SignalSlot/RecoverSlot.php b/src/SignalSlot/RecoverSlot.php
index 088e2417..6e6efdeb 100644
--- a/src/SignalSlot/RecoverSlot.php
+++ b/src/SignalSlot/RecoverSlot.php
@@ -1,8 +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/src/SignalSlot/RoleService/AbstractPermissionSlot.php b/src/SignalSlot/RoleService/AbstractPermissionSlot.php
index c2312bef..5c927ef1 100644
--- a/src/SignalSlot/RoleService/AbstractPermissionSlot.php
+++ b/src/SignalSlot/RoleService/AbstractPermissionSlot.php
@@ -1,8 +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/src/SignalSlot/RoleService/AssignRoleSlot.php b/src/SignalSlot/RoleService/AssignRoleSlot.php
index 78b448fe..9513b715 100644
--- a/src/SignalSlot/RoleService/AssignRoleSlot.php
+++ b/src/SignalSlot/RoleService/AssignRoleSlot.php
@@ -1,8 +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/src/SignalSlot/RoleService/DeleteRoleSlot.php b/src/SignalSlot/RoleService/DeleteRoleSlot.php
index 9d4de285..91b04e0f 100644
--- a/src/SignalSlot/RoleService/DeleteRoleSlot.php
+++ b/src/SignalSlot/RoleService/DeleteRoleSlot.php
@@ -1,8 +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/src/SignalSlot/RoleService/PublishRoleDraftSlot.php b/src/SignalSlot/RoleService/PublishRoleDraftSlot.php
index 0239bbe9..ccfa2a10 100644
--- a/src/SignalSlot/RoleService/PublishRoleDraftSlot.php
+++ b/src/SignalSlot/RoleService/PublishRoleDraftSlot.php
@@ -1,8 +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/src/SignalSlot/RoleService/RemoveRoleAssignmentSlot.php b/src/SignalSlot/RoleService/RemoveRoleAssignmentSlot.php
index 6384d3ff..4e4087f0 100644
--- a/src/SignalSlot/RoleService/RemoveRoleAssignmentSlot.php
+++ b/src/SignalSlot/RoleService/RemoveRoleAssignmentSlot.php
@@ -1,8 +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/src/SignalSlot/RoleService/UnassignRoleSlot.php b/src/SignalSlot/RoleService/UnassignRoleSlot.php
index be56c32a..6897dbe8 100644
--- a/src/SignalSlot/RoleService/UnassignRoleSlot.php
+++ b/src/SignalSlot/RoleService/UnassignRoleSlot.php
@@ -1,8 +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/src/SignalSlot/SectionService/AssignSectionSlot.php b/src/SignalSlot/SectionService/AssignSectionSlot.php
index b60a7535..e660befb 100644
--- a/src/SignalSlot/SectionService/AssignSectionSlot.php
+++ b/src/SignalSlot/SectionService/AssignSectionSlot.php
@@ -1,8 +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/src/SignalSlot/SectionService/DeleteSectionSlot.php b/src/SignalSlot/SectionService/DeleteSectionSlot.php
index 8ffd35eb..cedbaeca 100644
--- a/src/SignalSlot/SectionService/DeleteSectionSlot.php
+++ b/src/SignalSlot/SectionService/DeleteSectionSlot.php
@@ -1,8 +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/src/SignalSlot/SectionService/UpdateSectionSlot.php b/src/SignalSlot/SectionService/UpdateSectionSlot.php
index 54f67c62..d5ed3b9c 100644
--- a/src/SignalSlot/SectionService/UpdateSectionSlot.php
+++ b/src/SignalSlot/SectionService/UpdateSectionSlot.php
@@ -1,8 +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/src/SignalSlot/SetContentStateSlot.php b/src/SignalSlot/SetContentStateSlot.php
index 7015e27f..6bbf0073 100644
--- a/src/SignalSlot/SetContentStateSlot.php
+++ b/src/SignalSlot/SetContentStateSlot.php
@@ -1,8 +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/src/SignalSlot/SwapLocationSlot.php b/src/SignalSlot/SwapLocationSlot.php
index 4ab522d9..44ec2f17 100644
--- a/src/SignalSlot/SwapLocationSlot.php
+++ b/src/SignalSlot/SwapLocationSlot.php
@@ -1,8 +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/src/SignalSlot/TrashSlot.php b/src/SignalSlot/TrashSlot.php
index ceb2c9ab..cb75a34a 100644
--- a/src/SignalSlot/TrashSlot.php
+++ b/src/SignalSlot/TrashSlot.php
@@ -1,8 +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/src/SignalSlot/UnassignUserFromUserGroupSlot.php b/src/SignalSlot/UnassignUserFromUserGroupSlot.php
index 1373dde9..fdf3d1d9 100644
--- a/src/SignalSlot/UnassignUserFromUserGroupSlot.php
+++ b/src/SignalSlot/UnassignUserFromUserGroupSlot.php
@@ -1,8 +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/src/SignalSlot/UnhideLocationSlot.php b/src/SignalSlot/UnhideLocationSlot.php
index 572c4ff0..7f55b4d2 100644
--- a/src/SignalSlot/UnhideLocationSlot.php
+++ b/src/SignalSlot/UnhideLocationSlot.php
@@ -1,8 +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/src/SignalSlot/UpdateLocationSlot.php b/src/SignalSlot/UpdateLocationSlot.php
index 1bddc393..92610cb9 100644
--- a/src/SignalSlot/UpdateLocationSlot.php
+++ b/src/SignalSlot/UpdateLocationSlot.php
@@ -1,8 +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/src/SignalSlot/UpdateUrlSlot.php b/src/SignalSlot/UpdateUrlSlot.php
index cfa09e1f..bd679a36 100644
--- a/src/SignalSlot/UpdateUrlSlot.php
+++ b/src/SignalSlot/UpdateUrlSlot.php
@@ -1,8 +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/src/SignalSlot/UpdateUserGroupSlot.php b/src/SignalSlot/UpdateUserGroupSlot.php
index f9e7d7de..8694ba0f 100644
--- a/src/SignalSlot/UpdateUserGroupSlot.php
+++ b/src/SignalSlot/UpdateUserGroupSlot.php
@@ -1,8 +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/src/SignalSlot/UpdateUserSlot.php b/src/SignalSlot/UpdateUserSlot.php
index a9d72e1c..8decaa6d 100644
--- a/src/SignalSlot/UpdateUserSlot.php
+++ b/src/SignalSlot/UpdateUserSlot.php
@@ -1,8 +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/src/Twig/ContentTaggingExtension.php b/src/Twig/ContentTaggingExtension.php
index 517459f1..0665c58d 100644
--- a/src/Twig/ContentTaggingExtension.php
+++ b/src/Twig/ContentTaggingExtension.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the ContentTaggingExtension 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/tests/ContextProvider/RoleIdentifyTest.php b/tests/ContextProvider/RoleIdentifyTest.php
index 57e2a9d5..633404c7 100644
--- a/tests/ContextProvider/RoleIdentifyTest.php
+++ b/tests/ContextProvider/RoleIdentifyTest.php
@@ -42,7 +42,7 @@ protected function setUp()
         $this->repositoryMock = $this
             ->getMockBuilder(Repository::class)
             ->disableOriginalConstructor()
-            ->setMethods(array('getRoleService', 'getCurrentUser', 'getPermissionResolver'))
+            ->setMethods(['getRoleService', 'getCurrentUser', 'getPermissionResolver'])
             ->getMock();
 
         $this->roleServiceMock = $this->createMock(RoleService::class);
@@ -71,46 +71,46 @@ public function testSetIdentity()
         $roleId2 = 456;
         $roleId3 = 789;
         $limitationForRole2 = $this->generateLimitationMock(
-            array(
-                'limitationValues' => array('/1/2', '/1/2/43'),
-            )
+            [
+                'limitationValues' => ['/1/2', '/1/2/43'],
+            ]
         );
         $limitationForRole3 = $this->generateLimitationMock(
-            array(
-                'limitationValues' => array('foo', 'bar'),
-            )
+            [
+                'limitationValues' => ['foo', 'bar'],
+            ]
         );
-        $returnedRoleAssignments = array(
+        $returnedRoleAssignments = [
             $this->generateRoleAssignmentMock(
-                array(
+                [
                     'role' => $this->generateRoleMock(
-                        array(
+                        [
                             'id' => $roleId1,
-                        )
+                        ]
                     ),
-                )
+                ]
             ),
             $this->generateRoleAssignmentMock(
-                array(
+                [
                     'role' => $this->generateRoleMock(
-                        array(
+                        [
                             'id' => $roleId2,
-                        )
+                        ]
                     ),
                     'limitation' => $limitationForRole2,
-                )
+                ]
             ),
             $this->generateRoleAssignmentMock(
-                array(
+                [
                     'role' => $this->generateRoleMock(
-                        array(
+                        [
                             'id' => $roleId3,
-                        )
+                        ]
                     ),
                     'limitation' => $limitationForRole3,
-                )
+                ]
             ),
-        );
+        ];
 
         $this->roleServiceMock
             ->expects($this->once())
@@ -118,45 +118,45 @@ public function testSetIdentity()
             ->with($user, true)
             ->will($this->returnValue($returnedRoleAssignments));
 
-        $this->assertSame(array(), $userContext->getParameters());
+        $this->assertSame([], $userContext->getParameters());
         $contextProvider = new RoleIdentify($this->repositoryMock);
         $contextProvider->updateUserContext($userContext);
         $userContextParams = $userContext->getParameters();
         $this->assertArrayHasKey('roleIdList', $userContextParams);
-        $this->assertSame(array($roleId1, $roleId2, $roleId3), $userContextParams['roleIdList']);
+        $this->assertSame([$roleId1, $roleId2, $roleId3], $userContextParams['roleIdList']);
         $this->assertArrayHasKey('roleLimitationList', $userContextParams);
         $limitationIdentifierForRole2 = get_class($limitationForRole2);
         $limitationIdentifierForRole3 = get_class($limitationForRole3);
         $this->assertSame(
-            array(
-                "$roleId2-$limitationIdentifierForRole2" => array('/1/2', '/1/2/43'),
-                "$roleId3-$limitationIdentifierForRole3" => array('foo', 'bar'),
-            ),
+            [
+                "$roleId2-$limitationIdentifierForRole2" => ['/1/2', '/1/2/43'],
+                "$roleId3-$limitationIdentifierForRole3" => ['foo', 'bar'],
+            ],
             $userContextParams['roleLimitationList']
         );
     }
 
-    private function generateRoleAssignmentMock(array $properties = array())
+    private function generateRoleAssignmentMock(array $properties = [])
     {
         return $this
             ->getMockBuilder(UserRoleAssignment::class)
-            ->setConstructorArgs(array($properties))
+            ->setConstructorArgs([$properties])
             ->getMockForAbstractClass();
     }
 
-    private function generateRoleMock(array $properties = array())
+    private function generateRoleMock(array $properties = [])
     {
         return $this
             ->getMockBuilder(Role::class)
-            ->setConstructorArgs(array($properties))
+            ->setConstructorArgs([$properties])
             ->getMockForAbstractClass();
     }
 
-    private function generateLimitationMock(array $properties = array())
+    private function generateLimitationMock(array $properties = [])
     {
         $limitationMock = $this
             ->getMockBuilder(RoleLimitation::class)
-            ->setConstructorArgs(array($properties))
+            ->setConstructorArgs([$properties])
             ->getMockForAbstractClass();
         $limitationMock
             ->expects($this->any())
diff --git a/tests/Proxy/TagAwareStoreTest.php b/tests/Proxy/TagAwareStoreTest.php
index 98864433..02316290 100644
--- a/tests/Proxy/TagAwareStoreTest.php
+++ b/tests/Proxy/TagAwareStoreTest.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the TagAwareStoreTest 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.
  */
@@ -34,8 +32,8 @@ protected function tearDown()
 
     public function testGetPath()
     {
-        $path = $this->store->getTagPath('location-123') . DIRECTORY_SEPARATOR . 'en' . sha1('someContent');
-        $this->assertStringStartsWith(__DIR__ . DIRECTORY_SEPARATOR . 'ez' . DIRECTORY_SEPARATOR . '32' . DIRECTORY_SEPARATOR . '1-' . DIRECTORY_SEPARATOR . 'noitacol', $path);
+        $path = $this->store->getTagPath('location-123') . \DIRECTORY_SEPARATOR . 'en' . sha1('someContent');
+        $this->assertStringStartsWith(__DIR__ . \DIRECTORY_SEPARATOR . 'ez' . \DIRECTORY_SEPARATOR . '32' . \DIRECTORY_SEPARATOR . '1-' . \DIRECTORY_SEPARATOR . 'noitacol', $path);
     }
 
     public function testGetStalePath()
@@ -43,13 +41,13 @@ public function testGetStalePath()
         $this->markTestIncomplete('@todo Stale handling removed, needs adjustments once it is re added in new form');
         // Generate the lock file to force using the stale cache dir
         $locationId = 123;
-        $prefix = TagAwareStore::TAG_CACHE_DIR . DIRECTORY_SEPARATOR . $locationId;
-        $prefixStale = TagAwareStore::TAG_CACHE_DIR . DIRECTORY_SEPARATOR . $locationId;
+        $prefix = TagAwareStore::TAG_CACHE_DIR . \DIRECTORY_SEPARATOR . $locationId;
+        $prefixStale = TagAwareStore::TAG_CACHE_DIR . \DIRECTORY_SEPARATOR . $locationId;
         $lockFile = $this->store->getLocationCacheLockName($locationId);
         file_put_contents($lockFile, getmypid());
 
-        $path = $this->store->getPath($prefix . DIRECTORY_SEPARATOR . 'en' . sha1('someContent'));
-        $this->assertStringStartsWith(__DIR__ . DIRECTORY_SEPARATOR . $prefixStale, $path);
+        $path = $this->store->getPath($prefix . \DIRECTORY_SEPARATOR . 'en' . sha1('someContent'));
+        $this->assertStringStartsWith(__DIR__ . \DIRECTORY_SEPARATOR . $prefixStale, $path);
         @unlink($lockFile);
     }
 
@@ -115,7 +113,7 @@ public function testPurgeByRequestMultipleLocations()
         $this->markTestIncomplete('@todo needs adjustments for new impl on top of tags');
         $fs = $this->getFilesystemMock();
         $this->store->setFilesystem($fs);
-        $locationIds = array(123, 456, 789);
+        $locationIds = [123, 456, 789];
         $i = 0;
         foreach ($locationIds as $locationId) {
             $locationCacheDir = $this->store->getTagPath('location-' . $locationId);
diff --git a/tests/PurgeClient/LocalPurgeClientTest.php b/tests/PurgeClient/LocalPurgeClientTest.php
index 81205ed9..e52df555 100644
--- a/tests/PurgeClient/LocalPurgeClientTest.php
+++ b/tests/PurgeClient/LocalPurgeClientTest.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the LocalPurgeClientTest 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.
  */
@@ -29,7 +27,7 @@ class LocalPurgeClientTest extends TestCase
 {
     public function testPurge()
     {
-        $locationIds = array(123, 456, 789);
+        $locationIds = [123, 456, 789];
         $expectedBanRequest = Request::create('http://localhost', 'PURGE');
         $expectedBanRequest->headers->set('key', 'location-123 location-456 location-789');
 
diff --git a/tests/PurgeClient/RepositoryPrefixDecoratorTest.php b/tests/PurgeClient/RepositoryPrefixDecoratorTest.php
index 348277c3..76f01485 100644
--- a/tests/PurgeClient/RepositoryPrefixDecoratorTest.php
+++ b/tests/PurgeClient/RepositoryPrefixDecoratorTest.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the RepositoryPrefixDecoratorTest 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/tests/PurgeClient/VarnishPurgeClientTest.php b/tests/PurgeClient/VarnishPurgeClientTest.php
index 0a0cea73..ffa2c608 100644
--- a/tests/PurgeClient/VarnishPurgeClientTest.php
+++ b/tests/PurgeClient/VarnishPurgeClientTest.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * File containing the FOSPurgeClientTest 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.
  */
@@ -37,12 +35,12 @@ protected function setUp()
         parent::setUp();
         $this->cacheManager = $this->getMockBuilder(CacheManager::class)
             ->setConstructorArgs(
-                array(
+                [
                     $this->createMock(ProxyClientInterface::class),
                     $this->createMock(
                         UrlGeneratorInterface::class
                     ),
-                )
+                ]
             )
             ->getMock();
         $this->configResolver = $this->createMock(ConfigResolverInterface::class);
@@ -58,7 +56,7 @@ public function testPurgeNoLocationIds()
             ->expects($this->never())
             ->method('invalidate');
 
-        $this->purgeClient->purge(array());
+        $this->purgeClient->purge([]);
     }
 
     public function testPurgeOneLocationId()
@@ -190,11 +188,11 @@ public function testPurgeWithAuthHeaderAndKey(array $locationIds = [])
 
     public function purgeTestProvider()
     {
-        return array(
-            array(array(123)),
-            array(array(123, 456)),
-            array(array(123, 456, 789)),
-        );
+        return [
+            [[123]],
+            [[123, 456]],
+            [[123, 456, 789]],
+        ];
     }
 
     public function testPurgeAll()
diff --git a/tests/SignalSlot/AbstractContentSlotTest.php b/tests/SignalSlot/AbstractContentSlotTest.php
index d4091e31..9ae2af47 100644
--- a/tests/SignalSlot/AbstractContentSlotTest.php
+++ b/tests/SignalSlot/AbstractContentSlotTest.php
@@ -1,8 +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/tests/SignalSlot/AbstractPublishSlotTest.php b/tests/SignalSlot/AbstractPublishSlotTest.php
index 9fedf973..d49d65b4 100644
--- a/tests/SignalSlot/AbstractPublishSlotTest.php
+++ b/tests/SignalSlot/AbstractPublishSlotTest.php
@@ -1,8 +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/tests/SignalSlot/AbstractSlotTest.php b/tests/SignalSlot/AbstractSlotTest.php
index 53f71b23..f2a22800 100644
--- a/tests/SignalSlot/AbstractSlotTest.php
+++ b/tests/SignalSlot/AbstractSlotTest.php
@@ -1,8 +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.
  */
@@ -117,7 +115,7 @@ public function getUnreceivedSignals()
      */
     private function getAllSignals()
     {
-        $signals = array(
+        $signals = [
             Signal\URLAliasService\CreateUrlAliasSignal::class,
             Signal\URLAliasService\RemoveAliasesSignal::class,
             Signal\URLAliasService\CreateGlobalUrlAliasSignal::class,
@@ -198,7 +196,7 @@ private function getAllSignals()
             Signal\LocationService\CreateLocationSignal::class,
             Signal\LocationService\DeleteLocationSignal::class,
             Signal\LocationService\CopySubtreeSignal::class,
-        );
+        ];
 
         if (class_exists('eZ\Publish\Core\SignalSlot\Signal\ContentService\HideContentSignal', false)) {
             $signals[] = Signal\ContentService\HideContentSignal::class;
diff --git a/tests/SignalSlot/AssignUserToUserGroupSlotTest.php b/tests/SignalSlot/AssignUserToUserGroupSlotTest.php
index c6d11a0f..0d1e314f 100644
--- a/tests/SignalSlot/AssignUserToUserGroupSlotTest.php
+++ b/tests/SignalSlot/AssignUserToUserGroupSlotTest.php
@@ -1,8 +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/tests/SignalSlot/CopyContentSlotTest.php b/tests/SignalSlot/CopyContentSlotTest.php
index c923e6d7..efa8f858 100644
--- a/tests/SignalSlot/CopyContentSlotTest.php
+++ b/tests/SignalSlot/CopyContentSlotTest.php
@@ -1,8 +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/tests/SignalSlot/CopySubtreeSlotTest.php b/tests/SignalSlot/CopySubtreeSlotTest.php
index 834c092a..7c083c30 100644
--- a/tests/SignalSlot/CopySubtreeSlotTest.php
+++ b/tests/SignalSlot/CopySubtreeSlotTest.php
@@ -1,8 +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/tests/SignalSlot/CreateLocationSlotTest.php b/tests/SignalSlot/CreateLocationSlotTest.php
index a9745bb9..827b1a72 100644
--- a/tests/SignalSlot/CreateLocationSlotTest.php
+++ b/tests/SignalSlot/CreateLocationSlotTest.php
@@ -1,8 +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/tests/SignalSlot/CreateUserGroupSlotTest.php b/tests/SignalSlot/CreateUserGroupSlotTest.php
index 24833b5c..48144b50 100644
--- a/tests/SignalSlot/CreateUserGroupSlotTest.php
+++ b/tests/SignalSlot/CreateUserGroupSlotTest.php
@@ -1,8 +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/tests/SignalSlot/CreateUserSlotTest.php b/tests/SignalSlot/CreateUserSlotTest.php
index 80924211..d4ae65d6 100644
--- a/tests/SignalSlot/CreateUserSlotTest.php
+++ b/tests/SignalSlot/CreateUserSlotTest.php
@@ -1,8 +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/tests/SignalSlot/DeleteContentSlotTest.php b/tests/SignalSlot/DeleteContentSlotTest.php
index 6a2c2816..51db8717 100644
--- a/tests/SignalSlot/DeleteContentSlotTest.php
+++ b/tests/SignalSlot/DeleteContentSlotTest.php
@@ -1,8 +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/tests/SignalSlot/DeleteLocationSlotTest.php b/tests/SignalSlot/DeleteLocationSlotTest.php
index 6bcf4d1d..a6f42f7f 100644
--- a/tests/SignalSlot/DeleteLocationSlotTest.php
+++ b/tests/SignalSlot/DeleteLocationSlotTest.php
@@ -1,8 +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/tests/SignalSlot/HideLocationSlotTest.php b/tests/SignalSlot/HideLocationSlotTest.php
index 4415205d..fb76b8d8 100644
--- a/tests/SignalSlot/HideLocationSlotTest.php
+++ b/tests/SignalSlot/HideLocationSlotTest.php
@@ -1,8 +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/tests/SignalSlot/MoveSubtreeSlotTest.php b/tests/SignalSlot/MoveSubtreeSlotTest.php
index 14c6de22..f966ff98 100644
--- a/tests/SignalSlot/MoveSubtreeSlotTest.php
+++ b/tests/SignalSlot/MoveSubtreeSlotTest.php
@@ -1,8 +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/tests/SignalSlot/PublishVersionSlotTest.php b/tests/SignalSlot/PublishVersionSlotTest.php
index 68f4b93e..d6001432 100644
--- a/tests/SignalSlot/PublishVersionSlotTest.php
+++ b/tests/SignalSlot/PublishVersionSlotTest.php
@@ -1,8 +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/tests/SignalSlot/RecoverSlotTest.php b/tests/SignalSlot/RecoverSlotTest.php
index 321e8ce8..9ff0e459 100644
--- a/tests/SignalSlot/RecoverSlotTest.php
+++ b/tests/SignalSlot/RecoverSlotTest.php
@@ -1,8 +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/tests/SignalSlot/RoleService/AbstractPermissionSlotTest.php b/tests/SignalSlot/RoleService/AbstractPermissionSlotTest.php
index c8dd2b5e..70f5ed70 100644
--- a/tests/SignalSlot/RoleService/AbstractPermissionSlotTest.php
+++ b/tests/SignalSlot/RoleService/AbstractPermissionSlotTest.php
@@ -1,8 +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/tests/SignalSlot/SetContentStateSlotTest.php b/tests/SignalSlot/SetContentStateSlotTest.php
index b8bb8288..d51efc92 100644
--- a/tests/SignalSlot/SetContentStateSlotTest.php
+++ b/tests/SignalSlot/SetContentStateSlotTest.php
@@ -1,8 +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/tests/SignalSlot/SwapLocationSlotTest.php b/tests/SignalSlot/SwapLocationSlotTest.php
index 5e4961b5..872d77fd 100644
--- a/tests/SignalSlot/SwapLocationSlotTest.php
+++ b/tests/SignalSlot/SwapLocationSlotTest.php
@@ -1,8 +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/tests/SignalSlot/TrashSlotTest.php b/tests/SignalSlot/TrashSlotTest.php
index 5a1f806a..2c3476f7 100644
--- a/tests/SignalSlot/TrashSlotTest.php
+++ b/tests/SignalSlot/TrashSlotTest.php
@@ -1,8 +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/tests/SignalSlot/UnassignUserFromUserGroupSlotTest.php b/tests/SignalSlot/UnassignUserFromUserGroupSlotTest.php
index 5bd05fa8..5cf7cbe2 100644
--- a/tests/SignalSlot/UnassignUserFromUserGroupSlotTest.php
+++ b/tests/SignalSlot/UnassignUserFromUserGroupSlotTest.php
@@ -1,8 +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/tests/SignalSlot/UnhideLocationSlotTest.php b/tests/SignalSlot/UnhideLocationSlotTest.php
index bd35aca7..0b63b36d 100644
--- a/tests/SignalSlot/UnhideLocationSlotTest.php
+++ b/tests/SignalSlot/UnhideLocationSlotTest.php
@@ -1,8 +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/tests/SignalSlot/UpdateLocationSlotTest.php b/tests/SignalSlot/UpdateLocationSlotTest.php
index 39a7c016..c062f66e 100644
--- a/tests/SignalSlot/UpdateLocationSlotTest.php
+++ b/tests/SignalSlot/UpdateLocationSlotTest.php
@@ -1,8 +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/tests/SignalSlot/UpdateUrlSlotTest.php b/tests/SignalSlot/UpdateUrlSlotTest.php
index 9b41dc85..46afc678 100644
--- a/tests/SignalSlot/UpdateUrlSlotTest.php
+++ b/tests/SignalSlot/UpdateUrlSlotTest.php
@@ -1,8 +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/tests/SignalSlot/UpdateUserGroupSlotTest.php b/tests/SignalSlot/UpdateUserGroupSlotTest.php
index d1a60d7c..4fc4095b 100644
--- a/tests/SignalSlot/UpdateUserGroupSlotTest.php
+++ b/tests/SignalSlot/UpdateUserGroupSlotTest.php
@@ -1,8 +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/tests/SignalSlot/UpdateUserSlotTest.php b/tests/SignalSlot/UpdateUserSlotTest.php
index d77c5c88..d6acf395 100644
--- a/tests/SignalSlot/UpdateUserSlotTest.php
+++ b/tests/SignalSlot/UpdateUserSlotTest.php
@@ -1,8 +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.
  */