Skip to content

Commit ab6ec37

Browse files
committed
Merge branch 'main' into fix/allow-passing-own-auth-provider
2 parents 7e67d81 + 26ce5bd commit ab6ec37

11 files changed

+80
-148
lines changed

.github/policies/msgraph-sdk-php-core-branch-protection.yml

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,6 @@ resource: repository
99
configuration:
1010
branchProtectionRules:
1111

12-
- branchNamePattern: dev
13-
# This branch pattern applies to the following branches as of 08/30/2023:
14-
# dev
15-
16-
# Specifies whether this branch can be deleted. boolean
17-
allowsDeletions: false
18-
# Specifies whether forced pushes are allowed on this branch. boolean
19-
allowsForcePushes: false
20-
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
21-
dismissStaleReviews: true
22-
# Specifies whether admins can overwrite branch protection. boolean
23-
isAdminEnforced: false
24-
# Indicates whether "Require a pull request before merging" is enabled. boolean
25-
requiresPullRequestBeforeMerging: true
26-
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
27-
requiredApprovingReviewsCount: 1
28-
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
29-
requireCodeOwnersReview: true
30-
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
31-
requiresCommitSignatures: false
32-
# Are conversations required to be resolved before merging? boolean
33-
requiresConversationResolution: true
34-
# Are merge commits prohibited from being pushed to this branch. boolean
35-
requiresLinearHistory: false
36-
# 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
37-
requiredStatusChecks:
38-
- check-php-version-matrix
39-
- SonarCloud Code Analysis
40-
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
41-
requiresStrictStatusChecks: true
42-
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
43-
restrictsPushes: false
44-
# Restrict who can dismiss pull request reviews. boolean
45-
restrictsReviewDismissals: false
46-
4712
- branchNamePattern: main
4813
# This branch pattern applies to the following branches as of 08/30/2023:
4914
# main
@@ -72,7 +37,7 @@ configuration:
7237
requiredStatusChecks:
7338
- check-php-version-matrix
7439
- SonarCloud Code Analysis
75-
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
40+
# Require branches to be up-to-date before merging. Requires requiredStatusChecks. boolean
7641
requiresStrictStatusChecks: true
7742
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
7843
restrictsPushes: false

.github/release-please.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
manifest: true
2+
primaryBranch: main
3+
handleGHRelease: true

.github/workflows/pr-validation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: "Validate Pull Request"
55

66
on:
77
push:
8-
branches: [ main, dev ]
8+
branches: [ main ]
99
pull_request:
10-
branches: [ main, dev ]
10+
branches: [ main ]
1111

1212
defaults:
1313
run:

.github/workflows/project-auto-add.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
types:
1010
- opened
1111
branches:
12-
- "dev"
12+
- "main"
1313

1414
jobs:
1515
track_issue:

.github/workflows/update-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: "Update Docs"
55

66
on:
77
push:
8-
branches: dev
8+
branches: main
99

1010
defaults:
1111
run:
@@ -49,4 +49,4 @@ jobs:
4949
LABELS: generated
5050
run: |
5151
curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1
52-
bin/hub pull-request -b dev -m "$MESSAGE_TITLE" -m "$MESSAGE_BODY" -l "$LABELS"
52+
bin/hub pull-request -b main -m "$MESSAGE_TITLE" -m "$MESSAGE_BODY" -l "$LABELS"

.release-please-manifest.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "2.1.1"
3+
}

CONTRIBUTING.md

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,55 @@
11
# Contributing to the Microsoft Graph PHP SDK Core
2-
Thanks for considering making a contribution! Read over our guidelines and we will do our best to see your PRs merged successfully.
2+
Thanks for considering making a contribution! Read over our guidelines, and we will do our best to see your PRs merged successfully.
33

44
**NOTE**: A signed a contribution license agreement is required for all contributions and is checked automatically on new pull requests. You will be asked to read and sign the agreement https://cla.microsoft.com/ after submitting a request to this repository.
55

66
There are a few different recommended paths to get contributions into the released version of this library.
77

88
## File issues
9-
The best way to get started with a contribution is to start a dialog with us. Sometimes features will be under development or out of scope for this library and it's best to check before starting work on contribution, especially for large work items.
9+
The best way to get started with a contribution is to start a dialog with us. Sometimes features will be under development or out of scope for this library, and it's best to check before starting work on contribution, especially for large work items.
10+
11+
## Commit message format
12+
13+
To support our automated release process, pull requests are required to follow the [Conventional Commit](https://www.conventionalcommits.org/en/v1.0.0/)
14+
format.
15+
16+
Each commit message consists of a **header**, an optional **body** and an optional **footer**. The header is the first line of the commit and
17+
MUST have a **type** (see below for a list of types) and a **description**. An optional **scope** can be added to the header to give extra context.
18+
19+
```
20+
<type>[optional scope]: <short description>
21+
<BLANK LINE>
22+
<optional body>
23+
<BLANK LINE>
24+
<optional footer(s)>
25+
```
26+
27+
The recommended commit types used are:
28+
29+
- **feat** for feature updates (increments the _minor_ version)
30+
- **fix** for bug fixes (increments the _patch_ version)
31+
- **perf** for performance related changes e.g. optimizing an algorithm
32+
- **refactor** for code refactoring changes
33+
- **test** for test suite updates e.g. adding a test or fixing a test
34+
- **style** for changes that don't affect the meaning of code. e.g. formatting changes
35+
- **docs** for documentation updates e.g. ReadMe update or code documentation updates
36+
- **build** for build system changes (gradle updates, external dependency updates)
37+
- **ci** for CI configuration file changes e.g. updating a pipeline
38+
- **chore** for miscellaneous non-sdk changes in the repo e.g. removing an unused file
39+
40+
Adding a footer with the prefix **BREAKING CHANGE:** will cause an increment of the _major_ version.
1041

1142
## Pull requests
12-
If you are making documentation changes, feel free to submit a pull request against the **master** branch. All other pull requests should be submitted against the **dev** branch or a specific feature branch. The master branch is intended to represent the code released in the most-recent composer package.
43+
If you are making documentation changes, feel free to submit a pull request against the **main** branch. All other pull requests should be submitted against the **main** branch or a specific feature branch. The **main** branch is intended to represent the code released in the most-recent composer package.
1344

14-
When a new package is about to be released, changes in dev will be merged into master. The package will be generated from master.
45+
When a new package is about to be released, the release PR will be merged into main. The package will be generated from main.
1546

1647
Some things to note about this project:
1748

1849
### How the library is built
1950
The PHP SDK has a handwritten set of core files.
2051

21-
52+
2253
However, this is evaluated on a case-by-case basis. If the library is missing v1.0 Graph functionality that you wish to utilize, please [file an issue](https://github.com/microsoftgraph/msgraph-sdk-php-core/issues).
2354

2455
We do our best to prevent breaking changes from being introduced into the library during this process. If you find a breaking change, please file an issue and we will work to get this resolved ASAP.

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ To install the `microsoft-graph-core` library with Composer, either run `compose
88
```
99
{
1010
"require": {
11+
// x-release-please-start-version
1112
"microsoft/microsoft-graph-core": "^2.1.1"
13+
// x-release-please-end
1214
}
1315
}
1416
```
1517
## Get started with Microsoft Graph
1618

1719
### 1. Register your application
1820

19-
Register your application to use the Microsoft Graph API by following the steps at [Register an an application with the Microsoft Identity platform](https://aka.ms/registerApplication).
21+
Register your application to use the Microsoft Graph API by following the steps at [Register an application with the Microsoft Identity platform](https://aka.ms/registerApplication).
2022

2123
### 2. Authenticate with the Microsoft Graph service
2224

@@ -129,7 +131,7 @@ View or log issues on the [Issues](https://github.com/microsoftgraph/msgraph-sdk
129131

130132
## Contribute
131133

132-
Please read our [Contributing](https://github.com/microsoftgraph/msgraph-sdk-php-core/blob/master/CONTRIBUTING.md) guidelines carefully for advice on how to contribute to this repo.
134+
Please read our [Contributing](https://github.com/microsoftgraph/msgraph-sdk-php-core/blob/main/CONTRIBUTING.md) guidelines carefully for advice on how to contribute to this repo.
133135

134136
## Copyright and license
135137

release-please-config.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"bootstrap-sha": "66656259cea9373d96101ba2f81e0e0b80d7554b",
3+
"exclude-paths": [
4+
".git",
5+
".idea",
6+
".github",
7+
".vscode",
8+
"tests",
9+
"scripts"
10+
],
11+
"release-type": "simple",
12+
"include-component-in-tag": false,
13+
"include-v-in-tag": true,
14+
"packages": {
15+
".": {
16+
"package-name": "microsoft/microsoft-graph-core",
17+
"changelog-path": "CHANGELOG.md",
18+
"extra-files": [
19+
"src/GraphConstants.php",
20+
"README.md"
21+
]
22+
}
23+
},
24+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
25+
}

scripts/IncrementMinorVersion.php

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)