Fixed bug #303 : Open and close tag on same line can cause a PHP notice checking scope indent
Merge remote-tracking branch 'source/phpcs-fixer' into phpcs-fixer

* source/phpcs-fixer:
  Fixed bug #303 : Open and close tag on same line can cause a PHP notice checking scope indent