Merge pull request #16 from tobias-93/api2.0

Update bundle to add support of Google API 2.0

Services/GoogleClient.php

@@ -27,8 +27,13 @@ public function __construct(array $config, LoggerInterface $symfonyLogger = null
 
         $client = new \Google_Client($config);
         if ($symfonyLogger) {
-            $googleLogger = new \Google_Logger_Psr($client, $symfonyLogger);
-            $client->setLogger($googleLogger);
+            //BC for Google API 1.0
+            if (class_exists('\Google_Logger_Psr')) {
+                $googleLogger = new \Google_Logger_Psr($client, $symfonyLogger);
+                $client->setLogger($googleLogger);
+            } else {
+                $client->setLogger($symfonyLogger);
+            }
         }
 
         $client -> setApplicationName($config['application_name']);

UPGRADING.md

@@ -0,0 +1,7 @@
+UPGRADING
+=========
+
+Upgrade from version 2.1.\* to 2.2.\*
+-------------------------------
+* Since version 2.2.\*, we support version 2.\* of the Google API. Although this doesn't change much to the API of this bundle, you should be aware that many things changed (including authentication) in the Google API. See https://github.com/google/google-api-php-client/blob/master/UPGRADING.md.
+If you do not want to upgrade, you should add the version constraint `"google/apiclient": "1.*"` to your `composer.json`.

composer.json

@@ -15,7 +15,7 @@
         "php": ">=5.3.2",
         "symfony/framework-bundle": "2.*|~3.0",
         "symfony/yaml": "2.*|~3.0",
-        "google/apiclient": "1.*"
+        "google/apiclient": "1.*|2.*"
     },
     "require-dev": {
         "mockery/mockery": "*"
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2.x-dev"
+            "dev-master": "2.3.x-dev"
         }
     }    
 }