set grpc to v1.4.1 and other test fixes (GoogleCloudPlatform#422)

Author: bshaffer

.travis.yml

@@ -41,7 +41,7 @@ before_install:
   - mkdir -p build/logs
 
 before_script:
-  - travis_retry pecl install grpc
+  - travis_retry pecl install grpc-1.4.1
 
 script:
   - testing/run_all_tests.sh

logging/api/test/ListEntriesCommandTest.php

@@ -84,6 +84,6 @@ public function testListEntries()
             );
             $output = ob_get_clean();
             $this->assertRegexp('/: Test Message/', $output);
-        });
+        }, 10);
     }
 }

monitoring/test/monitoringTest.php

@@ -135,7 +135,7 @@ private function runCommand($commandName, $args = [])
             $commandTester->execute(
                 ['project_id' => self::$projectId] + $args,
                 ['interactive' => false]);
-        } catch (\Google\GAX\Exception $e) {
+        } catch (\Google\GAX\ApiException $e) {
             // if the command throws an error cast it as a string (as this would be the output)
             $application->renderException($e, $commandTester->getOutput());
             return $commandTester->getDisplay();

vision/phpunit.xml.dist

@@ -28,4 +28,7 @@
             <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
+    <php>
+        <env name="PHPUNIT_TESTS" value="1"/>
+    </php>
 </phpunit>

vision/src/detect_web.php

@@ -62,7 +62,9 @@ function detect_web($projectId, $path)
         printf('%d Web Entities found:' . PHP_EOL, count($web->entities()));
         foreach ($web->entities() as $entity) {
             printf('Score: %f' . PHP_EOL, $entity->score());
-            printf('Description: %s' . PHP_EOL, $entity->description());
+            if (isset($entity->info()['description'])) {
+                printf('Description: %s' . PHP_EOL, $entity->description());
+            }
             printf(PHP_EOL);
         }
     }

vision/src/detect_web_gcs.php

@@ -68,7 +68,9 @@ function detect_web_gcs($projectId, $bucketName, $objectName)
         printf('%d Web Entities found:' . PHP_EOL, count($web->entities()));
         foreach ($web->entities() as $entity) {
             printf('Score: %f' . PHP_EOL, $entity->score());
-            printf('Description: %s' . PHP_EOL, $entity->description());
+            if (isset($entity->info()['description'])) {
+                printf('Description: %s' . PHP_EOL, $entity->description());
+            }
             printf(PHP_EOL);
         }
     }

vision/test/CommandTest.php vision/test/visionTest.phpvision/test/CommandTest.php renamed to vision/test/visionTest.php

@@ -21,9 +21,9 @@
 use Symfony\Component\Console\Tester\CommandTester;
 
 /**
- * Unit Tests for transcribe commands.
+ * Unit Tests for vision commands.
  */
-class CommandTest extends \PHPUnit_Framework_TestCase
+class visionTest extends \PHPUnit_Framework_TestCase
 {
     private $bucketName;