Skip to content

Commit 0e72fd8

Browse files
vam-googlevam-google
authored
Fix generated PHP GAPIC classes (googleapis#724)
1) Fix php-cs-fixer phpdoc_annotation_without_dot issue 2) Put back dlp gapic client class example
1 parent 0cfa907 commit 0e72fd8

21 files changed

Lines changed: 366 additions & 357 deletions

‎src/Dlp/V2beta1/Gapic/DlpServiceGapicClient.php‎

Lines changed: 154 additions & 145 deletions
Large diffs are not rendered by default.

‎src/Dlp/V2beta1/resources/dlp_service_client_config.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@
2020
}
2121
},
2222
"methods": {
23-
"DeidentifyContent": {
23+
"InspectContent": {
2424
"timeout_millis": 60000,
25-
"retry_codes_name": "idempotent",
25+
"retry_codes_name": "non_idempotent",
2626
"retry_params_name": "default"
2727
},
28-
"AnalyzeDataSourceRisk": {
28+
"RedactContent": {
2929
"timeout_millis": 60000,
30-
"retry_codes_name": "idempotent",
30+
"retry_codes_name": "non_idempotent",
3131
"retry_params_name": "default"
3232
},
33-
"InspectContent": {
33+
"DeidentifyContent": {
3434
"timeout_millis": 60000,
35-
"retry_codes_name": "non_idempotent",
35+
"retry_codes_name": "idempotent",
3636
"retry_params_name": "default"
3737
},
38-
"RedactContent": {
38+
"AnalyzeDataSourceRisk": {
3939
"timeout_millis": 60000,
40-
"retry_codes_name": "non_idempotent",
40+
"retry_codes_name": "idempotent",
4141
"retry_params_name": "default"
4242
},
4343
"CreateInspectOperation": {

‎src/ErrorReporting/V1beta1/Gapic/ErrorGroupServiceGapicClient.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private static function getGapicVersion()
143143
* @param string $project
144144
* @param string $group
145145
*
146-
* @return string the formatted group resource
146+
* @return string The formatted group resource.
147147
* @experimental
148148
*/
149149
public static function groupName($project, $group)
@@ -168,9 +168,9 @@ public static function groupName($project, $group)
168168
* @param string $formattedName The formatted name string
169169
* @param string $template Optional name of template to match
170170
*
171-
* @return array an associative array from name component IDs to component values
171+
* @return array An associative array from name component IDs to component values.
172172
*
173-
* @throws ValidationException if $formattedName could not be matched
173+
* @throws ValidationException If $formattedName could not be matched.
174174
* @experimental
175175
*/
176176
public static function parseName($formattedName, $template = null)
@@ -314,7 +314,7 @@ public function __construct($options = [])
314314
*
315315
* Example: <code>projects/my-project-123/groups/my-group</code>
316316
* @param array $optionalArgs {
317-
* Optional
317+
* Optional.
318318
*
319319
* @type \Google\GAX\RetrySettings|array $retrySettings
320320
* Retry settings to use for this call. Can be a
@@ -368,9 +368,9 @@ public function getGroup($groupName, $optionalArgs = [])
368368
* }
369369
* ```
370370
*
371-
* @param errorGroup $group [Required] The group which replaces the resource on the server
371+
* @param ErrorGroup $group [Required] The group which replaces the resource on the server.
372372
* @param array $optionalArgs {
373-
* Optional
373+
* Optional.
374374
*
375375
* @type \Google\GAX\RetrySettings|array $retrySettings
376376
* Retry settings to use for this call. Can be a

‎src/ErrorReporting/V1beta1/Gapic/ErrorStatsServiceGapicClient.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ private static function getGapicVersion()
190190
*
191191
* @param string $project
192192
*
193-
* @return string the formatted project resource
193+
* @return string The formatted project resource.
194194
* @experimental
195195
*/
196196
public static function projectName($project)
@@ -214,9 +214,9 @@ public static function projectName($project)
214214
* @param string $formattedName The formatted name string
215215
* @param string $template Optional name of template to match
216216
*
217-
* @return array an associative array from name component IDs to component values
217+
* @return array An associative array from name component IDs to component values.
218218
*
219-
* @throws ValidationException if $formattedName could not be matched
219+
* @throws ValidationException If $formattedName could not be matched.
220220
* @experimental
221221
*/
222222
public static function parseName($formattedName, $template = null)
@@ -383,7 +383,7 @@ public function __construct($options = [])
383383
* If a group_id list is given, also <code>ErrorGroupStats</code> with zero
384384
* occurrences are returned.
385385
* @param array $optionalArgs {
386-
* Optional
386+
* Optional.
387387
*
388388
* @type string[] $groupId
389389
* [Optional] List all <code>ErrorGroupStats</code> with these IDs.
@@ -508,9 +508,9 @@ public function listGroupStats($projectName, $timeRange, $optionalArgs = [])
508508
* [Google Cloud Platform project
509509
* ID](https://support.google.com/cloud/answer/6158840).
510510
* Example: `projects/my-project-123`.
511-
* @param string $groupId [Required] The group for which events shall be returned
511+
* @param string $groupId [Required] The group for which events shall be returned.
512512
* @param array $optionalArgs {
513-
* Optional
513+
* Optional.
514514
*
515515
* @type ServiceContextFilter $serviceFilter
516516
* [Optional] List only ErrorGroups which belong to a service context that
@@ -599,7 +599,7 @@ public function listEvents($projectName, $groupId, $optionalArgs = [])
599599
* ID](https://support.google.com/cloud/answer/6158840).
600600
* Example: `projects/my-project-123`.
601601
* @param array $optionalArgs {
602-
* Optional
602+
* Optional.
603603
*
604604
* @type \Google\GAX\RetrySettings|array $retrySettings
605605
* Retry settings to use for this call. Can be a

‎src/ErrorReporting/V1beta1/Gapic/ReportErrorsServiceGapicClient.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private static function getGapicVersion()
142142
*
143143
* @param string $project
144144
*
145-
* @return string the formatted project resource
145+
* @return string The formatted project resource.
146146
* @experimental
147147
*/
148148
public static function projectName($project)
@@ -166,9 +166,9 @@ public static function projectName($project)
166166
* @param string $formattedName The formatted name string
167167
* @param string $template Optional name of template to match
168168
*
169-
* @return array an associative array from name component IDs to component values
169+
* @return array An associative array from name component IDs to component values.
170170
*
171-
* @throws ValidationException if $formattedName could not be matched
171+
* @throws ValidationException If $formattedName could not be matched.
172172
* @experimental
173173
*/
174174
public static function parseName($formattedName, $template = null)
@@ -314,9 +314,9 @@ public function __construct($options = [])
314314
* as `projects/` plus the
315315
* [Google Cloud Platform project ID](https://support.google.com/cloud/answer/6158840).
316316
* Example: `projects/my-project-123`.
317-
* @param reportedErrorEvent $event [Required] The error event to be reported
317+
* @param ReportedErrorEvent $event [Required] The error event to be reported.
318318
* @param array $optionalArgs {
319-
* Optional
319+
* Optional.
320320
*
321321
* @type \Google\GAX\RetrySettings|array $retrySettings
322322
* Retry settings to use for this call. Can be a

‎src/Language/V1beta2/Gapic/LanguageServiceGapicClient.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@ public function __construct($options = [])
228228
* }
229229
* ```
230230
*
231-
* @param Document $document input document
231+
* @param Document $document Input document.
232232
* @param array $optionalArgs {
233-
* Optional
233+
* Optional.
234234
*
235235
* @type int $encodingType
236236
* The encoding type used by the API to calculate sentence offsets for the
@@ -292,9 +292,9 @@ public function analyzeSentiment($document, $optionalArgs = [])
292292
* }
293293
* ```
294294
*
295-
* @param Document $document input document
295+
* @param Document $document Input document.
296296
* @param array $optionalArgs {
297-
* Optional
297+
* Optional.
298298
*
299299
* @type int $encodingType
300300
* The encoding type used by the API to calculate offsets.
@@ -354,9 +354,9 @@ public function analyzeEntities($document, $optionalArgs = [])
354354
* }
355355
* ```
356356
*
357-
* @param Document $document input document
357+
* @param Document $document Input document.
358358
* @param array $optionalArgs {
359-
* Optional
359+
* Optional.
360360
*
361361
* @type int $encodingType
362362
* The encoding type used by the API to calculate offsets.
@@ -417,9 +417,9 @@ public function analyzeEntitySentiment($document, $optionalArgs = [])
417417
* }
418418
* ```
419419
*
420-
* @param Document $document input document
420+
* @param Document $document Input document.
421421
* @param array $optionalArgs {
422-
* Optional
422+
* Optional.
423423
*
424424
* @type int $encodingType
425425
* The encoding type used by the API to calculate offsets.
@@ -478,9 +478,9 @@ public function analyzeSyntax($document, $optionalArgs = [])
478478
* }
479479
* ```
480480
*
481-
* @param Document $document input document
481+
* @param Document $document Input document.
482482
* @param array $optionalArgs {
483-
* Optional
483+
* Optional.
484484
*
485485
* @type \Google\GAX\RetrySettings|array $retrySettings
486486
* Retry settings to use for this call. Can be a
@@ -535,10 +535,10 @@ public function classifyText($document, $optionalArgs = [])
535535
* }
536536
* ```
537537
*
538-
* @param Document $document input document
539-
* @param Features $features the enabled features
538+
* @param Document $document Input document.
539+
* @param Features $features The enabled features.
540540
* @param array $optionalArgs {
541-
* Optional
541+
* Optional.
542542
*
543543
* @type int $encodingType
544544
* The encoding type used by the API to calculate offsets.

‎src/Logging/V2/Gapic/ConfigServiceV2GapicClient.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ private static function getGapicVersion()
217217
*
218218
* @param string $project
219219
*
220-
* @return string the formatted project resource
220+
* @return string The formatted project resource.
221221
* @experimental
222222
*/
223223
public static function projectName($project)
@@ -234,7 +234,7 @@ public static function projectName($project)
234234
* @param string $project
235235
* @param string $sink
236236
*
237-
* @return string the formatted sink resource
237+
* @return string The formatted sink resource.
238238
* @experimental
239239
*/
240240
public static function sinkName($project, $sink)
@@ -252,7 +252,7 @@ public static function sinkName($project, $sink)
252252
* @param string $project
253253
* @param string $exclusion
254254
*
255-
* @return string the formatted exclusion resource
255+
* @return string The formatted exclusion resource.
256256
* @experimental
257257
*/
258258
public static function exclusionName($project, $exclusion)
@@ -279,9 +279,9 @@ public static function exclusionName($project, $exclusion)
279279
* @param string $formattedName The formatted name string
280280
* @param string $template Optional name of template to match
281281
*
282-
* @return array an associative array from name component IDs to component values
282+
* @return array An associative array from name component IDs to component values.
283283
*
284-
* @throws ValidationException if $formattedName could not be matched
284+
* @throws ValidationException If $formattedName could not be matched.
285285
* @experimental
286286
*/
287287
public static function parseName($formattedName, $template = null)
@@ -451,7 +451,7 @@ public function __construct($options = [])
451451
* "billingAccounts/[BILLING_ACCOUNT_ID]"
452452
* "folders/[FOLDER_ID]"
453453
* @param array $optionalArgs {
454-
* Optional
454+
* Optional.
455455
*
456456
* @type string $pageToken
457457
* A page token is used to specify a page of values to be returned.
@@ -528,7 +528,7 @@ public function listSinks($parent, $optionalArgs = [])
528528
*
529529
* Example: `"projects/my-project-id/sinks/my-sink-id"`.
530530
* @param array $optionalArgs {
531-
* Optional
531+
* Optional.
532532
*
533533
* @type \Google\GAX\RetrySettings|array $retrySettings
534534
* Retry settings to use for this call. Can be a
@@ -597,7 +597,7 @@ public function getSink($sinkName, $optionalArgs = [])
597597
* @param LogSink $sink Required. The new sink, whose `name` parameter is a sink identifier that
598598
* is not already in use.
599599
* @param array $optionalArgs {
600-
* Optional
600+
* Optional.
601601
*
602602
* @type bool $uniqueWriterIdentity
603603
* Optional. Determines the kind of IAM identity returned as `writer_identity`
@@ -683,7 +683,7 @@ public function createSink($parent, $sink, $optionalArgs = [])
683683
* @param LogSink $sink Required. The updated sink, whose name is the same identifier that appears
684684
* as part of `sink_name`.
685685
* @param array $optionalArgs {
686-
* Optional
686+
* Optional.
687687
*
688688
* @type bool $uniqueWriterIdentity
689689
* Optional. See
@@ -764,7 +764,7 @@ public function updateSink($sinkName, $sink, $optionalArgs = [])
764764
*
765765
* Example: `"projects/my-project-id/sinks/my-sink-id"`.
766766
* @param array $optionalArgs {
767-
* Optional
767+
* Optional.
768768
*
769769
* @type \Google\GAX\RetrySettings|array $retrySettings
770770
* Retry settings to use for this call. Can be a
@@ -834,7 +834,7 @@ public function deleteSink($sinkName, $optionalArgs = [])
834834
* "billingAccounts/[BILLING_ACCOUNT_ID]"
835835
* "folders/[FOLDER_ID]"
836836
* @param array $optionalArgs {
837-
* Optional
837+
* Optional.
838838
*
839839
* @type string $pageToken
840840
* A page token is used to specify a page of values to be returned.
@@ -911,7 +911,7 @@ public function listExclusions($parent, $optionalArgs = [])
911911
*
912912
* Example: `"projects/my-project-id/exclusions/my-exclusion-id"`.
913913
* @param array $optionalArgs {
914-
* Optional
914+
* Optional.
915915
*
916916
* @type \Google\GAX\RetrySettings|array $retrySettings
917917
* Retry settings to use for this call. Can be a
@@ -978,7 +978,7 @@ public function getExclusion($name, $optionalArgs = [])
978978
* @param LogExclusion $exclusion Required. The new exclusion, whose `name` parameter is an exclusion name
979979
* that is not already used in the parent resource.
980980
* @param array $optionalArgs {
981-
* Optional
981+
* Optional.
982982
*
983983
* @type \Google\GAX\RetrySettings|array $retrySettings
984984
* Retry settings to use for this call. Can be a
@@ -1052,7 +1052,7 @@ public function createExclusion($parent, $exclusion, $optionalArgs = [])
10521052
* For example, to change the filter and description of an exclusion,
10531053
* specify an `update_mask` of `"filter,description"`.
10541054
* @param array $optionalArgs {
1055-
* Optional
1055+
* Optional.
10561056
*
10571057
* @type \Google\GAX\RetrySettings|array $retrySettings
10581058
* Retry settings to use for this call. Can be a
@@ -1116,7 +1116,7 @@ public function updateExclusion($name, $exclusion, $updateMask, $optionalArgs =
11161116
*
11171117
* Example: `"projects/my-project-id/exclusions/my-exclusion-id"`.
11181118
* @param array $optionalArgs {
1119-
* Optional
1119+
* Optional.
11201120
*
11211121
* @type \Google\GAX\RetrySettings|array $retrySettings
11221122
* Retry settings to use for this call. Can be a

0 commit comments

Comments
 (0)