IBX-8121: Fixed code style for 5.0

composer.json

@@ -65,13 +65,13 @@
         "behat/behat": "^3.6.1",
         "friends-of-behat/mink-extension": "^2.4",
         "ibexa/ci-scripts": "^0.2@dev",
-        "ibexa/code-style": "^1.0",
+        "ibexa/code-style": "~2.0.0",
         "jenner/simple_fork": "^1.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "phpstan/phpstan": "^1.2",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-symfony": "^1.3",
-        "phpunit/phpunit": "^8.2",
+        "phpunit/phpunit": "^9.6",
         "symfony/phpunit-bridge": "^5.1",
         "symfony/proxy-manager-bridge": "^5.3",
         "symfony/runtime": "^5.3.0"

phpstan-baseline.neon

@@ -8205,11 +8205,6 @@ parameters:
 			count: 1
 			path: src/lib/Base/Exceptions/InvalidArgumentType.php
 
-		-
-			message: "#^Access to an undefined property Ibexa\\\\Core\\\\Base\\\\Exceptions\\\\LimitationValidationException\\:\\:\\$validationErrors\\.$#"
-			count: 1
-			path: src/lib/Base/Exceptions/LimitationValidationException.php
-
 		-
 			message: "#^Method Ibexa\\\\Core\\\\Base\\\\Exceptions\\\\LimitationValidationException\\:\\:addParameter\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -24015,11 +24010,6 @@ parameters:
 			count: 1
 			path: tests/bundle/Core/DependencyInjection/Configuration/Parser/ImageTest.php
 
-		-
-			message: "#^Access to an undefined property Ibexa\\\\Tests\\\\Bundle\\\\Core\\\\DependencyInjection\\\\Configuration\\\\Parser\\\\LanguagesTest\\:\\:\\$minimalConfig\\.$#"
-			count: 1
-			path: tests/bundle/Core/DependencyInjection/Configuration/Parser/LanguagesTest.php
-
 		-
 			message: "#^Method Ibexa\\\\Tests\\\\Bundle\\\\Core\\\\DependencyInjection\\\\Configuration\\\\Parser\\\\LanguagesTest\\:\\:getMinimalConfiguration\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -24531,10 +24521,15 @@ parameters:
 			path: tests/bundle/Core/DependencyInjection/IbexaCoreExtensionTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$array of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) expects array\\|ArrayAccess, array\\|bool\\|float\\|int\\|string\\|null given\\.$#"
+			message: "#^Parameter \\#2 \\$array of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) expects array\\|ArrayAccess, array\\|bool\\|float\\|int\\|string\\|null given\\.$#"
 			count: 2
 			path: tests/bundle/Core/DependencyInjection/IbexaCoreExtensionTest.php
 
+		-
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertContains\\(\\) expects iterable, array\\|bool\\|float\\|int\\|string\\|null given\\.$#"
+			count: 1
+			path: tests/bundle/Core/DependencyInjection/IbexaCoreExtensionTest.php
+
 		-
 			message: "#^Property Ibexa\\\\Tests\\\\Bundle\\\\Core\\\\DependencyInjection\\\\IbexaCoreExtensionTest\\:\\:\\$minimalConfig has no type specified\\.$#"
 			count: 1
@@ -24985,11 +24980,6 @@ parameters:
 			count: 1
 			path: tests/bundle/Core/EventListener/RequestEventListenerTest.php
 
-		-
-			message: "#^Access to an undefined property Ibexa\\\\Tests\\\\Bundle\\\\Core\\\\EventListener\\\\RoutingListenerTest\\:\\:\\$container\\.$#"
-			count: 1
-			path: tests/bundle/Core/EventListener/RoutingListenerTest.php
-
 		-
 			message: "#^Method Ibexa\\\\Tests\\\\Bundle\\\\Core\\\\EventListener\\\\RoutingListenerTest\\:\\:testGetSubscribedEvents\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -25040,11 +25030,6 @@ parameters:
 			count: 1
 			path: tests/bundle/Core/EventListener/SessionInitByPostListenerTest.php
 
-		-
-			message: "#^Access to an undefined property Ibexa\\\\Tests\\\\Bundle\\\\Core\\\\EventListener\\\\SessionSetDynamicNameListenerTest\\:\\:\\$session\\.$#"
-			count: 1
-			path: tests/bundle/Core/EventListener/SessionSetDynamicNameListenerTest.php
-
 		-
 			message: "#^Method Ibexa\\\\Tests\\\\Bundle\\\\Core\\\\EventListener\\\\SessionSetDynamicNameListenerTest\\:\\:onSiteAccessMatchProvider\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -25290,6 +25275,11 @@ parameters:
 			count: 1
 			path: tests/bundle/Core/EventSubscriber/TrustedHeaderClientIpEventSubscriberTest.php
 
+		-
+			message: "#^Method Ibexa\\\\Tests\\\\Bundle\\\\Core\\\\EventSubscriber\\\\TrustedHeaderClientIpEventSubscriberTest\\:\\:__construct\\(\\) has parameter \\$name with no type specified\\.$#"
+			count: 1
+			path: tests/bundle/Core/EventSubscriber/TrustedHeaderClientIpEventSubscriberTest.php
+
 		-
 			message: "#^Method Ibexa\\\\Tests\\\\Bundle\\\\Core\\\\EventSubscriber\\\\TrustedHeaderClientIpEventSubscriberTest\\:\\:getTrustedHeaderEventSubscriberTestData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -26175,11 +26165,6 @@ parameters:
 			count: 1
 			path: tests/bundle/Core/Routing/JsRouting/ExposedRoutesExtractorTest.php
 
-		-
-			message: "#^Access to an undefined property Ibexa\\\\Tests\\\\Bundle\\\\Core\\\\Routing\\\\UrlAliasRouterTest\\:\\:\\$container\\.$#"
-			count: 1
-			path: tests/bundle/Core/Routing/UrlAliasRouterTest.php
-
 		-
 			message: "#^Call to an undefined method Ibexa\\\\Core\\\\MVC\\\\Symfony\\\\Routing\\\\UrlAliasRouter\\:\\:setConfigResolver\\(\\)\\.$#"
 			count: 1
@@ -35471,7 +35456,7 @@ parameters:
 			path: tests/integration/Core/Repository/Regression/EZP20018ObjectStateTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$expectedCount of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertCount\\(\\) expects int, int\\|null given\\.$#"
+			message: "#^Parameter \\#1 \\$expectedCount of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertCount\\(\\) expects int, int\\|null given\\.$#"
 			count: 2
 			path: tests/integration/Core/Repository/Regression/EZP20018ObjectStateTest.php
 
@@ -38090,11 +38075,6 @@ parameters:
 			count: 1
 			path: tests/integration/Core/Repository/SearchServiceTest.php
 
-		-
-			message: "#^Parameter \\#1 \\$expectedCount of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertCount\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: tests/integration/Core/Repository/SearchServiceTest.php
-
 		-
 			message: "#^Parameter \\#1 \\$parentLocationId of method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\LocationService\\:\\:newLocationCreateStruct\\(\\) expects int, int\\|null given\\.$#"
 			count: 1
@@ -45645,11 +45625,6 @@ parameters:
 			count: 1
 			path: tests/lib/Limitation/ParentContentTypeLimitationTypeTest.php
 
-		-
-			message: "#^Method PHPUnit\\\\Framework\\\\TestCase\\:\\:once\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: tests/lib/Limitation/ParentContentTypeLimitationTypeTest.php
-
 		-
 			message: "#^Access to an undefined property Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\ValueObject\\:\\:\\$id\\.$#"
 			count: 1
@@ -49240,11 +49215,6 @@ parameters:
 			count: 1
 			path: tests/lib/Pagination/LocationSearchHitAdapterTest.php
 
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\Cache\\\\CacheItem\\:\\:\\$defaultLifetime\\.$#"
-			count: 1
-			path: tests/lib/Persistence/Cache/AbstractBaseHandlerTest.php
-
 		-
 			message: "#^Method Ibexa\\\\Tests\\\\Core\\\\Persistence\\\\Cache\\\\AbstractBaseHandlerTest\\:\\:getCacheItem\\(\\) has parameter \\$key with no type specified\\.$#"
 			count: 1
@@ -49520,16 +49490,6 @@ parameters:
 			count: 3
 			path: tests/lib/Persistence/Cache/AbstractInMemoryCacheHandlerTest.php
 
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\Cache\\\\CacheItem\\:\\:\\$defaultLifetime\\.$#"
-			count: 1
-			path: tests/lib/Persistence/Cache/Adapter/InMemoryClearingProxyAdapterTest.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\Cache\\\\CacheItem\\:\\:\\$prevTags\\.$#"
-			count: 1
-			path: tests/lib/Persistence/Cache/Adapter/InMemoryClearingProxyAdapterTest.php
-
 		-
 			message: "#^Method Ibexa\\\\Tests\\\\Core\\\\Persistence\\\\Cache\\\\Adapter\\\\InMemoryClearingProxyAdapterTest\\:\\:arrayAsGenerator\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -56206,17 +56166,17 @@ parameters:
 			path: tests/lib/Repository/ContentValidator/ContentValidatorStrategyTest.php
 
 		-
-			message: "#^Method class@anonymous/tests/lib/Repository/ContentValidator/ContentValidatorStrategyTest\\.php\\:87\\:\\:__construct\\(\\) has parameter \\$validationReturn with no value type specified in iterable type array\\.$#"
+			message: "#^Method class@anonymous/tests/lib/Repository/ContentValidator/ContentValidatorStrategyTest\\.php\\:88\\:\\:__construct\\(\\) has parameter \\$validationReturn with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: tests/lib/Repository/ContentValidator/ContentValidatorStrategyTest.php
 
 		-
-			message: "#^Method class@anonymous/tests/lib/Repository/ContentValidator/ContentValidatorStrategyTest\\.php\\:87\\:\\:validate\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
+			message: "#^Method class@anonymous/tests/lib/Repository/ContentValidator/ContentValidatorStrategyTest\\.php\\:88\\:\\:validate\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: tests/lib/Repository/ContentValidator/ContentValidatorStrategyTest.php
 
 		-
-			message: "#^Property class@anonymous/tests/lib/Repository/ContentValidator/ContentValidatorStrategyTest\\.php\\:87\\:\\:\\$validationReturn type has no value type specified in iterable type array\\.$#"
+			message: "#^Property class@anonymous/tests/lib/Repository/ContentValidator/ContentValidatorStrategyTest\\.php\\:88\\:\\:\\$validationReturn type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: tests/lib/Repository/ContentValidator/ContentValidatorStrategyTest.php
 

phpunit.xml

@@ -24,13 +24,13 @@
       <directory>tests/bundle/Debug</directory>
     </testsuite>
     <testsuite name="bundle_installer">
-      <directory>tests/bundle/Installer</directory>
+      <directory>tests/bundle/RepositoryInstaller</directory>
     </testsuite>
     <testsuite name="bundle_io">
       <directory>tests/bundle/IO</directory>
     </testsuite>
     <testsuite name="bundle_lse">
-      <directory>tests/bundle/LegacySearchEngineBundle</directory>
+      <directory>tests/bundle/LegacySearchEngine</directory>
     </testsuite>
   </testsuites>
 </phpunit>

src/bundle/Core/ApiLoader/CacheFactory.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\Core\ApiLoader;
 
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;

src/bundle/Core/ApiLoader/Exception/InvalidRepositoryException.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\Core\ApiLoader\Exception;
 
 use InvalidArgumentException;

src/bundle/Core/ApiLoader/Exception/InvalidSearchEngine.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\Core\ApiLoader\Exception;
 
 use InvalidArgumentException;

src/bundle/Core/ApiLoader/Exception/InvalidSearchEngineIndexer.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\Core\ApiLoader\Exception;
 
 use InvalidArgumentException;

src/bundle/Core/ApiLoader/Exception/InvalidStorageEngine.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\Core\ApiLoader\Exception;
 
 use InvalidArgumentException;

src/bundle/Core/ApiLoader/RepositoryConfigurationProvider.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\Core\ApiLoader;
 
 use Ibexa\Bundle\Core\ApiLoader\Exception\InvalidRepositoryException;

src/bundle/Core/ApiLoader/RepositoryFactory.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\Core\ApiLoader;
 
 use Ibexa\Contracts\Core\Persistence\Filter\Content\Handler as ContentFilteringHandler;

src/bundle/Core/ApiLoader/SearchEngineFactory.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\Core\ApiLoader;
 
 use Ibexa\Bundle\Core\ApiLoader\Exception\InvalidSearchEngine;

src/bundle/Core/ApiLoader/SearchEngineIndexerFactory.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\Core\ApiLoader;
 
 use Ibexa\Bundle\Core\ApiLoader\Exception\InvalidSearchEngine;

src/bundle/Core/ApiLoader/StorageConnectionFactory.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\Core\ApiLoader;
 
 use InvalidArgumentException;

src/bundle/Core/ApiLoader/StorageEngineFactory.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\Core\ApiLoader;
 
 use Ibexa\Bundle\Core\ApiLoader\Exception\InvalidStorageEngine;

src/bundle/Core/Command/CleanupVersionsCommand.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\Core\Command;
 
 use Doctrine\DBAL\Connection;

src/bundle/Core/Command/CopySubtreeCommand.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\Core\Command;
 
 use Ibexa\Contracts\Core\Repository\ContentTypeService;

src/bundle/Core/Command/DebugConfigResolverCommand.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\Core\Command;
 
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;

src/bundle/Core/Command/DeleteContentTranslationCommand.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\Core\Command;
 
 use Exception;

src/bundle/Core/Command/RegenerateUrlAliasesCommand.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\Core\Command;
 
 use Exception;

src/bundle/Core/Command/ReindexCommand.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\Core\Command;
 
 use function count;

src/bundle/Core/Converter/ContentParamConverter.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\Core\Converter;
 
 use Ibexa\Contracts\Core\Repository\ContentService;

src/bundle/Core/Converter/LocationParamConverter.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\Core\Converter;
 
 use Ibexa\Contracts\Core\Repository\LocationService;

src/bundle/Core/Converter/RepositoryParamConverter.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\Core\Converter;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;

src/bundle/Core/DependencyInjection/Compiler/BinaryContentDownloadPass.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\Core\DependencyInjection\Compiler;
 
 use Ibexa\Core\FieldType\BinaryFile\BinaryFileStorage;

src/bundle/Core/DependencyInjection/Compiler/ChainConfigResolverPass.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\Core\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\Core\DependencyInjection\Configuration\ChainConfigResolver;

src/bundle/Core/DependencyInjection/Compiler/ChainRoutingPass.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\Core\DependencyInjection\Compiler;
 
 use Ibexa\Core\MVC\Symfony\Routing\ChainRouter;

src/bundle/Core/DependencyInjection/Compiler/ConsoleCacheWarmupPass.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\Core\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;