Skip to content

Commit 79b3c1f

Browse files
authored
Merge pull request #51 from microsoftgraph/dev
Release 2.0.0-RC4
2 parents f508f71 + 1d2b7b7 commit 79b3c1f

27 files changed

+1644
-290
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ You can install the Beta PHP SDK with Composer by editing your `composer.json` f
88
{
99
"minimum-stability": "RC"
1010
"require": {
11-
"microsoft/microsoft-graph-beta": "^2.0.0-RC3"
11+
"microsoft/microsoft-graph-beta": "^2.0.0-RC4"
1212
}
1313
}
1414
```
1515
OR
1616
```
1717
"require": {
18-
"microsoft/microsoft-graph-beta": "^2.0.0-RC3",
18+
"microsoft/microsoft-graph-beta": "^2.0.0-RC4",
1919
"microsoft/microsoft-graph-core": "@RC"
2020
}
2121
```

src/GraphConstants.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
final class GraphConstants
2020
{
2121
const API_VERSION = "beta";
22-
const SDK_VERSION = "2.0.0-RC3";
22+
const SDK_VERSION = "2.0.0-RC4";
2323
}

src/Model/ActionStep.php

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<?php
2+
/**
3+
* Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
4+
*
5+
* ActionStep File
6+
* PHP version 7
7+
*
8+
* @category Library
9+
* @package Microsoft.Graph
10+
* @copyright (c) Microsoft Corporation. All rights reserved.
11+
* @license https://opensource.org/licenses/MIT MIT License
12+
* @link https://graph.microsoft.com
13+
*/
14+
namespace Beta\Microsoft\Graph\Model;
15+
/**
16+
* ActionStep class
17+
*
18+
* @category Model
19+
* @package Microsoft.Graph
20+
* @copyright (c) Microsoft Corporation. All rights reserved.
21+
* @license https://opensource.org/licenses/MIT MIT License
22+
* @link https://graph.microsoft.com
23+
*/
24+
class ActionStep extends Entity
25+
{
26+
27+
/**
28+
* Gets the actionUrl
29+
*
30+
* @return ActionUrl|null The actionUrl
31+
*/
32+
public function getActionUrl()
33+
{
34+
if (array_key_exists("actionUrl", $this->_propDict) && !is_null($this->_propDict["actionUrl"])) {
35+
36+
if (is_a($this->_propDict["actionUrl"], "\Beta\Microsoft\Graph\Model\ActionUrl")) {
37+
return $this->_propDict["actionUrl"];
38+
} else {
39+
$this->_propDict["actionUrl"] = new ActionUrl($this->_propDict["actionUrl"]);
40+
return $this->_propDict["actionUrl"];
41+
}
42+
}
43+
return null;
44+
}
45+
46+
/**
47+
* Sets the actionUrl
48+
*
49+
* @param ActionUrl $val The value to assign to the actionUrl
50+
*
51+
* @return ActionStep The ActionStep
52+
*/
53+
public function setActionUrl($val)
54+
{
55+
$this->_propDict["actionUrl"] = $val;
56+
return $this;
57+
}
58+
/**
59+
* Gets the stepNumber
60+
*
61+
* @return int|null The stepNumber
62+
*/
63+
public function getStepNumber()
64+
{
65+
if (array_key_exists("stepNumber", $this->_propDict)) {
66+
return $this->_propDict["stepNumber"];
67+
} else {
68+
return null;
69+
}
70+
}
71+
72+
/**
73+
* Sets the stepNumber
74+
*
75+
* @param int $val The value of the stepNumber
76+
*
77+
* @return ActionStep
78+
*/
79+
public function setStepNumber($val)
80+
{
81+
$this->_propDict["stepNumber"] = $val;
82+
return $this;
83+
}
84+
/**
85+
* Gets the text
86+
*
87+
* @return string|null The text
88+
*/
89+
public function getText()
90+
{
91+
if (array_key_exists("text", $this->_propDict)) {
92+
return $this->_propDict["text"];
93+
} else {
94+
return null;
95+
}
96+
}
97+
98+
/**
99+
* Sets the text
100+
*
101+
* @param string $val The value of the text
102+
*
103+
* @return ActionStep
104+
*/
105+
public function setText($val)
106+
{
107+
$this->_propDict["text"] = $val;
108+
return $this;
109+
}
110+
}

src/Model/ActionUrl.php

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?php
2+
/**
3+
* Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
4+
*
5+
* ActionUrl File
6+
* PHP version 7
7+
*
8+
* @category Library
9+
* @package Microsoft.Graph
10+
* @copyright (c) Microsoft Corporation. All rights reserved.
11+
* @license https://opensource.org/licenses/MIT MIT License
12+
* @link https://graph.microsoft.com
13+
*/
14+
namespace Beta\Microsoft\Graph\Model;
15+
/**
16+
* ActionUrl class
17+
*
18+
* @category Model
19+
* @package Microsoft.Graph
20+
* @copyright (c) Microsoft Corporation. All rights reserved.
21+
* @license https://opensource.org/licenses/MIT MIT License
22+
* @link https://graph.microsoft.com
23+
*/
24+
class ActionUrl extends Entity
25+
{
26+
/**
27+
* Gets the displayName
28+
*
29+
* @return string|null The displayName
30+
*/
31+
public function getDisplayName()
32+
{
33+
if (array_key_exists("displayName", $this->_propDict)) {
34+
return $this->_propDict["displayName"];
35+
} else {
36+
return null;
37+
}
38+
}
39+
40+
/**
41+
* Sets the displayName
42+
*
43+
* @param string $val The value of the displayName
44+
*
45+
* @return ActionUrl
46+
*/
47+
public function setDisplayName($val)
48+
{
49+
$this->_propDict["displayName"] = $val;
50+
return $this;
51+
}
52+
/**
53+
* Gets the url
54+
*
55+
* @return string|null The url
56+
*/
57+
public function getUrl()
58+
{
59+
if (array_key_exists("url", $this->_propDict)) {
60+
return $this->_propDict["url"];
61+
} else {
62+
return null;
63+
}
64+
}
65+
66+
/**
67+
* Sets the url
68+
*
69+
* @param string $val The value of the url
70+
*
71+
* @return ActionUrl
72+
*/
73+
public function setUrl($val)
74+
{
75+
$this->_propDict["url"] = $val;
76+
return $this;
77+
}
78+
}

src/Model/AllowedValue.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class AllowedValue extends Entity
2626
{
2727
/**
2828
* Gets the isActive
29+
* Indicates whether the predefined value is active or deactivated. If set to false, this predefined value cannot be assigned to any additional supported directory objects.
2930
*
3031
* @return bool|null The isActive
3132
*/
@@ -40,6 +41,7 @@ public function getIsActive()
4041

4142
/**
4243
* Sets the isActive
44+
* Indicates whether the predefined value is active or deactivated. If set to false, this predefined value cannot be assigned to any additional supported directory objects.
4345
*
4446
* @param bool $val The isActive
4547
*

src/Model/Application.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function setAppRoles($val)
125125

126126
/**
127127
* Gets the createdDateTime
128-
* The date and time the application was registered. The DateTimeOffset type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z. Read-only. Supports $filter (eq, ne, NOT, ge, le, in, and eq on null values) and $orderBy.
128+
* The date and time the application was registered. The DateTimeOffset type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z. Read-only. Supports $filter (eq, ne, not, ge, le, in, and eq on null values) and $orderBy.
129129
*
130130
* @return \DateTime|null The createdDateTime
131131
*/
@@ -144,7 +144,7 @@ public function getCreatedDateTime()
144144

145145
/**
146146
* Sets the createdDateTime
147-
* The date and time the application was registered. The DateTimeOffset type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z. Read-only. Supports $filter (eq, ne, NOT, ge, le, in, and eq on null values) and $orderBy.
147+
* The date and time the application was registered. The DateTimeOffset type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z. Read-only. Supports $filter (eq, ne, not, ge, le, in, and eq on null values) and $orderBy.
148148
*
149149
* @param \DateTime $val The createdDateTime
150150
*
@@ -187,7 +187,7 @@ public function setDefaultRedirectUri($val)
187187

188188
/**
189189
* Gets the description
190-
* An optional description of the application. Supports $filter (eq, ne, NOT, ge, le, startsWith) and $search.
190+
* An optional description of the application. Supports $filter (eq, ne, not, ge, le, startsWith) and $search.
191191
*
192192
* @return string|null The description
193193
*/
@@ -202,7 +202,7 @@ public function getDescription()
202202

203203
/**
204204
* Sets the description
205-
* An optional description of the application. Supports $filter (eq, ne, NOT, ge, le, startsWith) and $search.
205+
* An optional description of the application. Supports $filter (eq, ne, not, ge, le, startsWith) and $search.
206206
*
207207
* @param string $val The description
208208
*
@@ -216,7 +216,7 @@ public function setDescription($val)
216216

217217
/**
218218
* Gets the disabledByMicrosoftStatus
219-
* Specifies whether Microsoft has disabled the registered application. Possible values are: null (default value), NotDisabled, and DisabledDueToViolationOfServicesAgreement (reasons may include suspicious, abusive, or malicious activity, or a violation of the Microsoft Services Agreement). Supports $filter (eq, ne, NOT).
219+
* Specifies whether Microsoft has disabled the registered application. Possible values are: null (default value), NotDisabled, and DisabledDueToViolationOfServicesAgreement (reasons may include suspicious, abusive, or malicious activity, or a violation of the Microsoft Services Agreement). Supports $filter (eq, ne, not).
220220
*
221221
* @return string|null The disabledByMicrosoftStatus
222222
*/
@@ -231,7 +231,7 @@ public function getDisabledByMicrosoftStatus()
231231

232232
/**
233233
* Sets the disabledByMicrosoftStatus
234-
* Specifies whether Microsoft has disabled the registered application. Possible values are: null (default value), NotDisabled, and DisabledDueToViolationOfServicesAgreement (reasons may include suspicious, abusive, or malicious activity, or a violation of the Microsoft Services Agreement). Supports $filter (eq, ne, NOT).
234+
* Specifies whether Microsoft has disabled the registered application. Possible values are: null (default value), NotDisabled, and DisabledDueToViolationOfServicesAgreement (reasons may include suspicious, abusive, or malicious activity, or a violation of the Microsoft Services Agreement). Supports $filter (eq, ne, not).
235235
*
236236
* @param string $val The disabledByMicrosoftStatus
237237
*
@@ -245,7 +245,7 @@ public function setDisabledByMicrosoftStatus($val)
245245

246246
/**
247247
* Gets the displayName
248-
* The display name for the application. Supports $filter (eq, ne, NOT, ge, le, in, startsWith, and eq on null values), $search, and $orderBy.
248+
* The display name for the application. Supports $filter (eq, ne, not, ge, le, in, startsWith, and eq on null values), $search, and $orderBy.
249249
*
250250
* @return string|null The displayName
251251
*/
@@ -260,7 +260,7 @@ public function getDisplayName()
260260

261261
/**
262262
* Sets the displayName
263-
* The display name for the application. Supports $filter (eq, ne, NOT, ge, le, in, startsWith, and eq on null values), $search, and $orderBy.
263+
* The display name for the application. Supports $filter (eq, ne, not, ge, le, in, startsWith, and eq on null values), $search, and $orderBy.
264264
*
265265
* @param string $val The displayName
266266
*
@@ -332,7 +332,7 @@ public function setIdentifierUris($val)
332332

333333
/**
334334
* Gets the info
335-
* Basic profile information of the application such as app's marketing, support, terms of service and privacy statement URLs. The terms of service and privacy statement are surfaced to users through the user consent experience. For more info, see How to: Add Terms of service and privacy statement for registered Azure AD apps. Supports $filter (eq, ne, NOT, ge, le, and eq on null values).
335+
* Basic profile information of the application such as app's marketing, support, terms of service and privacy statement URLs. The terms of service and privacy statement are surfaced to users through the user consent experience. For more info, see How to: Add Terms of service and privacy statement for registered Azure AD apps. Supports $filter (eq, ne, not, ge, le, and eq on null values).
336336
*
337337
* @return InformationalUrl|null The info
338338
*/
@@ -351,7 +351,7 @@ public function getInfo()
351351

352352
/**
353353
* Sets the info
354-
* Basic profile information of the application such as app's marketing, support, terms of service and privacy statement URLs. The terms of service and privacy statement are surfaced to users through the user consent experience. For more info, see How to: Add Terms of service and privacy statement for registered Azure AD apps. Supports $filter (eq, ne, NOT, ge, le, and eq on null values).
354+
* Basic profile information of the application such as app's marketing, support, terms of service and privacy statement URLs. The terms of service and privacy statement are surfaced to users through the user consent experience. For more info, see How to: Add Terms of service and privacy statement for registered Azure AD apps. Supports $filter (eq, ne, not, ge, le, and eq on null values).
355355
*
356356
* @param InformationalUrl $val The info
357357
*
@@ -424,7 +424,7 @@ public function setIsFallbackPublicClient($val)
424424

425425
/**
426426
* Gets the keyCredentials
427-
* The collection of key credentials associated with the application. Not nullable. Supports $filter (eq, NOT, ge, le).
427+
* The collection of key credentials associated with the application. Not nullable. Supports $filter (eq, not, ge, le).
428428
*
429429
* @return KeyCredential[]|null The keyCredentials
430430
*/
@@ -446,7 +446,7 @@ public function getKeyCredentials()
446446

447447
/**
448448
* Sets the keyCredentials
449-
* The collection of key credentials associated with the application. Not nullable. Supports $filter (eq, NOT, ge, le).
449+
* The collection of key credentials associated with the application. Not nullable. Supports $filter (eq, not, ge, le).
450450
*
451451
* @param KeyCredential[] $val The keyCredentials
452452
*
@@ -688,7 +688,7 @@ public function setPublisherDomain($val)
688688

689689
/**
690690
* Gets the requiredResourceAccess
691-
* Specifies the resources that the application needs to access. This property also specifies the set of delegated permissions and application roles that it needs for each of those resources. This configuration of access to the required resources drives the consent experience. No more than 50 resource services (APIs) can be configured. Beginning mid-October 2021, the total number of required permissions must not exceed 400. Not nullable. Supports $filter (eq, NOT, ge, le).
691+
* Specifies the resources that the application needs to access. This property also specifies the set of delegated permissions and application roles that it needs for each of those resources. This configuration of access to the required resources drives the consent experience. No more than 50 resource services (APIs) can be configured. Beginning mid-October 2021, the total number of required permissions must not exceed 400. Not nullable. Supports $filter (eq, not, ge, le).
692692
*
693693
* @return RequiredResourceAccess[]|null The requiredResourceAccess
694694
*/
@@ -710,7 +710,7 @@ public function getRequiredResourceAccess()
710710

711711
/**
712712
* Sets the requiredResourceAccess
713-
* Specifies the resources that the application needs to access. This property also specifies the set of delegated permissions and application roles that it needs for each of those resources. This configuration of access to the required resources drives the consent experience. No more than 50 resource services (APIs) can be configured. Beginning mid-October 2021, the total number of required permissions must not exceed 400. Not nullable. Supports $filter (eq, NOT, ge, le).
713+
* Specifies the resources that the application needs to access. This property also specifies the set of delegated permissions and application roles that it needs for each of those resources. This configuration of access to the required resources drives the consent experience. No more than 50 resource services (APIs) can be configured. Beginning mid-October 2021, the total number of required permissions must not exceed 400. Not nullable. Supports $filter (eq, not, ge, le).
714714
*
715715
* @param RequiredResourceAccess[] $val The requiredResourceAccess
716716
*
@@ -724,7 +724,7 @@ public function setRequiredResourceAccess($val)
724724

725725
/**
726726
* Gets the signInAudience
727-
* Specifies the Microsoft accounts that are supported for the current application. The possible values are: AzureADMyOrg, AzureADMultipleOrgs, AzureADandPersonalMicrosoftAccount (default), and PersonalMicrosoftAccount. See more in the table below. Supports $filter (eq, ne, NOT).
727+
* Specifies the Microsoft accounts that are supported for the current application. The possible values are: AzureADMyOrg, AzureADMultipleOrgs, AzureADandPersonalMicrosoftAccount (default), and PersonalMicrosoftAccount. See more in the table below. Supports $filter (eq, ne, not).
728728
*
729729
* @return string|null The signInAudience
730730
*/
@@ -739,7 +739,7 @@ public function getSignInAudience()
739739

740740
/**
741741
* Sets the signInAudience
742-
* Specifies the Microsoft accounts that are supported for the current application. The possible values are: AzureADMyOrg, AzureADMultipleOrgs, AzureADandPersonalMicrosoftAccount (default), and PersonalMicrosoftAccount. See more in the table below. Supports $filter (eq, ne, NOT).
742+
* Specifies the Microsoft accounts that are supported for the current application. The possible values are: AzureADMyOrg, AzureADMultipleOrgs, AzureADandPersonalMicrosoftAccount (default), and PersonalMicrosoftAccount. See more in the table below. Supports $filter (eq, ne, not).
743743
*
744744
* @param string $val The signInAudience
745745
*
@@ -786,7 +786,7 @@ public function setSpa($val)
786786

787787
/**
788788
* Gets the tags
789-
* Custom strings that can be used to categorize and identify the application. Not nullable. Supports $filter (eq, NOT, ge, le, startsWith).
789+
* Custom strings that can be used to categorize and identify the application. Not nullable. Supports $filter (eq, not, ge, le, startsWith).
790790
*
791791
* @return string|null The tags
792792
*/
@@ -801,7 +801,7 @@ public function getTags()
801801

802802
/**
803803
* Sets the tags
804-
* Custom strings that can be used to categorize and identify the application. Not nullable. Supports $filter (eq, NOT, ge, le, startsWith).
804+
* Custom strings that can be used to categorize and identify the application. Not nullable. Supports $filter (eq, not, ge, le, startsWith).
805805
*
806806
* @param string $val The tags
807807
*

0 commit comments

Comments
 (0)