From 59bf66288674d4b38001ce36878c4f333b0269ca Mon Sep 17 00:00:00 2001
From: Tchama <mat@collectifs.net>
Date: Thu, 16 Jul 2020 15:51:05 +0200
Subject: [PATCH] fix sf4 deprecated getting private container

---
 Resources/config/services.yml                |  2 ++
 Templating/Twig/CustomFieldRenderingTwig.php | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index 0d99d6623..e1822e2cb 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -108,6 +108,8 @@ services:
 
     chill.custom_field.twig.custom_fields_rendering:
         class: Chill\CustomFieldsBundle\Templating\Twig\CustomFieldRenderingTwig
+        arguments:
+            - "@chill.custom_field.helper"
         calls:
             - [setContainer, ["@service_container"]]
         tags:
diff --git a/Templating/Twig/CustomFieldRenderingTwig.php b/Templating/Twig/CustomFieldRenderingTwig.php
index a43d7dc26..a802e331c 100644
--- a/Templating/Twig/CustomFieldRenderingTwig.php
+++ b/Templating/Twig/CustomFieldRenderingTwig.php
@@ -22,6 +22,7 @@
 
 namespace Chill\CustomFieldsBundle\Templating\Twig;
 
+use Chill\CustomFieldsBundle\Service\CustomFieldsHelper;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Container;
@@ -45,6 +46,16 @@ class CustomFieldRenderingTwig extends \Twig_Extension implements ContainerAware
         'label_layout' => 'ChillCustomFieldsBundle:CustomField:render_label.html.twig'
     );
     
+    /**
+     * @var CustomFieldsHelper
+     */
+    private $customFieldsHelper;
+    
+    public function __construct(CustomFieldsHelper $customFieldsHelper)
+    {
+        $this->customFieldsHelper = $customFieldsHelper;
+    }
+    
     /*
      * (non-PHPdoc)
      * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
@@ -87,7 +98,7 @@ class CustomFieldRenderingTwig extends \Twig_Extension implements ContainerAware
     
     public function isEmptyValue($fields, CustomField $customField)
     {
-        return $this->container->get('chill.custom_field.helper')
+        return $this->customFieldsHelper
             ->isEmptyValue($fields, $customField);
     }