Merge 3.x into master

sonata-project · Jul 6, 2019 · d6bc1fc · d6bc1fc
2 parents 6291085 + a94cc70
commit d6bc1fc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/src/Controller/HelperController.php b/src/Controller/HelperController.php
@@ -44,7 +44,7 @@
 class HelperController
 {
     /**
-     * @var \Twig_Environment
+     * @var Environment
      */
     protected $twig;
 

diff --git a/tests/Controller/CRUDControllerTest.php b/tests/Controller/CRUDControllerTest.php
@@ -59,6 +59,7 @@
 use Symfony\Component\Security\Csrf\CsrfToken;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
+use Twig\Environment;
 
 /**
  * Test for CRUDController.
@@ -195,7 +196,7 @@ protected function setUp(): void
 
         $this->session = new Session(new MockArraySessionStorage());
 
-        $twig = $this->getMockBuilder(\Twig_Environment::class)
+        $twig = $this->getMockBuilder(Environment::class)
             ->disableOriginalConstructor()
             ->getMock();
 

diff --git a/tests/Form/Widget/BaseWidgetTest.php b/tests/Form/Widget/BaseWidgetTest.php
@@ -17,6 +17,7 @@
 use Symfony\Bridge\Twig\Extension\TranslationExtension;
 use Symfony\Bridge\Twig\Form\TwigRendererEngine;
 use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTranslator;
+use Twig\Environment;
 
 /**
  * Base class for tests checking rendering of form widgets with form_admin_fields.html.twig and
@@ -66,7 +67,7 @@ protected function getEnvironment()
     /**
      * {@inheritdoc}
      */
-    protected function getRenderingEngine(\Twig_Environment $environment = null)
+    protected function getRenderingEngine(Environment $environment = null)
     {
         if (!\in_array($this->type, ['form', 'filter'], true)) {
             throw new \Exception('Please override $this->type in your test class specifying template to use (either form or filter)');

diff --git a/tests/Menu/Integration/BaseMenuTest.php b/tests/Menu/Integration/BaseMenuTest.php
@@ -20,6 +20,7 @@
 use Symfony\Bridge\Twig\Extension\TranslationExtension;
 use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
 use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTranslator;
+use Twig\Environment;
 
 /**
  * Base class for tests checking rendering of twig templates.
@@ -39,7 +40,7 @@ public function setUp(): void
         ], 'is_dir');
 
         $loader = new StubFilesystemLoader($twigPaths);
-        $this->environment = new \Twig_Environment($loader, ['strict_variables' => true]);
+        $this->environment = new Environment($loader, ['strict_variables' => true]);
     }
 
     abstract protected function getTemplate();

diff --git a/tests/Twig/Extension/SonataAdminExtensionTest.php b/tests/Twig/Extension/SonataAdminExtensionTest.php
@@ -40,6 +40,7 @@
 use Symfony\Component\Translation\MessageSelector;
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Translation\TranslatorInterface;
+use Twig\Environment;
 
 /**
  * Test for SonataAdminExtension.
@@ -54,7 +55,7 @@ class SonataAdminExtensionTest extends TestCase
     private $twigExtension;
 
     /**
-     * @var \Twig_Environment
+     * @var Environment
      */
     private $environment;
 
@@ -178,7 +179,7 @@ class_exists(TranslationDumperPass::class) ? null : new MessageSelector()
         ]);
         $loader->addPath(__DIR__.'/../../../src/Resources/views/', 'SonataAdmin');
 
-        $this->environment = new \Twig_Environment($loader, [
+        $this->environment = new Environment($loader, [
             'strict_variables' => true,
             'cache' => false,
             'autoescape' => 'html',