Merge branch 'googleapis:main' into main

.github/workflows/backwards-compatibility-checks.yaml

@@ -69,7 +69,7 @@ jobs:
         # OwlBot PRs which are not labelled feat should not add new files or methods
         run: |
           ~/.composer/vendor/bin/roave-backward-compatibility-check \
-            --from=${{ github.head_ref || github.ref_name }} \
+            --from=origin/${{ github.head_ref || github.ref_name }} \
             --to=origin/main --format=github-actions
       - name: "Print the action item"
         run: |

.github/workflows/conformance-tests-storage-emulator.yaml

@@ -16,7 +16,7 @@ jobs:
 
     services:
       emulator:
-        image: gcr.io/cloud-devrel-public-resources/storage-testbench:v0.45.0
+        image: gcr.io/cloud-devrel-public-resources/storage-testbench:v0.49.0
         ports:
           - 9000:9000
 

.github/workflows/system-tests-spanner-emulator.yaml

@@ -18,7 +18,7 @@ jobs:
 
     services:
       emulator:
-        image: gcr.io/cloud-spanner-emulator/emulator:1.5.24
+        image: gcr.io/cloud-spanner-emulator/emulator:1.5.25
         ports:
           - 9010:9010
           - 9020:9020

.kokoro/docs/docker/Dockerfile

@@ -91,17 +91,15 @@ RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" &&
     php -r "if (hash_file('SHA384', 'composer-setup.php') === rtrim(file_get_contents('https://composer.github.io/installer.sig'))) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
     php composer-setup.php --filename=composer --install-dir=/usr/local/bin
 
-# Use phpDocumentor from HEAD until they create a new release
-# TODO: Remove once phpDocumentor tags a new release
+# Use phpDocumentor from HEAD (useful for testing changes before a release)
 # @see https://github.com/phpDocumentor/phpDocumentor/issues/3434
-COPY --from=phpdoc/phpdoc:3.5.3 /opt/phpdoc /opt/phpdoc
-RUN ln -s /opt/phpdoc/bin/phpdoc /usr/local/bin/phpdoc
-ENV PHPDOC_ENV=prod
+# COPY --from=phpdoc/phpdoc:3.5.3 /opt/phpdoc /opt/phpdoc
+# RUN ln -s /opt/phpdoc/bin/phpdoc /usr/local/bin/phpdoc
+# ENV PHPDOC_ENV=prod
 
-# Install phpdoc
-# TODO: uncomment once phpDocumentor creates a new release
-# RUN wget -O /usr/local/bin/phpdoc "https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.3.1/phpDocumentor.phar" \
-#   && chmod +x /usr/local/bin/phpdoc
+# Install phpdoc (v3.5.3)
+RUN wget -O /usr/local/bin/phpdoc "https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.5.3/phpDocumentor.phar" \
+  && chmod +x /usr/local/bin/phpdoc
 
 # Install Python3
 RUN wget https://www.python.org/ftp/python/3.9.14/Python-3.9.14.tgz \

.kokoro/docs/publish.sh

@@ -13,41 +13,44 @@ fi
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 PROJECT_DIR=$(dirname $(dirname $SCRIPT_DIR))
 
+phpdoc --version
+
 # Run "composer install" if it hasn't been run yet
 if [ ! -d 'dev/vendor/' ]; then
     composer install -d $PROJECT_DIR/dev
 fi
-
+STAGING_FLAG="";
 if [ "$STAGING_BUCKET" != "" ]; then
     echo "Using staging bucket ${STAGING_BUCKET}..."
+    STAGING_FLAG="--staging-bucket $STAGING_BUCKET"
 fi
-VERBOSITY="";
+VERBOSITY_FLAG="";
 if [ "$GCLOUD_DEBUG" = "1" ]; then
     echo "Setting verbosity to VERBOSE...";
-    VERBOSITY=" -v";
+    VERBOSITY_FLAG=" -v";
 fi
-
 find $PROJECT_DIR/* -mindepth 1 -maxdepth 1 -name 'composer.json' -not -path '*vendor/*' -regex "$PROJECT_DIR/[A-Z].*" -exec dirname {} \; | while read DIR
 do
     COMPONENT=$(basename $DIR)
     VERSION=$(cat $DIR/VERSION)
-    if [ "$STAGING_BUCKET" != "" ]; then
-        $PROJECT_DIR/dev/google-cloud docfx \
-            --component $COMPONENT \
-            --out $DIR/out \
-            --metadata-version $VERSION \
-            --staging-bucket $STAGING_BUCKET \
-            $VERBOSITY
-    else
-        # dry run
-        $PROJECT_DIR/dev/google-cloud docfx \
-            --component $COMPONENT \
-            --out $DIR/out \
-            --metadata-version $VERSION \
-            $VERBOSITY
-    fi
+    $PROJECT_DIR/dev/google-cloud docfx \
+        --component $COMPONENT \
+        --out $DIR/out \
+        --metadata-version $VERSION \
+        --with-cache \
+        $STAGING_FLAG \
+        $VERBOSITY_FLAG
 done
 
+# Add GAX repo
+GAX_DIR=$PROJECT_DIR/dev/vendor/google/gax
+$PROJECT_DIR/dev/google-cloud docfx \
+    --path $GAX_DIR \
+    --out gax-out \
+    --metadata-version $(cat $GAX_DIR/VERSION) \
+    $STAGING_FLAG \
+    $VERBOSITY_FLAG
+
 # If this run after a release, store the released artifacts.
 if [ "$KOKORO_GITHUB_COMMIT" != "" ]; then
     # Move to the project directory
@@ -81,7 +84,7 @@ if [ "$KOKORO_GITHUB_COMMIT" != "" ]; then
 
         # Store composer.lock for SBOM generation
         mkdir "pkg/$module"
-        composer update -d "$module"
+        composer update -d "$module" --ignore-platform-req ext-grpc
         cp "$module/composer.lock" "pkg/$module/composer.lock"
     done
 fi

.repo-metadata-full.json

@@ -25,9 +25,9 @@
     },
     "AdsMarketingPlatformAdmin": {
         "language": "php",
-        "distribution_name": "google/ads-marketingplatform-admin",
+        "distribution_name": "googleads/marketingplatform-admin",
         "release_level": "preview",
-        "client_documentation": "https://cloud.google.com/php/docs/reference/ads-marketingplatform-admin/latest",
+        "client_documentation": "https://cloud.google.com/php/docs/reference/googleads/marketingplatform-admin/latest",
         "library_type": "GAPIC_AUTO",
         "api_shortname": "marketingplatformadmin"
     },

AccessApproval/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

AccessApproval/src/V1/Client/AccessApprovalClient.php

@@ -90,15 +90,15 @@
  * name, and additionally a parseName method to extract the individual identifiers
  * contained within formatted names that are returned by the API.
  *
- * @method PromiseInterface approveApprovalRequestAsync(ApproveApprovalRequestMessage $request, array $optionalArgs = [])
- * @method PromiseInterface deleteAccessApprovalSettingsAsync(DeleteAccessApprovalSettingsMessage $request, array $optionalArgs = [])
- * @method PromiseInterface dismissApprovalRequestAsync(DismissApprovalRequestMessage $request, array $optionalArgs = [])
- * @method PromiseInterface getAccessApprovalServiceAccountAsync(GetAccessApprovalServiceAccountMessage $request, array $optionalArgs = [])
- * @method PromiseInterface getAccessApprovalSettingsAsync(GetAccessApprovalSettingsMessage $request, array $optionalArgs = [])
- * @method PromiseInterface getApprovalRequestAsync(GetApprovalRequestMessage $request, array $optionalArgs = [])
- * @method PromiseInterface invalidateApprovalRequestAsync(InvalidateApprovalRequestMessage $request, array $optionalArgs = [])
- * @method PromiseInterface listApprovalRequestsAsync(ListApprovalRequestsMessage $request, array $optionalArgs = [])
- * @method PromiseInterface updateAccessApprovalSettingsAsync(UpdateAccessApprovalSettingsMessage $request, array $optionalArgs = [])
+ * @method PromiseInterface<ApprovalRequest> approveApprovalRequestAsync(ApproveApprovalRequestMessage $request, array $optionalArgs = [])
+ * @method PromiseInterface<void> deleteAccessApprovalSettingsAsync(DeleteAccessApprovalSettingsMessage $request, array $optionalArgs = [])
+ * @method PromiseInterface<ApprovalRequest> dismissApprovalRequestAsync(DismissApprovalRequestMessage $request, array $optionalArgs = [])
+ * @method PromiseInterface<AccessApprovalServiceAccount> getAccessApprovalServiceAccountAsync(GetAccessApprovalServiceAccountMessage $request, array $optionalArgs = [])
+ * @method PromiseInterface<AccessApprovalSettings> getAccessApprovalSettingsAsync(GetAccessApprovalSettingsMessage $request, array $optionalArgs = [])
+ * @method PromiseInterface<ApprovalRequest> getApprovalRequestAsync(GetApprovalRequestMessage $request, array $optionalArgs = [])
+ * @method PromiseInterface<ApprovalRequest> invalidateApprovalRequestAsync(InvalidateApprovalRequestMessage $request, array $optionalArgs = [])
+ * @method PromiseInterface<PagedListResponse> listApprovalRequestsAsync(ListApprovalRequestsMessage $request, array $optionalArgs = [])
+ * @method PromiseInterface<AccessApprovalSettings> updateAccessApprovalSettingsAsync(UpdateAccessApprovalSettingsMessage $request, array $optionalArgs = [])
  */
 final class AccessApprovalClient
 {

AccessContextManager/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

AccessContextManager/src/V1/Client/AccessContextManagerClient.php

@@ -93,32 +93,32 @@
  * name, and additionally a parseName method to extract the individual identifiers
  * contained within formatted names that are returned by the API.
  *
- * @method PromiseInterface commitServicePerimetersAsync(CommitServicePerimetersRequest $request, array $optionalArgs = [])
- * @method PromiseInterface createAccessLevelAsync(CreateAccessLevelRequest $request, array $optionalArgs = [])
- * @method PromiseInterface createAccessPolicyAsync(AccessPolicy $request, array $optionalArgs = [])
- * @method PromiseInterface createGcpUserAccessBindingAsync(CreateGcpUserAccessBindingRequest $request, array $optionalArgs = [])
- * @method PromiseInterface createServicePerimeterAsync(CreateServicePerimeterRequest $request, array $optionalArgs = [])
- * @method PromiseInterface deleteAccessLevelAsync(DeleteAccessLevelRequest $request, array $optionalArgs = [])
- * @method PromiseInterface deleteAccessPolicyAsync(DeleteAccessPolicyRequest $request, array $optionalArgs = [])
- * @method PromiseInterface deleteGcpUserAccessBindingAsync(DeleteGcpUserAccessBindingRequest $request, array $optionalArgs = [])
- * @method PromiseInterface deleteServicePerimeterAsync(DeleteServicePerimeterRequest $request, array $optionalArgs = [])
- * @method PromiseInterface getAccessLevelAsync(GetAccessLevelRequest $request, array $optionalArgs = [])
- * @method PromiseInterface getAccessPolicyAsync(GetAccessPolicyRequest $request, array $optionalArgs = [])
- * @method PromiseInterface getGcpUserAccessBindingAsync(GetGcpUserAccessBindingRequest $request, array $optionalArgs = [])
- * @method PromiseInterface getIamPolicyAsync(GetIamPolicyRequest $request, array $optionalArgs = [])
- * @method PromiseInterface getServicePerimeterAsync(GetServicePerimeterRequest $request, array $optionalArgs = [])
- * @method PromiseInterface listAccessLevelsAsync(ListAccessLevelsRequest $request, array $optionalArgs = [])
- * @method PromiseInterface listAccessPoliciesAsync(ListAccessPoliciesRequest $request, array $optionalArgs = [])
- * @method PromiseInterface listGcpUserAccessBindingsAsync(ListGcpUserAccessBindingsRequest $request, array $optionalArgs = [])
- * @method PromiseInterface listServicePerimetersAsync(ListServicePerimetersRequest $request, array $optionalArgs = [])
- * @method PromiseInterface replaceAccessLevelsAsync(ReplaceAccessLevelsRequest $request, array $optionalArgs = [])
- * @method PromiseInterface replaceServicePerimetersAsync(ReplaceServicePerimetersRequest $request, array $optionalArgs = [])
- * @method PromiseInterface setIamPolicyAsync(SetIamPolicyRequest $request, array $optionalArgs = [])
- * @method PromiseInterface testIamPermissionsAsync(TestIamPermissionsRequest $request, array $optionalArgs = [])
- * @method PromiseInterface updateAccessLevelAsync(UpdateAccessLevelRequest $request, array $optionalArgs = [])
- * @method PromiseInterface updateAccessPolicyAsync(UpdateAccessPolicyRequest $request, array $optionalArgs = [])
- * @method PromiseInterface updateGcpUserAccessBindingAsync(UpdateGcpUserAccessBindingRequest $request, array $optionalArgs = [])
- * @method PromiseInterface updateServicePerimeterAsync(UpdateServicePerimeterRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> commitServicePerimetersAsync(CommitServicePerimetersRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> createAccessLevelAsync(CreateAccessLevelRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> createAccessPolicyAsync(AccessPolicy $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> createGcpUserAccessBindingAsync(CreateGcpUserAccessBindingRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> createServicePerimeterAsync(CreateServicePerimeterRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> deleteAccessLevelAsync(DeleteAccessLevelRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> deleteAccessPolicyAsync(DeleteAccessPolicyRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> deleteGcpUserAccessBindingAsync(DeleteGcpUserAccessBindingRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> deleteServicePerimeterAsync(DeleteServicePerimeterRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<AccessLevel> getAccessLevelAsync(GetAccessLevelRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<AccessPolicy> getAccessPolicyAsync(GetAccessPolicyRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<GcpUserAccessBinding> getGcpUserAccessBindingAsync(GetGcpUserAccessBindingRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<Policy> getIamPolicyAsync(GetIamPolicyRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<ServicePerimeter> getServicePerimeterAsync(GetServicePerimeterRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<PagedListResponse> listAccessLevelsAsync(ListAccessLevelsRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<PagedListResponse> listAccessPoliciesAsync(ListAccessPoliciesRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<PagedListResponse> listGcpUserAccessBindingsAsync(ListGcpUserAccessBindingsRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<PagedListResponse> listServicePerimetersAsync(ListServicePerimetersRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> replaceAccessLevelsAsync(ReplaceAccessLevelsRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> replaceServicePerimetersAsync(ReplaceServicePerimetersRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<Policy> setIamPolicyAsync(SetIamPolicyRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<TestIamPermissionsResponse> testIamPermissionsAsync(TestIamPermissionsRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> updateAccessLevelAsync(UpdateAccessLevelRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> updateAccessPolicyAsync(UpdateAccessPolicyRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> updateGcpUserAccessBindingAsync(UpdateGcpUserAccessBindingRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<OperationResponse> updateServicePerimeterAsync(UpdateServicePerimeterRequest $request, array $optionalArgs = [])
  */
 final class AccessContextManagerClient
 {

AdsAdManager/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1