Added more guard code for syntax errors. Further fix for #316.
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
	CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php