Merge branch 'master' into add-subdir-var

Author: bshaffer

appengine/flexible/analytics/app.php

@@ -16,19 +16,26 @@
  */
 
 use GuzzleHttp\Client;
-use Silex\Application;
-use Silex\Provider\TwigServiceProvider;
-use Symfony\Component\HttpFoundation\Request;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Message\ResponseInterface as Response;
+use Slim\Factory\AppFactory;
+use Slim\Views\Twig;
+use Slim\Views\TwigMiddleware;
 
-// create the Silex application
-$app = new Application();
-$app->register(new TwigServiceProvider());
-$app['twig.path'] = [ __DIR__ ];
+// Create App
+$app = AppFactory::create();
 
-$app->get('/', function (Application $app, Request $request) {
-    /** @var Twig_Environment $twig */
-    $twig = $app['twig'];
-    $trackingId = $app['GA_TRACKING_ID'];
+// Display errors
+$app->addErrorMiddleware(true, true, true);
+
+// Create Twig
+$twig = Twig::create(__DIR__);
+
+// Add Twig-View Middleware
+$app->add(TwigMiddleware::create($app, $twig));
+
+$app->get('/', function (Request $request, Response $response) use ($twig) {
+    $trackingId = getenv('GA_TRACKING_ID');
     # [START gae_flex_analytics_track_event]
     $baseUri = 'http://www.google-analytics.com/';
     $client = new GuzzleHttp\Client(['base_uri' => $baseUri]);
@@ -44,12 +51,13 @@
         'el' => 'Hearts',  # Event label.
         'ev' => 0,  # Event value, must be an integer
     ];
-    $response = $client->request('POST', 'collect', ['form_params' => $formData]);
+    $gaResponse = $client->request('POST', 'collect', ['form_params' => $formData]);
     # [END gae_flex_analytics_track_event]
-    return $twig->render('index.html.twig', [
-            'base_uri' => $baseUri,
-            'response_code' => $response->getStatusCode(),
-            'response_reason' => $response->getReasonPhrase()]);
+    return $twig->render($response, 'index.html.twig', [
+        'base_uri' => $baseUri,
+        'response_code' => $gaResponse->getStatusCode(),
+        'response_reason' => $gaResponse->getReasonPhrase()
+    ]);
 });
 
 return $app;

appengine/flexible/analytics/composer.json

@@ -1,8 +1,8 @@
 {
     "require": {
-        "silex/silex": "^2.3",
-        "twig/twig": "^1.24",
-        "guzzlehttp/guzzle": "^7.0",
-        "symfony/css-selector": "^3.1"
+        "slim/slim": "^4.0",
+        "slim/psr7": "^1.3",
+        "slim/twig-view": "^3.2",
+        "guzzlehttp/guzzle": "^7.0"
     }
 }

appengine/flexible/analytics/index.php

@@ -23,6 +23,4 @@
 
 // Run the app!
 // use "gcloud app deploy"
-$app['debug'] = true;
-$app['GA_TRACKING_ID'] = getenv('GA_TRACKING_ID');
 $app->run();

appengine/flexible/analytics/test/LocalTest.php

@@ -16,30 +16,25 @@
  */
 namespace Google\Cloud\Samples\AppEngine\Analytics;
 
-use Silex\WebTestCase;
+use PHPUnit\Framework\TestCase;
+use Google\Cloud\TestUtils\TestTrait;
+use Slim\Psr7\Factory\RequestFactory;
 
-class LocalTest extends WebTestCase
+class LocalTest extends TestCase
 {
-    public function setUp(): void
-    {
-        parent::setUp();
-        $this->client = $this->createClient();
-    }
+    use TestTrait;
 
-    public function createApplication()
+    public function testIndex()
     {
+        $this->requireEnv('GA_TRACKING_ID');
+
         $app = require __DIR__ . '/../app.php';
-        $app['GA_TRACKING_ID'] = getenv('GA_TRACKING_ID');
-        return $app;
-    }
 
-    public function testIndex()
-    {
         // Access the modules app top page.
-        $client = $this->client;
-        $crawler = $client->request('GET', '/');
-        $this->assertTrue($client->getResponse()->isOk());
-        $this->assertEquals(1, $crawler->filter(
-            'html:contains("returned 200")')->count());
+        $request = (new RequestFactory)->createRequest('GET', '/');
+        $response = $app->handle($request);
+        $this->assertEquals(200, $response->getStatusCode());
+        $body = (string) $response->getBody();
+        $this->assertStringContainsString('returned 200', $body);
     }
 }

appengine/flexible/datastore/app.php

@@ -16,29 +16,34 @@
  */
 
 use Google\Cloud\Datastore\DatastoreClient;
-use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Message\ResponseInterface as Response;
+use RKA\Middleware\IpAddress;
+use Slim\Factory\AppFactory;
 
-// create the Silex application
-$app = new Application();
+// Create App
+$app = AppFactory::create();
+
+// Display errors
+$app->addErrorMiddleware(true, true, true);
+
+// Add IP address middleware
+$checkProxyHeaders = true;
+$trustedProxies = ['10.0.0.1', '10.0.0.2'];
+$app->add(new IpAddress($checkProxyHeaders, $trustedProxies));
+
+$app->get('/', function (Request $request, Response $response) {
+    $projectId = getenv('GCLOUD_PROJECT');
+    if (empty($projectId)) {
+        $response->getBody()->write('Set the GCLOUD_PROJECT environment variable to run locally');
+        return $response;
+    }
 
-$app['datastore'] = function () use ($app) {
-    $projectId = $app['project_id'];
     # [START gae_flex_datastore_client]
     $datastore = new DatastoreClient([
         'projectId' => $projectId
     ]);
     # [END gae_flex_datastore_client]
-    return $datastore;
-};
-
-$app->get('/', function (Application $app, Request $request) {
-    if (empty($app['project_id'])) {
-        return 'Set the GCLOUD_PROJECT environment variable to run locally';
-    }
-    /** @var \Google_Service_Datastore $datastore */
-    $datastore = $app['datastore'];
 
     // determine the user's IP
     $user_ip = get_user_ip($request);
@@ -68,13 +73,16 @@
     }
     # [END gae_flex_datastore_query]
     array_unshift($visits, "Last 10 visits:");
-    return new Response(implode("\n", $visits), 200,
-        ['Content-Type' => 'text/plain']);
+    $response->getBody()->write(implode("\n", $visits));
+
+    return $response
+        ->withStatus(200)
+        ->withHeader('Content-Type', 'text/plain');
 });
 
 function get_user_ip(Request $request)
 {
-    $ip = $request->GetClientIp();
+    $ip = $request->getAttribute('ip_address');
     // Keep only the first two octets of the IP address.
     $octets = explode($separator = ':', $ip);
     if (count($octets) < 2) {  // Must be ip4 address

appengine/flexible/datastore/composer.json

@@ -1,6 +1,8 @@
 {
     "require": {
-        "silex/silex": "^2.3",
-        "google/cloud-datastore": "^1.0"
+        "google/cloud-datastore": "^1.0",
+        "slim/slim": "^4.0",
+        "slim/psr7": "^1.3",
+        "akrabat/ip-address-middleware": "^2.0"
     }
 }

appengine/flexible/datastore/index.php

@@ -23,6 +23,4 @@
 
 // Run the app!
 // use "gcloud app deploy"
-$app['debug'] = true;
-$app['project_id'] = getenv('GCLOUD_PROJECT');
 $app->run();

appengine/flexible/datastore/test/LocalTest.php

@@ -16,33 +16,23 @@
  */
 namespace Google\Cloud\Test;
 
-use Silex\WebTestCase;
+use PHPUnit\Framework\TestCase;
+use Google\Cloud\TestUtils\TestTrait;
+use Slim\Psr7\Factory\RequestFactory;
 
-class LocalTest extends WebTestCase
+class LocalTest extends TestCase
 {
-    public function setUp(): void
-    {
-        parent::setUp();
-        $this->client = $this->createClient();
-    }
+    use TestTrait;
 
-    public function createApplication()
+    public function testIndex()
     {
         $app = require __DIR__ . '/../app.php';
-        if (!$projectId = getenv('GCLOUD_PROJECT')) {
-            $this->markTestSkipped('Must set GCLOUD_PROJECT');
-        }
-        $app['project_id'] = $projectId;
-        return $app;
-    }
 
-    public function testIndex()
-    {
         // Access the modules app top page.
-        $client = $this->client;
-        $client->request('GET', '/');
-        $this->assertTrue($client->getResponse()->isOk());
-        $text = $client->getResponse()->getContent();
+        $request = (new RequestFactory)->createRequest('GET', '/');
+        $response = $app->handle($request);
+        $this->assertEquals(200, $response->getStatusCode());
+        $text = (string) $response->getBody();
         $this->assertStringContainsString("Last 10 visits:", $text);
     }
 }

appengine/flexible/drupal8/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "drush/drush": "^8.1"
+        "drush/drush": "^10.0"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^6.3",

appengine/flexible/helloworld/composer.json

@@ -1,9 +1,6 @@
 {
   "require": {
-    "silex/silex": "^2.3"
-  },
-  "require-dev": {
-    "symfony/browser-kit": "^4.4",
-    "symfony/http-kernel": "^4.4"
+    "slim/slim": "^4.0",
+    "slim/psr7": "^1.3"
   }
 }