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 2.8.2 into 2.9.x #8485

Merged
merged 40 commits into from
Feb 17, 2021

Conversation

fezfez and others added 30 commits November 27, 2020 18:50
* fixed entity generation for numeric values

* fixed entity generation for numeric values

Co-authored-by: julian <[email protected]>
Add docs to export-ignore
That comment is mistaken for a method comment because it precedes one.
The issue was reported but will most likely not be fixed.
These files must be require'd
* Housekeeping: CS Query, AbstractQuery, NativeQuery.

* Housekeeping: phpcs TreeWalker

* Housekeeping: CS Doctrine\ORM\EntityManager

* Housekeeping: CS Doctrine\ORM\Cache

* Upgrade git-phpcs

* Drop unused method parameter

* Describe types more precisely

Co-authored-by: Grégoire Paris <[email protected]>
CS Fixes 2 string interpolation to sprintf
greg0ire and others added 10 commits February 14, 2021 14:39
* Ensure identifier type is set on deleteJoinTableRecords

* Housekeeping: phpcs

* Housekeeping: phpcs

Co-authored-by: Benjamin Eberlei <[email protected]>
* [GH-8410] Fix memory leak in new toIterable and state bug.

The new AbstractQuery::toIterable() had a memory leak that
AbstractQuery::iterable() did not have. This leak is now fixed.

After fixing the leak, one test failed where the identity map in
ObjectHydrator triggered and lead to a notice. Introduced a new
AbstractHydrator::cleanupAfterRowIteration() that the ObjectHydrator
uses to cleanup the state.

* [GH-8413] Bugfix: Iterating with multiple, mixed results

When multiple entity results are part of a row, the result handling
must be different. In addition mixed results with scalars are broken
and now throw an exception as illegal operation.

* Housekeeping: phpcs

* [GH-8413] Add assertions for entity alias iteration.

* [GH-8387] Missing @deprecated on Query::iterate
@greg0ire greg0ire force-pushed the 2.8.x-merge-up-into-2.9.x_602d59a0aa86b9.63081052 branch from 70e3855 to 49864a7 Compare February 17, 2021 19:39
@greg0ire greg0ire merged commit 0ae53a6 into 2.9.x Feb 17, 2021
@greg0ire greg0ire deleted the 2.8.x-merge-up-into-2.9.x_602d59a0aa86b9.63081052 branch February 17, 2021 19:50
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