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

Allow DBAL 2.6 and common 2.8 to be installed #6580

Merged
merged 2 commits into from
Jul 25, 2017
Merged

Allow DBAL 2.6 and common 2.8 to be installed #6580

merged 2 commits into from
Jul 25, 2017

Conversation

Tobion
Copy link
Contributor

@Tobion Tobion commented Jul 24, 2017

DBAL 2.6 is released but currently dependencies can't be resolved as ORM 2.5 does not allow DBAL 2.6 and ORM 2.6 is not relased yet.

DBAL 2.6 is released but currently dependencies can't be resolved as ORM 2.5 does not allow DBAL 2.6 and ORM 2.6 is not relased yet.
composer.json Outdated
@@ -16,7 +16,7 @@
"php": ">=5.4",
"ext-pdo": "*",
"doctrine/collections": "~1.2",
"doctrine/dbal": ">=2.5-dev,<2.6-dev",
"doctrine/dbal": ">=2.5-dev,<2.7-dev",
"doctrine/instantiator": "~1.0.1",
"doctrine/common": ">=2.5-dev,<2.8-dev",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could also bump this to >=2.5-dev,<2.9-dev

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@Tobion Tobion changed the title Allow DBAL 2.6 to be installed Allow DBAL 2.6 and common 2.8 to be installed Jul 24, 2017
@Ocramius Ocramius added this to the 2.5.7 milestone Jul 25, 2017
@Ocramius Ocramius self-assigned this Jul 25, 2017
@Ocramius
Copy link
Member

Test looks good - failures unrelated. Thanks @Tobion!

@Ocramius Ocramius merged commit d27a9fc into doctrine:2.5 Jul 25, 2017
@Tobion Tobion deleted the patch-1 branch July 25, 2017 09:15
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