php 5.4 compatibility for olympus #626
Merged
Conversation
This file contains 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
Separate error level assignment into a variable in this commit so that the only difference between Olympus and Ascraeus is the addition of logic altering $level. PHPBB3-10615
We cannot use static in Olympus because it must be PHP 4 compatible. Therefore disable E_STRICT for Olympus. This commit should be reverted for Ascraeus. PHPBB3-10615
|
I've tested Unit Tests on PHP 5.4 with and without this patch. Patch fixes Unit Tests, so this should be fine. |
| // Unfortunately it cannot be made E_STRICT-clean while | ||
| // continuing to work on PHP 4. | ||
| // Therefore, in phpBB 3.0.x we disable E_STRICT on PHP 5.4+, | ||
| // while phpBB 3.1 will fix utf8 normalizer. |
There was a problem hiding this comment.
Oleg wanted to change this line again.
There was a problem hiding this comment.
Actually the wording here is fine, if it's ok with you it's ok with me.
|
However, bantu@9c7bc9c needs to have at least the ticket number in the footer. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge to olympus, then merge to develop and revert the second commit as explained in the commit message.
http://tracker.phpbb.com/browse/PHPBB3-10615
Ticket should remain open for fixing everything in 3.1 correctly.