Batch branch update from master

.travis.yml

@@ -18,6 +18,7 @@ before_script:
 
 script:
   - ./dev/sh/tests
+  - ./dev/sh/test-composer
   - vendor/bin/phpcs --standard=./phpcs-ruleset.xml
   - ./dev/sh/build-docs
 

README.md

@@ -20,7 +20,9 @@ This client supports the following Google Cloud Platform services at a [Beta](#v
 
 This client supports the following Google Cloud Platform services at an [Alpha](#versioning) quality level:
 * [Google Cloud Pub/Sub](#google-cloud-pubsub-alpha) (Alpha)
+* [Cloud Spanner](#cloud-spanner-alpha) (Alpha)
 * [Google Cloud Speech](#google-cloud-speech-alpha) (Alpha)
+* [Google Cloud Video Intelligence](#google-cloud-video-intelligence-alpha) (Alpha)
 * [Google Stackdriver Trace](#google-stackdriver-trace-alpha) (Alpha)
 
 If you need support for other Google APIs, please check out the [Google APIs Client Library for PHP](https://github.com/google/google-api-php-client).
@@ -390,6 +392,43 @@ Google Cloud Pub/Sub can be installed separately by requiring the `google/cloud-
 $ require google/cloud-pubsub
 ```
 
+## Cloud Spanner (Alpha)
+
+- [API Documentation](http://googlecloudplatform.github.io/google-cloud-php/#/docs/latest/spanner/spannerclient)
+- [Official Documentation](https://cloud.google.com/spanner/docs)
+
+#### Preview
+
+```php
+require 'vendor/autoload.php';
+
+use Google\Cloud\Spanner\SpannerClient;
+
+$spanner = new SpannerClient([
+    'projectId' => 'my_project'
+]);
+
+$db = $spanner->connect('my-instance', 'my-database');
+
+$userQuery = $db->execute('SELECT * FROM Users WHERE id = @id', [
+    'parameters' => [
+        'id' => $userId
+    ]
+]);
+
+$user = $userQuery->rows()->current();
+
+echo 'Hello ' . $user['firstName'];
+```
+
+#### google/cloud-spanner
+
+Cloud Spanner can be installed separately by requiring the `google/cloud-spanner` composer package:
+
+```
+$ require google/cloud-spanner
+```
+
 ## Google Cloud Speech (Alpha)
 
 - [API Documentation](http://googlecloudplatform.github.io/google-cloud-php/#/docs/latest/speech/speechclient)
@@ -425,24 +464,46 @@ Google Cloud Speech can be installed separately by requiring the `google/cloud-s
 $ require google/cloud-speech
 ```
 
-## Caching Access Tokens
+## Google Cloud Video Intelligence (Alpha)
 
-By default the library will use a simple in-memory caching implementation, however it is possible to override this behavior by passing a [PSR-6](http://www.php-fig.org/psr/psr-6/) caching implementation in to the desired client.
+- [API Documentation](http://googlecloudplatform.github.io/google-cloud-php/#/docs/latest/videointelligence/readme)
+- [Official Documentation](https://cloud.google.com/video-intelligence/docs)
 
-The following example takes advantage of [Symfony's Cache Component](https://github.com/symfony/cache).
+#### Preview
 
 ```php
-require 'vendor/autoload.php';
+require __DIR__ . '/vendor/autoload.php';
+
+use Google\Cloud\VideoIntelligence\V1beta1\VideoIntelligenceServiceClient;
+use google\cloud\videointelligence\v1beta1\Feature;
+
+$client = new VideoIntelligenceServiceClient();
+
+$inputUri = "gs://example-bucket/example-video.mp4";
+$features = [
+    Feature::LABEL_DETECTION,
+];
+$operationResponse = $client->annotateVideo($inputUri, $features);
+$operationResponse->pollUntilComplete();
+if ($operationResponse->operationSucceeded()) {
+    $results = $operationResponse->getResult();
+    foreach ($results->getAnnotationResultsList() as $result) {
+        foreach ($result->getLabelAnnotationsList() as $labelAnnotation) {
+            echo "Label: " . $labelAnnotation->getDescription() . "\n";
+        }
+    }
+} else {
+    $error = $operationResponse->getError();
+    echo "error: " . $error->getMessage() . "\n";
+}
+```
 
-use Google\Cloud\Storage\StorageClient;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
+#### google/cloud-videointelligence
 
-// Please take the proper precautions when storing your access tokens in a cache no matter the implementation.
-$cache = new ArrayAdapter();
+Cloud Video Intelligence can be installed separately by requiring the `google/cloud-videointelligence` composer package:
 
-$storage = new StorageClient([
-    'authCache' => $cache
-]);
+```
+$ require google/cloud-videointelligence
 ```
 
 ## Google Stackdriver Trace (Alpha)
@@ -457,7 +518,7 @@ require 'vendor/autoload.php';
 
 use Google\Cloud\Trace\TraceClient;
 
-$traceClient = new SpeechClient([
+$traceClient = new TraceClient([
     'projectId' => 'my_project'
 ]);
 
@@ -478,6 +539,34 @@ foreach($traceClient->traces() as $trace) {
 }
 ```
 
+#### google/cloud-trace
+
+Stackdriver Trace can be installed separately by requiring the `google/cloud-trace` composer package:
+
+```
+$ require google/cloud-trace
+```
+
+## Caching Access Tokens
+
+By default the library will use a simple in-memory caching implementation, however it is possible to override this behavior by passing a [PSR-6](http://www.php-fig.org/psr/psr-6/) caching implementation in to the desired client.
+
+The following example takes advantage of [Symfony's Cache Component](https://github.com/symfony/cache).
+
+```php
+require 'vendor/autoload.php';
+
+use Google\Cloud\Storage\StorageClient;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+
+// Please take the proper precautions when storing your access tokens in a cache no matter the implementation.
+$cache = new ArrayAdapter();
+
+$storage = new StorageClient([
+    'authCache' => $cache
+]);
+```
+
 ## Versioning
 
 This library follows [Semantic Versioning](http://semver.org/).

composer.json

@@ -19,6 +19,7 @@
         "natural language",
         "pubsub",
         "pub sub",
+        "spanner",
         "speech",
         "storage",
         "gcs",
@@ -41,11 +42,12 @@
     "require": {
         "php": ">=5.5",
         "rize/uri-template": "~0.3",
-        "google/auth": "^0.11",
+        "google/auth": "^1.0",
         "guzzlehttp/guzzle": "^5.3|^6.0",
         "guzzlehttp/psr7": "^1.2",
         "monolog/monolog": "~1",
-        "psr/http-message": "1.0.*"
+        "psr/http-message": "1.0.*",
+        "ramsey/uuid": "~3"
     },
     "require-dev": {
         "phpunit/phpunit": "4.8.*",
@@ -55,12 +57,14 @@
         "league/json-guard": "^0.3",
         "erusev/parsedown": "^1.6",
         "vierbergenlars/php-semver": "^3.0",
-        "google/proto-client-php": "^0.12",
-        "google/gax": "^0.8"
+        "google/proto-client-php": "^0.13",
+        "google/gax": "^0.10",
+        "symfony/lock": "3.3.x-dev#1ba6ac9"
     },
     "suggest": {
         "google/gax": "Required to support gRPC",
-        "google/proto-client-php": "Required to support gRPC"
+        "google/proto-client-php": "Required to support gRPC",
+        "symfony/lock": "Required for the Spanner cached based session pool. Please require the following commit: 3.3.x-dev#1ba6ac9"
     },
     "autoload": {
         "psr-4": {
@@ -72,7 +76,8 @@
             "Google\\Cloud\\Dev\\": "dev/src",
             "Google\\Cloud\\Tests\\System\\": "tests/system",
             "Google\\Cloud\\Tests\\Unit\\": "tests/unit"
-        }
+        },
+        "files": ["dev/src/Functions.php"]
     },
     "scripts": {
         "google-cloud": "dev/google-cloud"

dev/sh/test-composer

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "Checking Component Installability"
+
+php $(dirname $0)/../../tests/component/TestComposerInstall.php

dev/sh/tests

@@ -5,19 +5,19 @@ set -e
 function unit () {
   echo "Running Unit Test Suite"
 
-  vendor/bin/phpunit
+  $(dirname $0)/../../vendor/bin/phpunit
 }
 
 function system () {
   echo "Running System Test Suite"
 
-  vendor/bin/phpunit -c phpunit-system.xml.dist
+  $(dirname $0)/../../vendor/bin/phpunit -c phpunit-system.xml.dist
 }
 
 function snippets() {
   echo "Running Snippet Test Suite"
 
-  vendor/bin/phpunit -c phpunit-snippets.xml.dist
+  $(dirname $0)/../../vendor/bin/phpunit -c phpunit-snippets.xml.dist
 }
 
 unit

dev/src/Functions.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Google\Cloud\Dev;
+
+/**
+ * Create a test stub which extends a real class and allows overriding of private properties.
+ *
+ * @param string $extends The fully-qualified name of the class to extend.
+ * @param array $args An array of constructor arguments to use when creating the stub.
+ * @param array $props A list of private properties on which to enable overrriding.
+ * @return mixed
+ */
+function stub($extends, array $args = [], array $props = [])
+{
+    if (empty($props)) {
+        $props = ['connection'];
+    }
+
+    $tpl = 'class %s extends %s {private $___props = \'%s\'; use \Google\Cloud\Dev\StubTrait; }';
+
+    $name = 'Stub'. sha1($extends);
+
+    if (!class_exists($name)) {
+        eval(sprintf($tpl, $name, $extends, json_encode($props)));
+    }
+
+    $reflection = new \ReflectionClass($name);
+    return $reflection->newInstanceArgs($args);
+}

dev/src/Snippet/SnippetTestCase.php

@@ -53,7 +53,7 @@ public function snippetFromClass($class, $indexOrName = 0)
 
         self::$coverage->cover($snippet->identifier());
 
-        return $snippet;
+        return clone $snippet;
     }
 
     /**
@@ -77,7 +77,7 @@ public function snippetFromMagicMethod($class, $method, $indexOrName = 0)
 
         self::$coverage->cover($identifier);
 
-        return $snippet;
+        return clone $snippet;
     }
 
     /**
@@ -100,6 +100,6 @@ public function snippetFromMethod($class, $method, $indexOrName = 0)
 
         self::$coverage->cover($identifier);
 
-        return $snippet;
+        return clone $snippet;
     }
 }

dev/src/StubTrait.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Cloud\Dev;
+
+trait StubTrait
+{
+    public function ___getProperty($prop)
+    {
+        $property = $this->___getPropertyReflector($prop);
+
+        $property->setAccessible(true);
+        return $property->getValue($this);
+    }
+
+    public function ___setProperty($prop, $value)
+    {
+        if (!in_array($prop, json_decode($this->___props))) {
+            throw new \BadMethodCallException(sprintf('Property %s cannot be overloaded', $prop));
+        }
+
+        $property = $this->___getPropertyReflector($prop);
+
+        $property->setAccessible(true);
+        $property->setValue($this, $value);
+    }
+
+    private function ___getPropertyReflector($property)
+    {
+        $trait = new \ReflectionClass($this);
+        $ref = $trait->getParentClass();
+
+        try {
+            $property = $ref->getProperty($property);
+        } catch (\ReflectionException $e) {
+            throw new \BadMethodCallException($e->getMessage());
+        }
+
+        return $property;
+    }
+}

docs/contents/cloud-core.json

@@ -30,8 +30,14 @@
             "title": "StreamableUploader",
             "type": "core/upload/streamableuploader"
         }]
+    }, {
+        "title": "Duration",
+        "type": "core/duration"
     }, {
         "title": "Int64",
         "type": "core/int64"
+    }, {
+        "title": "Timestamp",
+        "type": "core/timestamp"
     }]
 }

docs/contents/cloud-pubsub.json

@@ -16,12 +16,6 @@
     }, {
         "title": "Topic",
         "type": "pubsub/topic"
-    }, {
-        "title": "Duration",
-        "type": "pubsub/duration"
-    }, {
-        "title": "Timestamp",
-        "type": "pubsub/timestamp"
     }, {
         "title": "v1",
         "type": "pubsub/v1/readme",