diff --git a/composer.json b/composer.json index 955d703602..cf4c95091a 100644 --- a/composer.json +++ b/composer.json @@ -76,7 +76,8 @@ "ibexa/test-core": "^0.1.x-dev", "phpstan/phpstan": "^1.10", "phpstan/phpstan-phpunit": "^1.3", - "phpstan/phpstan-symfony": "^1.3" + "phpstan/phpstan-symfony": "^1.3", + "symfony/webpack-encore-bundle": "^1.17.2" }, "config": { "allow-plugins": { diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index f2890b572c..e0cc17161c 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -3685,16 +3685,6 @@ parameters: count: 1 path: src/lib/Event/Options.php - - - message: "#^Call to method getEntrypointLookup\\(\\) on an unknown class Symfony\\\\WebpackEncoreBundle\\\\Asset\\\\EntrypointLookupCollectionInterface\\.$#" - count: 1 - path: src/lib/EventListener/AdminExceptionListener.php - - - - message: "#^Call to method reset\\(\\) on an unknown class Symfony\\\\WebpackEncoreBundle\\\\Asset\\\\TagRenderer\\.$#" - count: 1 - path: src/lib/EventListener/AdminExceptionListener.php - - message: "#^Cannot call method log\\(\\) on Psr\\\\Log\\\\LoggerInterface\\|null\\.$#" count: 1 @@ -3715,26 +3705,6 @@ parameters: count: 1 path: src/lib/EventListener/AdminExceptionListener.php - - - message: "#^Parameter \\$encoreTagRenderer of method Ibexa\\\\AdminUi\\\\EventListener\\\\AdminExceptionListener\\:\\:__construct\\(\\) has invalid type Symfony\\\\WebpackEncoreBundle\\\\Asset\\\\TagRenderer\\.$#" - count: 2 - path: src/lib/EventListener/AdminExceptionListener.php - - - - message: "#^Parameter \\$entrypointLookupCollection of method Ibexa\\\\AdminUi\\\\EventListener\\\\AdminExceptionListener\\:\\:__construct\\(\\) has invalid type Symfony\\\\WebpackEncoreBundle\\\\Asset\\\\EntrypointLookupCollectionInterface\\.$#" - count: 2 - path: src/lib/EventListener/AdminExceptionListener.php - - - - message: "#^Property Ibexa\\\\AdminUi\\\\EventListener\\\\AdminExceptionListener\\:\\:\\$encoreTagRenderer has unknown class Symfony\\\\WebpackEncoreBundle\\\\Asset\\\\TagRenderer as its type\\.$#" - count: 1 - path: src/lib/EventListener/AdminExceptionListener.php - - - - message: "#^Property Ibexa\\\\AdminUi\\\\EventListener\\\\AdminExceptionListener\\:\\:\\$entrypointLookupCollection has unknown class Symfony\\\\WebpackEncoreBundle\\\\Asset\\\\EntrypointLookupCollectionInterface as its type\\.$#" - count: 1 - path: src/lib/EventListener/AdminExceptionListener.php - - message: "#^Property Ibexa\\\\AdminUi\\\\EventListener\\\\AdminExceptionListener\\:\\:\\$siteAccessGroups type has no value type specified in iterable type array\\.$#" count: 1 diff --git a/tests/integration/AdminUiIbexaTestKernel.php b/tests/integration/AdminUiIbexaTestKernel.php index 5e2caac2ba..fe5c56bd82 100644 --- a/tests/integration/AdminUiIbexaTestKernel.php +++ b/tests/integration/AdminUiIbexaTestKernel.php @@ -15,11 +15,7 @@ use Ibexa\Bundle\Rest\IbexaRestBundle; use Ibexa\Bundle\Search\IbexaSearchBundle; use Ibexa\Bundle\User\IbexaUserBundle; -use Ibexa\Contracts\Migration\Metadata\Storage\MetadataStorage; -use Ibexa\Contracts\Migration\MigrationStorage; use Ibexa\Contracts\Test\Core\IbexaTestKernel; -use Ibexa\Migration\Metadata\Storage\InMemoryMetadataStorage; -use Ibexa\Migration\Storage\InMemoryMigrationStorage; use Ibexa\Tests\Integration\AdminUi\DependencyInjection\Configuration\IgnoredConfigParser; use Knp\Menu\FactoryInterface; use Lexik\Bundle\JWTAuthenticationBundle\Services\JWTTokenManagerInterface; @@ -27,7 +23,6 @@ use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\Config\Resource\FileResource; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer; use Symfony\WebpackEncoreBundle\Asset\EntrypointLookupCollection; use Symfony\WebpackEncoreBundle\Asset\TagRenderer; @@ -82,8 +77,6 @@ private static function loadRouting(ContainerBuilder $container, string $filePat private static function configureIbexaDXPBundles(ContainerBuilder $container): void { - self::configureMigrationsBundle($container); - $container->setParameter('form.type_extension.csrf.enabled', false); $container->setParameter('ibexa.http_cache.purge_type', 'local'); $container->setParameter('ibexa.http_cache.translation_aware.enabled', false); @@ -113,12 +106,6 @@ protected static function getExposedServicesByClass(): iterable yield from parent::getExposedServicesByClass(); } - private static function configureMigrationsBundle(ContainerBuilder $container): void - { - $container->setDefinition(MetadataStorage::class, new Definition(InMemoryMetadataStorage::class)); - $container->setDefinition(MigrationStorage::class, new Definition(InMemoryMigrationStorage::class)); - } - private static function configureThirdPartyBundles(ContainerBuilder $container): void { $container->setParameter('fos_http_cache.tag_handler.strict', false);