Merge branch 'master' into checkput

DamienHarper · Jan 9, 2024 · 8deb5c8 · 8deb5c8
2 parents 2b87d4b + b122eae
commit 8deb5c8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -38,14 +38,14 @@
     },
     "require-dev": {
         "gedmo/doctrine-extensions": "^2.4|^3.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^3.1|^4.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^3.1|^4.0|^5.0",
         "nyholm/symfony-bundle-test": "1.x-dev",
         "phpunit/phpunit": "^9.0",
         "symfony/browser-kit": "^5.4|^6.0|^7.0",
         "symfony/css-selector": "^5.4|^6.0|^7.0",
         "symfony/framework-bundle": "^5.4|^6.0|^7.0",
         "symfony/var-dumper": "^5.4|^6.0|^7.0",
-        "symfony/webpack-encore-bundle": "^1.12",
+        "symfony/webpack-encore-bundle": "^1.12|^2.0",
         "doctrine/data-fixtures": "^1.4"
     },
     "scripts": {

diff --git a/src/Controller/ViewerController.php b/src/Controller/ViewerController.php
@@ -10,6 +10,7 @@
 use DH\Auditor\Provider\Doctrine\Persistence\Schema\SchemaManager;
 use DH\Auditor\Provider\Doctrine\Service\AuditingService;
 use DH\AuditorBundle\Helper\UrlHelper;
+use DH\AuditorBundle\Tests\Controller\ViewerControllerTest;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -18,7 +19,7 @@
 use Twig\Environment;
 
 /**
- * @see \DH\AuditorBundle\Tests\Controller\ViewerControllerTest
+ * @see ViewerControllerTest
  */
 final class ViewerController
 {

diff --git a/src/DependencyInjection/Compiler/CustomConfigurationCompilerPass.php b/src/DependencyInjection/Compiler/CustomConfigurationCompilerPass.php
@@ -5,12 +5,13 @@
 namespace DH\AuditorBundle\DependencyInjection\Compiler;
 
 use DH\Auditor\Configuration;
+use DH\AuditorBundle\Tests\DependencyInjection\Compiler\CustomConfigurationCompilerPassTest;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * @see \DH\AuditorBundle\Tests\DependencyInjection\Compiler\CustomConfigurationCompilerPassTest
+ * @see CustomConfigurationCompilerPassTest
  */
 class CustomConfigurationCompilerPass implements CompilerPassInterface
 {

diff --git a/src/DependencyInjection/Compiler/DoctrineProviderConfigurationCompilerPass.php b/src/DependencyInjection/Compiler/DoctrineProviderConfigurationCompilerPass.php
@@ -9,14 +9,15 @@
 use DH\Auditor\Provider\Doctrine\DoctrineProvider;
 use DH\Auditor\Provider\Doctrine\Service\AuditingService;
 use DH\Auditor\Provider\Doctrine\Service\StorageService;
+use DH\AuditorBundle\Tests\DependencyInjection\Compiler\DoctrineMiddlewareCompilerPassTest;
 use Doctrine\DBAL\Driver\Middleware;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
-/** @see \DH\AuditorBundle\Tests\DependencyInjection\Compiler\DoctrineMiddlewareCompilerPassTest */
+/** @see DoctrineMiddlewareCompilerPassTest */
 class DoctrineProviderConfigurationCompilerPass implements CompilerPassInterface
 {
     private bool $isDHMiddlewareSupported = false;

diff --git a/src/Helper/UrlHelper.php b/src/Helper/UrlHelper.php
@@ -4,8 +4,10 @@
 
 namespace DH\AuditorBundle\Helper;
 
+use DH\AuditorBundle\Tests\Helper\UrlHelperTest;
+
 /**
- * @see \DH\AuditorBundle\Tests\Helper\UrlHelperTest
+ * @see UrlHelperTest
  */
 abstract class UrlHelper
 {

diff --git a/tests/DependencyInjection/Compiler/CustomConfigurationCompilerPassTest.php b/tests/DependencyInjection/Compiler/CustomConfigurationCompilerPassTest.php
@@ -5,6 +5,10 @@
 namespace DH\AuditorBundle\Tests\DependencyInjection\Compiler;
 
 use DH\Auditor\Configuration;
+use DH\Auditor\Tests\Provider\Doctrine\Fixtures\Entity\Standard\Blog\Author;
+use DH\Auditor\Tests\Provider\Doctrine\Fixtures\Entity\Standard\Blog\Comment;
+use DH\Auditor\Tests\Provider\Doctrine\Fixtures\Entity\Standard\Blog\Post;
+use DH\Auditor\Tests\Provider\Doctrine\Fixtures\Entity\Standard\Blog\Tag;
 use DH\AuditorBundle\DependencyInjection\Compiler\AddProviderCompilerPass;
 use DH\AuditorBundle\DependencyInjection\Compiler\CustomConfigurationCompilerPass;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
@@ -36,16 +40,16 @@ public function testCompilerPass(): void
                         1 => 'updatedAt',
                     ],
                     'entities' => [
-                        \DH\Auditor\Tests\Provider\Doctrine\Fixtures\Entity\Standard\Blog\Author::class => [
+                        Author::class => [
                             'enabled' => true,
                         ],
-                        \DH\Auditor\Tests\Provider\Doctrine\Fixtures\Entity\Standard\Blog\Post::class => [
+                        Post::class => [
                             'enabled' => true,
                         ],
-                        \DH\Auditor\Tests\Provider\Doctrine\Fixtures\Entity\Standard\Blog\Comment::class => [
+                        Comment::class => [
                             'enabled' => true,
                         ],
-                        \DH\Auditor\Tests\Provider\Doctrine\Fixtures\Entity\Standard\Blog\Tag::class => [
+                        Tag::class => [
                             'enabled' => true,
                         ],
                     ],