Issue #2364775 by sanchiz: Fix notices from CodeSniffer.