Addressed code review comments

Author: ryanmats

auth/README.md

@@ -19,7 +19,7 @@ methods will work on any Google Cloud API.
     $ cd php-docs-samples/auth
 ```
 4.  **Install dependencies** via [Composer](http://getcomposer.org/doc/00-intro.md).
-    Run `php composer.phar install` (if composer is installed locally) or `composer install`
+    Run `php composer.phar install --no-dev` (if composer is installed locally) or `composer install --no-dev`
     (if composer is installed globally).
 5.  Run `php auth.php`. The following commands are available and work on command line:
 ```
@@ -41,9 +41,8 @@ method only works on App Engine Standard.
 7. You can test the samples that use Compute Engine / App Engine credentials by
 deploying to either App Engine Flexible (which allows usage of Compute Engine
 credentials since App Engine Flexible apps run on Compute Engine instances) or
-App Engine Standard. If you are deploying to App Engine Standard, first open
-`app-standard.yaml` and set the value of `GCLOUD_PROJECT` to your project ID.
-Run either `gcloud app deploy app-standard.yaml` or `gcloud app deploy app-flex.yaml`.
+App Engine Standard. Run either `gcloud app deploy app-standard.yaml` or
+`gcloud app deploy app-flex.yaml`.
 
 8. Run `php auth.php COMMAND --help` to print information about the usage of each command.
 

auth/app-standard.yaml

@@ -5,6 +5,3 @@ threadsafe: true
 handlers:
 - url: /.*
   script: index.php
-
-env_variables:
-  GCLOUD_PROJECT: your-project-id

auth/composer.json

@@ -2,9 +2,8 @@
     "require": {
         "google/apiclient": "^2.1",
         "google/cloud-storage": "^1.0",
-        "paragonie/random_compat": "^2.0",
         "symfony/console": " ^3.0",
-        "google/auth":"^0.11"
+        "google/auth":"^1.0"
     },
     "autoload": {
         "psr-4": {

auth/composer.lock

@@ -18,23 +18,30 @@
 namespace Google\Cloud\Samples\Auth;
 
 use Google\Auth\Credentials\GCECredentials;
+use google\appengine\api\app_identity\AppIdentityService;
 
-// Install composer dependencies with "composer install"
-// @see http://getcomposer.org for more information.
 require __DIR__ . '/vendor/autoload.php';
 
-print('');
-if (GCECredentials::onGce()) {
-    printf("Buckets retrieved using the cloud client library:\n");
-    auth_cloud_explicit_compute_engine(getenv('GCLOUD_PROJECT'));
-    printf("\n");
-    printf("Buckets retrieved using the api client:\n");
-    auth_api_explicit_compute_engine(getenv('GCLOUD_PROJECT'));
-} else {
-    printf("Buckets retrieved using the cloud client library:\n");
-    auth_cloud_explicit_app_engine(getenv('GCLOUD_PROJECT'));
-    printf("\n");
-    printf("Buckets retrieved using the api client:\n");
-    auth_api_explicit_app_engine(getenv('GCLOUD_PROJECT'));
-}
-print('');
+$onGce = GCECredentials::onGce();
+$projectId = $onGce
+   ? getenv('GCLOUD_PROJECT')
+   : AppIdentityService::getApplicationId();
+?>
+
+Buckets retrieved using the cloud client library:
+
+ if ($onGce): ?>
+ auth_cloud_explicit_compute_engine($projectId) ?>
+ else: ?>
+ auth_cloud_explicit_app_engine($projectId) ?>
+ endif ?>
+
+
+Buckets retrieved using the api client:
+
+ if ($onGce): ?>
+ auth_api_explicit_compute_engine($projectId) ?>
+ else: ?>
+ auth_api_explicit_app_engine($projectId) ?>
+ endif ?>
+

auth/index.php

@@ -36,8 +36,8 @@ function auth_api_explicit_app_engine($projectId)
 {
     # Learn more about scopes at https://cloud.google.com/storage/docs/authentication#oauth-scopes
     $scope = 'https://www.googleapis.com/auth/devstorage.read_only';
-    $gae_credentials = new AppIdentityCredentials($scope);
-    $middleware = new AuthTokenMiddleware($gae_credentials);
+    $gaeCredentials = new AppIdentityCredentials($scope);
+    $middleware = new AuthTokenMiddleware($gaeCredentials);
     $stack = HandlerStack::create();
     $stack->push($middleware);
     $http_client = new Client([

auth/src/auth_api_explicit_app_engine.php

@@ -34,8 +34,8 @@
 
 function auth_api_explicit_compute_engine($projectId)
 {
-    $gce_credentials = new GCECredentials();
-    $middleware = new AuthTokenMiddleware($gce_credentials);
+    $gceCredentials = new GCECredentials();
+    $middleware = new AuthTokenMiddleware($gceCredentials);
     $stack = HandlerStack::create();
     $stack->push($middleware);
     $http_client = new Client([

auth/src/auth_api_explicit_compute_engine.php

@@ -31,10 +31,10 @@ function auth_cloud_explicit_app_engine($projectId)
 {
     # Learn more about scopes at https://cloud.google.com/storage/docs/authentication#oauth-scopes
     $scope = 'https://www.googleapis.com/auth/devstorage.read_only';
-    $gae_credentials = new AppIdentityCredentials($scope);
+    $gaeCredentials = new AppIdentityCredentials($scope);
     $config = [
         'projectId' => $projectId,
-        'credentialsFetcher' => $gae_credentials,
+        'credentialsFetcher' => $gaeCredentials,
     ];
     $storage = new StorageClient($config);
 

auth/src/auth_cloud_explicit_app_engine.php

@@ -29,10 +29,10 @@
 
 function auth_cloud_explicit_compute_engine($projectId)
 {
-    $gce_credentials = new GCECredentials();
+    $gceCredentials = new GCECredentials();
     $config = [
         'projectId' => $projectId,
-        'credentialsFetcher' => $gce_credentials,
+        'credentialsFetcher' => $gceCredentials,
     ];
     $storage = new StorageClient($config);