misc php72 cloudsql fixes

bshaffer · bshaffer · commit 6d6757ee1df7 · 2018-07-31T16:23:52.000-07:00
diff --git a/appengine/php72/cloudsql/app.yaml b/appengine/php72/cloudsql/app.yaml
@@ -13,8 +13,8 @@ runtime: php72
 env_variables:
   # Replace USER, PASSWORD, DATABASE, and CONNECTION_NAME with the
   # values obtained when configuring your Cloud SQL instance.
-  CLOUDSQL_USER: USER
-  CLOUDSQL_PASSWORD: PASSWORD
+  CLOUDSQL_USER:
+  CLOUDSQL_PASSWORD:
   CLOUDSQL_DSN: "mysql:dbname=DATABASE;unix_socket=/cloudsql/CONNECTION_NAME"
 # [END gae_cloudsql_mysql_env]
 
diff --git a/appengine/php72/cloudsql/index.php b/appengine/php72/cloudsql/index.php
@@ -15,45 +15,53 @@
  * limitations under the License.
  */
 
-# [START gae_cloudsql_example]
-// Connect to CloudSQL from App Engine.
 $dsn = getenv('CLOUDSQL_DSN');
 $user = getenv('CLOUDSQL_USER');
 $password = getenv('CLOUDSQL_PASSWORD');
+
+// Ensure the required environment variables are set to run the application
 if (!isset($dsn, $user) || false === $password) {
     throw new Exception('Set CLOUDSQL_DSN, CLOUDSQL_USER, and CLOUDSQL_PASSWORD environment variables');
 }
 
-// Create the PDO object to talk to CloudSQL
+# [START gae_cloudsql_example]
+// Create the PDO object to talk to CloudSQL. Use the following variables:
+//
+// $dsn = "mysql:dbname=DATABASE;unix_socket=/cloudsql/CONNECTION_NAME";
+// $user = 'YOUR_CLOUDSQL_USER';
+// $password = 'YOUR_CLOUDSQL_PASSWORD';
+//
+// If the unix socket is unavailable, try to connect using TCP. This will work
+// if you're running a local MySQL server or using the Cloud SQL proxy, for example:
+//
+//     $ cloud_sql_proxy -instances=your-connection-name=tcp:3306
+//
+// This will mean your DSN for connecting locally to Cloud SQL would look like this:
+//
+// $dsn = "mysql:dbname=DATABASE;host=127.0.0.1";
+//
 $db = new PDO($dsn, $user, $password);
 
 // create the tables if they don't exist
-$stmt = $db->prepare('CREATE TABLE IF NOT EXISTS entries ('
-    . 'guestName VARCHAR(255), '
-    . 'content VARCHAR(255))');
-$result = $stmt->execute();
-
-if (false === $result) {
-    exit("Error: " . $stmt->errorInfo()[2]);
-}
+$sql = 'CREATE TABLE IF NOT EXISTS entries (guestName VARCHAR(255), content VARCHAR(255))';
+$stmt = $db->prepare($sql);
+$stmt->execute();
 
 // Insert a new row into the guestbook on POST
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
     $stmt = $db->prepare('INSERT INTO entries (guestName, content) VALUES (:name, :content)');
-    $result = $stmt->execute([
+    $stmt->execute([
         ':name' => $_POST['name'],
         ':content' => $_POST['content'],
     ]);
-    if (false === $result) {
-        print("Error: " . $stmt->errorInfo()[2]);
-    }
 }
 
-// Show existing guestbook entries.
+// Query existing guestbook entries.
 $results = $db->query('SELECT * from entries');
 
+# [END gae_cloudsql_example]
 ?>
-<?php ?>
+
 <html>
     <body>
         <?php if ($results->rowCount() > 0): ?>
@@ -71,4 +79,3 @@
         </form>
     </body>
 </html>
-<?php # [END gae_cloudsql_example]?>
diff --git a/appengine/php72/cloudsql/phpunit.xml.dist b/appengine/php72/cloudsql/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit>
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="AppEngine for PHP 7.2 Cloud SQL test">
             <directory>test</directory>
diff --git a/appengine/php72/cloudsql/test/DeployMySQLTest.php b/appengine/php72/cloudsql/test/DeployMySQLTest.php
@@ -48,7 +48,7 @@ public static function beforeDeploy()
             || (!$database = getenv('CLOUDSQL_DATABASE'))
             || false === $password = getenv('CLOUDSQL_PASSWORD')) {
             self::markTestSkipped('Set the CLOUDSQL_CONNECTION_NAME_MYSQL, CLOUDSQL_USER'
-                . 'CLOUDSQL_DATABASE, and CLOUDSQL_PASSWORD environment variables');
+                . ' CLOUDSQL_DATABASE, and CLOUDSQL_PASSWORD environment variables');
         }
 
         $tmpDir = FileUtil::cloneDirectoryIntoTmp(__DIR__ . '/..');
diff --git a/appengine/php72/cloudsql/test/DeployPostgresTest.php b/appengine/php72/cloudsql/test/DeployPostgresTest.php
@@ -48,7 +48,7 @@ public static function beforeDeploy()
             || (!$database = getenv('CLOUDSQL_DATABASE'))
             || false === $password = getenv('CLOUDSQL_PASSWORD')) {
             self::markTestSkipped('Set the CLOUDSQL_CONNECTION_NAME_POSTGRES, CLOUDSQL_USER'
-                . 'CLOUDSQL_DATABASE, and CLOUDSQL_PASSWORD environment variables');
+                . ' CLOUDSQL_DATABASE, and CLOUDSQL_PASSWORD environment variables');
         }
 
         $tmpDir = FileUtil::cloneDirectoryIntoTmp(__DIR__ . '/..');

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static function beforeDeploy()`
`48`	`48`	`\|\| (!$database = getenv('CLOUDSQL_DATABASE'))`
`49`	`49`	`\|\| false === $password = getenv('CLOUDSQL_PASSWORD')) {`
`50`	`50`	`self::markTestSkipped('Set the CLOUDSQL_CONNECTION_NAME_MYSQL, CLOUDSQL_USER'`
`51`		`- . 'CLOUDSQL_DATABASE, and CLOUDSQL_PASSWORD environment variables');`
	`51`	`+ . ' CLOUDSQL_DATABASE, and CLOUDSQL_PASSWORD environment variables');`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$tmpDir = FileUtil::cloneDirectoryIntoTmp(__DIR__ . '/..');`