fix(tests): phpunit xml for cloud sql tests (GoogleCloudPlatform#1489)

Author: bshaffer

.kokoro/secrets.sh.enc

@@ -17,36 +17,28 @@
 namespace Google\Cloud\Test\GettingStarted;
 
 use Google\Cloud\TestUtils\TestTrait;
+use Google\Cloud\TestUtils\CloudSqlProxyTrait;
 use Google\Cloud\Samples\AppEngine\GettingStarted\CloudSqlDataModel;
 use PHPUnit\Framework\TestCase;
 use PDO;
-use Symfony\Component\Process\Process;
 
 class CloudSqlTest extends TestCase
 {
     use TestTrait;
-    private static $process;
+    use CloudSqlProxyTrait;
 
     public function setUp(): void
     {
         $connection = $this->requireEnv('CLOUDSQL_CONNECTION_NAME');
+        $socketDir = $this->requireEnv('DB_SOCKET_DIR');
+
+        $this->startCloudSqlProxy($connection, $socketDir);
+
         $dbUser = $this->requireEnv('CLOUDSQL_USER');
         $dbPass = $this->requireEnv('CLOUDSQL_PASSWORD');
         $dbName = getenv('CLOUDSQL_DATABASE_NAME') ?: 'bookshelf';
-        $socketDir = $this->requireEnv('DB_SOCKET_DIR');
         $socket = "${socketDir}/${connection}";
 
-        // create the directory to store the unix socket for cloud_sql_proxy
-        if (!is_dir($socketDir)) {
-            mkdir($socketDir, 0755, true);
-        }
-
-        self::$process = new Process(['cloud_sql_proxy', '-instances=' . $connection, '-dir', $socketDir]);
-        self::$process->start();
-        self::$process->waitUntil(function ($type, $buffer) {
-            return str_contains($buffer, 'Ready for new connections');
-        });
-
         if (!file_exists($socket)) {
             $this->markTestSkipped(
                 "You must run 'cloud_sql_proxy -instances=${connection} -dir=${socketDir}'"
@@ -60,11 +52,6 @@ public function setUp(): void
         $this->model = new CloudSqlDataModel($pdo);
     }
 
-    public static function tearDownAfterClass(): void
-    {
-        self::$process->stop();
-    }
-
     public function testDataModel()
     {
         $model = $this->model;

appengine/standard/getting-started/test/CloudSqlTest.php

@@ -2,7 +2,7 @@
 <phpunit colors="true" bootstrap="../../../testing/bootstrap.php">
   <testsuites>
     <testsuite name="CloudSQLMySQLSample">
-      <directory>tests</directory>
+      <directory>test</directory>
     </testsuite>
   </testsuites>
   <filter>

cloud_sql/mysql/pdo/phpunit.xml.dist

@@ -127,7 +127,7 @@ public static function initUnixDatabaseConnection(
                     'The PHP error was %s',
                     $e->getMessage()
                 ),
-                $e->getCode(),
+                (int) $e->getCode(),
                 $e
             );
         } catch (PDOException $e) {
@@ -140,7 +140,7 @@ public static function initUnixDatabaseConnection(
                     'https://cloud.google.com/sql/docs/mysql/connect-external-app',
                     $e->getMessage()
                 ),
-                $e->getCode(),
+                (int) $e->getCode(),
                 $e
             );
         }

cloud_sql/mysql/pdo/src/DBInitializer.php

@@ -21,29 +21,23 @@
 use Google\Cloud\Samples\CloudSQL\MySQL\DBInitializer;
 use Google\Cloud\Samples\CloudSQL\MySQL\Votes;
 use Google\Cloud\TestUtils\TestTrait;
+use Google\Cloud\TestUtils\CloudSqlProxyTrait;
 use PDO;
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Process\Process;
 
 class IntegrationTest extends TestCase
 {
     use TestTrait;
-    private static $process;
+    use CloudSqlProxyTrait;
 
     public static function setUpBeforeClass(): void
     {
         $connectionName = self::requireEnv('CLOUDSQL_CONNECTION_NAME_MYSQL');
         $socketDir = self::requireEnv('DB_SOCKET_DIR');
-        self::$process = new Process(['cloud_sql_proxy', '-instances=' . $connectionName . '=tcp:3306,' . $connectionName, '-dir', $socketDir]);
-        self::$process->start();
-        self::$process->waitUntil(function ($type, $buffer) {
-            return str_contains($buffer, 'Ready for new connections');
-        });
-    }
+        // '3306' was not working on kokoro we probably just need to update cloud_sql_proxy
+        $port = null;
 
-    public static function tearDownAfterClass(): void
-    {
-        self::$process->stop();
+        self::startCloudSqlProxy($connectionName, $socketDir, $port);
     }
 
     public function testUnixConnection()

cloud_sql/mysql/pdo/test/IntegrationTest.php

@@ -2,7 +2,7 @@
 <phpunit colors="true" bootstrap="../../../testing/bootstrap.php">
   <testsuites>
     <testsuite name="CloudSQLPostgresSample">
-      <directory>tests</directory>
+      <directory>test</directory>
     </testsuite>
   </testsuites>
   <filter>

cloud_sql/postgres/pdo/phpunit.xml.dist

@@ -127,7 +127,7 @@ public static function initUnixDatabaseConnection(
                     'The PHP error was %s',
                     $e->getMessage()
                 ),
-                $e->getCode(),
+                (int) $e->getCode(),
                 $e
             );
         } catch (PDOException $e) {
@@ -140,7 +140,7 @@ public static function initUnixDatabaseConnection(
                     'https://cloud.google.com/sql/docs/postgres/connect-external-app',
                     $e->getMessage()
                 ),
-                $e->getCode(),
+                (int) $e->getCode(),
                 $e
             );
         }

cloud_sql/postgres/pdo/src/DBInitializer.php

@@ -69,7 +69,7 @@
         );
     } else {
         $connectionName = getenv('CLOUDSQL_CONNECTION_NAME');
-        $socketDir = getenv('DB_SOCKET_DIR') ?: '/cloudsql';
+        $socketDir = getenv('DB_SOCKET_DIR') ?: '/tmp/cloudsql';
         return DBInitializer::initUnixDatabaseConnection(
             $username,
             $password,

cloud_sql/postgres/pdo/src/app.php

@@ -21,29 +21,22 @@
 use Google\Cloud\Samples\CloudSQL\Postgres\DBInitializer;
 use Google\Cloud\Samples\CloudSQL\Postgres\Votes;
 use Google\Cloud\TestUtils\TestTrait;
+use Google\Cloud\TestUtils\CloudSqlProxyTrait;
 use PDO;
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Process\Process;
 
 class IntegrationTest extends TestCase
 {
     use TestTrait;
-    private static $process;
+    use CloudSqlProxyTrait;
 
     public static function setUpBeforeClass(): void
     {
         $connectionName = self::requireEnv('CLOUDSQL_CONNECTION_NAME_POSTGRES');
         $socketDir = self::requireEnv('DB_SOCKET_DIR');
-        self::$process = new Process(['cloud_sql_proxy', '-instances=' . $connectionName . '=tcp:5432,' . $connectionName, '-dir', $socketDir]);
-        self::$process->start();
-        self::$process->waitUntil(function ($type, $buffer) {
-            return str_contains($buffer, 'Ready for new connections');
-        });
-    }
+        $port = '5432';
 
-    public static function tearDownAfterClass(): void
-    {
-        self::$process->stop();
+        self::startCloudSqlProxy($connectionName, $socketDir, $port);
     }
 
     public function testUnixConnection()

cloud_sql/postgres/pdo/test/IntegrationTest.php

@@ -2,7 +2,7 @@
 <phpunit colors="true" bootstrap="../../../testing/bootstrap.php">
   <testsuites>
     <testsuite name="CloudSQLSQLServerSample">
-      <directory>tests</directory>
+      <directory>test</directory>
     </testsuite>
   </testsuites>
   <filter>