diff --git a/MapsFleetEngine/src/V1/Client/TripServiceClient.php b/MapsFleetEngine/src/V1/Client/TripServiceClient.php index 07c1f7f6c07..083cc27fd06 100644 --- a/MapsFleetEngine/src/V1/Client/TripServiceClient.php +++ b/MapsFleetEngine/src/V1/Client/TripServiceClient.php @@ -40,6 +40,7 @@ use Google\Maps\FleetEngine\V1\Trip; use Google\Maps\FleetEngine\V1\UpdateTripRequest; use GuzzleHttp\Promise\PromiseInterface; +use Psr\Log\LoggerInterface; /** * Service Description: Trip management service. @@ -133,14 +134,14 @@ public static function tripName(string $provider, string $trip): 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); } @@ -195,6 +196,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 diff --git a/MapsFleetEngine/src/V1/Client/VehicleServiceClient.php b/MapsFleetEngine/src/V1/Client/VehicleServiceClient.php index 9eb70d735cf..c33555a3df8 100644 --- a/MapsFleetEngine/src/V1/Client/VehicleServiceClient.php +++ b/MapsFleetEngine/src/V1/Client/VehicleServiceClient.php @@ -44,6 +44,7 @@ use Google\Maps\FleetEngine\V1\Vehicle; use Google\Maps\FleetEngine\V1\Vehicle\VehicleType; use GuzzleHttp\Promise\PromiseInterface; +use Psr\Log\LoggerInterface; /** * Service Description: Vehicle management service. @@ -138,14 +139,14 @@ public static function vehicleName(string $provider, string $vehicle): 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); } @@ -200,6 +201,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 diff --git a/MapsFleetEngine/src/V1/VehicleMatch.php b/MapsFleetEngine/src/V1/VehicleMatch.php index d0945ffdbcb..70cfc1b7f9f 100644 --- a/MapsFleetEngine/src/V1/VehicleMatch.php +++ b/MapsFleetEngine/src/V1/VehicleMatch.php @@ -98,16 +98,15 @@ class VehicleMatch extends \Google\Protobuf\Internal\Message */ protected $vehicle_match_type = 0; /** - * The order requested for sorting vehicle matches. + * The order requested for sorting vehicle matches. Equivalent to + * `ordered_by`. * * Generated from protobuf field .maps.fleetengine.v1.SearchVehiclesRequest.VehicleMatchOrder requested_ordered_by = 9; */ protected $requested_ordered_by = 0; /** - * The actual order that was used for this vehicle. Normally this - * will match the 'order_by' field from the request; however, in certain - * circumstances such as an internal server error, a different method - * may be used (such as `PICKUP_POINT_STRAIGHT_DISTANCE`). + * The order requested for sorting vehicle matches. Equivalent to + * `requested_ordered_by`. * * Generated from protobuf field .maps.fleetengine.v1.SearchVehiclesRequest.VehicleMatchOrder ordered_by = 10; */ @@ -165,12 +164,11 @@ class VehicleMatch extends \Google\Protobuf\Internal\Message * @type int $vehicle_match_type * Type of the vehicle match. * @type int $requested_ordered_by - * The order requested for sorting vehicle matches. + * The order requested for sorting vehicle matches. Equivalent to + * `ordered_by`. * @type int $ordered_by - * The actual order that was used for this vehicle. Normally this - * will match the 'order_by' field from the request; however, in certain - * circumstances such as an internal server error, a different method - * may be used (such as `PICKUP_POINT_STRAIGHT_DISTANCE`). + * The order requested for sorting vehicle matches. Equivalent to + * `requested_ordered_by`. * } */ public function __construct($data = NULL) { @@ -636,7 +634,8 @@ public function setVehicleMatchType($var) } /** - * The order requested for sorting vehicle matches. + * The order requested for sorting vehicle matches. Equivalent to + * `ordered_by`. * * Generated from protobuf field .maps.fleetengine.v1.SearchVehiclesRequest.VehicleMatchOrder requested_ordered_by = 9; * @return int @@ -647,7 +646,8 @@ public function getRequestedOrderedBy() } /** - * The order requested for sorting vehicle matches. + * The order requested for sorting vehicle matches. Equivalent to + * `ordered_by`. * * Generated from protobuf field .maps.fleetengine.v1.SearchVehiclesRequest.VehicleMatchOrder requested_ordered_by = 9; * @param int $var @@ -662,10 +662,8 @@ public function setRequestedOrderedBy($var) } /** - * The actual order that was used for this vehicle. Normally this - * will match the 'order_by' field from the request; however, in certain - * circumstances such as an internal server error, a different method - * may be used (such as `PICKUP_POINT_STRAIGHT_DISTANCE`). + * The order requested for sorting vehicle matches. Equivalent to + * `requested_ordered_by`. * * Generated from protobuf field .maps.fleetengine.v1.SearchVehiclesRequest.VehicleMatchOrder ordered_by = 10; * @return int @@ -676,10 +674,8 @@ public function getOrderedBy() } /** - * The actual order that was used for this vehicle. Normally this - * will match the 'order_by' field from the request; however, in certain - * circumstances such as an internal server error, a different method - * may be used (such as `PICKUP_POINT_STRAIGHT_DISTANCE`). + * The order requested for sorting vehicle matches. Equivalent to + * `requested_ordered_by`. * * Generated from protobuf field .maps.fleetengine.v1.SearchVehiclesRequest.VehicleMatchOrder ordered_by = 10; * @param int $var