ensures onAppEngine returns true on Dev AppServer (#170)

googleapis · Sep 29, 2017 · 1d66066 · 1d66066
1 parent dc59009
commit 1d66066
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/Credentials/AppIdentityCredentials.php b/src/Credentials/AppIdentityCredentials.php
@@ -69,15 +69,25 @@ public function __construct($scope = array())
     }
 
     /**
-     * Determines if this an App Engine instance, by accessing the SERVER_SOFTWARE
-     * environment variable.
+     * Determines if this an App Engine instance, by accessing the
+     * SERVER_SOFTWARE environment variable (prod) or the APPENGINE_RUNTIME
+     * environment variable (dev).
      *
      * @return true if this an App Engine Instance, false otherwise
      */
     public static function onAppEngine()
     {
-        return isset($_SERVER['SERVER_SOFTWARE']) &&
-        strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false;
+        $appEngineProduction = isset($_SERVER['SERVER_SOFTWARE']) &&
+            0 === strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine');
+        if ($appEngineProduction) {
+            return true;
+        }
+        $appEngineDevAppServer = isset($_SERVER['APPENGINE_RUNTIME']) &&
+            $_SERVER['APPENGINE_RUNTIME'] == 'php';
+        if ($appEngineDevAppServer) {
+            return true;
+        }
+        return false;
     }
 
     /**

diff --git a/tests/Credentials/AppIndentityCredentialsTest.php b/tests/Credentials/AppIndentityCredentialsTest.php
@@ -33,6 +33,12 @@ public function testIsTrueWhenServerSoftwareIsGoogleAppEngine()
         $_SERVER['SERVER_SOFTWARE'] = 'Google App Engine';
         $this->assertTrue(AppIdentityCredentials::onAppEngine());
     }
+
+    public function testIsTrueWhenAppEngineRuntimeIsPhp()
+    {
+        $_SERVER['APPENGINE_RUNTIME'] = 'php';
+        $this->assertTrue(AppIdentityCredentials::onAppEngine());
+    }
 }
 
 class AppIdentityCredentialsGetCacheKeyTest extends \PHPUnit_Framework_TestCase