Added v16_1 classes for the library v22.1.0.

This is to support those who're people who're on v14 and doing
migration.

Change-Id: I519ba743da75ba4219cd69cdec4a09dc43bd988f

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 22.1.1
+*   Added support for v16_1 of Google Ads API.
+
 ## 22.1.0
 *   Added support for v16 of Google Ads API.
 *   Fixed dependabot alert in `examples/LaravelSampleApp/composer.lock`.

src/Google/Ads/GoogleAds/Constants.php

@@ -27,5 +27,5 @@ class Constants
     public const LIBRARY_NAME = 'gccl';
 
     // The library version.
-    public const LIBRARY_VERSION = '22.1.0';
+    public const LIBRARY_VERSION = '22.1.1';
 }

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

@@ -88,12 +88,12 @@ public function log(
         ?object $response = null
     ) {
         $this->logSummary(
-            requestData: $requestData,
-            responseData: compact('response', 'status') + ['call' => $forwardingCall]
+            $requestData,
+            compact('response', 'status') + ['call' => $forwardingCall]
         );
         $this->logDetails(
-            requestData: $requestData,
-            responseData: compact('response', 'status') + ['call' => $forwardingCall]
+            $requestData,
+            compact('response', 'status') + ['call' => $forwardingCall]
         );
     }
 

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

@@ -28,6 +28,8 @@ class GoogleAdsException extends ApiException
 {
     use GoogleAdsMetadataTrait;
 
+    private GoogleAdsFailure $googleAdsFailure;
+
     /**
      * Creates a `GoogleAdsException` instance with the specified parameters.
      *
@@ -37,7 +39,7 @@ class GoogleAdsException extends ApiException
      */
     public function __construct(
         ApiException $original,
-        private GoogleAdsFailure $googleAdsFailure,
+        GoogleAdsFailure $googleAdsFailure,
         array $optionalArgs = []
     ) {
         parent::__construct(
@@ -46,6 +48,7 @@ public function __construct(
             $original->getStatus(),
             $optionalArgs
         );
+        $this->googleAdsFailure = $googleAdsFailure;
     }
 
     /**

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

@@ -43,6 +43,7 @@ trait GoogleAdsGapicClientTrait
     private $linkedCustomerId = null;
     private $unaryMiddlewares = [];
     private $streamingMiddlewares = [];
+    private ?GoogleAdsResponseMetadata $responseMetadata = null;
 
     /**
      * @see GapicClientTrait::modifyClientOptions()
@@ -91,7 +92,7 @@ private function addFixedHeaderMiddleware(callable &$callable)
                 $headers[self::$LINKED_CUSTOMER_ID] = [$this->linkedCustomerId];
             }
 
-            $callable = new FixedHeaderMiddleware(nextHandler: $callable, headers: $headers);
+            $callable = new FixedHeaderMiddleware($callable, $headers);
         }
         return $callable;
     }
@@ -103,7 +104,7 @@ protected function modifyUnaryCallable(callable &$callable)
     {
         $callable = $this->addFixedHeaderMiddleware($callable);
         $callable = new UnaryGoogleAdsExceptionMiddleware($callable);
-        $callable = new UnaryGoogleAdsResponseMetadataCallable($callable);
+        $callable = new UnaryGoogleAdsResponseMetadataCallable($callable, $this);
         foreach ($this->unaryMiddlewares as $unaryMiddleware) {
             /** @var GoogleAdsMiddlewareAbstract $unaryMiddleware */
             $callable = $unaryMiddleware->withNextHandler($callable);
@@ -123,4 +124,14 @@ protected function modifyStreamingCallable(callable &$callable)
             $callable = $streamingMiddleware->withNextHandler($callable);
         }
     }
+
+    public function getResponseMetadata(): ?GoogleAdsResponseMetadata
+    {
+        return $this->responseMetadata;
+    }
+
+    public function setResponseMetadata(?GoogleAdsResponseMetadata $responseMetadata): void
+    {
+        $this->responseMetadata = $responseMetadata;
+    }
 }

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

@@ -25,13 +25,16 @@
  */
 class GoogleAdsLoggingInterceptor extends Interceptor
 {
+    private GoogleAdsCallLogger $callLogger;
+
     /**
      * Constructs the Google Ads logging interceptor.
      *
      * @param GoogleAdsCallLogger $callLogger the call logger for logging gRPC requests
      */
-    public function __construct(private GoogleAdsCallLogger $callLogger)
+    public function __construct(GoogleAdsCallLogger $callLogger)
     {
+        $this->callLogger = $callLogger;
     }
 
     /**
@@ -54,9 +57,9 @@ public function interceptUnaryUnary(
         array $options = []
     ) {
         return new GoogleAdsLoggingUnaryCall(
-            innerCall: $continuation($method, $argument, $deserialize, $metadata, $options),
-            lastRequestData: compact('method', 'argument', 'deserialize', 'metadata', 'options'),
-            googleAdsCallLogger: $this->callLogger
+            $continuation($method, $argument, $deserialize, $metadata, $options),
+            compact('method', 'argument', 'deserialize', 'metadata', 'options'),
+            $this->callLogger
         );
     }
 
@@ -80,9 +83,9 @@ public function interceptUnaryStream(
         array $options = []
     ) {
         return new GoogleAdsLoggingServerStreamingCall(
-            innerCall: $continuation($method, $argument, $deserialize, $metadata, $options),
-            lastRequestData: compact('method', 'argument', 'deserialize', 'metadata', 'options'),
-            googleAdsCallLogger: $this->callLogger
+            $continuation($method, $argument, $deserialize, $metadata, $options),
+            compact('method', 'argument', 'deserialize', 'metadata', 'options'),
+            $this->callLogger
         );
     }
 

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

@@ -26,7 +26,9 @@
  */
 class GoogleAdsLoggingServerStreamingCall extends ForwardingServerStreamingCall
 {
-    private $storedResponses;
+    private GoogleAdsCallLogger $googleAdsCallLogger;
+    private array $lastRequestData;
+    private array $storedResponses;
 
     /**
      * Constructs the LoggingSeverStreamingCall using the inner call and logging intercepter.
@@ -37,10 +39,12 @@ class GoogleAdsLoggingServerStreamingCall extends ForwardingServerStreamingCall
      */
     public function __construct(
         $innerCall,
-        private array $lastRequestData,
-        private GoogleAdsCallLogger $googleAdsCallLogger
+        array $lastRequestData,
+        GoogleAdsCallLogger $googleAdsCallLogger
     ) {
         parent::__construct($innerCall);
+        $this->lastRequestData = $lastRequestData;
+        $this->googleAdsCallLogger = $googleAdsCallLogger;
         if ($this->googleAdsCallLogger->isLoggingResponsesEnabled()) {
             $this->storedResponses = [];
         }

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

@@ -26,6 +26,9 @@
  */
 class GoogleAdsLoggingUnaryCall extends ForwardingUnaryCall
 {
+    private GoogleAdsCallLogger $googleAdsCallLogger;
+    private array $lastRequestData;
+
     /**
      * Constructs the LoggingUnaryCall using the inner call and logging intercepter.
      *
@@ -35,18 +38,20 @@ class GoogleAdsLoggingUnaryCall extends ForwardingUnaryCall
      */
     public function __construct(
         $innerCall,
-        private array $lastRequestData,
-        private GoogleAdsCallLogger $googleAdsCallLogger
+        array $lastRequestData,
+        GoogleAdsCallLogger $googleAdsCallLogger
     ) {
         parent::__construct($innerCall);
+        $this->lastRequestData = $lastRequestData;
+        $this->googleAdsCallLogger = $googleAdsCallLogger;
     }
 
     /**
      * {@inheritdoc}
      */
     public function wait()
     {
-        [$response, $status] = parent::wait();
+        list($response, $status) = parent::wait();
         $this->googleAdsCallLogger->log($this, $status, $this->lastRequestData, $response);
         return [$response, $status];
     }

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

@@ -25,13 +25,16 @@ class GoogleAdsResponseMetadata
 {
     use GoogleAdsMetadataTrait;
 
+    private array $metadata;
+
     /**
      * Creates a `GoogleAdsResponseMetadata` instance with the specified parameters.
      *
      * @param array $metadata the metadata
      */
-    public function __construct(private array $metadata)
+    public function __construct(array $metadata)
     {
+        $this->metadata = $metadata;
     }
 
     /**

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

@@ -27,11 +27,14 @@
  */
 class GoogleAdsServerStreamDecorator extends ServerStream
 {
+    protected ServerStream $serverStream;
+
     /**
      * @param ServerStream $serverStream the ServerStream to wrap
      */
-    public function __construct(protected ServerStream $serverStream)
+    public function __construct(ServerStream $serverStream)
     {
+        $this->serverStream = $serverStream;
     }
 
     /**