Merge branch 'master' into master

Author: ikuleshov

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/

appengine/standard/slim-framework/composer.json

@@ -1,5 +1,6 @@
 {
     "require": {
-        "slim/slim": " ^4.0"
+        "slim/slim": " ^4.0",
+        "slim/psr7": "^1.3"
     }
 }

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]