[CS] Bumped Ibexa Code Style to ~2.0.0 and aligned the codebase

ibexa · Jun 3, 2024 · a4da6d9 · a4da6d9
1 parent 36c49de
commit a4da6d9
Show file tree

Hide file tree

Showing 51 changed files with 79 additions and 30 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;