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.

Sign up for GitHub

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

Jump to bottom

#784 fix with inline array of type array<K, V> #785

Merged
merged 2 commits into from
Jun 17, 2017
Merged

#784 fix with inline array of type array<K, V> #785

merged 2 commits into from
Jun 17, 2017

Conversation

aviortm
Copy link
Contributor

@aviortm aviortm commented Jun 7, 2017 •
edited
Loading

No description provided.

goetas
goetas requested changes Jun 7, 2017
View reviewed changes
Copy link
Collaborator

@goetas goetas left a comment

Choose a reason for hiding this comment

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

Hi,
thanks for your PR.

Can you please remove the merge commit?

(if you need the latest master, you can rebase your branch)

tests/JMS/Serializer/Tests/Fixtures/ObjectWithInlineArray.php Outdated
{
$this->array = $array;
}

Copy link
Collaborator

Choose a reason for hiding this comment

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

too many empty lines

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@AlexeyDsov
Copy link

Could you merge this fix to 1.7 version?

@goetas
Copy link
Collaborator

goetas commented Jun 7, 2017

since is not a bugfix, but more an enhancement, will land in 1.8.0

@goetas goetas added this to the v1.8 milestone Jun 7, 2017
@aviortm
Copy link
Contributor Author

aviortm commented Jun 7, 2017

@goetas
Hi,
I removed the merge commit. Is it ok now?

@AlexeyDsov
Copy link

since is not a bugfix, but more an enhancement, will land in 1.8.0

@goetas this case became broken in 1.7 version after commit 32f0e131
i.e. this works before 1.7 and after 1.7 but never will work in 1.7?

@goetas
Copy link
Collaborator

goetas commented Jun 7, 2017

@AlexeyDsov ah... I see.

@goetas goetas added the bug label Jun 7, 2017
@goetas goetas removed this from the v1.8 milestone Jun 7, 2017
@goetas goetas self-assigned this Jun 7, 2017
@goetas goetas added this to the v1.8 milestone Jun 17, 2017
@goetas goetas merged commit 39a24e8 into schmittjoh:master Jun 17, 2017
@goetas
Copy link
Collaborator

goetas commented Jun 17, 2017

thanks!

@goetas goetas mentioned this pull request Jun 23, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@goetas goetas goetas approved these changes

Assignees

@goetas goetas

Labels
bug
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.
3 participants
@aviortm @AlexeyDsov @goetas