Fix conflict with class names

sonata-project · Aug 9, 2020 · 1b2c249 · 1b2c249
1 parent 70e3aa2
commit 1b2c249
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^7.2",
-        "sonata-project/doctrine-extensions": "^1.5",
+        "sonata-project/doctrine-extensions": "^1.9",
         "symfony/config": "^4.4 || ^5.1",
         "symfony/translation": "^4.4 || ^5.1",
         "symfony/twig-bridge": "^4.4 || ^5.1",

diff --git a/src/Bridge/Symfony/Bundle/SonataTwigBundle.php b/src/Bridge/Symfony/Bundle/SonataTwigBundle.php
@@ -13,13 +13,13 @@
 
 namespace Sonata\Twig\Bridge\Symfony\Bundle;
 
-use Sonata\Twig\Bridge\Symfony\SonataTwigBundle;
+use Sonata\Twig\Bridge\Symfony\SonataTwigBundle as ForwardCompatibleSonataTwigBundle;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 @trigger_error(sprintf(
     'The %s\SonataTwigBundle class is deprecated since version 1.4, to be removed in 2.0. Use %s instead.',
     __NAMESPACE__,
-    SonataTwigBundle::class
+    ForwardCompatibleSonataTwigBundle::class
 ), E_USER_DEPRECATED);
 
 if (false) {
@@ -35,4 +35,4 @@ final class SonataTwigBundle extends Bundle
     }
 }
 
-class_alias(SonataTwigBundle::class, __NAMESPACE__.'\SonataTwigBundle');
+class_alias(ForwardCompatibleSonataTwigBundle::class, __NAMESPACE__.'\SonataTwigBundle');
diff --git a/tests/App/AppKernel.php b/tests/App/AppKernel.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\Twig\Tests\App;
 
-use Sonata\Doctrine\Bridge\Symfony\Bundle\SonataDoctrineBundle;
+use Sonata\Doctrine\Bridge\Symfony\SonataDoctrineBundle;
 use Sonata\Twig\Bridge\Symfony\SonataTwigBundle;
 use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;