Merge branch 'main' into generate-script

manisha1997 · web-flow · commit f9ce35422dfe · 2025-04-02T23:34:23.000+05:30
diff --git a/examples/php/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackCallSummaryContext.php b/examples/php/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackCallSummaryContext.php
@@ -82,7 +82,7 @@ public function update(\DateTime $endDate, \DateTime $startDate, array $options
                 $options['accountSid'],
         ]);
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);
         $payload = $this->version->update('POST', $this->uri, [], $data, $headers);
 
         return new FeedbackCallSummaryInstance(
diff --git a/examples/php/src/Twilio/Rest/Api/V2010/Account/CallContext.php b/examples/php/src/Twilio/Rest/Api/V2010/Account/CallContext.php
@@ -86,7 +86,7 @@ public function delete(): bool
     public function fetch(): CallInstance
     {
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);
         $payload = $this->version->fetch('GET', $this->uri, [], [], $headers);
 
         return new CallInstance(
diff --git a/examples/php/src/Twilio/Rest/Api/V2010/Account/CallList.php b/examples/php/src/Twilio/Rest/Api/V2010/Account/CallList.php
@@ -85,7 +85,7 @@ public function create(string $requiredStringProperty, string $testMethod, array
                 Serialize::map($options['testArrayOfUri'], function ($e) { return $e; }),
         ]);
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);
         $payload = $this->version->create('POST', $this->uri, [], $data, $headers);
 
         return new CallInstance(
diff --git a/examples/php/src/Twilio/Rest/Api/V2010/AccountContext.php b/examples/php/src/Twilio/Rest/Api/V2010/AccountContext.php
@@ -84,7 +84,7 @@ public function delete(): bool
     public function fetch(): AccountInstance
     {
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);
         $payload = $this->version->fetch('GET', $this->uri, [], [], $headers);
 
         return new AccountInstance(
@@ -115,7 +115,7 @@ public function update(string $status, array $options = []): AccountInstance
                 $options['pauseBehavior'],
         ]);
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);
         $payload = $this->version->update('POST', $this->uri, [], $data, $headers);
 
         return new AccountInstance(
diff --git a/examples/php/src/Twilio/Rest/Api/V2010/AccountList.php b/examples/php/src/Twilio/Rest/Api/V2010/AccountList.php
@@ -70,7 +70,7 @@ public function create(array $options = []): AccountInstance
                 $options['twiml'],
         ]);
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' , 'X-Twilio-Webhook-Enabled' => $options['xTwilioWebhookEnabled']]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' , 'X-Twilio-Webhook-Enabled' => $options['xTwilioWebhookEnabled']]);
         $payload = $this->version->create('POST', $this->uri, [], $data, $headers);
 
         return new AccountInstance(
@@ -161,7 +161,8 @@ public function page(
             'PageSize' => $pageSize,
         ]);
 
-        $response = $this->version->page('GET', $this->uri, $params);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json']);
+        $response = $this->version->page('GET', $this->uri, $params, [], $headers);
 
         return new AccountPage($this->version, $response, $this->solution);
     }
diff --git a/examples/php/src/Twilio/Rest/FlexApi/V1/CallContext.php b/examples/php/src/Twilio/Rest/FlexApi/V1/CallContext.php
@@ -63,7 +63,7 @@ public function __construct(
     public function update(): CallInstance
     {
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);
         $payload = $this->version->update('POST', $this->uri, [], [], $headers);
 
         return new CallInstance(
diff --git a/examples/php/src/Twilio/Rest/FlexApi/V1/Credential/Aws/HistoryContext.php b/examples/php/src/Twilio/Rest/FlexApi/V1/Credential/Aws/HistoryContext.php
@@ -70,7 +70,7 @@ public function fetch(array $options = []): HistoryInstance
         ]);
         $params = \array_merge($params, Serialize::prefixedCollapsibleMap($options['addOnsData'], 'AddOns'));
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);
         $payload = $this->version->fetch('GET', $this->uri, $params, [], $headers);
 
         return new HistoryInstance(
diff --git a/examples/php/src/Twilio/Rest/FlexApi/V1/Credential/AwsContext.php b/examples/php/src/Twilio/Rest/FlexApi/V1/Credential/AwsContext.php
@@ -84,7 +84,7 @@ public function delete(): bool
     public function fetch(): AwsInstance
     {
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);
         $payload = $this->version->fetch('GET', $this->uri, [], [], $headers);
 
         return new AwsInstance(
@@ -114,7 +114,7 @@ public function update(array $options = []): AwsInstance
                 Serialize::booleanToString($options['testBoolean']),
         ]);
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);
         $payload = $this->version->update('POST', $this->uri, [], $data, $headers);
 
         return new AwsInstance(
diff --git a/examples/php/src/Twilio/Rest/FlexApi/V1/Credential/AwsList.php b/examples/php/src/Twilio/Rest/FlexApi/V1/Credential/AwsList.php
@@ -118,7 +118,8 @@ public function page(
             'PageSize' => $pageSize,
         ]);
 
-        $response = $this->version->page('GET', $this->uri, $params);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json']);
+        $response = $this->version->page('GET', $this->uri, $params, [], $headers);
 
         return new AwsPage($this->version, $response, $this->solution);
     }
diff --git a/examples/php/src/Twilio/Rest/FlexApi/V1/Credential/NewCredentialsList.php b/examples/php/src/Twilio/Rest/FlexApi/V1/Credential/NewCredentialsList.php
@@ -98,7 +98,7 @@ public function create(string $testString, array $options = []): NewCredentialsI
                 $options['someA2PThing'],
         ]);
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);
         $payload = $this->version->create('POST', $this->uri, [], $data, $headers);
 
         return new NewCredentialsInstance(
diff --git a/examples/php/src/Twilio/Rest/Versionless/DeployedDevices/FleetContext.php b/examples/php/src/Twilio/Rest/Versionless/DeployedDevices/FleetContext.php
@@ -63,7 +63,7 @@ public function __construct(
     public function fetch(): FleetInstance
     {
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);
         $payload = $this->version->fetch('GET', $this->uri, [], [], $headers);
 
         return new FleetInstance(
diff --git a/examples/php/src/Twilio/Rest/Versionless/DeployedDevices/FleetList.php b/examples/php/src/Twilio/Rest/Versionless/DeployedDevices/FleetList.php
@@ -65,7 +65,7 @@ public function create(array $options = []): FleetInstance
                 $options['name'],
         ]);
 
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);
         $payload = $this->version->create('POST', $this->uri, [], $data, $headers);
 
         return new FleetInstance(
diff --git a/examples/php/src/Twilio/Rest/Versionless/Understand/AssistantList.php b/examples/php/src/Twilio/Rest/Versionless/Understand/AssistantList.php
@@ -117,7 +117,8 @@ public function page(
             'PageSize' => $pageSize,
         ]);
 
-        $response = $this->version->page('GET', $this->uri, $params);
+        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json']);
+        $response = $this->version->page('GET', $this->uri, $params, [], $headers);
 
         return new AssistantPage($this->version, $response, $this->solution);
     }
diff --git a/scripts/build_twilio_library.py b/scripts/build_twilio_library.py
@@ -24,7 +24,7 @@
 generateForLanguages = {
     'twilio_iam_organizations.json' : ['java', 'csharp']
 }
-dynamic_languages = ['node', 'python', 'ruby']
+dynamic_languages = ['node', 'python', 'ruby', 'php']
 CLEANUP_IMPORT_LANGUAGES = ['java', 'php']
 REMOVE_DUPLICATE_IMPORT_LANGUAGES = ['node']
 CONFIG_FOLDER = 'tmp'
diff --git a/src/main/java/com/twilio/oai/api/PhpApiResourceBuilder.java b/src/main/java/com/twilio/oai/api/PhpApiResourceBuilder.java
@@ -161,6 +161,16 @@ private void updateNamespaceSubPart(CodegenOperation codegenOperation) {
         namespaceSubPart = namespaceSubPart.replaceAll("\\\\Function[\\\\]", "\\\\TwilioFunction\\\\");
     }
 
+    private List<CodegenParameter> filterPagingParams(List<CodegenParameter> queryParams) {
+        List<CodegenParameter> nonPagingParams = new ArrayList<>();
+        for (CodegenParameter param : queryParams) {
+            if (!param.baseName.startsWith("Page")) {
+                nonPagingParams.add(param);
+            }
+        }
+        return nonPagingParams;
+    }
+
     @Override
     public ApiResourceBuilder updateOperations(Resolver<CodegenParameter> codegenParameterIResolver) {
         PhpJsonRequestBodyResolver jsonRequestBodyResolver = new PhpJsonRequestBodyResolver(this, codegenPropertyIResolver);
@@ -185,6 +195,10 @@ public ApiResourceBuilder updateOperations(Resolver<CodegenParameter> codegenPar
             co.queryParams = co.queryParams.stream()
                     .map(item -> codegenParameterIResolver.resolve(item, this))
                     .collect(Collectors.toList());
+            List<CodegenParameter> nonPagingParams = filterPagingParams(co.queryParams);
+            if (!nonPagingParams.isEmpty()) {
+                co.vendorExtensions.put("x-has-non-pagination-params", true);
+            }
             co.formParams = co.formParams.stream()
                     .map(item -> codegenParameterIResolver.resolve(item, this))
                     .collect(Collectors.toList());
diff --git a/src/main/resources/twilio-php/contextMethod.mustache b/src/main/resources/twilio-php/contextMethod.mustache
@@ -132,11 +132,10 @@
         {{/optionalParams}}
 
     {{/formParams.0}}
-        $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' {{#headerParams}}{{#required}}, '{{baseName}}' =>
+        $headers = Values::of([{{^consumes}}'Content-Type' => 'application/x-www-form-urlencoded'{{/consumes}}{{#consumes}}{{#-first}}'Content-Type' => '{{{mediaType}}}'{{/-first}}{{/consumes}}{{^vendorExtensions.x-is-delete-operation}}{{#produces}}{{#-first}}, 'Accept' => '{{{mediaType}}}'{{/-first}}{{/produces}}{{/vendorExtensions.x-is-delete-operation}} {{#headerParams}}{{#required}}, '{{baseName}}' =>
             ${{#lambda.camelcase}}{{baseName}}{{/lambda.camelcase}}{{/required}}{{/headerParams}}{{#headerParams}}{{^required}}, '{{baseName}}' => $options['{{#lambda.camelcase}}{{baseName}}{{/lambda.camelcase}}']{{/required}}{{/headerParams}}]);
     {{#bodyParams.0}}
         $data = ${{#lambda.camelcase}}{{baseName}}{{/lambda.camelcase}}->toArray();
-        $headers['Content-Type'] = 'application/json';
     {{/bodyParams.0}}
     {{^vendorExtensions.x-is-delete-operation}}
         $payload = $this->version->{{#lambda.camelcase}}{{vendorExtensions.x-name}}{{/lambda.camelcase}}('{{httpMethod}}', $this->uri{{#queryParams.0}}, $params{{/queryParams.0}}{{^queryParams}}, []{{/queryParams}}{{#formParams.0}}, $data{{/formParams.0}}{{^formParams}}{{#bodyParams.0}}, $data{{/bodyParams.0}}{{^bodyParams}}, []{{/bodyParams}}{{/formParams}}, $headers);
diff --git a/src/main/resources/twilio-php/listRead.mustache b/src/main/resources/twilio-php/listRead.mustache
@@ -4,9 +4,9 @@
      * Unlike stream(), this operation is eager and will load `limit` records into
      * memory before returning.
      *
-     {{#queryParams.1}}
+     {{#vendorExtensions.x-has-non-pagination-params}}
      * @param array|Options $options Optional Arguments
-     {{/queryParams.1}}
+     {{/vendorExtensions.x-has-non-pagination-params}}
      * @param int $limit Upper limit for the number of records to return. read()
      *                   guarantees to never return more than limit.  Default is no
      *                   limit
@@ -17,9 +17,9 @@
      *                        efficient page size, i.e. min(limit, 1000)
      * @return {{apiName}}Instance[] Array of results
      */
-    public function read({{#queryParams.1}}array $options = [], {{/queryParams.1}}int $limit = null, $pageSize = null): array
+    public function read({{#vendorExtensions.x-has-non-pagination-params}}array $options = [], {{/vendorExtensions.x-has-non-pagination-params}}int $limit = null, $pageSize = null): array
     {
-        return \iterator_to_array($this->stream({{#queryParams.1}}$options, {{/queryParams.1}}$limit, $pageSize), false);
+        return \iterator_to_array($this->stream({{#vendorExtensions.x-has-non-pagination-params}}$options, {{/vendorExtensions.x-has-non-pagination-params}}$limit, $pageSize), false);
     }
 
     /**
@@ -30,9 +30,9 @@
      * The results are returned as a generator, so this operation is memory
      * efficient.
      *
-     {{#queryParams.1}}
+     {{#vendorExtensions.x-has-non-pagination-params}}
      * @param array|Options $options Optional Arguments
-     {{/queryParams.1}}
+     {{/vendorExtensions.x-has-non-pagination-params}}
      * @param int $limit Upper limit for the number of records to return. stream()
      *                   guarantees to never return more than limit.  Default is no
      *                   limit
@@ -43,11 +43,11 @@
      *                        efficient page size, i.e. min(limit, 1000)
      * @return Stream stream of results
      */
-    public function stream({{#queryParams.1}}array $options = [], {{/queryParams.1}}int $limit = null, $pageSize = null): Stream
+    public function stream({{#vendorExtensions.x-has-non-pagination-params}}array $options = [], {{/vendorExtensions.x-has-non-pagination-params}}int $limit = null, $pageSize = null): Stream
     {
         $limits = $this->version->readLimits($limit, $pageSize);
 
-        $page = $this->page({{#queryParams.1}}$options, {{/queryParams.1}}$limits['pageSize']);
+        $page = $this->page({{#vendorExtensions.x-has-non-pagination-params}}$options, {{/vendorExtensions.x-has-non-pagination-params}}$limits['pageSize']);
 
         return $this->version->stream($page, $limits['limit'], $limits['pageLimit']);
     }
@@ -62,15 +62,15 @@
      * @return {{apiName}}Page Page of {{apiName}}Instance
      */
     public function page(
-        {{#queryParams.1}}array $options = [],
-        {{/queryParams.1}}$pageSize = Values::NONE,
+        {{#vendorExtensions.x-has-non-pagination-params}}array $options = [],
+        {{/vendorExtensions.x-has-non-pagination-params}}$pageSize = Values::NONE,
         string $pageToken = Values::NONE,
         $pageNumber = Values::NONE
     ): {{apiName}}Page
     {
-        {{#queryParams.1}}
+        {{#vendorExtensions.x-has-non-pagination-params}}
         $options = new Values($options);
-        {{/queryParams.1}}
+        {{/vendorExtensions.x-has-non-pagination-params}}
 
         $params = Values::of([
             {{#vendorExtensions.optionFileParams}}
@@ -112,7 +112,8 @@
             'PageSize' => $pageSize,
         ]);
 
-        $response = $this->version->page('{{httpMethod}}', $this->uri, $params);
+        $headers = Values::of([{{^consumes}}'Content-Type' => 'application/x-www-form-urlencoded'{{/consumes}}{{#consumes}}{{#-first}}'Content-Type' => '{{{mediaType}}}'{{/-first}}{{/consumes}}{{#produces}}{{#-first}}, 'Accept' => '{{{mediaType}}}'{{/-first}}{{/produces}}]);
+        $response = $this->version->page('{{httpMethod}}', $this->uri, $params, [], $headers);
 
         return new {{apiName}}Page($this->version, $response, $this->solution);
     }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function delete(): bool`
`86`	`86`	`public function fetch(): CallInstance`
`87`	`87`	`{`
`88`	`88`
`89`		`- $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);`
	`89`	`+ $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);`
`90`	`90`	`$payload = $this->version->fetch('GET', $this->uri, [], [], $headers);`
`91`	`91`
`92`	`92`	`return new CallInstance(`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function __construct(`
`63`	`63`	`public function update(): CallInstance`
`64`	`64`	`{`
`65`	`65`
`66`		`- $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded' ]);`
	`66`	`+ $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json' ]);`
`67`	`67`	`$payload = $this->version->update('POST', $this->uri, [], [], $headers);`
`68`	`68`
`69`	`69`	`return new CallInstance(`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,8 @@ public function page(`
`118`	`118`	`'PageSize' => $pageSize,`
`119`	`119`	`]);`
`120`	`120`
`121`		`- $response = $this->version->page('GET', $this->uri, $params);`
	`121`	`+ $headers = Values::of(['Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json']);`
	`122`	`+ $response = $this->version->page('GET', $this->uri, $params, [], $headers);`
`122`	`123`
`123`	`124`	`return new AwsPage($this->version, $response, $this->solution);`
`124`	`125`	`}`