Skip to content

Commit

Permalink
Merge pull request #1334 from microsoftgraph/dev
Browse files Browse the repository at this point in the history
Release 1.106.0
  • Loading branch information
Ndiritu authored Sep 8, 2023
2 parents d137bb4 + 18979f3 commit a9f43d7
Show file tree
Hide file tree
Showing 100 changed files with 2,630 additions and 130 deletions.
14 changes: 10 additions & 4 deletions .github/policies/msgraph-sdk-php-branch-protection.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

# File initially created using https://github.com/MIchaelMainer/policyservicetoolkit/blob/main/branch_protection_export.ps1.
Expand All @@ -10,7 +10,7 @@ configuration:
branchProtectionRules:

- branchNamePattern: dev
# This branch pattern applies to the following branches as of 06/12/2023 10:31:17:
# This branch pattern applies to the following branches as of 08/30/2023:
# dev

# Specifies whether this branch can be deleted. boolean
Expand All @@ -33,6 +33,9 @@ configuration:
requiresConversationResolution: true
# Are merge commits prohibited from being pushed to this branch. boolean
requiresLinearHistory: false
# Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
requiredStatusChecks:
#- validate-pull-request #TODO: add this back once we are using Kiota
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
requiresStrictStatusChecks: true
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
Expand All @@ -41,7 +44,7 @@ configuration:
restrictsReviewDismissals: false

- branchNamePattern: main
# This branch pattern applies to the following branches as of 06/12/2023 10:31:17:
# This branch pattern applies to the following branches as of 08/30/2023:
# main

# Specifies whether this branch can be deleted. boolean
Expand All @@ -57,13 +60,16 @@ configuration:
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
requiredApprovingReviewsCount: 1
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
requireCodeOwnersReview: false
requireCodeOwnersReview: true
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
requiresCommitSignatures: false
# Are conversations required to be resolved before merging? boolean
requiresConversationResolution: true
# Are merge commits prohibited from being pushed to this branch. boolean
requiresLinearHistory: false
# Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
requiredStatusChecks:
#- validate-pull-request #TODO: add this back once we are using Kiota
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
requiresStrictStatusChecks: true
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bump-sdk-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
bump-sdk-version:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Git config user
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Create Release
uses: ncipollo/release-action@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
validate-pull-request:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Validate composer file
run: |
composer validate
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
create-tag:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Get SDK version and set environment variable
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ You can install the PHP SDK with Composer, either run `composer require microsof
```
{
"require": {
"microsoft/microsoft-graph": "^1.105.0"
"microsoft/microsoft-graph": "^1.106.0"
}
}
```
Expand Down
31 changes: 31 additions & 0 deletions src/Beta/Microsoft/Graph/Model/AccessPackageSubject.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,37 @@ public function setAltSecId($val)
return $this;
}

/**
* Gets the cleanupScheduledDateTime
*
* @return \DateTime|null The cleanupScheduledDateTime
*/
public function getCleanupScheduledDateTime()
{
if (array_key_exists("cleanupScheduledDateTime", $this->_propDict)) {
if (is_a($this->_propDict["cleanupScheduledDateTime"], "\DateTime") || is_null($this->_propDict["cleanupScheduledDateTime"])) {
return $this->_propDict["cleanupScheduledDateTime"];
} else {
$this->_propDict["cleanupScheduledDateTime"] = new \DateTime($this->_propDict["cleanupScheduledDateTime"]);
return $this->_propDict["cleanupScheduledDateTime"];
}
}
return null;
}

/**
* Sets the cleanupScheduledDateTime
*
* @param \DateTime $val The cleanupScheduledDateTime
*
* @return AccessPackageSubject
*/
public function setCleanupScheduledDateTime($val)
{
$this->_propDict["cleanupScheduledDateTime"] = $val;
return $this;
}

/**
* Gets the connectedOrganizationId
* The identifier of the connected organization of the subject.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function setAuthenticationStrength($val)

/**
* Gets the conditionsNotSatisfied
* Refers to the conditional access policy conditions that are not satisfied. The possible values are: none, application, users, devicePlatform, location, clientType, signInRisk, userRisk, time, deviceState, client,ipAddressSeenByAzureAD,ipAddressSeenByResourceProvider,unknownFutureValue,servicePrincipals,servicePrincipalRisk. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values in this evolvable enum: servicePrincipals,servicePrincipalRisk.
* Refers to the conditional access policy conditions that are not satisfied. The possible values are: none, application, users, devicePlatform, location, clientType, signInRisk, userRisk, time, deviceState, client,ipAddressSeenByAzureAD,ipAddressSeenByResourceProvider,unknownFutureValue,servicePrincipals,servicePrincipalRisk, authenticationFlows, insiderRisk . Note that you must use the Prefer: include-unknown-enum-members request header to get the following values in this evolvable enum: servicePrincipals,servicePrincipalRisk, authenticationFlows, insiderRisk. conditionalAccessConditions is a multi-valued enumeration and the property can contain multiple values in a comma-separated list.
*
* @return ConditionalAccessConditions|null The conditionsNotSatisfied
*/
Expand All @@ -78,7 +78,7 @@ public function getConditionsNotSatisfied()

/**
* Sets the conditionsNotSatisfied
* Refers to the conditional access policy conditions that are not satisfied. The possible values are: none, application, users, devicePlatform, location, clientType, signInRisk, userRisk, time, deviceState, client,ipAddressSeenByAzureAD,ipAddressSeenByResourceProvider,unknownFutureValue,servicePrincipals,servicePrincipalRisk. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values in this evolvable enum: servicePrincipals,servicePrincipalRisk.
* Refers to the conditional access policy conditions that are not satisfied. The possible values are: none, application, users, devicePlatform, location, clientType, signInRisk, userRisk, time, deviceState, client,ipAddressSeenByAzureAD,ipAddressSeenByResourceProvider,unknownFutureValue,servicePrincipals,servicePrincipalRisk, authenticationFlows, insiderRisk . Note that you must use the Prefer: include-unknown-enum-members request header to get the following values in this evolvable enum: servicePrincipals,servicePrincipalRisk, authenticationFlows, insiderRisk. conditionalAccessConditions is a multi-valued enumeration and the property can contain multiple values in a comma-separated list.
*
* @param ConditionalAccessConditions $val The value to assign to the conditionsNotSatisfied
*
Expand All @@ -92,7 +92,7 @@ public function setConditionsNotSatisfied($val)

/**
* Gets the conditionsSatisfied
* Refers to the conditional access policy conditions that are satisfied. The possible values are: none, application, users, devicePlatform, location, clientType, signInRisk, userRisk, time, deviceState, client,ipAddressSeenByAzureAD,ipAddressSeenByResourceProvider,unknownFutureValue,servicePrincipals,servicePrincipalRisk. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values in this evolvable enum: servicePrincipals,servicePrincipalRisk.
* Refers to the conditional access policy conditions that are satisfied. The possible values are: none, application, users, devicePlatform, location, clientType, signInRisk, userRisk, time, deviceState, client,ipAddressSeenByAzureAD,ipAddressSeenByResourceProvider,unknownFutureValue,servicePrincipals,servicePrincipalRisk, authenticationFlows, insiderRisk. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values in this evolvable enum: servicePrincipals,servicePrincipalRisk, authenticationFlows, insiderRisk. conditionalAccessConditions is a multi-valued enumeration and the property can contain multiple values in a comma-separated list.
*
* @return ConditionalAccessConditions|null The conditionsSatisfied
*/
Expand All @@ -111,7 +111,7 @@ public function getConditionsSatisfied()

/**
* Sets the conditionsSatisfied
* Refers to the conditional access policy conditions that are satisfied. The possible values are: none, application, users, devicePlatform, location, clientType, signInRisk, userRisk, time, deviceState, client,ipAddressSeenByAzureAD,ipAddressSeenByResourceProvider,unknownFutureValue,servicePrincipals,servicePrincipalRisk. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values in this evolvable enum: servicePrincipals,servicePrincipalRisk.
* Refers to the conditional access policy conditions that are satisfied. The possible values are: none, application, users, devicePlatform, location, clientType, signInRisk, userRisk, time, deviceState, client,ipAddressSeenByAzureAD,ipAddressSeenByResourceProvider,unknownFutureValue,servicePrincipals,servicePrincipalRisk, authenticationFlows, insiderRisk. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values in this evolvable enum: servicePrincipals,servicePrincipalRisk, authenticationFlows, insiderRisk. conditionalAccessConditions is a multi-valued enumeration and the property can contain multiple values in a comma-separated list.
*
* @param ConditionalAccessConditions $val The value to assign to the conditionsSatisfied
*
Expand Down Expand Up @@ -209,7 +209,7 @@ public function setEnforcedSessionControls($val)

/**
* Gets the excludeRulesSatisfied
* List of key-value pairs containing each matched exclude condition in the conditional access policy. Example: [{'devicePlatform' : 'DevicePlatform'}] means the policy didnt apply, because the DevicePlatform condition was a match.
* List of key-value pairs containing each matched exclude condition in the conditional access policy. Example: [{'devicePlatform' : 'DevicePlatform'}] means the policy didn't apply, because the DevicePlatform condition was a match.
*
* @return ConditionalAccessRuleSatisfied|null The excludeRulesSatisfied
*/
Expand All @@ -228,7 +228,7 @@ public function getExcludeRulesSatisfied()

/**
* Sets the excludeRulesSatisfied
* List of key-value pairs containing each matched exclude condition in the conditional access policy. Example: [{'devicePlatform' : 'DevicePlatform'}] means the policy didnt apply, because the DevicePlatform condition was a match.
* List of key-value pairs containing each matched exclude condition in the conditional access policy. Example: [{'devicePlatform' : 'DevicePlatform'}] means the policy didn't apply, because the DevicePlatform condition was a match.
*
* @param ConditionalAccessRuleSatisfied $val The value to assign to the excludeRulesSatisfied
*
Expand Down
31 changes: 31 additions & 0 deletions src/Beta/Microsoft/Graph/Model/AttachmentContentProperties.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,35 @@ public function setCurrentLabel($val)
$this->_propDict["currentLabel"] = $val;
return $this;
}

/**
* Gets the discoveredSensitiveTypes
*
* @return DiscoveredSensitiveType|null The discoveredSensitiveTypes
*/
public function getDiscoveredSensitiveTypes()
{
if (array_key_exists("discoveredSensitiveTypes", $this->_propDict)) {
if (is_a($this->_propDict["discoveredSensitiveTypes"], "\Beta\Microsoft\Graph\Model\DiscoveredSensitiveType") || is_null($this->_propDict["discoveredSensitiveTypes"])) {
return $this->_propDict["discoveredSensitiveTypes"];
} else {
$this->_propDict["discoveredSensitiveTypes"] = new DiscoveredSensitiveType($this->_propDict["discoveredSensitiveTypes"]);
return $this->_propDict["discoveredSensitiveTypes"];
}
}
return null;
}

/**
* Sets the discoveredSensitiveTypes
*
* @param DiscoveredSensitiveType $val The value to assign to the discoveredSensitiveTypes
*
* @return AttachmentContentProperties The AttachmentContentProperties
*/
public function setDiscoveredSensitiveTypes($val)
{
$this->_propDict["discoveredSensitiveTypes"] = $val;
return $this;
}
}
36 changes: 36 additions & 0 deletions src/Beta/Microsoft/Graph/Model/AzureAttestationSettingStatus.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php
/**
* Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
*
* AzureAttestationSettingStatus File
* PHP version 7
*
* @category Library
* @package Microsoft.Graph
* @copyright (c) Microsoft Corporation. All rights reserved.
* @license https://opensource.org/licenses/MIT MIT License
* @link https://graph.microsoft.com
*/
namespace Beta\Microsoft\Graph\Model;

use Microsoft\Graph\Core\Enum;

/**
* AzureAttestationSettingStatus class
*
* @category Model
* @package Microsoft.Graph
* @copyright (c) Microsoft Corporation. All rights reserved.
* @license https://opensource.org/licenses/MIT MIT License
* @link https://graph.microsoft.com
*/
class AzureAttestationSettingStatus extends Enum
{
/**
* The Enum AzureAttestationSettingStatus
*/
const NOT_APPLICABLE = "notApplicable";
const ENABLED = "enabled";
const DISABLED = "disabled";
const UNKNOWN_FUTURE_VALUE = "unknownFutureValue";
}
12 changes: 6 additions & 6 deletions src/Beta/Microsoft/Graph/Model/BaseItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class BaseItem extends Entity
{
/**
* Gets the createdBy
* Identity of the user, device, or application which created the item. Read-only.
* Identity of the user, device, or application that created the item. Read-only.
*
* @return IdentitySet|null The createdBy
*/
Expand All @@ -45,7 +45,7 @@ public function getCreatedBy()

/**
* Sets the createdBy
* Identity of the user, device, or application which created the item. Read-only.
* Identity of the user, device, or application that created the item. Read-only.
*
* @param IdentitySet $val The createdBy
*
Expand Down Expand Up @@ -148,7 +148,7 @@ public function setETag($val)

/**
* Gets the lastModifiedBy
* Identity of the user, device, and application which last modified the item. Read-only.
* Identity of the user, device, and application that last modified the item. Read-only.
*
* @return IdentitySet|null The lastModifiedBy
*/
Expand All @@ -167,7 +167,7 @@ public function getLastModifiedBy()

/**
* Sets the lastModifiedBy
* Identity of the user, device, and application which last modified the item. Read-only.
* Identity of the user, device, and application that last modified the item. Read-only.
*
* @param IdentitySet $val The lastModifiedBy
*
Expand Down Expand Up @@ -276,7 +276,7 @@ public function setParentReference($val)

/**
* Gets the webUrl
* URL that displays the resource in the browser. Read-only.
* URL that either displays the resource in the browser (for Office file formats), or is a direct link to the file (for other formats). Read-only.
*
* @return string|null The webUrl
*/
Expand All @@ -291,7 +291,7 @@ public function getWebUrl()

/**
* Sets the webUrl
* URL that displays the resource in the browser. Read-only.
* URL that either displays the resource in the browser (for Office file formats), or is a direct link to the file (for other formats). Read-only.
*
* @param string $val The webUrl
*
Expand Down
4 changes: 2 additions & 2 deletions src/Beta/Microsoft/Graph/Model/CloudPcExportJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public function setFormat($val)

/**
* Gets the reportName
* The report name. The possible values are: remoteConnectionHistoricalReports, dailyAggregatedRemoteConnectionReports, totalAggregatedRemoteConnectionReports, sharedUseLicenseUsageReport, sharedUseLicenseUsageRealTimeReport, unknownFutureValue, noLicenseAvailableConnectivityFailureReport. Note that you must use the Prefer: include-unknown-enum-members request header to get the following value(s) in this evolvable enum: noLicenseAvailableConnectivityFailureReport.
* The report name. The possible values are: remoteConnectionHistoricalReports, dailyAggregatedRemoteConnectionReports, totalAggregatedRemoteConnectionReports, sharedUseLicenseUsageReport, sharedUseLicenseUsageRealTimeReport, unknownFutureValue, noLicenseAvailableConnectivityFailureReport, inaccessibleCloudPcReports. Note that you must use the Prefer: include-unknown-enum-members request header to get the following value(s) in this evolvable enum: noLicenseAvailableConnectivityFailureReport, inaccessibleCloudPcReports.
*
* @return CloudPcReportName|null The reportName
*/
Expand All @@ -198,7 +198,7 @@ public function getReportName()

/**
* Sets the reportName
* The report name. The possible values are: remoteConnectionHistoricalReports, dailyAggregatedRemoteConnectionReports, totalAggregatedRemoteConnectionReports, sharedUseLicenseUsageReport, sharedUseLicenseUsageRealTimeReport, unknownFutureValue, noLicenseAvailableConnectivityFailureReport. Note that you must use the Prefer: include-unknown-enum-members request header to get the following value(s) in this evolvable enum: noLicenseAvailableConnectivityFailureReport.
* The report name. The possible values are: remoteConnectionHistoricalReports, dailyAggregatedRemoteConnectionReports, totalAggregatedRemoteConnectionReports, sharedUseLicenseUsageReport, sharedUseLicenseUsageRealTimeReport, unknownFutureValue, noLicenseAvailableConnectivityFailureReport, inaccessibleCloudPcReports. Note that you must use the Prefer: include-unknown-enum-members request header to get the following value(s) in this evolvable enum: noLicenseAvailableConnectivityFailureReport, inaccessibleCloudPcReports.
*
* @param CloudPcReportName $val The reportName
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function setIsThirdPartyPartner($val)

/**
* Gets the partnerAgentName
* Indicates the name of a partner agent and includes first-party and third-party. Currently, Citrix is the only third-party value. Read-Only.
* The name of the partner agent, whether first party or third party. Possible values for third-party partners are Citrix and VMware. Read-Only.
*
* @return CloudPcPartnerAgentName|null The partnerAgentName
*/
Expand All @@ -106,7 +106,7 @@ public function getPartnerAgentName()

/**
* Sets the partnerAgentName
* Indicates the name of a partner agent and includes first-party and third-party. Currently, Citrix is the only third-party value. Read-Only.
* The name of the partner agent, whether first party or third party. Possible values for third-party partners are Citrix and VMware. Read-Only.
*
* @param CloudPcPartnerAgentName $val The value to assign to the partnerAgentName
*
Expand Down
Loading

0 comments on commit a9f43d7

Please sign in to comment.