Merge branch 'jean-gui-master'

misd-service-development · Aug 22, 2016 · 21e4f76 · 21e4f76
2 parents ddce0d8 + 1e9bcf6
commit 21e4f76
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/Tests/AbstractTestCase.php b/Tests/AbstractTestCase.php
@@ -38,7 +38,6 @@ protected function getContainer(array $config = array(), KernelInterface $kernel
         $container->setParameter('kernel.cache_dir', sys_get_temp_dir() . '/linkify');
         $container->setParameter('kernel.bundles', array());
         $container->setParameter('kernel.root_dir', __DIR__ . '/Fixtures');
-        $container->set('service_container', $container);
 
         $container->registerExtension($extension);
         $extension->load($config, $container);

diff --git a/Tests/Twig/Extension/LinkifyTwigExtensionTest.php b/Tests/Twig/Extension/LinkifyTwigExtensionTest.php
@@ -13,6 +13,7 @@
 
 use Misd\LinkifyBundle\Tests\AbstractTestCase;
 use Misd\LinkifyBundle\Twig\Extension\LinkifyTwigExtension;
+use Twig_SimpleFilter;
 
 class LinkifyTwigExtensionTest extends AbstractTestCase
 {
@@ -36,8 +37,11 @@ public function testFilters()
 
         $filters = $extension->getFilters();
 
-        $this->assertArrayHasKey('linkify', $filters);
-        $this->assertInstanceOf('Twig_Filter_Method', $filters['linkify']);
+        $linkifyFilters = array_filter($filters, function (Twig_SimpleFilter $filter) {
+            return $filter->getName() === 'linkify';
+        });
+
+        $this->assertCount(1, $linkifyFilters);
     }
 
     public function testLinkify()

diff --git a/Twig/Extension/LinkifyTwigExtension.php b/Twig/Extension/LinkifyTwigExtension.php
@@ -12,7 +12,7 @@
 namespace Misd\LinkifyBundle\Twig\Extension;
 
 use Twig_Extension;
-use Twig_Filter_Method;
+use Twig_SimpleFilter;
 use Misd\LinkifyBundle\Helper\LinkifyHelper;
 
 /**
@@ -41,7 +41,7 @@ public function __construct(LinkifyHelper $helper)
     public function getFilters()
     {
         return array(
-            'linkify' => new Twig_Filter_Method($this, 'linkify', array(
+            new Twig_SimpleFilter('linkify', array($this, 'linkify'), array(
                 'pre_escape' => 'html',
                 'is_safe' => array('html')
             )),

diff --git a/composer.json b/composer.json
@@ -16,15 +16,16 @@
     },
     "require": {
         "php": "^5.3.3 || ^7.0",
-        "symfony/framework-bundle": "^2.1",
+        "symfony/framework-bundle": "^2.1 || ^3.0",
         "misd/linkify": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.0 || ^5.0",
-        "symfony/twig-bundle": "^2.1"
+        "symfony/twig-bundle": "^2.1 || ^3.0"
     },
     "conflict": {
-        "phpunit/phpunit-mock-objects": "<2.2"
+        "phpunit/phpunit-mock-objects": "<2.2",
+        "twig/twig": "<1.23"
     },
     "suggest": {
         "symfony/twig-bundle": "to use the Twig linkify filter"