Merge branch 'master' into use-multiphp-container

Author: bshaffer

.gitignore

@@ -8,6 +8,7 @@ credentials.*
 **/vendor/
 **/build/
 .php_cs.cache
+.php-cs-fixer.cache
 .vscode/
 .kokoro/secrets.sh
 .phpunit.result.cache

.kokoro/secrets-example.sh

@@ -60,6 +60,11 @@ export POSTGRES_DSN=
 export POSTGRES_DATABASE=
 export POSTGRES_USER=
 export POSTGRES_PASSWORD=
+export SQLSERVER_DSN=
+export SQLSERVER_DATABASE=
+export SQLSERVER_USER=
+export SQLSERVER_PASSWORD=
+export DB_SOCKET_DIR=
 
 # Datastore
 export CLOUD_DATASTORE_NAMESPACE=

.kokoro/secrets.sh.enc

@@ -1,22 +1,42 @@
 
 
-return (new PhpCsFixer\Config())
+// php-cs-fixer 3.0 distributed config file
+
+$config = new PhpCsFixer\Config();
+$config
     ->setRules([
         '@PSR2' => true,
         'concat_space' => ['spacing' => 'one'],
         'no_unused_imports' => true,
-        'method_argument_space' => false,
         'whitespace_after_comma_in_array' => true,
         'method_argument_space' => [
-            'keep_multiple_spaces_after_comma' => true, // for wordpress constants
-            'on_multiline' => 'ignore', // consider removing this someday
+            'keep_multiple_spaces_after_comma' => true,
+            'on_multiline' => 'ignore'
         ],
         'return_type_declaration' => [
             'space_before' => 'none'
         ],
+        // only converts simple strings in double quotes to single quotes
+        // ignores strings using variables, escape characters or single quotes inside
+        'single_quote' => true,
+        // there should be a single space b/w the cast and it's operand
+        'cast_spaces' => ['space' => 'single'],
+        // there shouldn't be any trailing whitespace at the end of a non-blank line
+        'no_trailing_whitespace' => true,
+        // there shouldn't be any trailing whitespace at the end of a blank line
+        'no_whitespace_in_blank_line' => true,
+        // there should be a space around binary operators like (=, => etc)
+        'binary_operator_spaces' => ['default' => 'single_space'],
+        // deals with rogue empty blank lines
+        'no_extra_blank_lines' => ['tokens' => ['extra']],
+        // reduces multi blank lines b/w phpdoc description and @param to a single line
+        // NOTE: Doesn't add a blank line if none exist
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->in(__DIR__)
     )
 ;
+
+return $config;

.php-cs-fixer.dist.php

@@ -15,6 +15,7 @@
 /firestore/**/*.php       @GoogleCloudPlatform/cloud-native-db-dpes @GoogleCloudPlatform/php-admins
 /iot/                     @gcseh @GoogleCloudPlatform/api-iot @GoogleCloudPlatform/php-admins
 /storage/                 @GoogleCloudPlatform/storage-dpe @GoogleCloudPlatform/php-admins
+/spanner/                 @GoogleCloudPlatform/api-spanner @GoogleCloudPlatform/php-admins
 
 
 # Functions samples owned by the Firebase team

CODEOWNERS

@@ -0,0 +1,43 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project,
+and in the interest of fostering an open and welcoming community,
+we pledge to respect all people who contribute through reporting issues,
+posting feature requests, updating documentation,
+submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project
+a harassment-free experience for everyone,
+regardless of level of experience, gender, gender identity and expression,
+sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information,
+such as physical or electronic
+addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct.
+By adopting this Code of Conduct,
+project maintainers commit themselves to fairly and consistently
+applying these principles to every aspect of managing this project.
+Project maintainers who do not follow or enforce the Code of Conduct
+may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior
+may be reported by opening an issue
+or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0,
+available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)

CODE_OF_CONDUCT.md

@@ -0,0 +1,7 @@
+# Security Policy
+
+To report a security issue, please use [g.co/vulnz](https://g.co/vulnz).
+
+The Google Security Team will respond within 5 working days of your report on g.co/vulnz.
+
+We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue.

SECURITY.md

@@ -1,5 +1,5 @@
 {
     "require": {
-        "google/analytics-data": "^0.5.0"
+        "google/analytics-data": "^0.7.0"
     }
 }

analyticsdata/composer.json

@@ -43,7 +43,6 @@
  */
 $property_id = 'YOUR-GA4-PROPERTY-ID';
 
-
 // [START analyticsdata_json_credentials_initialize]
 /* TODO(developer): Replace this variable with a valid path to the
  *  credentials.json file for your service account downloaded from the

analyticsdata/quickstart_json_credentials.php

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/analytics-data": "^0.5.0",
+        "google/analytics-data": "^0.7.0",
         "ext-bcmath":  "*"
     }
 }

analyticsdata/quickstart_oauth2/composer.json

@@ -72,7 +72,7 @@
             $entity['user_ip']);
     }
     # [END gae_flex_datastore_query]
-    array_unshift($visits, "Last 10 visits:");
+    array_unshift($visits, 'Last 10 visits:');
     $response->getBody()->write(implode("\n", $visits));
 
     return $response

appengine/flexible/datastore/app.php

@@ -30,6 +30,6 @@ public function testIndex()
         $this->assertEquals('200', $resp->getStatusCode(),
             'top page status code');
 
-        $this->assertStringContainsString("Last 10 visits:", (string) $resp->getBody());
+        $this->assertStringContainsString('Last 10 visits:', (string) $resp->getBody());
     }
 }

appengine/flexible/datastore/test/DeployTest.php

@@ -33,6 +33,6 @@ public function testIndex()
         $response = $app->handle($request);
         $this->assertEquals(200, $response->getStatusCode());
         $text = (string) $response->getBody();
-        $this->assertStringContainsString("Last 10 visits:", $text);
+        $this->assertStringContainsString('Last 10 visits:', $text);
     }
 }

appengine/flexible/datastore/test/LocalTest.php

@@ -41,7 +41,7 @@ public function testIndex()
         $this->assertEquals('200', $resp->getStatusCode(),
             'top page status code');
 
-        $this->assertStringContainsString("Logs:", (string) $resp->getBody());
+        $this->assertStringContainsString('Logs:', (string) $resp->getBody());
     }
     public function testAsyncLog()
     {

appengine/flexible/logging/test/DeployTest.php

@@ -33,7 +33,7 @@ public function testSomeLogs()
 
         $this->assertEquals(200, $response->getStatusCode());
         $text = (string) $response->getBody();
-        $this->assertStringContainsString("Logs:", $text);
+        $this->assertStringContainsString('Logs:', $text);
     }
 
     public function testAsyncLog()

appengine/flexible/logging/test/LocalTest.php

@@ -50,10 +50,10 @@ public function testIndex()
         $key = rand(0, 1000);
 
         // Test the /memcached REST API.
-        $this->put("/memcached/test$key", "sour");
-        $this->assertEquals("sour", $this->get("/memcached/test$key"));
-        $this->put("/memcached/test$key", "sweet");
-        $this->assertEquals("sweet", $this->get("/memcached/test$key"));
+        $this->put("/memcached/test$key", 'sour');
+        $this->assertEquals('sour', $this->get("/memcached/test$key"));
+        $this->put("/memcached/test$key", 'sweet');
+        $this->assertEquals('sweet', $this->get("/memcached/test$key"));
 
         // Make sure it handles a POST request too, which will increment the
         // counter.

appengine/flexible/memcache/test/DeployTest.php

@@ -62,26 +62,26 @@ public function testGetAndPut()
         // Use a random key to avoid colliding with simultaneous tests.
 
         // Test the /memcached REST API.
-        $request1 = (new RequestFactory)->createRequest('PUT', "/memcached/testkey1");
+        $request1 = (new RequestFactory)->createRequest('PUT', '/memcached/testkey1');
         $request1->getBody()->write('sour');
         $response1 = $app->handle($request1);
         $this->assertEquals(200, (string) $response1->getStatusCode());
 
         // Check that the key was written as expected
-        $request2 = (new RequestFactory)->createRequest('GET', "/memcached/testkey1");
+        $request2 = (new RequestFactory)->createRequest('GET', '/memcached/testkey1');
         $response2 = $app->handle($request2);
-        $this->assertEquals("sour", (string) $response2->getBody());
+        $this->assertEquals('sour', (string) $response2->getBody());
 
         // Test the /memcached REST API with a new value.
-        $request3 = (new RequestFactory)->createRequest('PUT', "/memcached/testkey2");
+        $request3 = (new RequestFactory)->createRequest('PUT', '/memcached/testkey2');
         $request3->getBody()->write('sweet');
         $response3 = $app->handle($request3);
         $this->assertEquals(200, (string) $response3->getStatusCode());
 
         // Check that the key was written as expected
-        $request4 = (new RequestFactory)->createRequest('GET', "/memcached/testkey2");
+        $request4 = (new RequestFactory)->createRequest('GET', '/memcached/testkey2');
         $response4 = $app->handle($request4);
-        $this->assertEquals("sweet", (string) $response4->getBody());
+        $this->assertEquals('sweet', (string) $response4->getBody());
     }
 }
 

appengine/flexible/memcache/test/LocalTest.php

@@ -28,7 +28,7 @@
 $app->addErrorMiddleware(true, true, true);
 
 $twilioAccountSid = getenv('TWILIO_ACCOUNT_SID');
-$twilioAuthToken  = getenv('TWILIO_AUTH_TOKEN');
+$twilioAuthToken = getenv('TWILIO_AUTH_TOKEN');
 $twilioNumber = getenv('TWILIO_FROM_NUMBER');
 
 # [START gae_flex_twilio_receive_call]

appengine/flexible/twilio/app.php

@@ -42,7 +42,7 @@ public function onOpen(ConnectionInterface $conn)
 
     public function onMessage(ConnectionInterface $from, $msg)
     {
-        $output = "Message received: " . $msg . "\n";
+        $output = 'Message received: ' . $msg . "\n";
         echo $output;
         foreach ($this->clients as $client) {
             $client->send($output);
@@ -59,7 +59,7 @@ public function onClose(ConnectionInterface $conn)
     public function onError(ConnectionInterface $conn, \Exception $e)
     {
         $conn->close();
-        echo "Connection closed due to error: " . $e->getMessage() . "\n";
+        echo 'Connection closed due to error: ' . $e->getMessage() . "\n";
         echo "\t" . $this->clients->count() . " connection(s) active.\n";
     }
 }

appengine/flexible/websockets/socket-demo.php

@@ -54,14 +54,14 @@ public function testIndex()
                 return $endPromise;
             })
             ->otherwise(function ($e) {
-                echo "Error: " . $e->getMessage() . "\n";
+                echo 'Error: ' . $e->getMessage() . "\n";
                 throw $e;
             });
 
         $this->loop->run();
         $resolvedMsg = Block\await($basePromise, $this->loop);
         $this->assertStringContainsString(
-            "Message received: Hello World!",
+            'Message received: Hello World!',
             strval($resolvedMsg)
         );
     }

appengine/flexible/websockets/test/LocalTest.php

@@ -97,7 +97,7 @@
  * You can have multiple installations in one database if you give each
  * a unique prefix. Only numbers, letters, and underscores please!
  */
-$table_prefix  = 'wp_';
+$table_prefix = 'wp_';
 
 /**
  * For developers: WordPress debugging mode.

appengine/flexible/wordpress/files/wp-config.php

@@ -43,7 +43,7 @@ function throwException()
             print('Triggering a PHP Fatal Error by including a file with a syntax error.');
             print($linkText);
             $filename = tempnam(sys_get_temp_dir(), 'php_syntax_error');
-            file_put_contents($filename, "");
+            file_put_contents($filename, '');
             require($filename);
             break;
         default:

appengine/standard/errorreporting/index.php

@@ -17,25 +17,31 @@
 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;
 
 class CloudSqlTest extends TestCase
 {
     use TestTrait;
+    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';
-        $socket = "/tmp/cloudsql/${connection}";
+        $socket = "${socketDir}/${connection}";
 
         if (!file_exists($socket)) {
             $this->markTestSkipped(
-                "You must run 'cloud_sql_proxy -instances=${connection} -dir=/cloudsql'"
+                "You must run 'cloud_sql_proxy -instances=${connection} -dir=${socketDir}'"
             );
         }
         $dsn = "mysql:unix_socket=${socket};dbname=${dbName}";
@@ -144,11 +150,11 @@ public function testDataModel()
 
         // Clean up.
         $result = $model->delete($breakfastId);
-        $this->assertTrue((bool)$result);
+        $this->assertTrue((bool) $result);
         $this->assertFalse($model->read($breakfastId));
-        $this->assertTrue((bool)$model->read($bellId));
+        $this->assertTrue((bool) $model->read($bellId));
         $result = $model->delete($bellId);
-        $this->assertTrue((bool)$result);
+        $this->assertTrue((bool) $result);
         $this->assertFalse($model->read($bellId));
     }
 }

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

@@ -41,7 +41,7 @@
 $r = new MonitoredResource();
 $r->setType('gce_instance');
 $r->setLabels([
-    'instance_id' =>$instanceId,
+    'instance_id' => $instanceId,
     'zone' => 'us-central1-f',
 ]);
 

appengine/standard/grpc/monitoring.php

@@ -47,7 +47,7 @@
 $strm->write($strmReq);
 
 $strmReq = new StreamingRecognizeRequest();
-$f = fopen($audioFile, "rb");
+$f = fopen($audioFile, 'rb');
 $fsize = filesize($audioFile);
 $bytes = fread($f, $fsize);
 $strmReq->setAudioContent($bytes);

appengine/standard/grpc/speech.php

@@ -1,3 +1,3 @@
 
 
-echo "hello world!";
+echo 'hello world!';