Merge pull request #516 from alexander-schranz/patch-1

Allow installation with Symfony 8

Author: stof

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",

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);

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();

src/EventListener/BlameListener.php

@@ -52,7 +52,7 @@ public function onKernelRequest(RequestEvent $event): void
     /**
      * @return array<string, string>
      */
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return array(
             KernelEvents::REQUEST => 'onKernelRequest',

src/EventListener/LocaleListener.php

@@ -34,7 +34,7 @@ public function onKernelRequest(RequestEvent $event): void
     /**
      * @return array<string, string>
      */
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return array(
             KernelEvents::REQUEST => 'onKernelRequest',

src/EventListener/LoggerListener.php

@@ -60,7 +60,7 @@ public function onKernelRequest(RequestEvent $event): void
     /**
      * @return array<string, string>
      */
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return array(
             KernelEvents::REQUEST => 'onKernelRequest',

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());

tests/DependencyInjection/Compiler/ReaderPassTest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Stof\DoctrineExtensionsBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Stof\DoctrineExtensionsBundle\DependencyInjection\Compiler\ReaderPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class ReaderPassTest extends TestCase
+{
+    public function testProcess(): void
+    {
+        $readerPass = new ReaderPass();
+        $container = new ContainerBuilder();
+
+        $readerPass->process($container);
+
+        self::assertTrue($container->has('.stof_doctrine_extensions.reader'));
+    }
+}

tests/DependencyInjection/Compiler/ValidateExtensionConfigurationPassTest.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Stof\DoctrineExtensionsBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Stof\DoctrineExtensionsBundle\DependencyInjection\Compiler\ValidateExtensionConfigurationPass;
+use Stof\DoctrineExtensionsBundle\DependencyInjection\StofDoctrineExtensionsExtension;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class ValidateExtensionConfigurationPassTest extends TestCase
+{
+    public function testProcessInvalidConfigurationExceptionEntityManagerNotFound(): void
+    {
+        $this->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);
+    }
+}