This branch is a manual rebase of current develop onto current master with PR #242 applied.
It delivers a reference on how the develop should look like when rebased to master after #242 application.
This PR was created to assist the integration of PR #242 to master (can be done automatically) and develop.
This PR can not automatically be merged to develop (it can be automatically merged with master, but that is not the point here).
I had to do some more than just selecting which side (theirs or mine) to use. There were several cases where neither was right and several where both were right.
I had to commit some additional work afterwards, because #242's implementation was not completely the same as #221's, which is already part of develop. I also removed several PHP-5.6-isms.
I hope, this can provide some help. If I can do more, please let me know. If you wanted to apply the fixes of #242 to master, I'd offer to rebase this branch to current develop, so this could be accepted in order to introduce #242 to develop.
This branch is a manual rebase of current develop onto current master with PR #242 applied. It delivers a reference on how the develop should look like when rebased to master after #242 application.
This PR was created to assist the integration of PR #242 to master (can be done automatically) and develop.
This PR can not automatically be merged to develop (it can be automatically merged with master, but that is not the point here).
I had to do some more than just selecting which side (theirs or mine) to use. There were several cases where neither was right and several where both were right.
I had to commit some additional work afterwards, because #242's implementation was not completely the same as #221's, which is already part of develop. I also removed several PHP-5.6-isms.
I hope, this can provide some help. If I can do more, please let me know. If you wanted to apply the fixes of #242 to master, I'd offer to rebase this branch to current develop, so this could be accepted in order to introduce #242 to develop.
This PR passes all tests locally.