Incorporate changes for supporting PHP 8.4 and removing non PHP 7.4 to legacy-v25.0.0

.travis.yml

@@ -3,10 +3,13 @@ language: php
 php:
   - 8.1
   - 8.2
+  - 8.3
+  - 8.4
   - nightly
 
 matrix:
   allow_failures:
+    - php: 8.4
     - php: nightly
 
 branches:

src/Google/Ads/GoogleAds/Lib/InsecureCredentialsWrapper.php

@@ -54,7 +54,7 @@ public function __construct(
      * @param $audience
      * @return callable
      */
-    public function getAuthorizationHeaderCallback($audience = null)
+    public function getAuthorizationHeaderCallback($audience = null): ?callable
     {
         return null;
     }

src/Google/Ads/GoogleAds/Lib/V16/InfoRedactor.php

@@ -385,7 +385,10 @@ private static function redactFeed(Feed $feed)
     private static function redactLocalServicesLeadContactDetailsEmail(
         LocalServicesLead $localServicesLead
     ) {
-        if ($localServicesLead?->getContactDetails()?->getEmail()) {
+        if (
+            !is_null($localServicesLead->getContactDetails())
+            && !is_null($localServicesLead->getContactDetails()->getEmail())
+        ) {
             $localServicesLead->getContactDetails()->setEmail(self::REDACTED_STRING);
         }
     }
@@ -399,7 +402,10 @@ private static function redactLocalServicesLeadContactDetailsEmail(
     private static function redactLocalServicesLeadConversationMessageDetailsText(
         LocalServicesLeadConversation $localServicesLeadConversation
     ) {
-        if ($localServicesLeadConversation?->getMessageDetails()?->getText()) {
+        if (
+            !is_null($localServicesLeadConversation->getMessageDetails())
+            && !is_null($localServicesLeadConversation->getMessageDetails()->getText())
+        ) {
             $localServicesLeadConversation->getMessageDetails()->setText(self::REDACTED_STRING);
         }
     }

src/Google/Ads/GoogleAds/Lib/V17/InfoRedactor.php

@@ -385,7 +385,10 @@ private static function redactFeed(Feed $feed)
     private static function redactLocalServicesLeadContactDetailsEmail(
         LocalServicesLead $localServicesLead
     ) {
-        if ($localServicesLead?->getContactDetails()?->getEmail()) {
+        if (
+            !is_null($localServicesLead->getContactDetails())
+            && !is_null($localServicesLead->getContactDetails()->getEmail())
+        ) {
             $localServicesLead->getContactDetails()->setEmail(self::REDACTED_STRING);
         }
     }
@@ -399,7 +402,10 @@ private static function redactLocalServicesLeadContactDetailsEmail(
     private static function redactLocalServicesLeadConversationMessageDetailsText(
         LocalServicesLeadConversation $localServicesLeadConversation
     ) {
-        if ($localServicesLeadConversation?->getMessageDetails()?->getText()) {
+        if (
+            !is_null($localServicesLeadConversation->getMessageDetails())
+            && !is_null($localServicesLeadConversation->getMessageDetails()->getText())
+        ) {
             $localServicesLeadConversation->getMessageDetails()->setText(self::REDACTED_STRING);
         }
     }

src/Google/Ads/GoogleAds/Lib/V18/InfoRedactor.php

@@ -385,7 +385,10 @@ private static function redactFeed(Feed $feed)
     private static function redactLocalServicesLeadContactDetailsEmail(
         LocalServicesLead $localServicesLead
     ) {
-        if ($localServicesLead?->getContactDetails()?->getEmail()) {
+        if (
+            !is_null($localServicesLead->getContactDetails())
+            && !is_null($localServicesLead->getContactDetails()->getEmail())
+        ) {
             $localServicesLead->getContactDetails()->setEmail(self::REDACTED_STRING);
         }
     }
@@ -399,7 +402,10 @@ private static function redactLocalServicesLeadContactDetailsEmail(
     private static function redactLocalServicesLeadConversationMessageDetailsText(
         LocalServicesLeadConversation $localServicesLeadConversation
     ) {
-        if ($localServicesLeadConversation?->getMessageDetails()?->getText()) {
+        if (
+            !is_null($localServicesLeadConversation->getMessageDetails())
+            && !is_null($localServicesLeadConversation->getMessageDetails()->getText())
+        ) {
             $localServicesLeadConversation->getMessageDetails()->setText(self::REDACTED_STRING);
         }
     }

src/Google/Ads/GoogleAds/V18/Services/Client/AccountBudgetProposalServiceClient.php

@@ -36,6 +36,7 @@
 use Google\ApiCore\ValidationException;
 use Google\Auth\FetchAuthTokenInterface;
 use GuzzleHttp\Promise\PromiseInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * Service Description: A service for managing account-level budgets through proposals.
@@ -56,7 +57,7 @@
  * name, and additionally a parseName method to extract the individual identifiers
  * contained within formatted names that are returned by the API.
  *
- * @method PromiseInterface mutateAccountBudgetProposalAsync(MutateAccountBudgetProposalRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<MutateAccountBudgetProposalResponse> mutateAccountBudgetProposalAsync(MutateAccountBudgetProposalRequest $request, array $optionalArgs = [])
  */
 class AccountBudgetProposalServiceClient
 {
@@ -175,14 +176,14 @@ public static function billingSetupName(string $customerId, string $billingSetup
      * listed, then parseName will check each of the supported templates, and return
      * the first match.
      *
-     * @param string $formattedName The formatted name string
-     * @param string $template      Optional name of template to match
+     * @param string  $formattedName The formatted name string
+     * @param ?string $template      Optional name of template to match
      *
      * @return array An associative array from name component IDs to component values.
      *
      * @throws ValidationException If $formattedName could not be matched.
      */
-    public static function parseName(string $formattedName, string $template = null): array
+    public static function parseName(string $formattedName, ?string $template = null): array
     {
         return self::parseFormattedName($formattedName, $template);
     }
@@ -237,6 +238,9 @@ public static function parseName(string $formattedName, string $template = null)
      *     @type callable $clientCertSource
      *           A callable which returns the client cert as a string. This can be used to
      *           provide a certificate and private key to the transport layer for mTLS.
+     *     @type false|LoggerInterface $logger
+     *           A PSR-3 compliant logger. If set to false, logging is disabled, ignoring the
+     *           'GOOGLE_SDK_PHP_LOGGING' environment flag
      * }
      *
      * @throws ValidationException

src/Google/Ads/GoogleAds/V18/Services/Client/AccountLinkServiceClient.php

@@ -38,6 +38,7 @@
 use Google\ApiCore\ValidationException;
 use Google\Auth\FetchAuthTokenInterface;
 use GuzzleHttp\Promise\PromiseInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * Service Description: This service allows management of links between Google Ads accounts and other
@@ -51,8 +52,8 @@
  * name, and additionally a parseName method to extract the individual identifiers
  * contained within formatted names that are returned by the API.
  *
- * @method PromiseInterface createAccountLinkAsync(CreateAccountLinkRequest $request, array $optionalArgs = [])
- * @method PromiseInterface mutateAccountLinkAsync(MutateAccountLinkRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<CreateAccountLinkResponse> createAccountLinkAsync(CreateAccountLinkRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<MutateAccountLinkResponse> mutateAccountLinkAsync(MutateAccountLinkRequest $request, array $optionalArgs = [])
  */
 class AccountLinkServiceClient
 {
@@ -135,14 +136,14 @@ public static function accountLinkName(string $customerId, string $accountLinkId
      * listed, then parseName will check each of the supported templates, and return
      * the first match.
      *
-     * @param string $formattedName The formatted name string
-     * @param string $template      Optional name of template to match
+     * @param string  $formattedName The formatted name string
+     * @param ?string $template      Optional name of template to match
      *
      * @return array An associative array from name component IDs to component values.
      *
      * @throws ValidationException If $formattedName could not be matched.
      */
-    public static function parseName(string $formattedName, string $template = null): array
+    public static function parseName(string $formattedName, ?string $template = null): array
     {
         return self::parseFormattedName($formattedName, $template);
     }
@@ -197,6 +198,9 @@ public static function parseName(string $formattedName, string $template = null)
      *     @type callable $clientCertSource
      *           A callable which returns the client cert as a string. This can be used to
      *           provide a certificate and private key to the transport layer for mTLS.
+     *     @type false|LoggerInterface $logger
+     *           A PSR-3 compliant logger. If set to false, logging is disabled, ignoring the
+     *           'GOOGLE_SDK_PHP_LOGGING' environment flag
      * }
      *
      * @throws ValidationException

src/Google/Ads/GoogleAds/V18/Services/Client/AdGroupAdLabelServiceClient.php

@@ -36,6 +36,7 @@
 use Google\ApiCore\ValidationException;
 use Google\Auth\FetchAuthTokenInterface;
 use GuzzleHttp\Promise\PromiseInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * Service Description: Service to manage labels on ad group ads.
@@ -48,7 +49,7 @@
  * name, and additionally a parseName method to extract the individual identifiers
  * contained within formatted names that are returned by the API.
  *
- * @method PromiseInterface mutateAdGroupAdLabelsAsync(MutateAdGroupAdLabelsRequest $request, array $optionalArgs = [])
+ * @method PromiseInterface<MutateAdGroupAdLabelsResponse> mutateAdGroupAdLabelsAsync(MutateAdGroupAdLabelsRequest $request, array $optionalArgs = [])
  */
 class AdGroupAdLabelServiceClient
 {
@@ -173,14 +174,14 @@ public static function labelName(string $customerId, string $labelId): string
      * listed, then parseName will check each of the supported templates, and return
      * the first match.
      *
-     * @param string $formattedName The formatted name string
-     * @param string $template      Optional name of template to match
+     * @param string  $formattedName The formatted name string
+     * @param ?string $template      Optional name of template to match
      *
      * @return array An associative array from name component IDs to component values.
      *
      * @throws ValidationException If $formattedName could not be matched.
      */
-    public static function parseName(string $formattedName, string $template = null): array
+    public static function parseName(string $formattedName, ?string $template = null): array
     {
         return self::parseFormattedName($formattedName, $template);
     }
@@ -235,6 +236,9 @@ public static function parseName(string $formattedName, string $template = null)
      *     @type callable $clientCertSource
      *           A callable which returns the client cert as a string. This can be used to
      *           provide a certificate and private key to the transport layer for mTLS.
+     *     @type false|LoggerInterface $logger
+     *           A PSR-3 compliant logger. If set to false, logging is disabled, ignoring the
+     *           'GOOGLE_SDK_PHP_LOGGING' environment flag
      * }
      *
      * @throws ValidationException