misc laravel improvements (GoogleCloudPlatform#838)

Author: bshaffer

appengine/php72/laravel-framework/bootstrap/app.php

@@ -41,7 +41,7 @@
     App\Exceptions\Handler::class
 );
 
-# [START google-app-engine-deployment]
+# [START] Set the storage path to the environment variable APP_STORAGE
 /*
 |--------------------------------------------------------------------------
 | Set Storage Path
@@ -54,7 +54,7 @@
 */
 
 $app->useStoragePath(env('APP_STORAGE', base_path() . '/storage'));
-# [END google-app-engine-deployment]
+# [END]
 
 /*
 |--------------------------------------------------------------------------

appengine/php72/laravel-framework/config/logging.php

@@ -30,6 +30,15 @@
     */
 
     'channels' => [
+
+        # [START] Add Stackdriver Logging and Error Reporting to your Laraval application
+        'stackdriver' => [
+            'driver' => 'custom',
+            'via' => App\Logging\CreateStackdriverLogger::class,
+            'level' => 'debug',
+        ],
+        # [END]
+
         'stack' => [
             'driver' => 'stack',
             'channels' => ['single'],
@@ -66,14 +75,6 @@
             'level' => 'debug',
         ],
 
-        # [START] Add Stackdriver Logging and Error Reporting to your Laraval application
-        'stackdriver' => [
-            'driver' => 'custom',
-            'via' => App\Logging\CreateStackdriverLogger::class,
-            'level' => 'debug',
-        ],
-        # [END]
-
     ],
 
 ];

appengine/php72/laravel-framework/routes/web.php

@@ -15,11 +15,11 @@
     return view('welcome');
 });
 
-Route::get('/log/{token}', function ($token) {
-    Log::info("Hello my log, token: $token");
+Route::get('/log/{message}', function ($message) {
+    Log::info("Hello my log, message: $message");
     return view('welcome');
 });
 
-Route::get('/exception/{token}', function ($token) {
-    throw new Exception("Intentional exception, token: $token");
+Route::get('/exception/{message}', function ($message) {
+    throw new Exception("Intentional exception, message: $message");
 });

appengine/php72/laravel-framework/test/DeployStackdriverTest.php

@@ -65,16 +65,16 @@ public function testLogging()
             'projectId' => self::getProjectId()
         ]);
 
-        $token = uniqid();
+        $message = uniqid();
         // The routes are defined in routes/web.php
-        $resp = $this->client->request('GET', "/log/$token", [
+        $resp = $this->client->request('GET', "/log/$message", [
             'http_errors' => false
         ]);
         $this->assertEquals('200', $resp->getStatusCode(), 'log page status code');
 
         // 'app' is the default logname of our Stackdriver Logging integration.
         $logger = $logging->logger('app');
-        $this->runEventuallyConsistentTest(function () use ($logger, $token) {
+        $this->runEventuallyConsistentTest(function () use ($logger, $message) {
             $logs = $logger->entries([
                 'pageSize' => 100,
                 'orderBy' => 'timestamp desc',
@@ -83,11 +83,11 @@ public function testLogging()
             $found = false;
             foreach ($logs as $log) {
                 $info = $log->info();
-                if (false !== strpos($info['jsonPayload']['message'], "token: $token")) {
+                if (false !== strpos($info['jsonPayload']['message'], "message: $message")) {
                     $found = true;
                 }
             }
-            $this->assertTrue($found, "The log entry $token was not found");
+            $this->assertTrue($found, "The log entry $message was not found");
         }, $eventuallyConsistentRetryCount = 5);
     }
 
@@ -97,16 +97,16 @@ public function testErrorReporting()
             'projectId' => self::getProjectId()
         ]);
 
-        $token = uniqid();
+        $message = uniqid();
         // The routes are defined in routes/web.php
-        $resp = $this->client->request('GET', "/exception/$token", [
+        $resp = $this->client->request('GET', "/exception/$message", [
             'http_errors' => false
         ]);
         $this->assertEquals('500', $resp->getStatusCode(), 'exception page status code');
 
         // 'app-error' is the default logname of our Stackdriver Error Reporting integration.
         $logger = $logging->logger('app-error');
-        $this->runEventuallyConsistentTest(function () use ($logger, $token) {
+        $this->runEventuallyConsistentTest(function () use ($logger, $message) {
             $logs = $logger->entries([
                 'pageSize' => 100,
                 'orderBy' => 'timestamp desc',
@@ -115,7 +115,7 @@ public function testErrorReporting()
             $found = false;
             foreach ($logs as $log) {
                 $info = $log->info();
-                if (false !== strpos($info['jsonPayload']['message'], "token: $token")) {
+                if (false !== strpos($info['jsonPayload']['message'], "message: $message")) {
                     $found = true;
                 }
             }