diff --git a/composer.json b/composer.json
index adc86fe..5a8e5f2 100644
--- a/composer.json
+++ b/composer.json
@@ -14,9 +14,8 @@
         "zetacomponents/system-information": "^1.1.1"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.0",
         "ibexa/ci-scripts": "^0.2@dev",
-        "ibexa/code-style": "^1.0",
+        "ibexa/code-style": "~2.0.0",
         "ibexa/content-forms": "~5.0.x-dev",
         "ibexa/design-engine": "~5.0.x-dev",
         "ibexa/doctrine-schema": "~5.0.x-dev",
diff --git a/src/bundle/Command/SystemInfoDumpCommand.php b/src/bundle/Command/SystemInfoDumpCommand.php
index 50e2d2e..0088eb5 100644
--- a/src/bundle/Command/SystemInfoDumpCommand.php
+++ b/src/bundle/Command/SystemInfoDumpCommand.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\Command;
 
 use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand;
diff --git a/src/bundle/Controller/SystemInfoController.php b/src/bundle/Controller/SystemInfoController.php
index 2342871..d1b4215 100644
--- a/src/bundle/Controller/SystemInfoController.php
+++ b/src/bundle/Controller/SystemInfoController.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\Controller;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\SystemInfoCollectorRegistry;
diff --git a/src/bundle/DependencyInjection/Compiler/OutputFormatPass.php b/src/bundle/DependencyInjection/Compiler/OutputFormatPass.php
index ebdf739..e82a4ac 100644
--- a/src/bundle/DependencyInjection/Compiler/OutputFormatPass.php
+++ b/src/bundle/DependencyInjection/Compiler/OutputFormatPass.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\OutputFormatRegistry;
diff --git a/src/bundle/DependencyInjection/Compiler/SystemInfoTabGroupPass.php b/src/bundle/DependencyInjection/Compiler/SystemInfoTabGroupPass.php
index dcf70e7..3a90594 100644
--- a/src/bundle/DependencyInjection/Compiler/SystemInfoTabGroupPass.php
+++ b/src/bundle/DependencyInjection/Compiler/SystemInfoTabGroupPass.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\DependencyInjection\Compiler;
 
 use Ibexa\AdminUi\Tab\TabGroup;
diff --git a/src/bundle/IbexaSystemInfoBundle.php b/src/bundle/IbexaSystemInfoBundle.php
index 8bfd90a..ef5c25d 100644
--- a/src/bundle/IbexaSystemInfoBundle.php
+++ b/src/bundle/IbexaSystemInfoBundle.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo;
 
 use Ibexa\Bundle\SystemInfo\DependencyInjection\Compiler\OutputFormatPass;
diff --git a/src/bundle/SystemInfo/Collector/ConfigurationSymfonyKernelSystemInfoCollector.php b/src/bundle/SystemInfo/Collector/ConfigurationSymfonyKernelSystemInfoCollector.php
index 10c0681..ec37361 100644
--- a/src/bundle/SystemInfo/Collector/ConfigurationSymfonyKernelSystemInfoCollector.php
+++ b/src/bundle/SystemInfo/Collector/ConfigurationSymfonyKernelSystemInfoCollector.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Value\SymfonyKernelSystemInfo;
diff --git a/src/bundle/SystemInfo/Collector/EzcHardwareSystemInfoCollector.php b/src/bundle/SystemInfo/Collector/EzcHardwareSystemInfoCollector.php
index 679414f..fcbb313 100644
--- a/src/bundle/SystemInfo/Collector/EzcHardwareSystemInfoCollector.php
+++ b/src/bundle/SystemInfo/Collector/EzcHardwareSystemInfoCollector.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\EzcSystemInfoWrapper;
diff --git a/src/bundle/SystemInfo/Collector/EzcPhpSystemInfoCollector.php b/src/bundle/SystemInfo/Collector/EzcPhpSystemInfoCollector.php
index c3f6bbb..edfa8e9 100644
--- a/src/bundle/SystemInfo/Collector/EzcPhpSystemInfoCollector.php
+++ b/src/bundle/SystemInfo/Collector/EzcPhpSystemInfoCollector.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\EzcSystemInfoWrapper;
diff --git a/src/bundle/SystemInfo/Collector/IbexaSystemInfoCollector.php b/src/bundle/SystemInfo/Collector/IbexaSystemInfoCollector.php
index 42182b7..294dd02 100644
--- a/src/bundle/SystemInfo/Collector/IbexaSystemInfoCollector.php
+++ b/src/bundle/SystemInfo/Collector/IbexaSystemInfoCollector.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use DateTime;
diff --git a/src/bundle/SystemInfo/Collector/JsonComposerLockSystemInfoCollector.php b/src/bundle/SystemInfo/Collector/JsonComposerLockSystemInfoCollector.php
index b712dde..9472be3 100644
--- a/src/bundle/SystemInfo/Collector/JsonComposerLockSystemInfoCollector.php
+++ b/src/bundle/SystemInfo/Collector/JsonComposerLockSystemInfoCollector.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Composer\InstalledVersions;
diff --git a/src/bundle/SystemInfo/Collector/RepositorySystemInfoCollector.php b/src/bundle/SystemInfo/Collector/RepositorySystemInfoCollector.php
index 6de3a38..4584b33 100644
--- a/src/bundle/SystemInfo/Collector/RepositorySystemInfoCollector.php
+++ b/src/bundle/SystemInfo/Collector/RepositorySystemInfoCollector.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Doctrine\DBAL\Connection;
diff --git a/src/bundle/SystemInfo/Collector/ServicesSystemInfoCollector.php b/src/bundle/SystemInfo/Collector/ServicesSystemInfoCollector.php
index eb6ac40..a82deae 100644
--- a/src/bundle/SystemInfo/Collector/ServicesSystemInfoCollector.php
+++ b/src/bundle/SystemInfo/Collector/ServicesSystemInfoCollector.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Value\ServicesSystemInfo;
diff --git a/src/bundle/SystemInfo/Collector/SystemInfoCollector.php b/src/bundle/SystemInfo/Collector/SystemInfoCollector.php
index 33f6e7b..d97b8c9 100644
--- a/src/bundle/SystemInfo/Collector/SystemInfoCollector.php
+++ b/src/bundle/SystemInfo/Collector/SystemInfoCollector.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Value;
diff --git a/src/bundle/SystemInfo/Exception/ComposerFileValidationException.php b/src/bundle/SystemInfo/Exception/ComposerFileValidationException.php
index 79613bb..bccee3a 100644
--- a/src/bundle/SystemInfo/Exception/ComposerFileValidationException.php
+++ b/src/bundle/SystemInfo/Exception/ComposerFileValidationException.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Exception;
 
 use Exception;
diff --git a/src/bundle/SystemInfo/Exception/ComposerJsonFileNotFoundException.php b/src/bundle/SystemInfo/Exception/ComposerJsonFileNotFoundException.php
index e0e4a6b..535fc94 100644
--- a/src/bundle/SystemInfo/Exception/ComposerJsonFileNotFoundException.php
+++ b/src/bundle/SystemInfo/Exception/ComposerJsonFileNotFoundException.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Exception;
 
 use Exception;
diff --git a/src/bundle/SystemInfo/Exception/ComposerLockFileNotFoundException.php b/src/bundle/SystemInfo/Exception/ComposerLockFileNotFoundException.php
index f90b4d0..71f5a9d 100644
--- a/src/bundle/SystemInfo/Exception/ComposerLockFileNotFoundException.php
+++ b/src/bundle/SystemInfo/Exception/ComposerLockFileNotFoundException.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Exception;
 
 use Exception;
diff --git a/src/bundle/SystemInfo/Exception/MetricsNotFoundException.php b/src/bundle/SystemInfo/Exception/MetricsNotFoundException.php
index 1ab06ac..3c1f6e2 100644
--- a/src/bundle/SystemInfo/Exception/MetricsNotFoundException.php
+++ b/src/bundle/SystemInfo/Exception/MetricsNotFoundException.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Exception;
 
 use Exception;
diff --git a/src/bundle/SystemInfo/Exception/SystemInfoException.php b/src/bundle/SystemInfo/Exception/SystemInfoException.php
index e2d9f9c..586e4ff 100644
--- a/src/bundle/SystemInfo/Exception/SystemInfoException.php
+++ b/src/bundle/SystemInfo/Exception/SystemInfoException.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Exception;
 
 interface SystemInfoException
diff --git a/src/bundle/SystemInfo/Exception/SystemInfoServiceNotFoundException.php b/src/bundle/SystemInfo/Exception/SystemInfoServiceNotFoundException.php
index e7cb881..20f9dd3 100644
--- a/src/bundle/SystemInfo/Exception/SystemInfoServiceNotFoundException.php
+++ b/src/bundle/SystemInfo/Exception/SystemInfoServiceNotFoundException.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Exception;
 
 use Exception;
diff --git a/src/bundle/SystemInfo/EzcSystemInfoWrapper.php b/src/bundle/SystemInfo/EzcSystemInfoWrapper.php
index 39e2e67..07b6800 100644
--- a/src/bundle/SystemInfo/EzcSystemInfoWrapper.php
+++ b/src/bundle/SystemInfo/EzcSystemInfoWrapper.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo;
 
 use ezcSystemInfo;
diff --git a/src/bundle/SystemInfo/OutputFormat.php b/src/bundle/SystemInfo/OutputFormat.php
index 81d34e8..a12e6c0 100644
--- a/src/bundle/SystemInfo/OutputFormat.php
+++ b/src/bundle/SystemInfo/OutputFormat.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo;
 
 interface OutputFormat
diff --git a/src/bundle/SystemInfo/OutputFormat/JsonOutputFormat.php b/src/bundle/SystemInfo/OutputFormat/JsonOutputFormat.php
index 6d5328d..4b5bf0c 100644
--- a/src/bundle/SystemInfo/OutputFormat/JsonOutputFormat.php
+++ b/src/bundle/SystemInfo/OutputFormat/JsonOutputFormat.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\OutputFormat;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\OutputFormat as SystemInfoOutputFormat;
diff --git a/src/bundle/SystemInfo/OutputFormatRegistry.php b/src/bundle/SystemInfo/OutputFormatRegistry.php
index c076e8e..a0b215e 100644
--- a/src/bundle/SystemInfo/OutputFormatRegistry.php
+++ b/src/bundle/SystemInfo/OutputFormatRegistry.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo;
 
 use Ibexa\Core\Base\Exceptions\NotFoundException;
diff --git a/src/bundle/SystemInfo/Registry/IdentifierBased.php b/src/bundle/SystemInfo/Registry/IdentifierBased.php
index b36f162..33be971 100644
--- a/src/bundle/SystemInfo/Registry/IdentifierBased.php
+++ b/src/bundle/SystemInfo/Registry/IdentifierBased.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Registry;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\SystemInfoCollectorRegistry;
diff --git a/src/bundle/SystemInfo/SystemInfoCollectorRegistry.php b/src/bundle/SystemInfo/SystemInfoCollectorRegistry.php
index aab76f6..ffe1fad 100644
--- a/src/bundle/SystemInfo/SystemInfoCollectorRegistry.php
+++ b/src/bundle/SystemInfo/SystemInfoCollectorRegistry.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo;
 
 /**
diff --git a/src/bundle/SystemInfo/Value/ComposerPackage.php b/src/bundle/SystemInfo/Value/ComposerPackage.php
index 31baacc..d54eda7 100644
--- a/src/bundle/SystemInfo/Value/ComposerPackage.php
+++ b/src/bundle/SystemInfo/Value/ComposerPackage.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Value;
 
 use Ibexa\Contracts\Core\Repository\Values\ValueObject;
diff --git a/src/bundle/SystemInfo/Value/ComposerSystemInfo.php b/src/bundle/SystemInfo/Value/ComposerSystemInfo.php
index c13abaa..e50eb1e 100644
--- a/src/bundle/SystemInfo/Value/ComposerSystemInfo.php
+++ b/src/bundle/SystemInfo/Value/ComposerSystemInfo.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Value;
 
 use Ibexa\Contracts\Core\Repository\Values\ValueObject;
diff --git a/src/bundle/SystemInfo/Value/HardwareSystemInfo.php b/src/bundle/SystemInfo/Value/HardwareSystemInfo.php
index b03e9db..306fd82 100644
--- a/src/bundle/SystemInfo/Value/HardwareSystemInfo.php
+++ b/src/bundle/SystemInfo/Value/HardwareSystemInfo.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Value;
 
 use Ibexa\Contracts\Core\Repository\Values\ValueObject;
diff --git a/src/bundle/SystemInfo/Value/IbexaSystemInfo.php b/src/bundle/SystemInfo/Value/IbexaSystemInfo.php
index 4373d80..cea1bff 100644
--- a/src/bundle/SystemInfo/Value/IbexaSystemInfo.php
+++ b/src/bundle/SystemInfo/Value/IbexaSystemInfo.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Value;
 
 use Ibexa\Contracts\Core\Repository\Values\ValueObject;
diff --git a/src/bundle/SystemInfo/Value/InvalidSystemInfo.php b/src/bundle/SystemInfo/Value/InvalidSystemInfo.php
index 010fbfa..f73d572 100644
--- a/src/bundle/SystemInfo/Value/InvalidSystemInfo.php
+++ b/src/bundle/SystemInfo/Value/InvalidSystemInfo.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Value;
 
 use Ibexa\Contracts\Core\Repository\Values\ValueObject;
diff --git a/src/bundle/SystemInfo/Value/PhpSystemInfo.php b/src/bundle/SystemInfo/Value/PhpSystemInfo.php
index 28f73ac..7c511eb 100644
--- a/src/bundle/SystemInfo/Value/PhpSystemInfo.php
+++ b/src/bundle/SystemInfo/Value/PhpSystemInfo.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Value;
 
 use Ibexa\Contracts\Core\Repository\Values\ValueObject;
diff --git a/src/bundle/SystemInfo/Value/RepositoryMetrics.php b/src/bundle/SystemInfo/Value/RepositoryMetrics.php
index d525ed7..f42ef4d 100644
--- a/src/bundle/SystemInfo/Value/RepositoryMetrics.php
+++ b/src/bundle/SystemInfo/Value/RepositoryMetrics.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Value;
 
 use Ibexa\Contracts\Core\Repository\Values\ValueObject;
diff --git a/src/bundle/SystemInfo/Value/RepositorySystemInfo.php b/src/bundle/SystemInfo/Value/RepositorySystemInfo.php
index 49f486d..a25aefa 100644
--- a/src/bundle/SystemInfo/Value/RepositorySystemInfo.php
+++ b/src/bundle/SystemInfo/Value/RepositorySystemInfo.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Value;
 
 use Ibexa\Contracts\Core\Repository\Values\ValueObject;
diff --git a/src/bundle/SystemInfo/Value/ServicesSystemInfo.php b/src/bundle/SystemInfo/Value/ServicesSystemInfo.php
index fdafe6e..328c8a5 100644
--- a/src/bundle/SystemInfo/Value/ServicesSystemInfo.php
+++ b/src/bundle/SystemInfo/Value/ServicesSystemInfo.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Value;
 
 /**
diff --git a/src/bundle/SystemInfo/Value/SymfonyKernelSystemInfo.php b/src/bundle/SystemInfo/Value/SymfonyKernelSystemInfo.php
index 21c5561..c16bcd0 100644
--- a/src/bundle/SystemInfo/Value/SymfonyKernelSystemInfo.php
+++ b/src/bundle/SystemInfo/Value/SymfonyKernelSystemInfo.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Value;
 
 use Ibexa\Contracts\Core\Repository\Values\ValueObject;
diff --git a/src/bundle/SystemInfo/Value/SystemInfo.php b/src/bundle/SystemInfo/Value/SystemInfo.php
index a36fdb0..c24c7c4 100644
--- a/src/bundle/SystemInfo/Value/SystemInfo.php
+++ b/src/bundle/SystemInfo/Value/SystemInfo.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Value;
 
 /**
diff --git a/src/bundle/View/Matcher/SystemInfo/Identifier.php b/src/bundle/View/Matcher/SystemInfo/Identifier.php
index 2e92edc..2374e0d 100644
--- a/src/bundle/View/Matcher/SystemInfo/Identifier.php
+++ b/src/bundle/View/Matcher/SystemInfo/Identifier.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\View\Matcher\SystemInfo;
 
 use Ibexa\Bundle\SystemInfo\View\SystemInfoView;
diff --git a/src/bundle/View/SystemInfoView.php b/src/bundle/View/SystemInfoView.php
index 31a7ab2..8be6a51 100644
--- a/src/bundle/View/SystemInfoView.php
+++ b/src/bundle/View/SystemInfoView.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\View;
 
 use Ibexa\Core\MVC\Symfony\View\BaseView;
diff --git a/src/bundle/View/SystemInfoViewBuilder.php b/src/bundle/View/SystemInfoViewBuilder.php
index 4487dbd..09293ba 100644
--- a/src/bundle/View/SystemInfoViewBuilder.php
+++ b/src/bundle/View/SystemInfoViewBuilder.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\View;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Exception\SystemInfoException;
diff --git a/src/lib/EventListener/SystemInfoTabGroupListener.php b/src/lib/EventListener/SystemInfoTabGroupListener.php
index cb0732d..55b57f0 100644
--- a/src/lib/EventListener/SystemInfoTabGroupListener.php
+++ b/src/lib/EventListener/SystemInfoTabGroupListener.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\SystemInfo\EventListener;
 
 use Ibexa\AdminUi\Tab\Event\TabEvents;
diff --git a/tests/bundle/SystemInfo/Collector/ConfigurationSymfonyKernelSystemInfoCollectorTest.php b/tests/bundle/SystemInfo/Collector/ConfigurationSymfonyKernelSystemInfoCollectorTest.php
index 92768e5..cb912bf 100644
--- a/tests/bundle/SystemInfo/Collector/ConfigurationSymfonyKernelSystemInfoCollectorTest.php
+++ b/tests/bundle/SystemInfo/Collector/ConfigurationSymfonyKernelSystemInfoCollectorTest.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Collector\ConfigurationSymfonyKernelSystemInfoCollector;
@@ -39,34 +40,34 @@ public function testCollect()
             ->getMock();
 
         $kernelMock
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('getEnvironment')
-            ->will($this->returnValue($expected->environment));
+            ->will(self::returnValue($expected->environment));
 
         $kernelMock
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('isDebug')
-            ->will($this->returnValue($expected->debugMode));
+            ->will(self::returnValue($expected->debugMode));
 
         $kernelMock
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('getProjectDir')
-            ->will($this->returnValue($expected->projectDir));
+            ->will(self::returnValue($expected->projectDir));
 
         $kernelMock
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('getCacheDir')
-            ->will($this->returnValue($expected->cacheDir));
+            ->will(self::returnValue($expected->cacheDir));
 
         $kernelMock
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('getLogDir')
-            ->will($this->returnValue($expected->logDir));
+            ->will(self::returnValue($expected->logDir));
 
         $kernelMock
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('getCharset')
-            ->will($this->returnValue($expected->charset));
+            ->will(self::returnValue($expected->charset));
 
         $symfonyCollector = new ConfigurationSymfonyKernelSystemInfoCollector(
             $kernelMock,
diff --git a/tests/bundle/SystemInfo/Collector/EzcHardwareSystemInfoCollectorTest.php b/tests/bundle/SystemInfo/Collector/EzcHardwareSystemInfoCollectorTest.php
index ac3247a..f6a35b8 100644
--- a/tests/bundle/SystemInfo/Collector/EzcHardwareSystemInfoCollectorTest.php
+++ b/tests/bundle/SystemInfo/Collector/EzcHardwareSystemInfoCollectorTest.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Collector\EzcHardwareSystemInfoCollector;
diff --git a/tests/bundle/SystemInfo/Collector/EzcPhpSystemInfoCollectorTest.php b/tests/bundle/SystemInfo/Collector/EzcPhpSystemInfoCollectorTest.php
index 1d38a07..c86ac53 100644
--- a/tests/bundle/SystemInfo/Collector/EzcPhpSystemInfoCollectorTest.php
+++ b/tests/bundle/SystemInfo/Collector/EzcPhpSystemInfoCollectorTest.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Collector\EzcPhpSystemInfoCollector;
diff --git a/tests/bundle/SystemInfo/Collector/JsonComposerLockSystemInfoCollectorTest.php b/tests/bundle/SystemInfo/Collector/JsonComposerLockSystemInfoCollectorTest.php
index 3f1b47d..9239c27 100644
--- a/tests/bundle/SystemInfo/Collector/JsonComposerLockSystemInfoCollectorTest.php
+++ b/tests/bundle/SystemInfo/Collector/JsonComposerLockSystemInfoCollectorTest.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Collector\JsonComposerLockSystemInfoCollector;
diff --git a/tests/bundle/SystemInfo/Collector/RepositorySystemInfoCollectorTest.php b/tests/bundle/SystemInfo/Collector/RepositorySystemInfoCollectorTest.php
index 10be262..f4658af 100644
--- a/tests/bundle/SystemInfo/Collector/RepositorySystemInfoCollectorTest.php
+++ b/tests/bundle/SystemInfo/Collector/RepositorySystemInfoCollectorTest.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Doctrine\DBAL\Connection;
@@ -75,32 +76,32 @@ public function testCollect()
         ]);
 
         $this->dbalConnectionMock
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('getDatabasePlatform')
-            ->will($this->returnValue($this->dbalPlatformMock));
+            ->will(self::returnValue($this->dbalPlatformMock));
 
         $this->dbalPlatformMock
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('getName')
-            ->will($this->returnValue($expected->type));
+            ->will(self::returnValue($expected->type));
 
         $this->dbalConnectionMock
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('getDatabase')
-            ->will($this->returnValue($expected->name));
+            ->will(self::returnValue($expected->name));
 
         $this->dbalConnectionMock
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('getHost')
-            ->will($this->returnValue($expected->host));
+            ->will(self::returnValue($expected->host));
 
         $this->dbalConnectionMock
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('getUsername')
-            ->will($this->returnValue($expected->username));
+            ->will(self::returnValue($expected->username));
 
         $this->metricsProviderMock
-            ->expects($this->exactly(5))
+            ->expects(self::exactly(5))
             ->method('provideMetrics')
             ->withConsecutive(
                 ['published'],
@@ -118,7 +119,7 @@ public function testCollect()
             );
 
         $this->metricsMock
-            ->expects($this->exactly(5))
+            ->expects(self::exactly(5))
             ->method('getValue')
             ->willReturnOnConsecutiveCalls(
                 $expected->repositoryMetrics->publishedCount,
diff --git a/tests/bundle/SystemInfo/Collector/ServicesSystemInfoCollectorTest.php b/tests/bundle/SystemInfo/Collector/ServicesSystemInfoCollectorTest.php
index 05d94bc..ea6180b 100644
--- a/tests/bundle/SystemInfo/Collector/ServicesSystemInfoCollectorTest.php
+++ b/tests/bundle/SystemInfo/Collector/ServicesSystemInfoCollectorTest.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Collector\ServicesSystemInfoCollector;
@@ -38,7 +39,7 @@ public function testCollect(): void
         );
 
         $this->serviceProviderMock
-            ->expects($this->exactly(3))
+            ->expects(self::exactly(3))
             ->method('getServiceType')
             ->withConsecutive(
                 ['searchEngine'],
diff --git a/tests/bundle/SystemInfo/Registry/IdentifierBasedTest.php b/tests/bundle/SystemInfo/Registry/IdentifierBasedTest.php
index ecb9387..057d35e 100644
--- a/tests/bundle/SystemInfo/Registry/IdentifierBasedTest.php
+++ b/tests/bundle/SystemInfo/Registry/IdentifierBasedTest.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\Bundle\SystemInfo\SystemInfo\Registry;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Registry\IdentifierBased;
@@ -79,6 +80,7 @@ public function testReplaceItem()
      * Test getting all registered identifiers.
      *
      * @covers \Ibexa\Bundle\SystemInfo\SystemInfo\Registry\IdentifierBased::getIdentifiers()
+     *
      * @depends testAddAndGetItems
      */
     public function testGetIdentifiers()
diff --git a/tests/bundle/View/Matcher/SystemInfo/IdentitifierTest.php b/tests/bundle/View/Matcher/SystemInfo/IdentitifierTest.php
index af99578..aafcc54 100644
--- a/tests/bundle/View/Matcher/SystemInfo/IdentitifierTest.php
+++ b/tests/bundle/View/Matcher/SystemInfo/IdentitifierTest.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\Bundle\SystemInfo\View\Matcher\SystemInfo;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Value\HardwareSystemInfo;
diff --git a/tests/bundle/View/SystemInfoViewBuilderTest.php b/tests/bundle/View/SystemInfoViewBuilderTest.php
index a603d81..4c2f193 100644
--- a/tests/bundle/View/SystemInfoViewBuilderTest.php
+++ b/tests/bundle/View/SystemInfoViewBuilderTest.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\Bundle\SystemInfo\View;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Value\SystemInfo;
@@ -42,11 +43,11 @@ public function testBuildView()
         $this->getRegistryMock()
             ->method('getItem')
             ->with('test')
-            ->will($this->returnValue($this->getCollectorMock()));
+            ->will(self::returnValue($this->getCollectorMock()));
 
         $this->getCollectorMock()
             ->method('collect')
-            ->will($this->returnValue($systemInfo));
+            ->will(self::returnValue($systemInfo));
 
         $view = $builder->buildView(['systemInfoIdentifier' => 'test', 'viewType' => 'test']);
         self::assertSame($view->getInfo(), $systemInfo);
diff --git a/tests/lib/EventListener/SystemInfoTabGroupListenerTest.php b/tests/lib/EventListener/SystemInfoTabGroupListenerTest.php
index 437236e..f52edc6 100644
--- a/tests/lib/EventListener/SystemInfoTabGroupListenerTest.php
+++ b/tests/lib/EventListener/SystemInfoTabGroupListenerTest.php
@@ -99,7 +99,7 @@ public function testSubscribedEvents()
         $systemInfoCollectorRegistry = $this->createMock(SystemInfoCollectorRegistry::class);
         $systemInfoTabGroupListener = new SystemInfoTabGroupListener($this->tabRegistry, $this->tabFactory, $systemInfoCollectorRegistry);
 
-        $this->assertSame([TabEvents::TAB_GROUP_PRE_RENDER => ['onTabGroupPreRender', 10]], $systemInfoTabGroupListener::getSubscribedEvents());
+        self::assertSame([TabEvents::TAB_GROUP_PRE_RENDER => ['onTabGroupPreRender', 10]], $systemInfoTabGroupListener::getSubscribedEvents());
     }
 
     public function dataProvider(): array