Skip to content
This repository has been archived by the owner on Sep 30, 2021. It is now read-only.

Manual merge #586

Merged
merged 12 commits into from
Nov 26, 2018
Merged

Manual merge #586

merged 12 commits into from
Nov 26, 2018

Conversation

greg0ire
Copy link
Contributor

No description provided.

@greg0ire
Copy link
Contributor Author

The build breaks with:

TypeError: IntlDateFormatter::__construct() expects parameter 6 to be string, null given

I don't understand why the build would pass on 3.x

@greg0ire
Copy link
Contributor Author

Ah I understand, it's about the "strict types" declaration.

@@ -39,3 +39,8 @@ This package is available under the [MIT license](LICENSE).
[coveralls_stable_link]: https://coveralls.io/github/sonata-project/SonataCoreBundle?branch=3.x
[coveralls_unstable_badge]: https://coveralls.io/repos/github/sonata-project/SonataCoreBundle/badge.svg?branch=master
[coveralls_unstable_link]: https://coveralls.io/github/sonata-project/SonataCoreBundle?branch=master

[scrutinizer_stable_badge]: https://scrutinizer-ci.com/g/sonata-project/SonataCoreBundle/badges/quality-score.png?b=3.x
Copy link
Member

Choose a reason for hiding this comment

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

this looks wrong

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should it be master?

Copy link
Member

Choose a reason for hiding this comment

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

yes and it is currently available, maybe your branch was outdated? 🤔

Copy link
Member

Choose a reason for hiding this comment

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

ah sorry, no it isn't available in master, but yes it should be master in the URL

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But it says "stable", and master is unstable.

Copy link
Member

Choose a reason for hiding this comment

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

argh you are right, sorry for confusing.

Everything is fine 👍

sphinx_rtd_theme
Copy link
Member

Choose a reason for hiding this comment

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

the dev kit changes should be available as they get executed against master separately

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What should I do? Won't dev-kit fix anything that goes wrong?

Copy link
Member

Choose a reason for hiding this comment

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

Ofc it will, but only when it gets executed again

@greg0ire greg0ire mentioned this pull request Nov 26, 2018
Forcing it to null:
- is useless;
- breaks if you use the "strict types" feature of php 7.
@greg0ire greg0ire merged commit 93133e8 into sonata-project:master Nov 26, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants