Merge pull request #1 from bluetel/ez3

Ez3

Author: tomaske

composer.json

@@ -13,12 +13,13 @@
         "psr-4": {"spec\\Inviqa\\EzTextEnhancerBundle\\": "spec"}
     },
     "require": {
-        "php": "~5.5|~7.0",
-        "symfony/framework-bundle": "^2.8",
-        "symfony/twig-bundle": "^2.8",
-        "ezsystems/ezpublish-kernel": "^6.5"
+        "php": "^7.4",
+        "symfony/framework-bundle": "^5.0",
+        "symfony/twig-bundle": "^5.0",
+        "ezsystems/ezplatform-kernel": "~1.1.2",
+        "ezsystems/ezplatform-richtext": "~2.1.1"
     },
     "require-dev": {
-        "phpspec/phpspec": "^3.1"
+        "phpspec/phpspec": "^6.3.0"
     }
 }

spec/Twig/TwigTextEnhancerExtensionSpec.php

@@ -2,12 +2,13 @@
 
 namespace spec\Inviqa\EzTextEnhancerBundle\Twig;
 
-use eZ\Publish\Core\FieldType\RichText\Converter;
+use EzSystems\EzPlatformRichText\eZ\RichText\Converter;
 use Inviqa\EzTextEnhancerBundle\TextEnhancer;
 use Inviqa\EzTextEnhancerBundle\Twig\TwigTextEnhancerExtension;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Twig\TwigFilter;
 
 class TwigTextEnhancerExtensionSpec extends ObjectBehavior
 {
@@ -49,7 +50,7 @@ function it_converts_the_text_and_then_it_enhances_it_if_DOMDocument_is_received
         $this->enhanceText($inputDocument)->shouldReturn('<p>my <strong>enhanced</strong> text</p>');
     }
 
-    public function getMatchers()
+    public function getMatchers(): array
     {
         return [
             'returnTheFilters' => function ($filters, $expected)
@@ -63,7 +64,7 @@ public function getMatchers()
                 }
 
                 for ($i = 0; $i < count($filters); $i++) {
-                    if (!$filters[$i] instanceof \Twig_SimpleFilter) {
+                    if (!$filters[$i] instanceof TwigFilter) {
                         return false;
                     }
 

src/Resources/config/services.xml

@@ -6,12 +6,13 @@
 
     <services>
         <service id="inviqa.text_enhancer.chain_text_enhancer"
-                 class="Inviqa\EzTextEnhancerBundle\TextEnhancer\ChainTextEnhancer">
+                 class="Inviqa\EzTextEnhancerBundle\TextEnhancer\ChainTextEnhancer"
+                 public="true">
         </service>
 
         <service id="inviqa.text_enhancer.twig_extension"
                  class="Inviqa\EzTextEnhancerBundle\Twig\TwigTextEnhancerExtension">
-            <argument type="service" id="ezpublish.fieldtype.ezrichtext.converter.output.xhtml5" />
+            <argument type="service" id="ezrichtext.converter.output.xhtml5.core" />
             <argument type="service" id="service_container" />
             <tag name="twig.extension" />
         </service>

src/Twig/TwigTextEnhancerExtension.php

@@ -2,9 +2,11 @@
 
 namespace Inviqa\EzTextEnhancerBundle\Twig;
 
-use eZ\Publish\Core\FieldType\RichText\Converter;
+use EzSystems\EzPlatformRichText\eZ\RichText\Converter;
 use Inviqa\EzTextEnhancerBundle\TextEnhancer;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
 
 /**
  * Unfortunately, Twig extensions (like that one) are attached to the twig service. The drawback of this situation
@@ -16,7 +18,7 @@
  * expect many dependencies, we prefer to keep the "dirty" solution in a single place. THIS IS WHY THIS SERVICE REQUIRES
  * THE CONTAINER.
  */
-final class TwigTextEnhancerExtension extends \Twig_Extension
+final class TwigTextEnhancerExtension extends AbstractExtension
 {
     const TEXT_ENHANCER_SERVICE_ID = 'inviqa.text_enhancer.chain_text_enhancer';
 
@@ -64,7 +66,7 @@ public function getName()
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('enhance_text', [$this, 'enhanceText'], ['is_safe' => ['all']]),
+            new TwigFilter('enhance_text', [$this, 'enhanceText'], ['is_safe' => ['all']]),
         ];
     }