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

Manually merge 2.11.x into 3.0.x #4300

Merged
merged 16 commits into from Sep 26, 2020
Merged

Manually merge 2.11.x into 3.0.x #4300

merged 16 commits into from Sep 26, 2020

Conversation

morozov
Copy link
Member

@morozov morozov commented Sep 26, 2020

Most of the changes from 2.11.x are discarded since:

  1. Some of them are applied to the code that doesn't exist in 3.0.x.
  2. Fix BC break: QueryBuilder::andWhere() etc. should ignore empty strings #4286 would have to be reverted anyway (closes Don't ignore empty strings in QueryBuilder #4290).
  3. The issue fixed by Fix ExceptionTest::testConnectionExceptionSqLite() on macOS #4297 in 2.11.x is apparently fixed by Segregated support of unique index and unique constraint #3980 in 3.0.x which is not yet merged to master where I checked for the fix.

greg0ire and others added 16 commits September 20, 2020 17:21
…t-indexes

Add explanation about implicit indexes
Remove "All" for some deprecated phpdoc
Ignore empty strings in QueryBuilder::and/orWhere() & and/orHaving().
Fix BC break: QueryBuilder::andWhere() etc. should ignore empty strings
Fix phpdoc on deprecated functions
Restore PDOStatement::quote() for backward compatibility
…ace-subtyping

Deprecate Abstraction\Result
…eter

Fix Third parameter not allowed for PDO::FETCH_COLUMN
Fix ExceptionTest::testConnectionExceptionSqLite() on macOS
@morozov morozov marked this pull request as draft September 26, 2020 14:50
@morozov morozov merged commit 5b9a194 into doctrine:3.0.x Sep 26, 2020
@morozov morozov self-assigned this Sep 26, 2020
@morozov morozov linked an issue Sep 26, 2020 that may be closed by this pull request
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 29, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Don't ignore empty strings in QueryBuilder
4 participants