From edc1c6cbd14620621a41d2e4f0d861eed24ec6bf Mon Sep 17 00:00:00 2001
From: Tobias Feijten <tobias@kick-in.nl>
Date: Wed, 10 Feb 2016 21:58:13 +0100
Subject: [PATCH] Add symfony3 compatibility and update Travis checks

---
 .travis.yml                   | 6 ++++++
 Resources/config/services.yml | 8 ++++----
 composer.json                 | 7 +++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 77d57be..5fe30da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,12 @@ matrix:
       env: SYMFONY_VERSION=2.5.*
     - php: 5.5
       env: SYMFONY_VERSION=dev-master
+    - php: 5.5
+      env: SYMFONY_VERSION=2.8.*
+    - php: 5.5
+      env: SYMFONY_VERSION=3.0.*
+    - php: 7.0
+      env: SYMFONY_VERSION=3.0.*
 
 
 
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index 3e02642..b5d59ff 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -1,18 +1,18 @@
 services:
     happyr.google.api.client:
         class: HappyR\Google\ApiBundle\Services\GoogleClient
-        arguments: [%happy_r_google_api%, @?logger]
+        arguments: ["%happy_r_google_api%", "@?logger"]
         tags:
             - { name: monolog.logger, channel: google_client }
 
     happyr.google.api.analytics:
         class: HappyR\Google\ApiBundle\Services\AnalyticsService
-        arguments: [@happyr.google.api.client]
+        arguments: ["@happyr.google.api.client"]
     
     happyr.google.api.youtube:
         class: HappyR\Google\ApiBundle\Services\YoutubeService
-        arguments: [@happyr.google.api.client]
+        arguments: ["@happyr.google.api.client"]
 
     happyr.google.api.groups_migration:
         class: HappyR\Google\ApiBundle\Services\GroupsMigrationService
-        arguments: [@happyr.google.api.client]
+        arguments: ["@happyr.google.api.client"]
diff --git a/composer.json b/composer.json
index 5b89cfe..960fb8d 100644
--- a/composer.json
+++ b/composer.json
@@ -13,17 +13,16 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": "2.*",
-        "symfony/yaml": "2.*",
+        "symfony/framework-bundle": "2.*|~3.0",
+        "symfony/yaml": "2.*|~3.0",
         "google/apiclient": "1.*"
     },
     "require-dev": {
         "mockery/mockery": "*"
     },
     "autoload": {
-        "psr-0": { "HappyR\\Google\\ApiBundle": "" }
+        "psr-4": { "HappyR\\Google\\ApiBundle\\": "" }
     },
-    "target-dir": "HappyR/Google/ApiBundle",
     "extra": {
         "branch-alias": {
             "dev-master": "2.2.x-dev"