Merge branch 'master' into add-shakespeare-query

Author: bshaffer

appengine/flexible/endpoints/README.md

@@ -21,8 +21,6 @@ Run the application:
 
     $ php -S localhost:8080
 
-In your web browser, go to the following address: http://localhost:8080.
-
 ### Using the echo client
 
 With the app running locally, you can execute the simple echo client using:
@@ -38,7 +36,7 @@ Open the `swagger.yaml` file and in the `host` property, replace
 
 Then, deploy the sample using `gcloud`:
 
-    gcloud app deploy
+    gcloud beta app deploy
 
 Once deployed, you can access the application at https://YOUR-PROJECT-ID.appspot.com/
 or run the command `gcloud app browse`.
@@ -92,3 +90,17 @@ To use the client ID for authentication:
 Now you can use the client ID to make requests to the API:
 
     $ php endpoints.php make-request https://YOUR-PROJECT-ID.appspot.com YOUR-API-KEY /path/to/client-secrets.json
+
+
+## Viewing the Endpoints graphs
+
+By using Endpoints, you get access to several metrics that are displayed graphically in the Cloud Console.
+
+To view the Endpoints graphs:
+
+1. Go to the [Endpoints section in Cloud Console](https://console.cloud.google.com/endpoints) of the project you deployed your API to.
+2. Click on your API to view more detailed information about the metrics collected.
+
+## Swagger UI
+
+The Swagger UI is an open source Swagger project that allows you to explore your API through a UI. Find out more about it on the [Swagger site](http://swagger.io/swagger-ui/).

appengine/flexible/endpoints/app.php

@@ -23,30 +23,10 @@
  */
 
 use Silex\Application;
-use Silex\Provider\TwigServiceProvider;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Yaml\Yaml;
 
 // create the Silex application
 $app = new Application();
-$app->register(new TwigServiceProvider());
-$app['twig.path'] = [ __DIR__ ];
-
-$app->get('/', function () use ($app) {
-    /** @var Twig_Environment $twig */
-    $twig = $app['twig'];
-
-    // Shows the index page
-    return $app['twig']->render('endpoints.html.twig');
-});
-
-$app->get('/api-docs', function () use ($app) {
-    // Serves up the Swagger spec for the API.
-    $swaggerText = file_get_contents(__DIR__ . '/swagger.yaml');
-    $swaggerArray = Yaml::parse($swaggerText);
-
-    return $app->json($swaggerArray);
-});
 
 $app->post('/echo', function () use ($app) {
     // Simple echo service.

appengine/flexible/endpoints/composer.json

@@ -1,9 +1,6 @@
 {
     "require": {
         "silex/silex": " ^1.3",
-        "twig/twig": "~1.8|~2.0",
-        "symfony/twig-bridge": " ~2.7|3.0.*",
-        "symfony/yaml": "^3.0",
         "symfony/console": " ^3.0",
         "google/auth": " 0.7"
     },