README Updates for App Engine BETA (GoogleCloudPlatform#660)

Author: bshaffer

appengine/php72/README.md

@@ -1,6 +1,28 @@
 # App Engine for PHP 7.2
 
-*Please note ALL samples in this directory are in ALPHA*
+> Please note ALL samples in this directory are in `BETA`
 
-[Sign up](https://goo.gl/qpQg5k ) to get alpha access.
+[Read the docs](https://cloud.google.com/appengine/docs/standard/php7)
 
+## Getting Started Guides
+
+* [Quickstart](https://cloud.google.com/appengine/docs/standard/php7/quickstart)
+* [Building an App](https://cloud.google.com/appengine/docs/standard/php7/building-app/)
+
+## Code Samples
+
+* [Implementing `Google Auth`](auth)
+* [Connecting to `Cloud SQL`](cloudsql)
+* [Enabling `Cloud Error Reporting`](errorreporting)
+* [Implementing a `front controller`](front-controller)
+* [Making `gRPC` calls](grpc)
+* [Using the `Metadata` server](metadata)
+* [Using `Cloud Storage`](storage)
+* [Enabling `Cloud Trace`](trace)
+
+## Framework Guides
+
+* [Laravel](laravel-framework)
+* [Slim Framework](slim-framework)
+* [Symfony](symfony-framework)
+* [WordPress](wordpress)

appengine/php72/auth/README.md

@@ -1,37 +1,35 @@
-# Google Auth PHP Sample Application
+# Google Auth on App Engine Standard for PHP 7.2
 
-[![Open in Cloud Shell][shell_img]][shell_link]
-
-[shell_img]: http://gstatic.com/cloudssh/images/open-btn.png
-[shell_link]: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googlecloudplatform/php-docs-samples&page=editor&working_dir=auth
+This sample application demonstrates how to [Authenticate Users](https://cloud.google.com/appengine/docs/standard/php7/authenticating-users)
+on App Engine Standard.
 
 ## Description
 
-This command-line application shows how to authenticate to Google Cloud APIs
-using different methods. This sample uses Storage as an example, but these
-methods will work on any Google Cloud API.
+This application shows how to authenticate to Google Cloud APIs using two
+different methods. This sample uses Storage as an example, but these methods
+will work for any Google Cloud API.
+
+## Deploy to App Engine
 
-## Build and Run
 1.  **Enable APIs** - [Enable the Storage API](https://console.cloud.google.com/flows/enableapi?apiid=storage-api.googleapis.com)
     and create a new project or select an existing project.
-2.  **Download The Credentials** - Click "Go to credentials" after enabling the APIs. Click "New Credentials"
-    and select "Service Account Key". Create a new service account, use the JSON key type, and
-    select "Create". Once downloaded, set the environment variable `GOOGLE_APPLICATION_CREDENTIALS`
-    to the path of the JSON key that was downloaded.
-3.  **Clone the repo** and cd into this directory
-```
+1.  **Clone the repo** and cd into this directory
+    ```
     $ git clone https://github.com/GoogleCloudPlatform/php-docs-samples
-    $ cd php-docs-samples/auth
-```
-4.  **Install dependencies** via [Composer](http://getcomposer.org/doc/00-intro.md).
-    Run `php composer.phar install --no-dev` (if composer is installed locally) or `composer install --no-dev`
-    (if composer is installed globally).
-5. Run `gcloud app deploy` to deploy to App Engine.
-
-## Contributing changes
-
-* See [CONTRIBUTING.md](../CONTRIBUTING.md)
-
-## Licensing
-
-* See [LICENSE](../LICENSE)
+    $ cd php-docs-samples/appengine/php72/auth
+    ```
+1.  **Install dependencies** via [Composer](http://getcomposer.org/doc/00-intro.md).
+    Run `php composer.phar install --no-dev` (if composer is installed locally)
+    or `composer install --no-dev` (if composer is installed globally).
+1.  Run `gcloud app deploy` to deploy to App Engine.
+
+## Run Locally
+
+1.  **Download The Credentials** - Click "Go to credentials" after enabling the
+    APIs. Click "New Credentials" and select "Service Account Key". Create a new
+    service account, use the JSON key type, and select "Create". Once
+    downloaded, set the environment variable `GOOGLE_APPLICATION_CREDENTIALS` to
+    the path of the JSON key that was downloaded.
+1.  Run PHP's built-in web server with the command `php -S localhost:8000` and
+    then view the application in your browser at
+    [http://localhost:8000](http://localhost:8000).

appengine/php72/cloudsql/README.md

@@ -1,12 +1,15 @@
-# Cloud SQL & Google App Engine
+# Cloud SQL on App Engine Standard for PHP 7.2
 
-This sample application demonstrates how to use [Cloud SQL with Google App Engine](https://cloud.google.com/appengine/docs/php/cloud-sql/).
+This sample application demonstrates how to use [Cloud SQL on App Engine for PHP 7.2](https://cloud.google.com/appengine/docs/standard/php7/using-cloud-sql).
 
 ## Setup
 
 Before you can run or deploy the sample, you will need to do the following:
 
-1. Create a [Second Generation Cloud SQL](https://cloud.google.com/sql/docs/create-instance) instance. You can do this from the [Cloud Console](https://console.developers.google.com) or via the [Cloud SDK](https://cloud.google.com/sdk). To create it via the SDK use the following command:
+1. Create a [Second Generation Cloud SQL](https://cloud.google.com/sql/docs/create-instance)
+   instance. You can do this from the [Cloud Console](https://console.developers.google.com)
+   or via the [Cloud SDK](https://cloud.google.com/sdk). To create it via the
+   SDK use the following command:
 
         $ gcloud sql instances create YOUR_INSTANCE_NAME
 

appengine/php72/errorreporting/README.md

@@ -1,7 +1,7 @@
-# App Engine for PHP 7.2 Error Reporting samples
+# Stackdriver Error Reporting on App Engine Standard for PHP 7.2
 
-This app demonstrates how to report errors on App Engine for PHP 7.2 and shows how
-different PHP error types are handled.
+This application demonstrates how to report errors on App Engine Standard for
+PHP 7.2. It also demonstrates how different PHP error types are handled.
 
 To set up **error reporting** in your App Engine PHP 7.2 application, simply follow
 these two steps:
@@ -10,7 +10,7 @@ these two steps:
    ```sh
    composer require google/cloud-error-reporting
    ```
-2. Create a [`php.ini`](php.ini) file in the root of your project and set
+1. Create a [`php.ini`](php.ini) file in the root of your project and set
    `auto_prepend_file` to the following:
     ```ini
     ; in php.ini
@@ -22,25 +22,48 @@ registers the client library's error handler.
 
 [prepend]: https://github.com/GoogleCloudPlatform/google-cloud-php-errorreporting/blob/master/src/prepend.php
 
-## Setup
+If you cannot modify your `php.ini`, the `prepend.php` file can be manually
+included to register the error handler:
+
+```php
+# This works for files in the root of your project. Adjust __DIR__ accordingly.
+require_once __DIR__ . '/vendor/google/cloud-error-reporting/src/prepend.php';
+```
+
+## Setup the sample
 
 - Install [`composer`](https://getcomposer.org)
 - Install dependencies by running:
-
     ```sh
     composer install
     ```
-
 - Install the [Google Cloud SDK](https://developers.google.com/cloud/sdk/).
 
-## Deploy
+## Deploy the sample
+
+### Deploy with `gcloud`
+
+Deploy the samples by doing the following:
+
+```
+gcloud config set project YOUR_PROJECT_ID
+gcloud app deploy
+gcloud app browse
+```
+
+The last command will open `https://{YOUR_PROJECT_ID}.appspot.com/`
+in your browser. Browse to `/` to see a list of examples to execute.
 
 ### Run Locally
 
-You can run the sample locally using PHP's build-in web server:
+Uncomment the `require_once` statement at the top of [`index.php`](index.php),
+or add the `auto_prepend_file` above to your local `php.ini`.
+
+Now run the sample locally using PHP's build-in web server:
 
 ```
-# export environemnt variables locally which are set by app engine when deployed
+# export environemnt variables locally which are set by App Engine when deployed
+export GOOGLE_APPLICATION_CREDENTIALS=/path/to/credentials.json
 export GOOGLE_CLOUD_PROJECT=YOUR_PROJECT_ID
 export GAE_SERVICE=local
 export GAE_VERSION=testing
@@ -50,16 +73,3 @@ php -S localhost:8000
 ```
 
 Browse to `localhost:8000` to see a list of examples to execute.
-
-### Deploy with gcloud
-
-Deploy the samples by doing the following:
-
-```
-gcloud config set project YOUR_PROJECT_ID
-gcloud app deploy
-gcloud app browse
-```
-
-The last command will open `https://{YOUR_PROJECT_ID}.appspot.com/`
-in your browser. Browse to `/` to see a list of examples to execute.

appengine/php72/errorreporting/index.php

@@ -10,6 +10,11 @@
 #
 # [END gae_erroreporting_register_handler]
 
+# Uncomment this line if you'd like to include `prepend.php` manually instead of
+# using `php.ini`:
+#
+#    require_once 'vendor/google/cloud-error-reporting/src/prepend.php';
+#
 // throw a test exception to trigger our exception handler
 if (isset($_GET['type'])) {
     $linkText = '<p>This should now be visible in the '

appengine/php72/front-controller/README.md

@@ -1,7 +1,7 @@
-# App Engine for PHP 7.2 Front Controller sample
+# Front Controllers on App Engine Standard for PHP 7.2
 
 This app demonstrates how to implement a simple front controller for legacy
-projects. The main code sample lies in [`index.php`](index.php#L13). This is one
+projects. The main code sample is in [`index.php`](index.php#L13). This is one
 example of a front controller. See here for more examples:
 
  * [front controller implementation using the Slim Framework](../slim-framework/index.php#L26)

appengine/php72/getting-started/README.md

@@ -1,3 +1,7 @@
 # Getting Started on App Engine for PHP 7.2
 
-This application is meant to help run a small PHP application which integrates with Cloud SQL and Cloud Storage on App Engine Standard for PHP 7.2. The tutorial uses the Slim framework.
+This sample demonstrates how to deploy a PHP application which integrates with
+Cloud SQL and Cloud Storage on App Engine Standard for PHP 7.2. The tutorial
+uses the Slim framework.
+
+## View the [full tutorial](https://cloud.google.com/appengine/docs/standard/php7/building-app/)

appengine/php72/helloworld/README.md

@@ -1,27 +1,6 @@
-# Hello World on App Engine for PHP 7.2
+# Hello World on App Engine Standard for PHP 7.2
 
 This sample demonstrates how to deploy a *very* basic application to Google
 App Engine for PHP 7.2.
 
-## Setup
-
-Before running this sample:
-
-### Create a project (if you haven't already)
-
-- Go to
-  [Google Developers Console](https://console.developers.google.com/project)
-  and create a new project.
-
-## Deploy to App Engine
-
-**Deploy with gcloud**
-
-```
-gcloud config set project YOUR_PROJECT_ID
-gcloud app deploy
-gcloud app browse
-```
-
-The last command will open `https://{YOUR_PROJECT_ID}.appspot.com/`
-in your browser.
+## View the [full tutorial](https://cloud.google.com/appengine/docs/standard/php7/quickstart)

appengine/php72/laravel-framework/README.md

@@ -1,5 +1,4 @@
-Laravel on App Engine for PHP 7.2
-=================================
+# Laravel Framework on App Engine Standard for PHP 7.2
 
 [Laravel][laravel] is an open source web framework for PHP developers that encourages the use of the model-view-controller (MVC) pattern.
 
@@ -65,7 +64,7 @@ laravel.com. This version was tested to work with `laravel/laravel-framework:^5.
 
     ![Laravel welcome page][laravel-welcome]
 
-## Set up Database Sessions
+## Set up Database Sessions with Cloud SQL
 
 **Note**: This section only works with Laravel 5.4.16. To use earlier versions of
 Laravel, you need to manually add the `DB_SOCKET` value to
@@ -103,7 +102,7 @@ Laravel, you need to manually add the `DB_SOCKET` value to
         export DB_DATABASE=laravel DB_USERNAME=root DB_PASSWORD=YOUR_DB_PASSWORD
         php artisan migrate --force
 
-1. Modify your `app.yaml` file with the following contents:
+1. Modify your `app.yaml` file with contents from [`app-dbsessions.yaml`](app-dbsessions.yaml):
 
         runtime: php72
 

…ework/test/DeployDatabaseSessionTest.php …el-framework/test/DeployDatabaseTest.phpappengine/php72/laravel-framework/test/DeployDatabaseSessionTest.php renamed to appengine/php72/laravel-framework/test/DeployDatabaseTest.php appengine/php72/laravel-framework/test/DeployDatabaseSessionTest.php renamed to appengine/php72/laravel-framework/test/DeployDatabaseTest.php

@@ -21,7 +21,7 @@
 use Google\Cloud\TestUtils\TestTrait;
 use PHPUnit\Framework\TestCase;
 
-class DeployDatabaseSessionTest extends TestCase
+class DeployDatabaseTest extends TestCase
 {
     use TestTrait;
     use DeployLaravelTrait;