Fix Circular reference (#68)

FriendsOfSymfony · Apr 30, 2018 · b6d628d · b6d628d
1 parent 8ebaed1
commit b6d628d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Renderer/CKEditorRenderer.php b/src/Renderer/CKEditorRenderer.php
@@ -62,7 +62,7 @@ class CKEditorRenderer implements CKEditorRendererInterface
      * @param EngineInterface                $templating
      * @param null|string                    $locale
      */
-    public function __construct($containerOrJsonBuilder, RouterInterface $router = null, Packages $packages = null, RequestStack $requestStack = null, EngineInterface
+    public function __construct($containerOrJsonBuilder, RouterInterface $router = null, Packages $packages = null, RequestStack $requestStack = null,
     $templating = null, $locale = null)
     {
         if ($containerOrJsonBuilder instanceof ContainerInterface) {
@@ -71,7 +71,7 @@ public function __construct($containerOrJsonBuilder, RouterInterface $router = n
             $router = $containerOrJsonBuilder->get('router');
             $packages = $containerOrJsonBuilder->get('assets.packages');
             $requestStack = $containerOrJsonBuilder->get('request_stack');
-            $templating = $containerOrJsonBuilder->get('templating');
+            $templating = $containerOrJsonBuilder->has('twig') ? $containerOrJsonBuilder->get('twig') : $containerOrJsonBuilder->get('templating');
         } elseif ($containerOrJsonBuilder instanceof JsonBuilder) {
             $jsonBuilder = $containerOrJsonBuilder;
             if ($router === null) {

diff --git a/src/Resources/config/renderer.xml b/src/Resources/config/renderer.xml
@@ -10,7 +10,7 @@
             <argument type="service" id="router"/>
             <argument type="service" id="assets.packages" on-invalid="null"/>
             <argument type="service" id="request_stack"/>
-            <argument type="service" id="templating" on-invalid="null"/>
+            <argument type="expression">container.has('twig') ? container.get('twig') : container.get('templating')</argument>
             <argument type="expression">container.hasParameter('locale') ? parameter('locale') : null</argument>
         </service>