More Region Tag Updates (GoogleCloudPlatform#691)

Author: averikitsch

appengine/flexible/laravel/config/logging.php

@@ -65,13 +65,11 @@
             'driver' => 'errorlog',
             'level' => 'debug',
         ],
-        // [START stackdriver_channel_definition ]
         'stackdriver' => [
             'driver' => 'custom',
             'via' => App\Logging\CreateCustomLogger::class,
             'level' => 'debug',
         ],
-        // [END stackdriver_channel_definition ]
 
     ],
 

appengine/flexible/metadata/app.php

@@ -14,10 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-# [START app]
 use Silex\Application;
 
-# [START metadata]
+# [START gae_flex_metadata]
 function get_external_ip_using_google_cloud()
 {
     $metadata = new Google\Cloud\Core\Compute\Metadata();
@@ -38,7 +37,7 @@ function get_external_ip_using_curl()
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     return curl_exec($ch);
 }
-# [END metadata]
+# [END gae_flex_metadata]
 
 // create the Silex application
 $app = new Application();
@@ -56,6 +55,5 @@ function get_external_ip_using_curl()
     }
     return sprintf('External IP: %s', $externalIp);
 });
-# [END app]
 
 return $app;

appengine/flexible/tasks/index.php

@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-// [START example_task_handler]
 require_once __DIR__ . '/vendor/autoload.php';
 
 use Symfony\Component\HttpFoundation\Request;
@@ -46,4 +45,3 @@
 }
 
 $app->run();
-// [END example_task_handler]

appengine/flexible/tasks/src/create_task.php

@@ -29,7 +29,6 @@
 use Google_Service_CloudTasks_Task;
 use Google_Service_CloudTasks_CreateTaskRequest;
 
-# [START create_task]
 /**
  * Create a task for a given App Engine queue
  * ```
@@ -89,4 +88,3 @@ function create_task($projectId, $queueId, $location, $payload = 'helloworld', $
     );
     printf('Created task %s' . PHP_EOL, $response['name']);
 }
-# [END create_task]

appengine/php55/cloudsql/app.php

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-# [START all]
+# [START gae_php_mysql_app]
 use Silex\Application;
 use Silex\Provider\TwigServiceProvider;
 use Symfony\Component\HttpFoundation\Request;
@@ -71,20 +71,18 @@
 
     return $db;
 };
-# [END all]
+# [END gae_php_mysql_app]
 
 $app->get('create_tables', function () use ($app) {
     /** @var PDO $db */
     $db = $app['database'];
-    # [START create_tables]
     // create the tables
     $stmt = $db->prepare('CREATE TABLE IF NOT EXISTS entries ('
         . 'entryID INT NOT NULL AUTO_INCREMENT, '
         . 'guestName VARCHAR(255), '
         . 'content VARCHAR(255), '
         . 'PRIMARY KEY(entryID))');
     $result = $stmt->execute();
-    # [END create_tables]
 
     if (false === $result) {
         return sprintf("Error: %s\n", $stmt->errorInfo()[2]);

appengine/php55/cloudsql/app.yaml

@@ -6,11 +6,11 @@ handlers:
 - url: /.*
   script: index.php
 
-# [START env]
+# [START gae_php_mysql_env]
 env_variables:
   # Replace USER, PASSWORD, DATABASE, and CONNECTION_NAME with the
   # values obtained when configuring your Cloud SQL instance.
   MYSQL_DSN: mysql:unix_socket=/cloudsql/INSTANCE_CONNECTION_NAME;dbname=DATABASE
   MYSQL_USER: USER
   MYSQL_PASSWORD: PASSWORD
-# [END env]
+# [END gae_php_mysql_env]

appengine/php55/http/app.php

@@ -34,7 +34,7 @@
     /** @var Twig_Environment $twig */
     $twig = $app['twig'];
 
-    # [START http_bin]
+    # [START gae_issue_request_http_bin]
     $url = 'http://httpbin.org/post?query=update';
     $data = ['data' => 'this', 'data2' => 'that'];
     $headers = "accept: */*\r\n" .
@@ -51,7 +51,7 @@
     ];
     $context = stream_context_create($context);
     $result = file_get_contents($url, false, $context);
-    # [END http_bin]
+    # [END gae_issue_request_http_bin]
     return $twig->render('http.html.twig', ['file_result' => $result]);
 });
 
@@ -64,7 +64,7 @@
         throw new \Exception('You must enable cURL or cURLite in php.ini');
     }
 
-    # [START curl_request]
+    # [START gae_issue_request_curl_request]
     $url = 'http://httpbin.org/post?query=update';
     $data = ['data' => 'this', 'data2' => 'that'];
     $headers = [
@@ -92,15 +92,15 @@
 
     // close connection
     curl_close($ch);
-    # [END curl_request]
+    # [END gae_issue_request_curl_request]
     return $twig->render('http.html.twig', ['curl_result' => $result]);
 });
 
 $app->post('/request/guzzle', function () use ($app) {
     /** @var Twig_Environment $twig */
     $twig = $app['twig'];
 
-    # [START guzzle_request]
+    # [START gae_issue_request_guzzle_request]
     $url = 'http://httpbin.org/post?query=update';
     $data = ['data' => 'this', 'data2' => 'that'];
     $headers = [
@@ -113,7 +113,7 @@
     $guzzle = new GuzzleHttp\Client;
     $request = new GuzzleHttp\Psr7\Request('POST', $url, $headers, http_build_query($data));
     $result = $guzzle->send($request);
-    # [END guzzle_request]
+    # [END gae_issue_request_guzzle_request]
 
     return $twig->render('http.html.twig', ['guzzle_result' => $result->getBody()]);
 });

appengine/php55/mail/app.yaml

@@ -17,22 +17,18 @@ threadsafe: yes
 api_version: 1
 
 inbound_services:
-# [START mail_service]
+# [START gae_mail_api_service]
 - mail
-# [END mail_service]
-# [START bounce_service]
+# [END gae_mail_api_service]
 - mail_bounce
-# [END bounce_service]
 handlers:
-# [START incoming_handler]
+# [START gae_mail_api_incoming_handler]
 - url: /_ah/mail/.+
   script: handle_incoming_email.php
   login: admin
-# [END incoming_handler]
-# [START bounce_handler]
+# [END gae_mail_api_incoming_handler]
 - url: /_ah/bounce
   script: handle_bounced_email.php
   login: admin
-# [END bounce_handler]
 - url: .*
-  script: index.php
+  script: index.php

appengine/php55/mail/index.php

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-// [START all]
+// [START gae_mail_api]
 use google\appengine\api\mail\Message;
 
 // Notice that $image_content_id is the optional Content-ID header value of the
@@ -37,4 +37,4 @@
 } catch (InvalidArgumentException $e) {
     echo 'There was an error';
 }
-// [END all]
+// [END gae_mail_api]

appengine/php55/mailgun/app.php

@@ -52,7 +52,6 @@
     $mailgunDomain,
     $mailgunApiKey
 ) {
-    # [START simple_message]
     // Instantiate the client.
     $httpClient = new Http\Adapter\Guzzle6\Client();
     $mailgunClient = new Mailgun\Mailgun($mailgunApiKey, $httpClient);
@@ -64,7 +63,6 @@
         'subject' => 'Hello',
         'text' => 'Testing some Mailgun awesomeness!',
     ));
-    # [END simple_message]
     return $result;
 });
 
@@ -75,7 +73,6 @@
     $cc = '',
     $bcc = ''
 ) {
-    # [START complex_message]
     // Instantiate the client.
     $httpClient = new Http\Adapter\Guzzle6\Client();
     $mailgunClient = new Mailgun\Mailgun($mailgunApiKey, $httpClient);
@@ -101,7 +98,6 @@
     $result = $mailgunClient->sendMessage($mailgunDomain, $postData, array(
         'attachment' => array($fileAttachment, $fileAttachment),
     ));
-    # [END complex_message]
     return $result;
 });
 

appengine/php55/mailjet/app.php

@@ -41,7 +41,7 @@
     $mailjet = $app['mailjet'];
     $recipient = $request->get('recipient');
 
-    # [START send_email]
+    # [START gae_mailjet_send_message]
     $body = [
         'FromEmail' => "[email protected]",
         'FromName' => "Testing Mailjet",
@@ -66,7 +66,7 @@
     }
 
     return 'Error: ' . print_r($response->getStatus(), true);
-    # [END send_email]
+    # [END gae_mailjet_send_message]
 });
 
 $app['mailjet'] = function () use ($app) {
@@ -76,9 +76,9 @@
     $mailjetApiKey = $app['mailjet.api_key'];
     $mailjetSecret = $app['mailjet.secret'];
 
-    # [START mailjet_client]
+    # [START gae_mailjet_import]
     $mailjet = new Mailjet\Client($mailjetApiKey, $mailjetSecret);
-    # [END mailjet_client]
+    # [END gae_mailjet_import]
 
     return $mailjet;
 };

appengine/php55/memcache/app.php

@@ -38,46 +38,42 @@
 $app->post('/', function (Application $app, Request $request) {
     /** @var Twig_Environment $twig */
     $twig = $app['twig'];
-    # [START who_count]
+    # [START gae_memcache_who_count]
     $memcache = new Memcached;
     $memcache->set('who', $request->get('who'));
     return $twig->render('memcache.html.twig', [
         'who' => $request->get('who'),
         'count' => $memcache->increment('count', 1, 0),
         'host' => $request->getHost(),
     ]);
-    # [END who_count]
+    # [END gae_memcache_who_count]
 });
 
 // Simple HTTP GET and PUT operators.
 $app->get('/memcache/{key}', function ($key) {
-    # [START memcache_get]
+    # [START gae_memcache_get]
     $memcache = new Memcache;
     return $memcache->get($key);
-    # [END memcache_get]
+    # [END gae_memcache_get]
 });
 
 $app->put('/memcache/{key}', function ($key, Request $request) {
-    # [START memcache_put]
+    # [START gae_memcache_put]
     $memcache = new Memcache;
     $value = $request->getContent();
     return $memcache->set($key, $value);
-    # [END memcache_put]
+    # [END gae_memcache_put]
 });
 
 $app->get('/memcached/{key}', function ($key) {
-    # [START memcached_get]
     $memcache = new Memcached;
     return $memcache->get($key);
-    # [END memcached_get]
 });
 
 $app->put('/memcached/{key}', function ($key, Request $request) {
-    # [START memcached_put]
     $memcache = new Memcached;
     $value = $request->getContent();
     return $memcache->set($key, $value);
-    # [END memcached_put]
 });
 
 return $app;

appengine/php55/phpmyadmin/config.inc.php

@@ -1,6 +1,4 @@
-
 
-// [START_EXCLUDE silent]
 /**
  * Copyright 2016 Google Inc.
  *
@@ -16,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// [END_EXCLUDE]
 /*
  * This is needed for cookie based authentication to encrypt password in
  * cookie
@@ -62,4 +59,3 @@
 $cfg['PmaNoRelation_DisableWarning'] = true;
 $cfg['ExecTimeLimit'] = 60;
 $cfg['CheckConfigurationPermissions'] = false;
-// [END all]