From 0da4145d4058ae6c8a8c2e0b54b17ab427891423 Mon Sep 17 00:00:00 2001
From: Michael Bausor <michaelbausor@google.com>
Date: Wed, 16 Aug 2017 14:53:28 -0700
Subject: [PATCH 1/2] Fix DEFAULT keyword in generated protobuf class

---
 .../Google/Logging/Type/LogSeverity.php       |  2 +-
 tests/InstantiateClassesTest.php              | 67 +++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 tests/InstantiateClassesTest.php

diff --git a/src/generated/Google/Logging/Type/LogSeverity.php b/src/generated/Google/Logging/Type/LogSeverity.php
index c244d3355..bbd397108 100644
--- a/src/generated/Google/Logging/Type/LogSeverity.php
+++ b/src/generated/Google/Logging/Type/LogSeverity.php
@@ -27,7 +27,7 @@ class LogSeverity
      *
      * Generated from protobuf enum <code>DEFAULT = 0;</code>
      */
-    const DEFAULT = 0;
+    const GPBDEFAULT = 0;
     /**
      * (100) Debug or trace information.
      *
diff --git a/tests/InstantiateClassesTest.php b/tests/InstantiateClassesTest.php
new file mode 100644
index 000000000..abf5a6dcd
--- /dev/null
+++ b/tests/InstantiateClassesTest.php
@@ -0,0 +1,67 @@
+<?php
+/*
+ * Copyright 2017, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace Google\GAX\UnitTests;
+
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use RecursiveRegexIterator;
+use RegexIterator;
+
+class InstantiateClassesTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider classesProvider
+     */
+    public function testInstantiateProtobufClass($class)
+    {
+        if (strpos($class, 'GrpcClient') !== false) {
+            $instance = new $class('dummyhostname', ['credentials' => null]);
+        } else {
+            $instance = new $class();
+        }
+        $this->assertNotNull($instance);
+    }
+
+    public function classesProvider()
+    {
+        $dir = new RecursiveDirectoryIterator('src/generated/Google');
+        $it = new RecursiveIteratorIterator($dir);
+        $reg = new RegexIterator($it, '#.+\.php$#', RecursiveRegexIterator::GET_MATCH);
+        foreach ($reg as $files) {
+            $file = $files[0];
+            $namespace = str_replace("/", "\\", substr($file, 13));
+            $class = explode('.', $namespace)[0];
+            yield [$class];
+        }
+    }
+}

From fc22d479bca9c2bcda5c9194f6626a0740fd0124 Mon Sep 17 00:00:00 2001
From: Michael Bausor <michaelbausor@google.com>
Date: Wed, 16 Aug 2017 16:18:55 -0700
Subject: [PATCH 2/2] Add travis retry to pecl install because it is flaky

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a0f9e9157..0db93a3b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ php:
 sudo: required
 dist: trusty
 install:
-  - pecl install grpc
+  - travis_retry pecl install grpc
   - composer install
 script:
   - vendor/bin/phpunit --coverage-clover=coverage.xml