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

Use equal to instead of equal of in assertSqlGeneration() #9195

Merged
merged 1 commit into from
Nov 20, 2021

Conversation

simPod
Copy link
Contributor

@simPod simPod commented Nov 20, 2021

No description provided.

@simPod simPod force-pushed the equal-to-english branch 2 times, most recently from c2b6628 to 95e1cd6 Compare November 20, 2021 12:59
@greg0ire greg0ire closed this Nov 20, 2021
@greg0ire greg0ire reopened this Nov 20, 2021
@greg0ire
Copy link
Member

Restarting the build after the merge up

@greg0ire
Copy link
Member

🤔 🤔 🤔 Why are you contributing this to 3.0.x and not 2.10.x?

@simPod simPod changed the base branch from 3.0.x to 2.10.x November 20, 2021 16:16
@simPod
Copy link
Contributor Author

simPod commented Nov 20, 2021

I had 3.0 checked out. changed.

@derrabus derrabus added this to the 2.10.3 milestone Nov 20, 2021
@derrabus derrabus added the CI label Nov 20, 2021
@derrabus derrabus enabled auto-merge (squash) November 20, 2021 16:23
@greg0ire
Copy link
Member

I think the right order for this was switch branch, and then force push, Github CI looks confused…

@greg0ire greg0ire closed this Nov 20, 2021
auto-merge was automatically disabled November 20, 2021 20:07

Pull request was closed

@greg0ire greg0ire reopened this Nov 20, 2021
@derrabus derrabus merged commit a663dda into doctrine:2.10.x Nov 20, 2021
derrabus added a commit that referenced this pull request Nov 28, 2021
* Adding Attributes code block (#9161)

Just that there is some real-world example somewhere ;-) see #9020 (comment)

* Use `equal to` instead of `equal of` in `assertSqlGeneration()` (#9195)

* Add a psalm type for field mapping

Field mapping have different definitions
in property definition and method return.
As suggested in issue and to avoid further desynchronization,
a psalm type has been created.
Fixes #9193

* Psalm 4.13.1, PHPStan 1.2.0 (#9204)

Co-authored-by: Thomas Landauer <thomas@landauer.at>
Co-authored-by: Simon Podlipsky <simon@podlipsky.net>
Co-authored-by: Julien LARY <47776596+laryjulien@users.noreply.github.com>
Co-authored-by: Grégoire Paris <postmaster@greg0ire.fr>
derrabus added a commit to derrabus/orm that referenced this pull request Nov 29, 2021
* 2.11.x:
  Add missing deprecations for YAML metadata mapping (doctrine#9206)
  Drop support for DBAL 3.1
  Psalm 4.13.1, PHPStan 1.2.0 (doctrine#9204)
  Add a psalm type for field mapping
  Use `equal to` instead of `equal of` in `assertSqlGeneration()` (doctrine#9195)
  Adding Attributes code block (doctrine#9161)
derrabus added a commit to derrabus/orm that referenced this pull request Nov 29, 2021
* 2.11.x:
  Add missing deprecations for YAML metadata mapping (doctrine#9206)
  Drop support for DBAL 3.1
  Psalm 4.13.1, PHPStan 1.2.0 (doctrine#9204)
  Add a psalm type for field mapping
  Use `equal to` instead of `equal of` in `assertSqlGeneration()` (doctrine#9195)
  Adding Attributes code block (doctrine#9161)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants