Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release 5.1.1 into 5.2.x #873

Merged
merged 11 commits into from
Dec 19, 2024
Merged

Conversation

github-actions[bot]
Copy link
Contributor

Release Notes for 5.1.1

5.1.x bugfix release (patch)

5.1.1

  • Total issues resolved: 0
  • Total pull requests resolved: 3
  • Total contributors: 2

CI

greg0ire and others added 10 commits December 8, 2024 21:01
As per the decision we made during the hackathon.
It is used in tests.
We must provide a psr logger instead.
Drop Psalm in favor of PHPStan
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4 to 5.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@v4...v5)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
…/codecov/codecov-action-5

Bump codecov/codecov-action from 4 to 5
Bumps [doctrine/.github](https://github.com/doctrine/.github) from 5.2.0 to 6.0.0.
- [Release notes](https://github.com/doctrine/.github/releases)
- [Commits](doctrine/.github@5.2.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]>
…ine/dot-github-6.0.0

Bump doctrine/.github from 5.2.0 to 6.0.0
Bumps [doctrine/.github](https://github.com/doctrine/.github) from 6.0.0 to 7.1.0.
- [Release notes](https://github.com/doctrine/.github/releases)
- [Commits](doctrine/.github@6.0.0...7.1.0)

---
updated-dependencies:
- dependency-name: doctrine/.github
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
…/doctrine/dot-github-7.1.0

Bump doctrine/.github from 6.0.0 to 7.1.0
@GromNaN GromNaN force-pushed the 5.1.x-merge-up-into-5.2.x_DU7yTzD2 branch from b1fc7ff to 7392df5 Compare December 18, 2024 15:17
@GromNaN GromNaN force-pushed the 5.1.x-merge-up-into-5.2.x_DU7yTzD2 branch from 7392df5 to 1994bac Compare December 18, 2024 15:24
@GromNaN GromNaN requested review from alcaeus and greg0ire December 18, 2024 15:40
@GromNaN
Copy link
Member

GromNaN commented Dec 18, 2024

Deprecation of callable logger in doctrine/data-fixtures have been fixed in 5.1.1 by 7cadc10, while it was also fixed in 5.2.0 by #865.

The merge conflict resolution takes the version in 5.1.1 that is compatible with psr/log v1, but remove compability with doctrine/data-fixtures 1.17

@GromNaN GromNaN merged commit 97a7737 into 5.2.x Dec 19, 2024
22 checks passed
@GromNaN GromNaN deleted the 5.1.x-merge-up-into-5.2.x_DU7yTzD2 branch December 19, 2024 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants