Also remove need to manually indent INFINITE_LOOP_TRAP. This is a breaking change for Python users of this property. However, very few users of this property exist, given that the existing code breaks if the block ID has a $ in it (also fixed in this PR).
* fix indentation for the return statement in function blocks that return a value
* Fix hard-coded autoindent, and swap it for Blockly.PHP.INDENT
* Fix hard-coded 2 spaces indent and use language-appropriate global indent