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

Add columns for 3.1.x and 4.0x #11229

Merged
merged 1 commit into from
Feb 7, 2024
Merged

Conversation

greg0ire
Copy link
Member

@greg0ire greg0ire commented Feb 6, 2024

No description provided.

@greg0ire greg0ire merged commit 599dd58 into doctrine:3.0.x Feb 7, 2024
@greg0ire greg0ire added this to the 3.0.1 milestone Feb 7, 2024
@greg0ire greg0ire deleted the add-columns branch February 7, 2024 06:56
derrabus added a commit that referenced this pull request Feb 7, 2024
This reverts commit 599dd58, reversing
changes made to 1854ce2.
@derrabus
Copy link
Member

derrabus commented Feb 7, 2024

Reverted in 94144e1. We have changed this in 2.18.x already (see #11207), it's just not merged up yet.

@derrabus derrabus removed this from the 3.0.1 milestone Feb 7, 2024
@greg0ire
Copy link
Member Author

greg0ire commented Feb 7, 2024

Oh right,sorry!

derrabus added a commit to derrabus/orm that referenced this pull request Feb 7, 2024
* 3.0.x:
  Revert "Merge pull request doctrine#11229 from greg0ire/add-columns"
  Add columns for 3.1.x and 4.0x
  Update version ORM from 2 to 3 in docs (doctrine#11221)
  Clean up outdated sentence (doctrine#11224)
  Update README.md
  Point link to correct upgrade guide (doctrine#11220)
  Ignore subclasses without discriminatorValue when generating discriminator column condition SQL (doctrine#11200)
  Update branches in README
derrabus added a commit to derrabus/orm that referenced this pull request Feb 7, 2024
* 3.1.x:
  Add TokenType class (doctrine#11228)
  Revert "Merge pull request doctrine#11229 from greg0ire/add-columns"
  Add columns for 3.1.x and 4.0x
  Update version ORM from 2 to 3 in docs (doctrine#11221)
  Clean up outdated sentence (doctrine#11224)
  Update README.md
  Point link to correct upgrade guide (doctrine#11220)
  Ignore subclasses without discriminatorValue when generating discriminator column condition SQL (doctrine#11200)
  Update branches in README
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants