Merge 3.9.x into 4.2.x #6695
Merged
Merge 3.9.x into 4.2.x #6695
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
Bumps [doctrine/.github](https://github.com/doctrine/.github) from 5.3.0 to 6.0.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/doctrine/.github/releases">doctrine/.github's releases</a>.</em></p> <blockquote> <h2>PHP 8.4 by default</h2> <h1>Changed</h1> <ul> <li>jobs now run by default on PHP 8.4</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/doctrine/.github/commit/1d4be832a360a0486acc1e7085f2757f5e193148"><code>1d4be83</code></a> Merge pull request <a href="https://redirect.github.com/doctrine/.github/issues/56">#56</a> from greg0ire/php-8-4</li> <li><a href="https://github.com/doctrine/.github/commit/b5bfddb54dae525ff60d95a3f8f4382a6d7ddfd8"><code>b5bfddb</code></a> Run jobs on PHP 8.4 by default</li> <li>See full diff in <a href="https://github.com/doctrine/.github/compare/5.3.0...6.0.0">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [doctrine/.github](https://github.com/doctrine/.github) from 6.0.0 to 7.1.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/doctrine/.github/releases">doctrine/.github's releases</a>.</em></p> <blockquote> <h2>Website schema validation workflow</h2> <h2>Added</h2> <p>We now have a new workflow that allows to validate modification of <code>.doctrine-project.json</code> files.</p> <h2>Drop Psalm</h2> <h2>Removed</h2> <p>The Psalm workflow has been removed. We are now only relying on PHPStan.</p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/doctrine/.github/commit/297a67470cc07912349db6384af2abcac3df2285"><code>297a674</code></a> Merge pull request <a href="https://redirect.github.com/doctrine/.github/issues/55">#55</a> from SenseException/website-schema</li> <li><a href="https://github.com/doctrine/.github/commit/d4e1cdaed6a7ae9318bb7fc0d12216b71d18821b"><code>d4e1cda</code></a> Create website-schema workflow</li> <li><a href="https://github.com/doctrine/.github/commit/43ddb9be7184e43820da27d10deed6b0f70abe0b"><code>43ddb9b</code></a> Merge pull request <a href="https://redirect.github.com/doctrine/.github/issues/50">#50</a> from greg0ire/remove-psalm</li> <li><a href="https://github.com/doctrine/.github/commit/4b328b8b9580821db3159cabb04093b87820191e"><code>4b328b8</code></a> Remove Psalm job</li> <li><a href="https://github.com/doctrine/.github/commit/7370aa0299efd0d357d1e17f8583c1a046a38374"><code>7370aa0</code></a> Merge pull request <a href="https://redirect.github.com/doctrine/.github/issues/57">#57</a> from greg0ire/update-template</li> <li><a href="https://github.com/doctrine/.github/commit/3dbb0966473ea2ab5f8796db8d5ea185250cdff7"><code>3dbb096</code></a> Reference the new workflow</li> <li>See full diff in <a href="https://github.com/doctrine/.github/compare/6.0.0...7.1.0">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
| Q | A |------------- | ----------- | Type | improvement | Fixed issues | N/A #### Summary This PR bumps PHPStan to version 2. I've reintroduced the baseline because there are some errors that need further investigation and I did not want to block this upgrade for too long.
* 3.9.x: PHPStan 2.1.1 (doctrine#6690) PHPUnit 9.6.22 (doctrine#6691) Bump doctrine/.github from 6.0.0 to 7.1.0 (doctrine#6649) Bump doctrine/.github from 5.3.0 to 6.0.0 (doctrine#6642)
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.