Merge branch 'main' into add-functions-preload-sample

appengine/flexible/metadata/test/DeployTest.php

@@ -31,7 +31,7 @@ public function testIndex()
             '200',
             $resp->getStatusCode(),
             'Top page status code should be 200');
-        $this->assertRegExp('/External IP: .*/', (string) $resp->getBody());
+        $this->assertMatchesRegularExpression('/External IP: .*/', (string) $resp->getBody());
     }
 
     public function testCurl()
@@ -42,6 +42,6 @@ public function testCurl()
             '200',
             $resp->getStatusCode(),
             '/curl status code should be 200');
-        $this->assertRegExp('/External IP: .*/', (string) $resp->getBody());
+        $this->assertMatchesRegularExpression('/External IP: .*/', (string) $resp->getBody());
     }
 }

dlp/src/deidentify_cloud_storage.php

@@ -37,7 +37,6 @@
 use Google\Cloud\Dlp\V2\InspectJobConfig;
 use Google\Cloud\Dlp\V2\TransformationConfig;
 use Google\Cloud\Dlp\V2\TransformationDetailsStorageConfig;
-use Google\Cloud\Dlp\V2\Client\BaseClient\DlpServiceBaseClient;
 use Google\Cloud\Dlp\V2\DlpJob\JobState;
 
 /**
@@ -104,13 +103,13 @@ function deidentify_cloud_storage(
     // Specify the de-identify template used for the transformation.
     $transformationConfig = (new TransformationConfig())
         ->setDeidentifyTemplate(
-            DlpServiceBaseClient::projectDeidentifyTemplateName($callingProjectId, $deidentifyTemplateName)
+            DlpServiceClient::projectDeidentifyTemplateName($callingProjectId, $deidentifyTemplateName)
         )
         ->setStructuredDeidentifyTemplate(
-            DlpServiceBaseClient::projectDeidentifyTemplateName($callingProjectId, $structuredDeidentifyTemplateName)
+            DlpServiceClient::projectDeidentifyTemplateName($callingProjectId, $structuredDeidentifyTemplateName)
         )
         ->setImageRedactTemplate(
-            DlpServiceBaseClient::projectDeidentifyTemplateName($callingProjectId, $imageRedactTemplateName)
+            DlpServiceClient::projectDeidentifyTemplateName($callingProjectId, $imageRedactTemplateName)
         );
 
     $deidentify = (new Deidentify())

monitoring/test/alertsTest.php

@@ -37,7 +37,7 @@ public function testCreatePolicy()
         $output = $this->runFunctionSnippet('alert_create_policy', [
             'projectId' => self::$projectId,
         ]);
-        $this->assertRegexp($regexp, $output);
+        $this->assertMatchesRegularExpression($regexp, $output);
 
         // Save the policy ID for later
         preg_match($regexp, $output, $matches);
@@ -93,7 +93,7 @@ public function testCreateChannel()
         $output = $this->runFunctionSnippet('alert_create_channel', [
             'projectId' => self::$projectId,
         ]);
-        $this->assertRegexp($regexp, $output);
+        $this->assertMatchesRegularExpression($regexp, $output);
 
         // Save the channel ID for later
         preg_match($regexp, $output, $matches);
@@ -111,14 +111,14 @@ public function testReplaceChannel()
         $output = $this->runFunctionSnippet('alert_create_channel', [
             'projectId' => self::$projectId,
         ]);
-        $this->assertRegexp($regexp, $output);
+        $this->assertMatchesRegularExpression($regexp, $output);
         preg_match($regexp, $output, $matches);
         $channelId1 = $matches[1];
 
         $output = $this->runFunctionSnippet('alert_create_channel', [
             'projectId' => self::$projectId,
         ]);
-        $this->assertRegexp($regexp, $output);
+        $this->assertMatchesRegularExpression($regexp, $output);
         preg_match($regexp, $output, $matches);
         $channelId2 = $matches[1];
 

pubsub/api/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-pubsub": "^1.39",
+        "google/cloud-pubsub": "^1.46",
         "rg/avro-php": "^2.0.1||^3.0.0"
     }
 }

pubsub/api/src/create_cloud_storage_subscription.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright 2023 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * For instructions on how to run the full sample:
+ *
+ * @see https://github.com/GoogleCloudPlatform/php-docs-samples/blob/main/pubsub/api/README.md
+ */
+
+namespace Google\Cloud\Samples\PubSub;
+
+# [START pubsub_create_cloud_storage_subscription]
+use Google\Cloud\PubSub\PubSubClient;
+
+/**
+ * Creates a Pub/Sub GCS subscription.
+ *
+ * @param string $projectId  The Google project ID.
+ * @param string $topicName  The Pub/Sub topic name.
+ * @param string $subscriptionName  The Pub/Sub subscription name.
+ * @param string $bucket The Cloud Storage bucket name without any prefix like "gs://".
+ */
+function create_cloud_storage_subscription($projectId, $topicName, $subscriptionName, $bucket)
+{
+    $pubsub = new PubSubClient([
+        'projectId' => $projectId,
+    ]);
+    $topic = $pubsub->topic($topicName);
+    $subscription = $topic->subscription($subscriptionName);
+    $config = ['bucket' => $bucket];
+    $subscription->create([
+        'cloudStorageConfig' => $config
+    ]);
+
+    printf('Subscription created: %s' . PHP_EOL, $subscription->name());
+}
+# [END pubsub_create_cloud_storage_subscription]
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
+\Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

pubsub/api/test/pubsubTest.php

@@ -309,6 +309,31 @@ public function testCreateAndDeleteBigQuerySubscription()
         $this->assertMatchesRegularExpression(sprintf('/%s/', $subscription), $output);
     }
 
+    public function testCreateAndDeleteStorageSubscription()
+    {
+        $topic = $this->requireEnv('GOOGLE_PUBSUB_TOPIC');
+        $subscription = 'test-subscription-' . rand();
+        $bucket = $this->requireEnv('GOOGLE_PUBSUB_STORAGE_BUCKET');
+
+        $output = $this->runFunctionSnippet('create_cloud_storage_subscription', [
+            self::$projectId,
+            $topic,
+            $subscription,
+            $bucket,
+        ]);
+
+        $this->assertMatchesRegularExpression('/Subscription created:/', $output);
+        $this->assertMatchesRegularExpression(sprintf('/%s/', $subscription), $output);
+
+        $output = $this->runFunctionSnippet('delete_subscription', [
+            self::$projectId,
+            $subscription,
+        ]);
+
+        $this->assertMatchesRegularExpression('/Subscription deleted:/', $output);
+        $this->assertMatchesRegularExpression(sprintf('/%s/', $subscription), $output);
+    }
+
     public function testCreateAndDetachSubscription()
     {
         $topic = $this->requireEnv('GOOGLE_PUBSUB_TOPIC');
@@ -433,14 +458,14 @@ public function testPublishAndSubscribeWithOrderingKeys()
             self::$projectId,
             $topic,
         ]);
-        $this->assertRegExp('/Message published/', $output);
+        $this->assertMatchesRegularExpression('/Message published/', $output);
 
         $output = $this->runFunctionSnippet('enable_subscription_ordering', [
             self::$projectId,
             $topic,
             'subscriberWithOrdering' . rand(),
         ]);
-        $this->assertRegExp('/Created subscription with ordering/', $output);
-        $this->assertRegExp('/\"enableMessageOrdering\":true/', $output);
+        $this->assertMatchesRegularExpression('/Created subscription with ordering/', $output);
+        $this->assertMatchesRegularExpression('/\"enableMessageOrdering\":true/', $output);
     }
 }

run/laravel/README.md

@@ -235,7 +235,7 @@ The configuration is similar to the deployment to Cloud Run, requiring the datab
 1. Create a Cloud Run job to apply database migrations:
 
     ```
-    gcloud beta run jobs create migrate \
+    gcloud run jobs create migrate \
         --image=${REGISTRY_NAME}/laravel \
         --region=${REGION} \
         --set-cloudsql-instances ${PROJECT_ID}:${REGION}:${INSTANCE_NAME} \
@@ -247,7 +247,7 @@ The configuration is similar to the deployment to Cloud Run, requiring the datab
 1. Execute the job:
 
     ```
-    gcloud beta run jobs execute migrate --region ${REGION} --wait
+    gcloud run jobs execute migrate --region ${REGION} --wait
     ```
 
 * Confirm the application of database migrations by clicking the "See logs for this execution" link. 
@@ -323,7 +323,7 @@ To apply application code changes, update the Cloud Run service with this new co
 To apply database migrations, run the Cloud Run job using the newly built container:
 
     ```bash
-    gcloud beta run jobs execute migrate --region ${REGION}
+    gcloud run jobs execute migrate --region ${REGION}
     ```
 
     Note: To generate new migrations to apply, you will need to run `php artisan make:migration` in a local development environment.

run/laravel/phpunit.xml

@@ -5,18 +5,16 @@
          colors="true"
 >
     <testsuites>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">./tests/Unit</directory>
-        </testsuite>
         <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
+            <directory>tests/Feature</directory>
         </testsuite>
     </testsuites>
     <coverage processUncoveredFiles="true">
         <include>
             <directory suffix=".php">./app</directory>
         </include>
     </coverage>
+
     <php>
         <env name="APP_ENV" value="testing"/>
         <env name="BCRYPT_ROUNDS" value="4"/>

speech/test/speechTest.php

@@ -85,7 +85,7 @@ public function testTranscribe($command, $audioFile, $requireGrpc = false)
 
         // Check for the word time offsets
         if (in_array($command, ['transcribe_async_words'])) {
-            $this->assertRegexp('/start: "*.*s", end: "*.*s/', $output);
+            $this->assertMatchesRegularExpression('/start: "*.*s", end: "*.*s/', $output);
         }
     }
 

storage/test/IamTest.php

@@ -165,7 +165,7 @@ public function testListIamMembers()
   %s
 
 /', self::$user);
-        $this->assertRegexp($binding, $output);
+        $this->assertMatchesRegularExpression($binding, $output);
 
         $bindingWithCondition = sprintf(
             'Role: roles/storage.objectViewer

vision/test/visionTest.php

@@ -119,7 +119,7 @@ public function testLandmarkCommand()
     {
         $path = __DIR__ . '/data/tower.jpg';
         $output = $this->runFunctionSnippet('detect_landmark', ['path' => $path]);
-        $this->assertRegexp(
+        $this->assertMatchesRegularExpression(
             '/Eiffel Tower|Champ de Mars|Trocadéro Gardens/',
             $output
         );
@@ -131,7 +131,7 @@ public function testLandmarkCommandGcs()
 
         $path = 'gs://' . $bucketName . '/vision/tower.jpg';
         $output = $this->runFunctionSnippet('detect_landmark_gcs', ['path' => $path]);
-        $this->assertRegexp(
+        $this->assertMatchesRegularExpression(
             '/Eiffel Tower|Champ de Mars|Trocadéro Gardens/',
             $output
         );