Symfony 4 support (#18)

Author: jschroed91

composer.json

@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": ">=5.3.9",
-        "symfony/framework-bundle": "~2.3||3.*",
+        "symfony/framework-bundle": "~2.3||3.*||4.*",
         "caxy/php-htmldiff": "~0.1"
     },
     "require-dev": {

src/Resources/config/services.yml

@@ -7,12 +7,15 @@ services:
     caxy.html_diff.config:
         class: "%caxy.html_diff.config.class%"
         factory: ["%caxy.html_diff.config.class%", create]
+        public: true
     caxy.html_diff:
         class: "%caxy.html_diff.class%"
+        public: true
         calls:
             - [setConfig, ["@caxy.html_diff.config"]]
     caxy.twig.html_diff_extension:
         class: "%caxy.twig.html_diff_extension.class%"
-        arguments: ["@service_container"]
+        arguments: ["@caxy.html_diff"]
+        public: true
         tags:
             - { name: twig.extension }

src/Twig/HtmlDiffExtension.php

@@ -2,24 +2,23 @@
 
 namespace Caxy\HtmlDiffBundle\Twig;
 
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Caxy\HtmlDiffBundle\Service\HtmlDiffService;
 
 class HtmlDiffExtension extends \Twig_Extension
 {
     protected $container;
 
     protected $htmlDiff;
 
-    public function __construct(ContainerInterface $container)
+    public function __construct(HtmlDiffService $htmlDiff)
     {
-        $this->container = $container;
-        $this->htmlDiff = $this->container->get('caxy.html_diff');
+        $this->htmlDiff = $htmlDiff;
     }
 
     public function getFunctions()
     {
         return array(
-            new \Twig_SimpleFunction('htmldiff', array($this, 'htmlDiff')),
+            new \Twig_SimpleFunction('htmldiff', array($this, 'htmlDiff'), array('is_safe' => array('html'))),
         );
     }