Updated Google SDK #176

Also removed unnecessary google serveces.

Author: Md. Alimuzzaman Alim

lib/Google/.gitattributes

@@ -0,0 +1,9 @@
+/.github export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/CONTRIBUTING.md export-ignore
+/examples export-ignore
+/phpunit.xml.dist export-ignore
+/style export-ignore
+/tests export-ignore
+/UPGRADING.md export-ignore

lib/Google/README.md

@@ -2,13 +2,13 @@
 
 # Google APIs Client Library for PHP #
 
-> ### NOTE: If you arrived here from `developers.google.com`, you should be using the [v1-branch](https://github.com/google/google-api-php-client/tree/v1-master) of this repo
-
-## Description ##
 The Google API Client Library enables you to work with Google APIs such as Google+, Drive, or YouTube on your server.
 
-## Beta ##
-This library is in Beta. We're comfortable enough with the stability and features of the library that we want you to build real production applications on it. We will make an effort to support the public and protected surface of the library and maintain backwards compatibility in the future. While we are still in Beta, we reserve the right to make incompatible changes. If we do remove some functionality (typically because better functionality exists or if the feature proved infeasible), our intention is to deprecate and provide ample time for developers to update their code.
+These client libraries are officially supported by Google.  However, the libraries are considered complete and are in maintenance mode. This means that we will address critical bugs and security issues but will not add any new features.
+
+## Google Cloud Platform
+
+For Google Cloud Platform APIs such as Datastore, Cloud Storage or Pub/Sub, we recommend using [GoogleCloudPlatform/google-cloud-php](https://github.com/GoogleCloudPlatform/google-cloud-php) which is under active development.
 
 ## Requirements ##
 * [PHP 5.4.0 or higher](http://www.php.net/)
@@ -18,7 +18,7 @@ http://developers.google.com/api-client-library/php
 
 ## Installation ##
 
-You can use **Composer** or simply **Download the Release** 
+You can use **Composer** or simply **Download the Release**
 
 ### Composer
 
@@ -29,7 +29,7 @@ composer installed.
 Once composer is installed, execute the following command in your project root to install this library:
 
 ```sh
-composer require google/apiclient:^2.0.0@RC
+composer require google/apiclient:^2.0
 ```
 
 Finally, be sure to include the autoloader:
@@ -51,8 +51,8 @@ require_once '/path/to/google-api-php-client/vendor/autoload.php';
 
 For additional installation and setup instructions, see [the documentation](https://developers.google.com/api-client-library/php/start/installation).
 
-## Basic Example ##
-See the examples/ directory for examples of the key client features. You can
+## Examples ##
+See the [`examples/`](examples) directory for examples of the key client features. You can
 view them in your browser by running the php built-in web server.
 
 ```
@@ -62,7 +62,9 @@ $ php -S localhost:8000 -t examples/
 And then browsing to the host and port you specified
 (in the above example, `http://localhost:8000`).
 
-```PHP
+### Basic Example ###
+
+```php
 // include your composer dependencies
 require_once 'vendor/autoload.php';
 
@@ -79,21 +81,253 @@ foreach ($results as $item) {
 }
 ```
 
+### Authentication with OAuth ###
+
+> An example of this can be seen in [`examples/simple-file-upload.php`](examples/simple-file-upload.php).
+
+1. Follow the instructions to [Create Web Application Credentials](https://developers.google.com/api-client-library/php/auth/web-app#creatingcred)
+1. Download the JSON credentials
+1. Set the path to these credentials using `Google_Client::setAuthConfig`:
+
+    ```php
+    $client = new Google_Client();
+    $client->setAuthConfig('/path/to/client_credentials.json');
+    ```
+
+1. Set the scopes required for the API you are going to call
+
+    ```php
+    $client->addScope(Google_Service_Drive::DRIVE);
+    ```
+
+1. Set your application's redirect URI
+
+    ```php
+    // Your redirect URI can be any registered URI, but in this example
+    // we redirect back to this same page
+    $redirect_uri = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
+    $client->setRedirectUri($redirect_uri);
+    ```
+
+1. In the script handling the redirect URI, exchange the authorization code for an access token:
+
+    ```php
+    if (isset($_GET['code'])) {
+        $token = $client->fetchAccessTokenWithAuthCode($_GET['code']);
+    }
+    ```
+
+### Authentication with Service Accounts ###
+
+> An example of this can be seen in [`examples/service-account.php`](examples/service-account.php).
+
+Some APIs
+(such as the [YouTube Data API](https://developers.google.com/youtube/v3/)) do
+not support service accounts. Check with the specific API documentation if API
+calls return unexpected 401 or 403 errors.
+
+1. Follow the instructions to [Create a Service Account](https://developers.google.com/api-client-library/php/auth/service-accounts#creatinganaccount)
+1. Download the JSON credentials
+1. Set the path to these credentials using the `GOOGLE_APPLICATION_CREDENTIALS` environment variable:
+
+    ```php
+    putenv('GOOGLE_APPLICATION_CREDENTIALS=/path/to/service-account.json');
+    ```
+
+1. Tell the Google client to use your service account credentials to authenticate:
+
+    ```php
+    $client = new Google_Client();
+    $client->useApplicationDefaultCredentials();
+    ```
+
+1. Set the scopes required for the API you are going to call
+
+    ```php
+    $client->addScope(Google_Service_Drive::DRIVE);
+    ```
+
+1. If you have delegated domain-wide access to the service account and you want to impersonate a user account, specify the email address of the user account using the method setSubject:
+
+    ```php
+    $client->setSubject($user_to_impersonate);
+    ```
+
+### Making Requests ###
+
+The classes used to call the API in [google-api-php-client-services](https://github.com/Google/google-api-php-client-services) are autogenerated. They map directly to the JSON requests and responses found in the [APIs Explorer](https://developers.google.com/apis-explorer/#p/).
+
+A JSON request to the [Datastore API](https://developers.google.com/apis-explorer/#p/datastore/v1beta3/datastore.projects.runQuery) would look like this:
+
+```json
+POST https://datastore.googleapis.com/v1beta3/projects/YOUR_PROJECT_ID:runQuery?key=YOUR_API_KEY
+
+{
+    "query": {
+        "kind": [{
+            "name": "Book"
+        }],
+        "order": [{
+            "property": {
+                "name": "title"
+            },
+            "direction": "descending"
+        }],
+        "limit": 10
+    }
+}
+```
+
+Using this library, the same call would look something like this:
+
+```php
+// create the datastore service class
+$datastore = new Google_Service_Datastore($client);
+
+// build the query - this maps directly to the JSON
+$query = new Google_Service_Datastore_Query([
+    'kind' => [
+        [
+            'name' => 'Book',
+        ],
+    ],
+    'order' => [
+        'property' => [
+            'name' => 'title',
+        ],
+        'direction' => 'descending',
+    ],
+    'limit' => 10,
+]);
+
+// build the request and response
+$request = new Google_Service_Datastore_RunQueryRequest(['query' => $query]);
+$response = $datastore->projects->runQuery('YOUR_DATASET_ID', $request);
+```
+
+However, as each property of the JSON API has a corresponding generated class, the above code could also be written like this:
+
+```php
+// create the datastore service class
+$datastore = new Google_Service_Datastore($client);
+
+// build the query
+$request = new Google_Service_Datastore_RunQueryRequest();
+$query = new Google_Service_Datastore_Query();
+//   - set the order
+$order = new Google_Service_Datastore_PropertyOrder();
+$order->setDirection('descending');
+$property = new Google_Service_Datastore_PropertyReference();
+$property->setName('title');
+$order->setProperty($property);
+$query->setOrder([$order]);
+//   - set the kinds
+$kind = new Google_Service_Datastore_KindExpression();
+$kind->setName('Book');
+$query->setKinds([$kind]);
+//   - set the limit
+$query->setLimit(10);
+
+// add the query to the request and make the request
+$request->setQuery($query);
+$response = $datastore->projects->runQuery('YOUR_DATASET_ID', $request);
+```
+
+The method used is a matter of preference, but *it will be very difficult to use this library without first understanding the JSON syntax for the API*, so it is recommended to look at the [APIs Explorer](https://developers.google.com/apis-explorer/#p/) before using any of the services here.
+
+### Making HTTP Requests Directly ###
+
+If Google Authentication is desired for external applications, or a Google API is not available yet in this library, HTTP requests can be made directly.
+
+The `authorize` method returns an authorized [Guzzle Client](http://docs.guzzlephp.org/), so any request made using the client will contain the corresponding authorization.
+
+```php
+// create the Google client
+$client = new Google_Client();
+
+/**
+ * Set your method for authentication. Depending on the API, This could be
+ * directly with an access token, API key, or (recommended) using
+ * Application Default Credentials.
+ */
+$client->useApplicationDefaultCredentials();
+$client->addScope(Google_Service_Plus::PLUS_ME);
+
+// returns a Guzzle HTTP Client
+$httpClient = $client->authorize();
+
+// make an HTTP request
+$response = $httpClient->get('https://www.googleapis.com/plus/v1/people/me');
+```
+
+### Caching ###
+
+It is recommended to use another caching library to improve performance. This can be done by passing a [PSR-6](http://www.php-fig.org/psr/psr-6/) compatible library to the client:
+
+```php
+use League\Flysystem\Adapter\Local;
+use League\Flysystem\Filesystem;
+use Cache\Adapter\Filesystem\FilesystemCachePool;
+
+$filesystemAdapter = new Local(__DIR__.'/');
+$filesystem        = new Filesystem($filesystemAdapter);
+
+$cache = new FilesystemCachePool($filesystem);
+$client->setCache($cache);
+```
+
+In this example we use [PHP Cache](http://www.php-cache.com/). Add this to your project with composer:
+
+```
+composer require cache/filesystem-adapter
+```
+
+### Updating Tokens ###
+
+When using [Refresh Tokens](https://developers.google.com/identity/protocols/OAuth2InstalledApp#refresh) or [Service Account Credentials](https://developers.google.com/identity/protocols/OAuth2ServiceAccount#overview), it may be useful to perform some action when a new access token is granted. To do this, pass a callable to the `setTokenCallback` method on the client:
+
+```php
+$logger = new Monolog\Logger;
+$tokenCallback = function ($cacheKey, $accessToken) use ($logger) {
+  $logger->debug(sprintf('new access token received at cache key %s', $cacheKey));
+};
+$client->setTokenCallback($tokenCallback);
+```
+
+### Debugging Your HTTP Request using Charles ###
+
+It is often very useful to debug your API calls by viewing the raw HTTP request. This library supports the use of [Charles Web Proxy](https://www.charlesproxy.com/documentation/getting-started/). Download and run Charles, and then capture all HTTP traffic through Charles with the following code:
+
+```php
+// FOR DEBUGGING ONLY
+$httpClient = new GuzzleHttp\Client([
+    'proxy' => 'localhost:8888', // by default, Charles runs on localhost port 8888
+    'verify' => false, // otherwise HTTPS requests will fail.
+]);
+
+$client = new Google_Client();
+$client->setHttpClient($httpClient);
+```
+
+Now all calls made by this library will appear in the Charles UI.
+
+One additional step is required in Charles to view SSL requests. Go to **Charles > Proxy > SSL Proxying Settings** and add the domain you'd like captured. In the case of the Google APIs, this is usually `*.googleapis.com`.
+
 ### Service Specific Examples ###
 
 YouTube: https://github.com/youtube/api-samples/tree/master/php
 
-## Frequently Asked Questions ##
+## How Do I Contribute? ##
 
-### What do I do if something isn't working? ###
+Please see the [contributing](CONTRIBUTING.md) page for more information. In particular, we love pull requests - but please make sure to sign the [contributor license agreement](https://developers.google.com/api-client-library/php/contribute).
 
-For support with the library the best place to ask is via the  google-api-php-client tag on StackOverflow: http://stackoverflow.com/questions/tagged/google-api-php-client
+## Frequently Asked Questions ##
 
-If there is a specific bug with the library, please file a issue in the Github issues tracker, including a (minimal) example of the failing code and any specific errors retrieved. Feature requests can also be filed, as long as they are core library requests, and not-API specific: for those, refer to the documentation for the individual APIs for the best place to file requests. Please try to provide a clear statement of the problem that the feature would address.
+### What do I do if something isn't working? ###
 
-### How do I contribute? ###
+For support with the library the best place to ask is via the google-api-php-client tag on StackOverflow: http://stackoverflow.com/questions/tagged/google-api-php-client
 
-We accept contributions via Github Pull Requests, but all contributors need to be covered by the standard Google Contributor License Agreement. You can find links, and more instructions, in the documentation: https://developers.google.com/api-client-library/php/contribute
+If there is a specific bug with the library, please [file a issue](https://github.com/google/google-api-php-client/issues) in the Github issues tracker, including an example of the failing code and any specific errors retrieved. Feature requests can also be filed, as long as they are core library requests, and not-API specific: for those, refer to the documentation for the individual APIs for the best place to file requests. Please try to provide a clear statement of the problem that the feature would address.
 
 ### I want an example of X! ###
 
@@ -119,7 +353,7 @@ $opt_params = array(
 
 ### How do I set a field to null? ###
 
-The library strips out nulls from the objects sent to the Google APIs as its the default value of all of the uninitialised properties. To work around this, set the field you want to null to Google_Model::NULL_VALUE. This is a placeholder that will be replaced with a true null when sent over the wire.
+The library strips out nulls from the objects sent to the Google APIs as its the default value of all of the uninitialized properties. To work around this, set the field you want to null to `Google_Model::NULL_VALUE`. This is a placeholder that will be replaced with a true null when sent over the wire.
 
 ## Code Quality ##
 

lib/Google/composer.json

@@ -1,25 +1,28 @@
 {
-    "name": "usabilitydynamics/google-api-php-client",
+    "name": "google/apiclient",
     "type": "library",
     "description": "Client library for Google APIs",
     "keywords": ["google"],
     "homepage": "http://developers.google.com/api-client-library/php",
     "license": "Apache-2.0",
     "require": {
         "php": ">=5.4",
-        "google/auth": "0.7",
-        "firebase/php-jwt": "~2.0|~3.0",
+        "google/auth": "^1.0",
+        "firebase/php-jwt": "~2.0|~3.0|~4.0|~5.0",
         "monolog/monolog": "^1.17",
-        "phpseclib/phpseclib": "2.0.1",
-        "guzzlehttp/guzzle": "~5.2",
-        "guzzlehttp/psr7": "1.2.*",
-        "psr/http-message": "1.0.*"
+        "phpseclib/phpseclib": "~0.3.10|~2.0",
+        "guzzlehttp/guzzle": "~5.3.1|~6.0",
+        "guzzlehttp/psr7": "^1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4",
+        "phpunit/phpunit": "~4.8.36",
         "squizlabs/php_codesniffer": "~2.3",
-        "symfony/dom-crawler": "~2.0",
-        "symfony/css-selector": "~2.0"
+        "symfony/dom-crawler": "~2.1",
+        "symfony/css-selector": "~2.1",
+        "cache/filesystem-adapter": "^0.3.2"
+    },
+    "suggest": {
+        "cache/filesystem-adapter": "For caching certs and tokens (using Google_Client::setCache)"
     },
     "autoload": {
         "psr-0": {