Merge 3.4.x up into 4.0.x #11762
Merged
Merge 3.4.x up into 4.0.x #11762
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge 2.20.x up into 2.21.x
Merge 2.20.x up into 2.21.x
We have a plan to drop Psalm. Before we do that, let us ensure we run PHPStan at the level we agreed upon during the Hackathon.
Raise PHPStan level to 7
Bumps [doctrine/.github](https://github.com/doctrine/.github) from 5.2.0 to 5.3.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](doctrine/.github@5.2.0...5.3.0) --- updated-dependencies: - dependency-name: doctrine/.github dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…ions/2.20.x/doctrine/dot-github-5.3.0 Bump doctrine/.github from 5.2.0 to 5.3.0
When there are no conflicts between branches, we create pull requests where the head branch is a branch on the origin repository. That branch points to a commit that should already have coverage information provided by the build that happens after merging a regular pull request. The thing is, coverage information provided by builds that happen before merging a pull request are associated with the commit of the head repository. This means that when merging up 1.2 into 1.3, the build produces coverage information that is the result of a merge between 1.2 and 1.3, and associates it with 1.2, although it is run on with a codebase that is much closer to 1.3 (and is in fact supposed to become 1.3 after the merge). This means that when we create a merge up PR from 1.2 to anything else, the coverage information is going to be wrong until a PR targeting 1.2 gets merged. I do not think we need coverage about conflictless merge up PRs more than we need accurate numbers, so I propose we disable the upload for those instead of, say, trying to associate them with the temporary merge commit.
Merge 2.20.x up into 2.21.x
Avoid coverage upload for merge up pull requests
Merge 2.20.x up into 3.3.x
Merge 2.20.x up into 2.21.x
Merge 2.20.x up into 3.3.x
Bumps [doctrine/.github](https://github.com/doctrine/.github) from 5.3.0 to 6.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](doctrine/.github@5.3.0...6.0.0) --- updated-dependencies: - dependency-name: doctrine/.github dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…ions/2.20.x/doctrine/dot-github-6.0.0 Bump doctrine/.github from 5.3.0 to 6.0.0
Merge 3.3.x up into 3.4.x
Merge 2.21.x up into 3.4.x
* Run static analysis checks on PHP 8.4 * Remove forgotten references to Psalm * Remove invalid annotation I do not think it achieves anything.
Some calls to assert() are no longer necessary.
This avoids a test flakyness observed when using PostgreSQL in the CI.
Merge 2.20.x up into 3.3.x
Merge 3.3.x up into 3.4.x
This change was accidentally dropped during a merge up.
Run SA checks with PHP 8.4
Merge 3.3.x up into 3.4.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.