diff --git a/composer.json b/composer.json index 65241374..422e2dba 100644 --- a/composer.json +++ b/composer.json @@ -14,11 +14,11 @@ "require": { "php": "^8.1", "gedmo/doctrine-extensions": "^3.21.0", - "symfony/cache": "^6.4 || ^7.0", - "symfony/config": "^6.4 || ^7.0", - "symfony/dependency-injection": "^6.4 || ^7.0", - "symfony/event-dispatcher": "^6.4 || ^7.0", - "symfony/http-kernel": "^6.4 || ^7.0", + "symfony/cache": "^6.4 || ^7.0 || ^8.0", + "symfony/config": "^6.4 || ^7.0 || ^8.0", + "symfony/dependency-injection": "^6.4 || ^7.0 || ^8.0", + "symfony/event-dispatcher": "^6.4 || ^7.0 || ^8.0", + "symfony/http-kernel": "^6.4 || ^7.0 || ^8.0", "symfony/translation-contracts": "^2.5 || ^3.5" }, "require-dev": { @@ -27,9 +27,9 @@ "phpstan/phpstan-phpunit": "^2.0", "phpstan/phpstan-strict-rules": "^2.0", "phpstan/phpstan-symfony": "^2.0", - "symfony/mime": "^6.4 || ^7.0", - "symfony/phpunit-bridge": "^v6.4.1 || ^7.0.1", - "symfony/security-core": "^6.4 || ^7.0" + "symfony/mime": "^6.4 || ^7.0 || ^8.0", + "symfony/phpunit-bridge": "^v6.4.1 || ^7.0.1 || ^8.0", + "symfony/security-core": "^6.4 || ^7.0 || ^8.0" }, "suggest": { "doctrine/doctrine-bundle": "to use the ORM extensions", diff --git a/src/DependencyInjection/Compiler/ValidateExtensionConfigurationPass.php b/src/DependencyInjection/Compiler/ValidateExtensionConfigurationPass.php index 2e75a18b..eabb7ba8 100644 --- a/src/DependencyInjection/Compiler/ValidateExtensionConfigurationPass.php +++ b/src/DependencyInjection/Compiler/ValidateExtensionConfigurationPass.php @@ -22,7 +22,7 @@ class ValidateExtensionConfigurationPass implements CompilerPassInterface * * @return void */ - public function process(ContainerBuilder $container) + public function process(ContainerBuilder $container): void { $extension = $container->getExtension('stof_doctrine_extensions'); \assert($extension instanceof StofDoctrineExtensionsExtension); diff --git a/src/DependencyInjection/StofDoctrineExtensionsExtension.php b/src/DependencyInjection/StofDoctrineExtensionsExtension.php index 301e7e18..04501ab4 100644 --- a/src/DependencyInjection/StofDoctrineExtensionsExtension.php +++ b/src/DependencyInjection/StofDoctrineExtensionsExtension.php @@ -93,7 +93,7 @@ class StofDoctrineExtensionsExtension extends Extension /** * @return void */ - public function load(array $configs, ContainerBuilder $container) + public function load(array $configs, ContainerBuilder $container): void { $processor = new Processor(); $configuration = new Configuration(); diff --git a/src/EventListener/BlameListener.php b/src/EventListener/BlameListener.php index ff3ba86f..75d3abad 100644 --- a/src/EventListener/BlameListener.php +++ b/src/EventListener/BlameListener.php @@ -52,7 +52,7 @@ public function onKernelRequest(RequestEvent $event): void /** * @return array */ - public static function getSubscribedEvents() + public static function getSubscribedEvents(): array { return array( KernelEvents::REQUEST => 'onKernelRequest', diff --git a/src/EventListener/LocaleListener.php b/src/EventListener/LocaleListener.php index b58dd3c8..76a8d454 100644 --- a/src/EventListener/LocaleListener.php +++ b/src/EventListener/LocaleListener.php @@ -34,7 +34,7 @@ public function onKernelRequest(RequestEvent $event): void /** * @return array */ - public static function getSubscribedEvents() + public static function getSubscribedEvents(): array { return array( KernelEvents::REQUEST => 'onKernelRequest', diff --git a/src/EventListener/LoggerListener.php b/src/EventListener/LoggerListener.php index b2892c86..703e417e 100644 --- a/src/EventListener/LoggerListener.php +++ b/src/EventListener/LoggerListener.php @@ -60,7 +60,7 @@ public function onKernelRequest(RequestEvent $event): void /** * @return array */ - public static function getSubscribedEvents() + public static function getSubscribedEvents(): array { return array( KernelEvents::REQUEST => 'onKernelRequest', diff --git a/src/StofDoctrineExtensionsBundle.php b/src/StofDoctrineExtensionsBundle.php index 2656f2ba..e67b264b 100644 --- a/src/StofDoctrineExtensionsBundle.php +++ b/src/StofDoctrineExtensionsBundle.php @@ -14,7 +14,7 @@ class StofDoctrineExtensionsBundle extends Bundle * * @return void */ - public function build(ContainerBuilder $container) + public function build(ContainerBuilder $container): void { $container->addCompilerPass(new ValidateExtensionConfigurationPass()); $container->addCompilerPass(new ReaderPass()); diff --git a/tests/DependencyInjection/Compiler/ReaderPassTest.php b/tests/DependencyInjection/Compiler/ReaderPassTest.php new file mode 100644 index 00000000..4bc45dc1 --- /dev/null +++ b/tests/DependencyInjection/Compiler/ReaderPassTest.php @@ -0,0 +1,20 @@ +process($container); + + self::assertTrue($container->has('.stof_doctrine_extensions.reader')); + } +} diff --git a/tests/DependencyInjection/Compiler/ValidateExtensionConfigurationPassTest.php b/tests/DependencyInjection/Compiler/ValidateExtensionConfigurationPassTest.php new file mode 100644 index 00000000..ea5f29c9 --- /dev/null +++ b/tests/DependencyInjection/Compiler/ValidateExtensionConfigurationPassTest.php @@ -0,0 +1,44 @@ +expectException(InvalidConfigurationException::class); + + $readerPass = new ValidateExtensionConfigurationPass(); + $extension = new StofDoctrineExtensionsExtension(); + $container = new ContainerBuilder(); + $container->registerExtension($extension); + + $extension->load([ + 'orm' => ['default' => []], + ], $container); + + $readerPass->process($container); + } + + public function testProcessInvalidConfigurationExceptionDocumentManagerNotFound(): void + { + $this->expectException(InvalidConfigurationException::class); + + $readerPass = new ValidateExtensionConfigurationPass(); + $extension = new StofDoctrineExtensionsExtension(); + $container = new ContainerBuilder(); + $container->registerExtension($extension); + + $extension->load([ + 'mongodb' => ['default' => []], + ], $container); + + $readerPass->process($container); + } +}