[ticket/15069] Refactor template class#4735
Open
javiexin wants to merge 5 commits intophpbb:masterfrom
Open
Conversation
4 tasks
Member
|
try re-basing on master
assuming you set up your upstream |
PHPBB3-15069
Contributor
Author
|
Done, thanks a lot! Hopefully, the tests will pass this time with all your help! |
Remove duplicate code created by the automatic merge. PHPBB3-15069
Contributor
Author
|
Still merge issues. These were automatically solved in an incorrect way (code was duplicate). |
Compatibility PHP 7.2 PHPBB3-15069
Contributor
Author
|
@rxu I have pushed a new commit with PHP 7.2 changes. Please, take a look at them, just in case there is something that I did wrong; specially look at the changes to the uses of |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For reference and details, see https://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=50881
Checklist:
Tracker ticket:
https://tracker.phpbb.com/browse/PHPBB3-15069