Remove unused parameter

This isn't used, or did you want to do `$this->getRuleset($ruleset)` instead?
Update ValidatingInterface.php
Fix merge conflicts