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

Adds back child html functionality, add test, and fixes json strings #34

Merged
merged 4 commits into from
Nov 17, 2018
Merged

Adds back child html functionality, add test, and fixes json strings #34

merged 4 commits into from
Nov 17, 2018

Conversation

JoshuaCarter
Copy link
Contributor

This is part 2 of #33 which was merged prematurely. A 1.3 release should be created for these changes.

Child HTML functionality

Inner html is processsed as it was (though refactored along with the rest of the class). It may be the case that inner html shouldn't be allowed, but for now at least it should be left in.

Test

Adds test for multiple root level properties in json data.

Json strings

Json strings were not being wrapped in quotes. PHP would identify them as undeclared constants and fallback to identifying them as a string and throw a notice. Tests throw exceptions on notice. Would eventually be an issue when a string overlapped with a constant name, etc.

jcarter added 4 commits November 12, 2018 16:59
Children:
- Logic added back in (though refactored to better fit in).

Strings:
- Some strings were treated as (non existent) php contstants due to a
  lack of quotes.
@JoshuaCarter JoshuaCarter self-assigned this Nov 12, 2018
@JoshuaCarter
Copy link
Contributor Author

@nglasl can you look over the code in this PR and #33 and let me know of any changes you think should be made, etc.

@nglasl
Copy link
Contributor

nglasl commented Nov 14, 2018

@JoshuaCarter while some of this definitely looks like voodoo, it seems consistent so I can't fault anything. No issues with it being merged, just remember that it needs to come back to master somehow.

@JoshuaCarter
Copy link
Contributor Author

JoshuaCarter commented Nov 14, 2018

@nglasl It's all voodoo, and I am the voodoo mastah!
Nazeebo

I've got a checkbox on the card for porting to master/ss4 :)

@JoshuaCarter JoshuaCarter changed the title WIP: Adds back child html functionality, add test, and fixes json strings Adds back child html functionality, add test, and fixes json strings Nov 17, 2018
@JoshuaCarter JoshuaCarter merged commit ad801e1 into symbiote:1.2 Nov 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants