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

[#318] Add conflict with "doctrine/dbal:2.7.0" #320

Merged
merged 1 commit into from
Apr 10, 2018

Conversation

phansys
Copy link
Member

@phansys phansys commented Apr 5, 2018

Q A
Branch master
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #318
License MIT
Doc PR n/a

TODO:

  • Add tests.

Fixes #318.

@phansys phansys changed the title Add support for null => true in CreateSchemaListener::postGenerateSchemaTable() [WIP] Add support for null => true in CreateSchemaListener::postGenerateSchemaTable() Apr 7, 2018
@phansys phansys force-pushed the ticket_318 branch 2 times, most recently from 339b48b to 1f8c9cc Compare April 7, 2018 17:42
@phansys phansys changed the title [WIP] Add support for null => true in CreateSchemaListener::postGenerateSchemaTable() Add support for null => true in CreateSchemaListener::postGenerateSchemaTable() Apr 7, 2018
@phansys phansys changed the base branch from master to 1.0 April 7, 2018 17:57
@phansys
Copy link
Member Author

phansys commented Apr 7, 2018

Changed base to 1.0 since it should be treated as a bugfix IMO.

@phansys phansys changed the title Add support for null => true in CreateSchemaListener::postGenerateSchemaTable() [WIP] Add support for null => true in CreateSchemaListener::postGenerateSchemaTable() Apr 8, 2018
@phansys phansys force-pushed the ticket_318 branch 4 times, most recently from d64ceed to f269c48 Compare April 8, 2018 16:04
@phansys phansys changed the title [WIP] Add support for null => true in CreateSchemaListener::postGenerateSchemaTable() Add support for null => true in CreateSchemaListener::postGenerateSchemaTable() Apr 8, 2018
@phansys phansys changed the title Add support for null => true in CreateSchemaListener::postGenerateSchemaTable() [#318] Add conflict with "doctrine/dbal:2.7.0" Apr 8, 2018
@@ -23,6 +23,7 @@
"fabpot/php-cs-fixer": "^1.11"
},
"conflict": {
"doctrine/dbal": "2.7.0",
Copy link

@axzx axzx Apr 9, 2018

Choose a reason for hiding this comment

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

"doctrine/dbal": ">=2.7.0",

Copy link
Member Author

Choose a reason for hiding this comment

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

Release 2.7.1 should fix the issue. Could you confirm you're experiencing it with that version?

Copy link

Choose a reason for hiding this comment

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

OK, I'm sorry.
I thought that from 2.7.0 is this problem.

@tolry tolry merged commit 5725eca into sonata-project:1.0 Apr 10, 2018
@tolry
Copy link
Contributor

tolry commented Apr 10, 2018

great, thanks!

@phansys phansys deleted the ticket_318 branch April 10, 2018 11:14
@phansys
Copy link
Member Author

phansys commented Apr 10, 2018

@tolry, thank you for merging!
Release 1.0.9 states that this PR was merged in it, but it isn't.

@tolry
Copy link
Contributor

tolry commented Apr 10, 2018

hmm, did I mess up? I will take a look ...

@tolry
Copy link
Contributor

tolry commented Apr 10, 2018

@tolry
Copy link
Contributor

tolry commented Apr 10, 2018

@phansys d'oh - you used short array syntax in your test 😄 https://travis-ci.org/simplethings/EntityAuditBundle/jobs/364493226

@phansys
Copy link
Member Author

phansys commented Apr 10, 2018

Tests for 5.3 weren't running 😇
Fixed in #323.

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.

3 participants