Merge branch '2.0' into 2.1

 Conflicts:
	.travis.yml

Author: yukoff

.travis.yml

@@ -26,6 +26,11 @@ matrix:
       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
@@ -34,14 +39,24 @@ matrix:
       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.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.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"]
+
   allow_failures:
     - php: nightly
   fast_finish: true

Resources/config/repositories.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
         <parameter key="tmdb.authentication_repository.class">Tmdb\Repository\AuthenticationRepository</parameter>

Resources/config/services.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
         <!-- Options parameters -->
@@ -26,7 +26,7 @@
         </service>
 
         <service id="tmdb.configuration" class="%tmdb.client_configuration.class%" public="false">
-            <argument key="event_dispatcher" type="service" id="event_dispatcher" />
+            <argument type="service" id="event_dispatcher" />
             <argument>%tmdb.options%</argument>
 
             <call method="setCacheHandler">

Resources/config/twig.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
         <parameter key="tmdb.twig.image_extension.class">Tmdb\SymfonyBundle\Twig\TmdbExtension</parameter>