Skip to content

Commit

Permalink
Merge pull request #43 from microsoftgraph/dev
Browse files Browse the repository at this point in the history
Release 2.0.0-RC2
  • Loading branch information
Ndiritu authored Nov 5, 2021
2 parents 463ce7b + 999fe5e commit 13b935c
Show file tree
Hide file tree
Showing 232 changed files with 1,258 additions and 989 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ You can install the Beta PHP SDK with Composer by editing your `composer.json` f
{
"minimum-stability": "RC"
"require": {
"microsoft/microsoft-graph-beta": "^2.0.0-RC1"
"microsoft/microsoft-graph-beta": "^2.0.0-RC2"
}
}
```
OR
```
"require": {
"microsoft/microsoft-graph-beta": "^2.0.0-RC1",
"microsoft/microsoft-graph-beta": "^2.0.0-RC2",
"microsoft/microsoft-graph-core": "@RC"
}
```
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"require-dev": {
"phpunit/phpunit": "^8.0 || ^9.0",
"phpstan/phpstan": "^0.12.90"
"phpstan/phpstan": "^0.12.90 || ^1.0.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/CallRecords/Model/Media.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,11 @@ public function getStreams()
if (array_key_exists("streams", $this->_propDict) && !is_null($this->_propDict["streams"])) {

if (count($this->_propDict['streams']) > 0 && is_a($this->_propDict['streams'][0], 'MediaStream')) {
return $this->_propDict['streams'];
return $this->_propDict['streams'];
}
$streams = [];
foreach ($this->_propDict['streams'] as $singleValue) {
$streams []= new MediaStream($singleValue);
$streams []= new MediaStream($singleValue);
}
$this->_propDict['streams'] = $streams;
return $this->_propDict['streams'];
Expand Down
16 changes: 8 additions & 8 deletions src/Ediscovery/Model/SourceCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class SourceCollection extends \Beta\Microsoft\Graph\Model\Entity
{
/**
* Gets the contentQuery
* 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
* 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.
*
* @return string|null The contentQuery
*/
Expand All @@ -41,7 +41,7 @@ public function getContentQuery()

/**
* Sets the contentQuery
* 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
* 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.
*
* @param string $val The contentQuery
*
Expand Down Expand Up @@ -121,7 +121,7 @@ public function setCreatedDateTime($val)

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

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

/**
* Gets the description
* The description of the sourceCollection
* The description of the sourceCollection.
*
* @return string|null The description
*/
Expand All @@ -169,7 +169,7 @@ public function getDescription()

/**
* Sets the description
* The description of the sourceCollection
* The description of the sourceCollection.
*
* @param string $val The description
*
Expand All @@ -183,7 +183,7 @@ public function setDescription($val)

/**
* Gets the displayName
* The display name of the sourceCollection
* The display name of the sourceCollection.
*
* @return string|null The displayName
*/
Expand All @@ -198,7 +198,7 @@ public function getDisplayName()

/**
* Sets the displayName
* The display name of the sourceCollection
* The display name of the sourceCollection.
*
* @param string $val The displayName
*
Expand Down
4 changes: 2 additions & 2 deletions src/ExternalConnectors/Model/DisplayTemplate.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ public function getRules()
if (array_key_exists("rules", $this->_propDict) && !is_null($this->_propDict["rules"])) {

if (count($this->_propDict['rules']) > 0 && is_a($this->_propDict['rules'][0], 'PropertyRule')) {
return $this->_propDict['rules'];
return $this->_propDict['rules'];
}
$rules = [];
foreach ($this->_propDict['rules'] as $singleValue) {
$rules []= new PropertyRule($singleValue);
$rules []= new PropertyRule($singleValue);
}
$this->_propDict['rules'] = $rules;
return $this->_propDict['rules'];
Expand Down
4 changes: 2 additions & 2 deletions src/ExternalConnectors/Model/Property.php
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ public function getLabels()
if (array_key_exists("labels", $this->_propDict) && !is_null($this->_propDict["labels"])) {

if (count($this->_propDict['labels']) > 0 && is_a($this->_propDict['labels'][0], 'Label')) {
return $this->_propDict['labels'];
return $this->_propDict['labels'];
}
$labels = [];
foreach ($this->_propDict['labels'] as $singleValue) {
$labels []= new Label($singleValue);
$labels []= new Label($singleValue);
}
$this->_propDict['labels'] = $labels;
return $this->_propDict['labels'];
Expand Down
4 changes: 2 additions & 2 deletions src/ExternalConnectors/Model/SearchSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ public function getSearchResultTemplates()
if (array_key_exists("searchResultTemplates", $this->_propDict) && !is_null($this->_propDict["searchResultTemplates"])) {

if (count($this->_propDict['searchResultTemplates']) > 0 && is_a($this->_propDict['searchResultTemplates'][0], 'DisplayTemplate')) {
return $this->_propDict['searchResultTemplates'];
return $this->_propDict['searchResultTemplates'];
}
$searchResultTemplates = [];
foreach ($this->_propDict['searchResultTemplates'] as $singleValue) {
$searchResultTemplates []= new DisplayTemplate($singleValue);
$searchResultTemplates []= new DisplayTemplate($singleValue);
}
$this->_propDict['searchResultTemplates'] = $searchResultTemplates;
return $this->_propDict['searchResultTemplates'];
Expand Down
2 changes: 1 addition & 1 deletion src/GraphConstants.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
final class GraphConstants
{
const API_VERSION = "beta";
const SDK_VERSION = "2.0.0-RC1";
const SDK_VERSION = "2.0.0-RC2";
}
37 changes: 0 additions & 37 deletions src/ManagedTenants/Model/ManagedTenant.php
Original file line number Diff line number Diff line change
Expand Up @@ -506,43 +506,6 @@ public function setManagementTemplates($val)
}


/**
* Gets the riskyUsers
* The collection of users flagged for risk across managed tenants.
*
* @return RiskyUser[]|null The riskyUsers
*/
public function getRiskyUsers()
{
if (array_key_exists('riskyUsers', $this->_propDict) && !is_null($this->_propDict['riskyUsers'])) {
$riskyUsers = [];
if (count($this->_propDict['riskyUsers']) > 0 && is_a($this->_propDict['riskyUsers'][0], 'RiskyUser')) {
return $this->_propDict['riskyUsers'];
}
foreach ($this->_propDict['riskyUsers'] as $singleValue) {
$riskyUsers []= new RiskyUser($singleValue);
}
$this->_propDict['riskyUsers'] = $riskyUsers;
return $this->_propDict['riskyUsers'];
}
return null;
}

/**
* Sets the riskyUsers
* The collection of users flagged for risk across managed tenants.
*
* @param RiskyUser[] $val The riskyUsers
*
* @return ManagedTenant
*/
public function setRiskyUsers($val)
{
$this->_propDict["riskyUsers"] = $val;
return $this;
}


/**
* Gets the tenantGroups
* The collection of a logical grouping of managed tenants used by the multi-tenant management platform.
Expand Down
4 changes: 2 additions & 2 deletions src/ManagedTenants/Model/ManagementActionDeploymentStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ public function getWorkloadActionDeploymentStatuses()
if (array_key_exists("workloadActionDeploymentStatuses", $this->_propDict) && !is_null($this->_propDict["workloadActionDeploymentStatuses"])) {

if (count($this->_propDict['workloadActionDeploymentStatuses']) > 0 && is_a($this->_propDict['workloadActionDeploymentStatuses'][0], 'WorkloadActionDeploymentStatus')) {
return $this->_propDict['workloadActionDeploymentStatuses'];
return $this->_propDict['workloadActionDeploymentStatuses'];
}
$workloadActionDeploymentStatuses = [];
foreach ($this->_propDict['workloadActionDeploymentStatuses'] as $singleValue) {
$workloadActionDeploymentStatuses []= new WorkloadActionDeploymentStatus($singleValue);
$workloadActionDeploymentStatuses []= new WorkloadActionDeploymentStatus($singleValue);
}
$this->_propDict['workloadActionDeploymentStatuses'] = $workloadActionDeploymentStatuses;
return $this->_propDict['workloadActionDeploymentStatuses'];
Expand Down
4 changes: 2 additions & 2 deletions src/ManagedTenants/Model/ManagementIntentInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ public function getManagementTemplates()
if (array_key_exists("managementTemplates", $this->_propDict) && !is_null($this->_propDict["managementTemplates"])) {

if (count($this->_propDict['managementTemplates']) > 0 && is_a($this->_propDict['managementTemplates'][0], 'ManagementTemplateDetailedInfo')) {
return $this->_propDict['managementTemplates'];
return $this->_propDict['managementTemplates'];
}
$managementTemplates = [];
foreach ($this->_propDict['managementTemplates'] as $singleValue) {
$managementTemplates []= new ManagementTemplateDetailedInfo($singleValue);
$managementTemplates []= new ManagementTemplateDetailedInfo($singleValue);
}
$this->_propDict['managementTemplates'] = $managementTemplates;
return $this->_propDict['managementTemplates'];
Expand Down
Loading

0 comments on commit 13b935c

Please sign in to comment.