Merge branch 'master' into master

Author: rsamborski

.kokoro/deploy_gae.cfg

@@ -0,0 +1,19 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/php74"
+}
+
+# Run the deployment tests
+env_vars: {
+    key: "RUN_DEPLOYMENT_TESTS"
+    value: "true"
+}
+
+# Only run deployment tests for App Engine Standard
+env_vars: {
+    key: "TEST_DIRECTORIES"
+    value: "appengine/standard"
+}

.kokoro/deploy_gcf.cfg

@@ -0,0 +1,19 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/php74"
+}
+
+# Run the deployment tests
+env_vars: {
+    key: "RUN_DEPLOYMENT_TESTS"
+    value: "true"
+}
+
+# Only run deployment tests for Cloud Functions
+env_vars: {
+    key: "TEST_DIRECTORIES"
+    value: "functions"
+}

.kokoro/deploy_misc.cfg

@@ -0,0 +1,19 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/php74"
+}
+
+# Run the deployment tests
+env_vars: {
+    key: "RUN_DEPLOYMENT_TESTS"
+    value: "true"
+}
+
+# Run deployment tests for Cloud Run, EventArc Endpoints
+env_vars: {
+    key: "TEST_DIRECTORIES"
+    value: "endpoints eventarc run"
+}

.kokoro/secrets.sh.enc

@@ -33,7 +33,7 @@ class DeployTest extends TestCase
 
     public function setUp(): void
     {
-        $this->projectId = getenv('GOOGLE_PROJECT_ID');
+        self::$projectId = getenv('GOOGLE_PROJECT_ID');
     }
 
     public function testIndex()
@@ -98,7 +98,7 @@ public function testFatalErrors()
     private function verifyReportedError($message, $retryCount = 5)
     {
         $errorStats = new ErrorStatsServiceClient();
-        $projectName = $errorStats->projectName($this->projectId);
+        $projectName = $errorStats->projectName(self::$projectId);
 
         $timeRange = (new QueryTimeRange())
             ->setPeriod(QueryTimeRange_Period::PERIOD_1_HOUR);
@@ -111,7 +111,10 @@ private function verifyReportedError($message, $retryCount = 5)
             $message
         ) {
             $messages = [];
-            $response = $errorStats->listGroupStats($projectName, $timeRange);
+            $response = $errorStats->listGroupStats(
+                $projectName,
+                ['timeRange' => $timeRange]
+            );
             foreach ($response->iterateAllElements() as $groupStat) {
                 $response = $errorStats->listEvents($projectName, $groupStat->getGroup()->getGroupId(), [
                     'timeRange' => $timeRange,

appengine/standard/errorreporting/test/DeployTest.php

@@ -4,7 +4,8 @@
     "slim/slim": "^4.0",
     "slim/psr7": "^1.0",
     "slim/twig-view": "^3.0",
-    "php-di/slim-bridge": "^3.1"
+    "php-di/slim-bridge": "^3.1",
+    "symfony/yaml": "^5.2"
   },
   "autoload": {
      "psr-4": {

appengine/standard/getting-started/composer.json

@@ -1,5 +1,4 @@
-# Use the PHP 7.3 runtime (BETA) by replacing "php72" below with "php73"
-runtime: php72
+runtime: php74
 
 env_variables:
   ## Put production environment variables here.
@@ -17,4 +16,4 @@ env_variables:
   ## To use Stackdriver logging in your Laravel application, copy
   ## "app/Logging/CreateStackdriverLogger.php" and "config/logging.php"
   ## into your Laravel application. Then uncomment the following line:
-  # LOG_CHANNEL: stackdriver
+  # LOG_CHANNEL: stackdriver

appengine/standard/laravel-framework/app-dbsessions.yaml

@@ -41,6 +41,11 @@
     App\Exceptions\Handler::class
 );
 
+$app->singleton(
+    Illuminate\Foundation\Exceptions\Handler::class,
+    App\Exceptions\Handler::class
+);
+
 # [START] Set the storage path to the environment variable APP_STORAGE
 /*
 |--------------------------------------------------------------------------

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

@@ -17,7 +17,9 @@
 <phpunit bootstrap="../../../testing/bootstrap.php">
     <testsuites>
         <testsuite name="AppEngine for PHP 7.2 Laravel Framework test">
-            <directory>test</directory>
+            <!-- This sample is BROKEN! See issue link below. -->
+            <!-- https://github.com/GoogleCloudPlatform/php-docs-samples/issues/1349 -->
+            <!-- <directory>test</directory> -->
         </testsuite>
     </testsuites>
     <filter>

appengine/standard/laravel-framework/phpunit.xml.dist

@@ -67,6 +67,10 @@ public static function beforeDeploy()
 
     public function testHomepage()
     {
+        $this->markTestSkipped(
+            'This sample is BROKEN. See https://github.com/GoogleCloudPlatform/php-docs-samples/issues/1349'
+        );
+
         // Access the blog top page
         $resp = $this->client->get('/');
         $this->assertEquals(