Skip to content

Merge 3.5.x up into 3.6.x#12234

Merged
greg0ire merged 15 commits intodoctrine:3.6.xfrom
mpdude:merge-3.5.x-into-3.6.x
Oct 22, 2025
Merged

Merge 3.5.x up into 3.6.x#12234
greg0ire merged 15 commits intodoctrine:3.6.xfrom
mpdude:merge-3.5.x-into-3.6.x

Conversation

@mpdude
Copy link
Copy Markdown
Contributor

@mpdude mpdude commented Oct 21, 2025

No description provided.

mpdude and others added 15 commits October 9, 2025 10:23
Revert "Fix fields of transient classes being considered duplicate with `reportFieldsWhereDeclared` (doctrine#11769)"
The order of results is not guaranteed unless we do so, and the test can
fail in some cases:

	There was 1 failure:

	1) Doctrine\Tests\ORM\Functional\QueryTest::testToIterableWithMixedResultArbitraryJoinsScalars
	Failed asserting that two strings are equal.
	--- Expected
	+++ Actual
	@@ @@
	-'Doctrine 2'
	+'lala 2'

	/home/runner/work/orm/orm/tests/Tests/ORM/Functional/QueryTest.php:481
Bumps [doctrine/.github](https://github.com/doctrine/.github) from 8.0.0 to 10.1.0.
- [Release notes](https://github.com/doctrine/.github/releases)
- [Commits](doctrine/.github@8.0.0...10.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
…ions/2.20.x/doctrine/dot-github-10.1.0

Bump doctrine/.github from 8.0.0 to 10.1.0
That test never got executed.
Platforms in the MySQL/MariaDB family require that.
@mpdude mpdude requested a review from greg0ire October 21, 2025 15:33
@greg0ire greg0ire merged commit 4fd9e94 into doctrine:3.6.x Oct 22, 2025
109 of 110 checks passed
@greg0ire
Copy link
Copy Markdown
Member

Thanks @mpdude !

@mpdude mpdude deleted the merge-3.5.x-into-3.6.x branch October 22, 2025 11:01
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.

5 participants