-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
7 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -218,8 +218,6 @@ protected function getCredentialsWrapper() | |
*/ | ||
private function setClientOptions(array $options) | ||
{ | ||
$hasEmulator = $options['hasEmulator'] ?? false; | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
bshaffer
Author
Contributor
|
||
|
||
// serviceAddress is now deprecated and acts as an alias for apiEndpoint | ||
if (isset($options['serviceAddress'])) { | ||
$options['apiEndpoint'] = $this->pluck('serviceAddress', $options, false); | ||
|
@@ -316,7 +314,7 @@ private function setClientOptions(array $options) | |
$transport, | ||
$options['transportConfig'], | ||
$options['clientCertSource'], | ||
$hasEmulator | ||
$options['hasEmulator'] ?? false | ||
); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@bshaffer moving this below would be alright if
$options
weren't overridden by$options = new ClientOptions($options);
.Would you please revert this refactoring?