Merge branch 'master' into spanner-commit-stats-sample

larkee · web-flow · commit 1b98b36f8439 · 2021-02-19T00:26:46.000+11:00
diff --git a/appengine/flexible/analytics/phpunit.xml.dist b/appengine/flexible/analytics/phpunit.xml.dist
@@ -21,6 +21,7 @@
     <testsuites>
         <testsuite name="App Engine Flex Memcache tests">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <logging>
diff --git a/appengine/flexible/datastore/phpunit.xml.dist b/appengine/flexible/datastore/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="App Engine Flex Datastore tests">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <logging>
diff --git a/appengine/flexible/drupal8/phpunit.xml.dist b/appengine/flexible/drupal8/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="Drupal deployment test">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/appengine/flexible/helloworld/phpunit.xml.dist b/appengine/flexible/helloworld/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="PHP Getting Started Test Suite">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <logging>
diff --git a/appengine/flexible/laravel/phpunit.xml.dist b/appengine/flexible/laravel/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="Laravel deployment test">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/appengine/flexible/logging/phpunit.xml.dist b/appengine/flexible/logging/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="AppEngine Flex logging test">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <logging>
diff --git a/appengine/flexible/memcache/phpunit.xml.dist b/appengine/flexible/memcache/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="App Engine Flex Memcache tests">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <logging>
diff --git a/appengine/flexible/metadata/phpunit.xml.dist b/appengine/flexible/metadata/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="AppEngine Flex metadata test">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <logging>
diff --git a/appengine/flexible/staticcontent/phpunit.xml.dist b/appengine/flexible/staticcontent/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="PHP static content test">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/appengine/flexible/storage/phpunit.xml.dist b/appengine/flexible/storage/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="AppEngine Flex storage test">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <logging>
diff --git a/appengine/flexible/supervisord/addition/phpunit.xml.dist b/appengine/flexible/supervisord/addition/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite>
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <logging>
diff --git a/appengine/flexible/supervisord/replacement/phpunit.xml.dist b/appengine/flexible/supervisord/replacement/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite>
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/appengine/flexible/symfony/phpunit.xml.dist b/appengine/flexible/symfony/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="Symfony deployment test">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/appengine/flexible/tasks/phpunit.xml.dist b/appengine/flexible/tasks/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="App Engine Flexible Cloud Tasks test">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <logging>
diff --git a/appengine/flexible/twilio/phpunit.xml.dist b/appengine/flexible/twilio/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="PHP twilio test">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <logging>
diff --git a/appengine/flexible/websockets/phpunit.xml.dist b/appengine/flexible/websockets/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="default">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <logging>
diff --git a/appengine/flexible/wordpress/phpunit.xml.dist b/appengine/flexible/wordpress/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="App Engine Flexible WordPress test">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <php>
diff --git a/appengine/standard/slim-framework/.gcloudignore b/appengine/standard/slim-framework/.gcloudignore
@@ -0,0 +1,17 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+
+# PHP Composer dependencies:
+/vendor/
diff --git a/appengine/standard/slim-framework/composer.json b/appengine/standard/slim-framework/composer.json
@@ -1,5 +1,6 @@
 {
     "require": {
-        "slim/slim": " ^4.0"
+        "slim/slim": " ^4.0",
+        "slim/psr7": "^1.3"
     }
 }
diff --git a/appengine/standard/slim-framework/index.php b/appengine/standard/slim-framework/index.php
@@ -22,13 +22,20 @@
  */
 require 'vendor/autoload.php';
 
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Slim\Factory\AppFactory;
+
 # [START gae_slim_front_controller]
-$app = new Slim\App();
-$app->get('/', function ($request, $response) {
+$app = AppFactory::create();
+$app->addRoutingMiddleware();
+
+$app->get('/', function (Request $request, Response $response) {
     // Use the Null Coalesce Operator in PHP7
     // http://php.net/manual/en/language.operators.comparison.php#language.operators.comparison.coalesce
     $name = $request->getQueryParams()['name'] ?? 'World';
-    return $response->getBody()->write("Hello, $name!");
+    $response->getBody()->write("Hello, $name!");
+    return $response;
 });
 $app->run();
 # [END gae_slim_front_controller]
diff --git a/bigtable/composer.json b/bigtable/composer.json
@@ -1,7 +1,6 @@
 {
     "require": {
-        "google/cloud-bigtable": "^1.3.1",
-        "psr/cache": "^1.0"
+        "google/cloud-bigtable": "^1.3.1"
     },
     "autoload-dev": {
         "psr-4": {
diff --git a/endpoints/getting-started/phpunit.xml.dist b/endpoints/getting-started/phpunit.xml.dist
@@ -18,6 +18,7 @@
     <testsuites>
         <testsuite name="PHP endpoints test">
             <directory>test</directory>
+            <exclude>test/DeployTest.php</exclude>
         </testsuite>
     </testsuites>
     <logging>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`		`- "slim/slim": " ^4.0"`
	`3`	`+ "slim/slim": " ^4.0",`
	`4`	`+ "slim/psr7": "^1.3"`
`4`	`5`	`}`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`		`- "google/cloud-bigtable": "^1.3.1",`
`4`		`- "psr/cache": "^1.0"`
	`3`	`+ "google/cloud-bigtable": "^1.3.1"`
`5`	`4`	`},`
`6`	`5`	`"autoload-dev": {`
`7`	`6`	`"psr-4": {`