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

Attachment::getFilename() may be null on inline-att, widen return type #235

Merged
merged 2 commits into from
Oct 11, 2017

Conversation

wujku
Copy link
Contributor

@wujku wujku commented Oct 11, 2017

Inline attachments may not have both 'filename' and 'name' parameters.
In this case getFilename() returns \TypeError.

@Slamdunk Slamdunk added the bug label Oct 11, 2017
@Slamdunk
Copy link
Collaborator

Please:

  1. Change base branch from master to v1.0
  2. Add tests so we are not going to be tempted to readd the typehint again in the future

@wujku wujku force-pushed the hotfix/inline_attachment branch from 659be1d to aac79b5 Compare October 11, 2017 08:48
@Slamdunk
Copy link
Collaborator

@wujku To change the base branch you can follow the Github guide, ping me if you need help.

@wujku wujku changed the base branch from master to v1.0 October 11, 2017 09:33
@Slamdunk Slamdunk changed the title Removed return type from Attachment::getFilename() Attachment::getFilename() may be null on inline-att, widen return type Oct 11, 2017
@Slamdunk Slamdunk merged commit f01dd84 into ddeboer:v1.0 Oct 11, 2017
@Slamdunk
Copy link
Collaborator

Thank you @wujku

@wujku wujku deleted the hotfix/inline_attachment branch October 11, 2017 09:36
@wujku
Copy link
Contributor Author

wujku commented Oct 11, 2017

@Slamdunk Do you merge this with master branch?

@Slamdunk
Copy link
Collaborator

Of course: master represents the development branch, vX.X the current stable branch, like v1.0. New feature should be pushed in master (like your previous ones), bugfixes like this one in v1.0.
Once merged, all bugfixes are always merged in the development branch (by hand in CLI).

@Slamdunk
Copy link
Collaborator

  1. Bugfix released in 1.0.3 tag
  2. Changes merged in master with 37b2945

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants