PSR-2 fixes and make sure we check both $_SERVER and $_POST in the dispatch.php