Skip to content

Commit c5e1624

Browse files
author
Caitlin Bales (MSFT)
authored
Merge pull request #91 from microsoftgraph/cbales-working
Bugfix for serializing enums in PHP
2 parents 57cb5c8 + 5cbb03f commit c5e1624

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Templates/Android/generated/BaseEntityCollectionReferenceRequest.java.tt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
final String requestUrl = getBaseRequest().getRequestUrl().toString();
2828
final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/" + new<#=TypeName(c)#>.id);
2929
new <#=TypeWithReferencesRequestBuilder(c)#>(requestUrl, getBaseRequest().getClient(), /* Options */ null)
30-
.buildRequest()
30+
.buildRequest(getBaseRequest().getOptions())
3131
.post(new<#=TypeName(c)#>, body, callback);
3232
}
3333

3434
public <#=TypeName(c)#> post(final <#=TypeName(c)#> new<#=TypeName(c)#>) throws ClientException {
3535
final String requestUrl = getBaseRequest().getRequestUrl().toString();
3636
final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/" + new<#=TypeName(c)#>.id);
3737
return new <#=TypeWithReferencesRequestBuilder(c)#>(requestUrl,getBaseRequest().getClient(), /* Options */ null)
38-
.buildRequest()
38+
.buildRequest(getBaseRequest().getOptions())
3939
.post(new<#=TypeName(c)#>, body);
4040
}
4141

Templates/Android/generated/BaseEntityCollectionRequest.java.tt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
public void post(final <#=TypeName(c)#> new<#=TypeName(c)#>, final ICallback<<#=TypeName(c)#>> callback) {
4343
final String requestUrl = getBaseRequest().getRequestUrl().toString();
4444
new <#=TypeRequestBuilder(c)#>(requestUrl, getBaseRequest().getClient(), /* Options */ null)
45-
.buildRequest()
45+
.buildRequest(getBaseRequest().getOptions())
4646
.post(new<#=TypeName(c)#>, callback);
4747
}
4848

4949
public <#=TypeName(c)#> post(final <#=TypeName(c)#> new<#=TypeName(c)#>) throws ClientException {
5050
final String requestUrl = getBaseRequest().getRequestUrl().toString();
5151
return new <#=TypeRequestBuilder(c)#>(requestUrl, getBaseRequest().getClient(), /* Options */ null)
52-
.buildRequest()
52+
.buildRequest(getBaseRequest().getOptions())
5353
.post(new<#=TypeName(c)#>);
5454
}
5555

Templates/PHP/Model/EntityType.php.tt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ if (property.Type.GetTypeString()[0] == '\\') { #>
266266
foreach ($serializableProperties as $property => $val) {
267267
if (is_a($val, "\DateTime")) {
268268
$serializableProperties[$property] = $val->format(\DateTime::RFC3339);
269+
} else if (is_a($val, "\Microsoft\Graph\Core\Enum")) {
270+
$serializableProperties[$property] = $val->value();
269271
}
270272
}
271273
return $serializableProperties;

0 commit comments

Comments
 (0)