updates from main

Author: bshaffer

Core/src/ApiHelperTrait.php

@@ -243,6 +243,9 @@ protected function constructGapic($gapicName, array $config)
      */
     private function convertDataToProtos(array $input, array $map): array
     {
+        if (!isset($this->serializer)) {
+            throw new \LogicException('Serializer must be set to use this function');
+        }
         foreach ($map as $key => $className) {
             if (isset($input[$key])) {
                 $input[$key] = $this->serializer->decodeMessage(new $className(), $input[$key]);

Datastore/src/Operation.php

@@ -19,6 +19,7 @@
 
 use Google\ApiCore\Options\CallOptions;
 use Google\Cloud\Core\ApiHelperTrait;
+use Google\Cloud\Core\OptionsValidator;
 use Google\Cloud\Core\Timestamp;
 use Google\Cloud\Core\TimestampTrait;
 use Google\Cloud\Core\ValidateTrait;
@@ -117,6 +118,7 @@ public function __construct(
         $this->databaseId = $databaseId;
         $this->entityMapper = $entityMapper;
         $this->serializer = new Serializer();
+        $this->optionsValidator = new OptionsValidator($this->serializer);
     }
 
     /**