Skip to content

Commit

Permalink
Merge pull request #1255 from microsoftgraph/dev
Browse files Browse the repository at this point in the history
Release 1.99.0
  • Loading branch information
Ndiritu authored Jun 13, 2023
2 parents 15cec55 + cd23117 commit 8f12e70
Show file tree
Hide file tree
Showing 330 changed files with 20,372 additions and 1,051 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @ddyett @MichaelMainer @nikithauc @zengin @silaskenneth @Ndiritu @shemogumbe
* @microsoftgraph/msgraph-devx-php-write
73 changes: 73 additions & 0 deletions .github/policies/msgraph-sdk-php-branch-protection.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

# File initially created using https://github.com/MIchaelMainer/policyservicetoolkit/blob/main/branch_protection_export.ps1.

name: msgraph-sdk-php-branch-protection
description: Branch protection policy for the msgraph-sdk-php repository
resource: repository
configuration:
branchProtectionRules:

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

# Specifies whether this branch can be deleted. boolean
allowsDeletions: false
# Specifies whether forced pushes are allowed on this branch. boolean
allowsForcePushes: false
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
dismissStaleReviews: true
# Specifies whether admins can overwrite branch protection. boolean
isAdminEnforced: false
# Indicates whether "Require a pull request before merging" is enabled. boolean
requiresPullRequestBeforeMerging: true
# 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: 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
# 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.
restrictsPushes: false
# Restrict who can dismiss pull request reviews. boolean
restrictsReviewDismissals: false

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

# Specifies whether this branch can be deleted. boolean
allowsDeletions: false
# Specifies whether forced pushes are allowed on this branch. boolean
allowsForcePushes: false
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
dismissStaleReviews: true
# Specifies whether admins can overwrite branch protection. boolean
isAdminEnforced: false
# Indicates whether "Require a pull request before merging" is enabled. boolean
requiresPullRequestBeforeMerging: true
# 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
# 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
# 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.
restrictsPushes: false
# Restrict who can dismiss pull request reviews. boolean
restrictsReviewDismissals: false

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.93.0"
"microsoft/microsoft-graph": "^1.99.0"
}
}
```
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"require-dev": {
"phpunit/phpunit": "^8.0 || ^9.0",
"mikey179/vfsstream": "^1.2",
"phpstan/phpstan": "^0.12.90 || ^1.0.0"
"phpstan/phpstan": "^0.12.90 || ^1.0.0",
"guzzlehttp/promises": "^1.0 || ^2.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/Beta/Microsoft/Graph/CallRecords/Model/MediaStream.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class MediaStream extends \Beta\Microsoft\Graph\Model\Entity

/**
* Gets the audioCodec
* Codec name used to encode audio for transmission on the network. Possible values are: unknown, invalid, cn, pcma, pcmu, amrWide, g722, g7221, g7221c, g729, multiChannelAudio, muchv2, opus, satin, satinFullband, rtAudio8, rtAudio16, silk, silkNarrow, silkWide, siren, xmsRTA, unknownFutureValue.
* Codec name used to encode audio for transmission on the network. Possible values are: unknown, invalid, cn, pcma, pcmu, amrWide, g722, g7221, g7221c, g729, multiChannelAudio, muchv2, opus, satin, satinFullband, rtAudio8, rtAudio16, silk, silkNarrow, silkWide, siren, xmsRta, unknownFutureValue.
*
* @return AudioCodec|null The audioCodec
*/
Expand All @@ -45,7 +45,7 @@ public function getAudioCodec()

/**
* Sets the audioCodec
* Codec name used to encode audio for transmission on the network. Possible values are: unknown, invalid, cn, pcma, pcmu, amrWide, g722, g7221, g7221c, g729, multiChannelAudio, muchv2, opus, satin, satinFullband, rtAudio8, rtAudio16, silk, silkNarrow, silkWide, siren, xmsRTA, unknownFutureValue.
* Codec name used to encode audio for transmission on the network. Possible values are: unknown, invalid, cn, pcma, pcmu, amrWide, g722, g7221, g7221c, g729, multiChannelAudio, muchv2, opus, satin, satinFullband, rtAudio8, rtAudio16, silk, silkNarrow, silkWide, siren, xmsRta, unknownFutureValue.
*
* @param AudioCodec $val The value to assign to the audioCodec
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ class LifecycleTaskCategory extends Enum
const JOINER = "joiner";
const LEAVER = "leaver";
const UNKNOWN_FUTURE_VALUE = "unknownFutureValue";
const MOVER = "mover";
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ class LifecycleWorkflowCategory extends Enum
const JOINER = "joiner";
const LEAVER = "leaver";
const UNKNOWN_FUTURE_VALUE = "unknownFutureValue";
const MOVER = "mover";
}
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public function getExecutionScope()
* Sets the executionScope
* The unique identifier of the Azure AD identity that last modified the workflow object.
*
* @param \Beta\Microsoft\Graph\Model\User[] $val The executionScope
* @param UserProcessingResult[] $val The executionScope
*
* @return Workflow
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ class WorkflowTriggerTimeBasedAttribute extends Enum
const EMPLOYEE_HIRE_DATE = "employeeHireDate";
const EMPLOYEE_LEAVE_DATE_TIME = "employeeLeaveDateTime";
const UNKNOWN_FUTURE_VALUE = "unknownFutureValue";
const CREATED_DATE_TIME = "createdDateTime";
}
109 changes: 108 additions & 1 deletion src/Beta/Microsoft/Graph/Model/Account.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,39 @@
* @license https://opensource.org/licenses/MIT MIT License
* @link https://graph.microsoft.com
*/
class Account extends Entity
class Account implements \JsonSerializable
{
/**
* The array of properties available
* to the model
*
* @var array $_propDict
*/
protected $_propDict;

/**
* Construct a new Account
*
* @param array $propDict A list of properties to set
*/
function __construct($propDict = array())
{
if (!is_array($propDict)) {
$propDict = array();
}
$this->_propDict = $propDict;
}

/**
* Gets the property dictionary of the Account
*
* @return array The list of properties
*/
public function getProperties()
{
return $this->_propDict;
}

/**
* Gets the blocked
*
Expand Down Expand Up @@ -105,6 +136,33 @@ public function setDisplayName($val)
return $this;
}

/**
* Gets the id
*
* @return string|null The id
*/
public function getId()
{
if (array_key_exists("id", $this->_propDict)) {
return $this->_propDict["id"];
} else {
return null;
}
}

/**
* Sets the id
*
* @param string $val The id
*
* @return Account
*/
public function setId($val)
{
$this->_propDict["id"] = $val;
return $this;
}

/**
* Gets the lastModifiedDateTime
*
Expand Down Expand Up @@ -190,4 +248,53 @@ public function setSubCategory($val)
return $this;
}

/**
* Gets the ODataType
*
* @return string|null The ODataType
*/
public function getODataType()
{
if (array_key_exists('@odata.type', $this->_propDict)) {
return $this->_propDict["@odata.type"];
}
return null;
}

/**
* Sets the ODataType
*
* @param string $val The ODataType
*
* @return Account
*/
public function setODataType($val)
{
$this->_propDict["@odata.type"] = $val;
return $this;
}

/**
* Serializes the object by property array
* Manually serialize DateTime into RFC3339 format
*
* @return array The list of properties
*/
#[\ReturnTypeWillChange]
public function jsonSerialize()
{
$serializableProperties = $this->getProperties();
foreach ($serializableProperties as $property => $val) {
if (is_a($val, "\DateTime")) {
$serializableProperties[$property] = $val->format(\DateTime::RFC3339);
} else if (is_a($val, "\Microsoft\Graph\Core\Enum")) {
$serializableProperties[$property] = $val->value();
} else if (is_a($val, "\Entity")) {
$serializableProperties[$property] = $val->jsonSerialize();
} else if (is_a($val, "\GuzzleHttp\Psr7\Stream")) {
$serializableProperties[$property] = (string) $val;
}
}
return $serializableProperties;
}
}
2 changes: 2 additions & 0 deletions src/Beta/Microsoft/Graph/Model/AdministrativeUnit.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public function setDisplayName($val)

/**
* Gets the isMemberManagementRestricted
* true if members of this administrative unit should be treated as sensitive, which requires specific permissions to manage. Default value is false. Use this property to define administrative units whose roles don't inherit from tenant-level administrators, and management of individual member objects is limited to administrators scoped to a restricted management administrative unit. Immutable, so cannot be changed later.
*
* @return bool|null The isMemberManagementRestricted
*/
Expand All @@ -98,6 +99,7 @@ public function getIsMemberManagementRestricted()

/**
* Sets the isMemberManagementRestricted
* true if members of this administrative unit should be treated as sensitive, which requires specific permissions to manage. Default value is false. Use this property to define administrative units whose roles don't inherit from tenant-level administrators, and management of individual member objects is limited to administrators scoped to a restricted management administrative unit. Immutable, so cannot be changed later.
*
* @param bool $val The isMemberManagementRestricted
*
Expand Down
Loading

0 comments on commit 8f12e70

Please sign in to comment.