updates for slim v4 (GoogleCloudPlatform#1087)

Author: bshaffer

appengine/php72/getting-started/composer.json

@@ -1,8 +1,10 @@
 {
   "require": {
     "google/cloud-storage": "^1.6",
-    "slim/slim": "^3.0",
-    "slim/twig-view": "^2.4"
+    "slim/slim": "^4.0",
+    "slim/twig-view": "^3.0",
+    "slim/http": "^1.0",
+    "slim/psr7": "^1.0"
   },
   "autoload": {
      "psr-4": {

appengine/php72/getting-started/src/app.php

@@ -26,11 +26,8 @@
 
 // [END gae_php_app_storage_client_import]
 
-$app = new Slim\App([
-    'settings' => [
-        'displayErrorDetails' => true,
-    ],
-]);
+$app = Slim\Factory\AppFactory::create();
+$app->addErrorMiddleware(true, true, true);
 
 // Get container
 $container = $app->getContainer();

appengine/php72/getting-started/src/controllers.php

@@ -26,7 +26,9 @@
 use Google\Cloud\Storage\Bucket;
 
 $app->get('/', function (Request $request, Response $response) {
-    return $response->withRedirect('/books');
+    return $response
+        ->withHeader('Location', '/books')
+        ->withStatus(302);
 })->setName('home');
 
 $app->get('/books', function (Request $request, Response $response) {
@@ -60,7 +62,9 @@
     }
     $id = $this->cloudsql->create($book);
 
-    return $response->withRedirect("/books/$id");
+    return $response
+        ->withHeader('Location', "/books/$id")
+        ->withStatus(302);
 });
 
 $app->get('/books/{id}', function (Request $request, Response $response, $args) {
@@ -109,7 +113,9 @@
         $book['image_url'] = $imageUrl;
     }
     if ($this->cloudsql->update($book)) {
-        return $response->withRedirect("/books/$args[id]");
+        return $response
+            ->withHeader('Location', "/books/$args[id]")
+            ->withStatus(302);
     }
 
     return new Response('Could not update book');
@@ -128,7 +134,9 @@
             $object->delete();
             // [END gae_php_app_delete_image]
         }
-        return $response->withRedirect('/books');
+        return $response
+            ->withHeader('Location', '/books')
+            ->withStatus(302);
     }
 
     return $response->withStatus(404);

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

@@ -31,7 +31,7 @@ public function setUp() : void
         $dbUser = $this->requireEnv('CLOUDSQL_USER');
         $dbPass = $this->requireEnv('CLOUDSQL_PASSWORD');
         $dbName = getenv('CLOUDSQL_DATABASE_NAME') ?: 'bookshelf';
-        $socket = "/cloudsql/${connection}";
+        $socket = "/tmp/cloudsql/${connection}";
 
         if (!file_exists($socket)) {
             $this->markTestSkipped(

appengine/php72/getting-started/test/ControllersTest.php

@@ -19,9 +19,8 @@
 
 use Google\Cloud\TestUtils\TestTrait;
 use Google\Cloud\Samples\AppEngine\GettingStarted\CloudSqlDataModel;
-use Slim\Http\Environment;
-use Slim\Http\Request;
-use Slim\Http\Response;
+use Slim\Psr7\Factory\RequestFactory;
+use Slim\Psr7\Response;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -48,8 +47,7 @@ public function setUp()
     public function testRoot()
     {
         $action = $this->getAction('home');
-        $environment = Environment::mock();
-        $request = Request::createFromEnvironment($environment);
+        $request = (new RequestFactory)->createRequest('get', '/');
         $response = $action($request, new Response());
 
         $this->assertEquals(302, $response->getStatusCode());
@@ -205,7 +203,9 @@ public function testRoot()
 
     private function getAction($name)
     {
-        $route = $this->app->getContainer()->get('router')->getNamedRoute($name);
+        $route = $this->app->getRouteCollector()
+            ->getNamedRoute($name);
+
         return $route->getCallable();
     }
 }

appengine/php72/slim-framework/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "slim/slim": " ^3.0"
+        "slim/slim": " ^4.0"
     }
 }