Skip to content

Commit 13b935c

Browse files
authored
Merge pull request #43 from microsoftgraph/dev
Release 2.0.0-RC2
2 parents 463ce7b + 999fe5e commit 13b935c

File tree

232 files changed

+1258
-989
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+1258
-989
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-RC1"
11+
"microsoft/microsoft-graph-beta": "^2.0.0-RC2"
1212
}
1313
}
1414
```
1515
OR
1616
```
1717
"require": {
18-
"microsoft/microsoft-graph-beta": "^2.0.0-RC1",
18+
"microsoft/microsoft-graph-beta": "^2.0.0-RC2",
1919
"microsoft/microsoft-graph-core": "@RC"
2020
}
2121
```

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"require-dev": {
2020
"phpunit/phpunit": "^8.0 || ^9.0",
21-
"phpstan/phpstan": "^0.12.90"
21+
"phpstan/phpstan": "^0.12.90 || ^1.0.0"
2222
},
2323
"autoload": {
2424
"psr-4": {

src/CallRecords/Model/Media.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,11 @@ public function getStreams()
199199
if (array_key_exists("streams", $this->_propDict) && !is_null($this->_propDict["streams"])) {
200200

201201
if (count($this->_propDict['streams']) > 0 && is_a($this->_propDict['streams'][0], 'MediaStream')) {
202-
return $this->_propDict['streams'];
202+
return $this->_propDict['streams'];
203203
}
204204
$streams = [];
205205
foreach ($this->_propDict['streams'] as $singleValue) {
206-
$streams []= new MediaStream($singleValue);
206+
$streams []= new MediaStream($singleValue);
207207
}
208208
$this->_propDict['streams'] = $streams;
209209
return $this->_propDict['streams'];

src/Ediscovery/Model/SourceCollection.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class SourceCollection extends \Beta\Microsoft\Graph\Model\Entity
2626
{
2727
/**
2828
* Gets the contentQuery
29-
* The query string in KQL (Keyword Query Language) query. For details, see Keyword queries and search conditions for Content Search and eDiscovery. You can refine searches by using fields paired with values; for example, subject:'Quarterly Financials' AND Date>=06/01/2016 AND Date<=07/01/2016
29+
* The query string in KQL (Keyword Query Language) query. For details, see Keyword queries and search conditions for Content Search and eDiscovery. You can refine searches by using fields paired with values; for example, subject:'Quarterly Financials' AND Date>=06/01/2016 AND Date<=07/01/2016.
3030
*
3131
* @return string|null The contentQuery
3232
*/
@@ -41,7 +41,7 @@ public function getContentQuery()
4141

4242
/**
4343
* Sets the contentQuery
44-
* The query string in KQL (Keyword Query Language) query. For details, see Keyword queries and search conditions for Content Search and eDiscovery. You can refine searches by using fields paired with values; for example, subject:'Quarterly Financials' AND Date>=06/01/2016 AND Date<=07/01/2016
44+
* The query string in KQL (Keyword Query Language) query. For details, see Keyword queries and search conditions for Content Search and eDiscovery. You can refine searches by using fields paired with values; for example, subject:'Quarterly Financials' AND Date>=06/01/2016 AND Date<=07/01/2016.
4545
*
4646
* @param string $val The contentQuery
4747
*
@@ -121,7 +121,7 @@ public function setCreatedDateTime($val)
121121

122122
/**
123123
* Gets the dataSourceScopes
124-
* When specified, the collection will span across a service for an entire workload. Possible values are: none,allTenantMailboxes,allTenantSites,allCaseCustodians,allCaseNoncustodialDataSources.
124+
* When specified, the collection will span across a service for an entire workload. Possible values are: none, allTenantMailboxes, allTenantSites, allCaseCustodians, allCaseNoncustodialDataSources.
125125
*
126126
* @return DataSourceScopes|null The dataSourceScopes
127127
*/
@@ -140,7 +140,7 @@ public function getDataSourceScopes()
140140

141141
/**
142142
* Sets the dataSourceScopes
143-
* When specified, the collection will span across a service for an entire workload. Possible values are: none,allTenantMailboxes,allTenantSites,allCaseCustodians,allCaseNoncustodialDataSources.
143+
* When specified, the collection will span across a service for an entire workload. Possible values are: none, allTenantMailboxes, allTenantSites, allCaseCustodians, allCaseNoncustodialDataSources.
144144
*
145145
* @param DataSourceScopes $val The dataSourceScopes
146146
*
@@ -154,7 +154,7 @@ public function setDataSourceScopes($val)
154154

155155
/**
156156
* Gets the description
157-
* The description of the sourceCollection
157+
* The description of the sourceCollection.
158158
*
159159
* @return string|null The description
160160
*/
@@ -169,7 +169,7 @@ public function getDescription()
169169

170170
/**
171171
* Sets the description
172-
* The description of the sourceCollection
172+
* The description of the sourceCollection.
173173
*
174174
* @param string $val The description
175175
*
@@ -183,7 +183,7 @@ public function setDescription($val)
183183

184184
/**
185185
* Gets the displayName
186-
* The display name of the sourceCollection
186+
* The display name of the sourceCollection.
187187
*
188188
* @return string|null The displayName
189189
*/
@@ -198,7 +198,7 @@ public function getDisplayName()
198198

199199
/**
200200
* Sets the displayName
201-
* The display name of the sourceCollection
201+
* The display name of the sourceCollection.
202202
*
203203
* @param string $val The displayName
204204
*

src/ExternalConnectors/Model/DisplayTemplate.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ public function getRules()
119119
if (array_key_exists("rules", $this->_propDict) && !is_null($this->_propDict["rules"])) {
120120

121121
if (count($this->_propDict['rules']) > 0 && is_a($this->_propDict['rules'][0], 'PropertyRule')) {
122-
return $this->_propDict['rules'];
122+
return $this->_propDict['rules'];
123123
}
124124
$rules = [];
125125
foreach ($this->_propDict['rules'] as $singleValue) {
126-
$rules []= new PropertyRule($singleValue);
126+
$rules []= new PropertyRule($singleValue);
127127
}
128128
$this->_propDict['rules'] = $rules;
129129
return $this->_propDict['rules'];

src/ExternalConnectors/Model/Property.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ public function getLabels()
175175
if (array_key_exists("labels", $this->_propDict) && !is_null($this->_propDict["labels"])) {
176176

177177
if (count($this->_propDict['labels']) > 0 && is_a($this->_propDict['labels'][0], 'Label')) {
178-
return $this->_propDict['labels'];
178+
return $this->_propDict['labels'];
179179
}
180180
$labels = [];
181181
foreach ($this->_propDict['labels'] as $singleValue) {
182-
$labels []= new Label($singleValue);
182+
$labels []= new Label($singleValue);
183183
}
184184
$this->_propDict['labels'] = $labels;
185185
return $this->_propDict['labels'];

src/ExternalConnectors/Model/SearchSettings.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public function getSearchResultTemplates()
3535
if (array_key_exists("searchResultTemplates", $this->_propDict) && !is_null($this->_propDict["searchResultTemplates"])) {
3636

3737
if (count($this->_propDict['searchResultTemplates']) > 0 && is_a($this->_propDict['searchResultTemplates'][0], 'DisplayTemplate')) {
38-
return $this->_propDict['searchResultTemplates'];
38+
return $this->_propDict['searchResultTemplates'];
3939
}
4040
$searchResultTemplates = [];
4141
foreach ($this->_propDict['searchResultTemplates'] as $singleValue) {
42-
$searchResultTemplates []= new DisplayTemplate($singleValue);
42+
$searchResultTemplates []= new DisplayTemplate($singleValue);
4343
}
4444
$this->_propDict['searchResultTemplates'] = $searchResultTemplates;
4545
return $this->_propDict['searchResultTemplates'];

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-RC1";
22+
const SDK_VERSION = "2.0.0-RC2";
2323
}

src/ManagedTenants/Model/ManagedTenant.php

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -506,43 +506,6 @@ public function setManagementTemplates($val)
506506
}
507507

508508

509-
/**
510-
* Gets the riskyUsers
511-
* The collection of users flagged for risk across managed tenants.
512-
*
513-
* @return RiskyUser[]|null The riskyUsers
514-
*/
515-
public function getRiskyUsers()
516-
{
517-
if (array_key_exists('riskyUsers', $this->_propDict) && !is_null($this->_propDict['riskyUsers'])) {
518-
$riskyUsers = [];
519-
if (count($this->_propDict['riskyUsers']) > 0 && is_a($this->_propDict['riskyUsers'][0], 'RiskyUser')) {
520-
return $this->_propDict['riskyUsers'];
521-
}
522-
foreach ($this->_propDict['riskyUsers'] as $singleValue) {
523-
$riskyUsers []= new RiskyUser($singleValue);
524-
}
525-
$this->_propDict['riskyUsers'] = $riskyUsers;
526-
return $this->_propDict['riskyUsers'];
527-
}
528-
return null;
529-
}
530-
531-
/**
532-
* Sets the riskyUsers
533-
* The collection of users flagged for risk across managed tenants.
534-
*
535-
* @param RiskyUser[] $val The riskyUsers
536-
*
537-
* @return ManagedTenant
538-
*/
539-
public function setRiskyUsers($val)
540-
{
541-
$this->_propDict["riskyUsers"] = $val;
542-
return $this;
543-
}
544-
545-
546509
/**
547510
* Gets the tenantGroups
548511
* The collection of a logical grouping of managed tenants used by the multi-tenant management platform.

src/ManagedTenants/Model/ManagementActionDeploymentStatus.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ public function getWorkloadActionDeploymentStatuses()
125125
if (array_key_exists("workloadActionDeploymentStatuses", $this->_propDict) && !is_null($this->_propDict["workloadActionDeploymentStatuses"])) {
126126

127127
if (count($this->_propDict['workloadActionDeploymentStatuses']) > 0 && is_a($this->_propDict['workloadActionDeploymentStatuses'][0], 'WorkloadActionDeploymentStatus')) {
128-
return $this->_propDict['workloadActionDeploymentStatuses'];
128+
return $this->_propDict['workloadActionDeploymentStatuses'];
129129
}
130130
$workloadActionDeploymentStatuses = [];
131131
foreach ($this->_propDict['workloadActionDeploymentStatuses'] as $singleValue) {
132-
$workloadActionDeploymentStatuses []= new WorkloadActionDeploymentStatus($singleValue);
132+
$workloadActionDeploymentStatuses []= new WorkloadActionDeploymentStatus($singleValue);
133133
}
134134
$this->_propDict['workloadActionDeploymentStatuses'] = $workloadActionDeploymentStatuses;
135135
return $this->_propDict['workloadActionDeploymentStatuses'];

0 commit comments

Comments
 (0)