Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
Merge pull request #47 from aik099/scrutinizer-patch-1

Scrutinizer Auto-Fixes
Removing code to work with both 1.x and 2.x versions of PHP_CodeSniffer

- also increasing test coverage
Merge pull request #51 from aik099/49-drop-phpcs-15-support

Removing code to work with both 1.x and 2.x versions of PHP_CodeSniffer
Merge branch 'master' into in-portal

* master:
  Removing code to work with both 1.x and 2.x versions of PHP_CodeSniffer
  Scrutinizer Auto-Fixes