Addressed Travis testing issues

Author: ryanmats

auth/auth.php

@@ -28,6 +28,7 @@
 
 // Create auth-cloud-implicit Command.
 $application->add((new Command('auth-cloud-implicit'))
+    ->addArgument('projectId', InputArgument::REQUIRED, 'Your project ID')
     ->setDescription('Authenticate to a cloud client library using a service account implicitly.')
     ->setHelp(<<
 The %command.name% command authenticates to a cloud client library
@@ -38,13 +39,14 @@
 EOF
     )
     ->setCode(function ($input, $output) {
-        auth_cloud_implicit();
+        auth_cloud_implicit($input->getArgument('projectId'));
     })
 );
 
 // Create auth-cloud-explicit Command.
 $application->add((new Command('auth-cloud-explicit'))
     ->addArgument('serviceAccountPath', InputArgument::REQUIRED, 'Path to your service account.')
+    ->addArgument('projectId', InputArgument::REQUIRED, 'Your project ID')
     ->setDescription('Authenticate to a cloud client library using a service account explicitly.')
     ->setHelp(<<
 The %command.name% command authenticates to a cloud client library
@@ -55,7 +57,7 @@
 EOF
     )
     ->setCode(function ($input, $output) {
-        auth_cloud_explicit($input->getArgument('serviceAccountPath'));
+        auth_cloud_explicit($input->getArgument('projectId'), $input->getArgument('serviceAccountPath'));
     })
 );
 

auth/index.php

@@ -38,6 +38,3 @@
     auth_api_explicit_app_engine(getenv('GCLOUD_PROJECT'));
 }
 print('');
-
-
-

auth/src/auth_api_explicit_app_engine.php

@@ -22,6 +22,7 @@
 
 # [START auth_api_explicit_app_engine]
 namespace Google\Cloud\Samples\Auth;
+
 use Google\Auth\Credentials\AppIdentityCredentials;
 use Google\Auth\Middleware\AuthTokenMiddleware;
 use GuzzleHttp\Client;

auth/src/auth_api_explicit_compute_engine.php

@@ -22,6 +22,7 @@
 
 # [START auth_api_explicit_compute_engine]
 namespace Google\Cloud\Samples\Auth;
+
 use Google\Auth\Credentials\GCECredentials;
 use Google\Auth\Middleware\AuthTokenMiddleware;
 use GuzzleHttp\Client;

auth/src/auth_cloud_explicit.php

@@ -26,12 +26,13 @@
 // Imports the Google Cloud Storage client library.
 use Google\Cloud\Storage\StorageClient;
 
-function auth_cloud_explicit($serviceAccountPath)
+function auth_cloud_explicit($projectId, $serviceAccountPath)
 {
     # Explicitly use service account credentials by specifying the private key
     # file.
     $config = [
         'keyFilePath' => $serviceAccountPath,
+        'projectId' => $projectId,
     ];
     $storage = new StorageClient($config);
 

auth/src/auth_cloud_implicit.php

@@ -26,11 +26,15 @@
 // Imports the Google Cloud Storage client library.
 use Google\Cloud\Storage\StorageClient;
 
-function auth_cloud_implicit()
+function auth_cloud_implicit($projectId)
 {
+    $config = [
+        'projectId' => $projectId,
+    ];
+
     # If you don't specify credentials when constructing the client, the
     # client library will look for credentials in the environment.
-    $storage = new StorageClient();
+    $storage = new StorageClient($config);
 
     # Make an authenticated API request (listing storage buckets)
     foreach ($storage->buckets() as $bucket) {

auth/test/authTest.php

@@ -32,20 +32,20 @@ public function setUp()
             $this->markTestSkipped('Set the GOOGLE_APPLICATION_CREDENTIALS ' .
                 'environment variable');
         }
-        $this->bucketName = getenv('GCS_BUCKET_NAME');
+        $this->bucketName = getenv('GOOGLE_STORAGE_BUCKET');
         $this->projectId = getenv('GCLOUD_PROJECT');
     }
 
     public function testAuthCloudImplicitCommand()
     {
-        $output = $this->runCommand('auth-cloud-implicit');
+        $output = $this->runCommand('auth-cloud-implicit', null, $this->projectId);
         $this->assertContains($this->bucketName, $output);
     }
 
     public function testAuthCloudExplicitCommand()
     {
         $serviceAccountPath = getenv('GOOGLE_APPLICATION_CREDENTIALS');
-        $output = $this->runCommand('auth-cloud-explicit', $serviceAccountPath);
+        $output = $this->runCommand('auth-cloud-explicit', $serviceAccountPath, $this->projectId);
         $this->assertContains($this->bucketName, $output);
     }
 
@@ -97,7 +97,7 @@ private function runCommand($commandName, $serviceAccountPath=null, $projectId=n
         $commandTester = new CommandTester($command);
 
         ob_start();
-        if ($serviceAccountPath and $projectId) {
+        if ($serviceAccountPath) {
             try {
                 $commandTester->execute(
                     [
@@ -111,13 +111,6 @@ private function runCommand($commandName, $serviceAccountPath=null, $projectId=n
                 $application->renderException($e, $commandTester->getOutput());
                 return $commandTester->getDisplay();
             }
-        } else if ($serviceAccountPath) {
-            $commandTester->execute(
-                [
-                    'serviceAccountPath'=> $serviceAccountPath
-                ],
-                ['interactive' => false]
-            );
         } else if ($projectId) {
             try {
                 $commandTester->execute(