Merge pull request #28 from ivan1986/master

Update for symfony 5

Author: wtfzdotnet

.travis.yml

@@ -2,7 +2,8 @@ sudo: false
 language: php
 
 php:
-  - 5.5
+  - 7.3
+  - 7.4
   - nightly
   - hhvm
 
@@ -20,46 +21,15 @@ script: vendor/bin/phpunit --verbose
 
 matrix:
   include:
-    - php: 5.6
-      env: [SYMFONY_VERSION="2.7.*", SYMFONY_EVENT_DISPATCHER_VERSION="2.7.*"]
-    - php: 5.6
-      env: [SYMFONY_VERSION="2.8.*", SYMFONY_EVENT_DISPATCHER_VERSION="2.8.*"]
-    - php: 5.6
-      env: [SYMFONY_VERSION="3.0.*", SYMFONY_EVENT_DISPATCHER_VERSION="3.0.*"]
-    - php: 5.6
-      env: [SYMFONY_VERSION="3.1.*", SYMFONY_EVENT_DISPATCHER_VERSION="3.1.*"]
-    - php: 5.6
-      env: [SYMFONY_VERSION="3.2.*", SYMFONY_EVENT_DISPATCHER_VERSION="3.2.*"]
-    - php: 5.6
-      env: [SYMFONY_VERSION="^3.3", SYMFONY_EVENT_DISPATCHER_VERSION="^3.3"]
-
-    - php: 7.0
-      env: [SYMFONY_VERSION="2.7.*", SYMFONY_EVENT_DISPATCHER_VERSION="2.7.*"]
-    - php: 7.0
-      env: [SYMFONY_VERSION="2.8.*", SYMFONY_EVENT_DISPATCHER_VERSION="2.8.*"]
-    - php: 7.0
-      env: [SYMFONY_VERSION="3.0.*", SYMFONY_EVENT_DISPATCHER_VERSION="3.0.*"]
-    - php: 7.0
-      env: [SYMFONY_VERSION="3.1.*", SYMFONY_EVENT_DISPATCHER_VERSION="3.1.*"]
-    - php: 7.0
-      env: [SYMFONY_VERSION="3.2.*", SYMFONY_EVENT_DISPATCHER_VERSION="3.2.*"]
-    - php: 7.0
-      env: [SYMFONY_VERSION="^3.3", SYMFONY_EVENT_DISPATCHER_VERSION="^3.3"]
-
-    - php: 7.1
-      env: [SYMFONY_VERSION="2.7.*", SYMFONY_EVENT_DISPATCHER_VERSION="2.7.*"]
-    - php: 7.1
-      env: [SYMFONY_VERSION="2.8.*", SYMFONY_EVENT_DISPATCHER_VERSION="2.8.*"]
-    - php: 7.1
-      env: [SYMFONY_VERSION="3.0.*", SYMFONY_EVENT_DISPATCHER_VERSION="3.0.*"]
-    - php: 7.1
-      env: [SYMFONY_VERSION="3.1.*", SYMFONY_EVENT_DISPATCHER_VERSION="3.1.*"]
-    - php: 7.1
-      env: [SYMFONY_VERSION="3.2.*", SYMFONY_EVENT_DISPATCHER_VERSION="3.2.*"]
-    - php: 7.1
-      env: [SYMFONY_VERSION="^3.3", SYMFONY_EVENT_DISPATCHER_VERSION="^3.3"]
-    - php: 7.1
-      env: [SYMFONY_VERSION="^4.0", SYMFONY_EVENT_DISPATCHER_VERSION="^4.0"]
+    - php: 7.3
+      env: [SYMFONY_VERSION="^4.4", SYMFONY_EVENT_DISPATCHER_VERSION="^4.4"]
+    - php: 7.3
+      env: [SYMFONY_VERSION="^5.0", SYMFONY_EVENT_DISPATCHER_VERSION="^5.0"]
+
+    - php: 7.4
+      env: [SYMFONY_VERSION="^4.4", SYMFONY_EVENT_DISPATCHER_VERSION="^4.4"]
+    - php: 7.4
+      env: [SYMFONY_VERSION="^5.0", SYMFONY_EVENT_DISPATCHER_VERSION="^5.0"]
 
   allow_failures:
     - php: nightly

DependencyInjection/Configuration.php

@@ -18,8 +18,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('tmdb_symfony');
+        $treeBuilder = new TreeBuilder('tmdb_symfony');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()

Tests/DependencyInjection/TmdbSymfonyExtensionTest.php

@@ -2,7 +2,7 @@
 
 namespace Tmdb\SymfonyBundle\Tests\DependencyInjection;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Container;
 use Tmdb\SymfonyBundle\Tests\TestKernel;
 

Twig/TmdbExtension.php

@@ -3,10 +3,11 @@
 
 use Tmdb\Client;
 use Tmdb\Helper\ImageHelper;
-use Tmdb\Model\Image;
 use Tmdb\Repository\ConfigurationRepository;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
 
-class TmdbExtension extends \Twig_Extension
+class TmdbExtension extends AbstractExtension
 {
     /**
      * @var ImageHelper|null
@@ -26,8 +27,8 @@ public function __construct(Client $client)
     public function getFilters()
     {
         return array(
-            new \Twig_SimpleFilter('tmdb_image_html', array($this, 'getHtml')),
-            new \Twig_SimpleFilter('tmdb_image_url', array($this, 'getUrl')),
+            new TwigFilter('tmdb_image_html', array($this, 'getHtml')),
+            new TwigFilter('tmdb_image_url', array($this, 'getUrl')),
         );
     }
 

composer.json

@@ -14,17 +14,17 @@
     ],
     "require": {
         "php": ">=5.5.0",
-        "symfony/config": ">=2.7,<5",
-        "symfony/dependency-injection": ">=2.7,<5",
-        "symfony/event-dispatcher": ">=2.7,<5",
-        "symfony/http-kernel": ">=2.7,<5",
-        "doctrine/doctrine-cache-bundle": "^1.0",
-        "php-tmdb/api": "^2.1",
-        "twig/twig": "^1.11|^2.0"
+        "symfony/config": "^4.3.7 || ^5.0",
+        "symfony/dependency-injection": "^4.3.7 || ^5.0",
+        "symfony/event-dispatcher": "^4.3.7 || ^5.0",
+        "symfony/http-kernel": "^4.3.7 || ^5.0",
+        "symfony/yaml": "^4.3.7 || ^5.0",
+        "php-tmdb/api": "^3.0",
+        "twig/twig": "^2.0|^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8||^5.0,<5.4",
-        "symfony/framework-bundle": ">=2.7,<5"
+        "phpunit/phpunit": ">=5.7",
+        "symfony/framework-bundle": "^4.3.7 || ^5.0"
     },
     "autoload": {
         "psr-4": { "Tmdb\\SymfonyBundle\\": "" }