Merge pull request #82 from Zales0123/fix-deprecations

Replace deprecated EngineInterface with Environment

Author: maximehuran

src/Controller/SearchController.php

@@ -27,14 +27,14 @@
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Templating\EngineInterface;
+use Twig\Environment;
 
 class SearchController extends AbstractController
 {
     public const SORT_ASC = 'asc';
     public const SORT_DESC = 'desc';
 
-    /** @var EngineInterface */
+    /** @var Environment */
     private $templatingEngine;
 
     /** @var Search */
@@ -55,19 +55,8 @@ class SearchController extends AbstractController
     /** @var RenderDocumentUrlHelper */
     private $renderDocumentUrlHelper;
 
-    /**
-     * SearchController constructor.
-     *
-     * @param EngineInterface $templatingEngine
-     * @param Search $documentSearch
-     * @param ChannelContextInterface $channelContext
-     * @param CurrencyContextInterface $currencyContext
-     * @param TaxonContextInterface $taxonContext
-     * @param GridConfig $gridConfig
-     * @param RenderDocumentUrlHelper $renderDocumentUrlHelper
-     */
     public function __construct(
-        EngineInterface $templatingEngine,
+        Environment $templatingEngine,
         Search $documentSearch,
         ChannelContextInterface $channelContext,
         CurrencyContextInterface $currencyContext,
@@ -138,15 +127,15 @@ public function searchAction(Request $request): Response
         $formatter = new \NumberFormatter($request->getLocale() . '@currency=' . $currencyCode, \NumberFormatter::CURRENCY);
 
         // Display result list
-        return $this->templatingEngine->renderResponse('@MonsieurBizSyliusSearchPlugin/Search/result.html.twig', [
+        return new Response($this->templatingEngine->render('@MonsieurBizSyliusSearchPlugin/Search/result.html.twig', [
             'query' => $this->gridConfig->getQuery(),
             'limits' => $this->gridConfig->getLimits(),
             'resultSet' => $resultSet,
             'channel' => $this->channelContext->getChannel(),
             'currencyCode' => $this->currencyContext->getCurrencyCode(),
             'moneySymbol' => $formatter->getSymbol(\NumberFormatter::CURRENCY_SYMBOL),
             'gridConfig' => $this->gridConfig,
-        ]);
+        ]));
     }
 
     /**
@@ -166,13 +155,13 @@ public function instantAction(Request $request): Response
         $resultSet = $this->documentSearch->instant($this->gridConfig);
 
         // Display instant result list
-        return $this->templatingEngine->renderResponse('@MonsieurBizSyliusSearchPlugin/Instant/result.html.twig', [
+        return new Response($this->templatingEngine->render('@MonsieurBizSyliusSearchPlugin/Instant/result.html.twig', [
             'query' => $this->gridConfig->getQuery(),
             'resultSet' => $resultSet,
             'channel' => $this->channelContext->getChannel(),
             'currencyCode' => $this->currencyContext->getCurrencyCode(),
             'gridConfig' => $this->gridConfig,
-        ]);
+        ]));
     }
 
     /**
@@ -196,14 +185,14 @@ public function taxonAction(Request $request): Response
         $formatter = new \NumberFormatter($request->getLocale() . '@currency=' . $currencyCode, \NumberFormatter::CURRENCY);
 
         // Display result list
-        return $this->templatingEngine->renderResponse('@MonsieurBizSyliusSearchPlugin/Taxon/result.html.twig', [
+        return new Response($this->templatingEngine->render('@MonsieurBizSyliusSearchPlugin/Taxon/result.html.twig', [
             'taxon' => $this->gridConfig->getTaxon(),
             'limits' => $this->gridConfig->getLimits(),
             'resultSet' => $resultSet,
             'channel' => $this->channelContext->getChannel(),
             'currencyCode' => $this->currencyContext->getCurrencyCode(),
             'moneySymbol' => $formatter->getSymbol(\NumberFormatter::CURRENCY_SYMBOL),
             'gridConfig' => $this->gridConfig,
-        ]);
+        ]));
     }
 }

src/Twig/Extension/RenderSearchForm.php

@@ -16,21 +16,27 @@
 use MonsieurBiz\SyliusSearchPlugin\Form\Type\SearchType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Templating\EngineInterface;
+use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\Markup;
 use Twig\TwigFunction;
 
 class RenderSearchForm extends AbstractExtension
 {
+    /** @var FormFactoryInterface */
     private $formFactory;
 
+    /** @var Environment */
     private $templatingEngine;
 
+    /** @var RequestStack */
     private $requestStack;
 
-    public function __construct(FormFactoryInterface $formFactory, EngineInterface $templatingEngine, RequestStack $requestStack)
-    {
+    public function __construct(
+        FormFactoryInterface $formFactory,
+        Environment $templatingEngine,
+        RequestStack $requestStack
+    ) {
         $this->formFactory = $formFactory;
         $this->templatingEngine = $templatingEngine;
         $this->requestStack = $requestStack;