Issue #2249723 by andrei.dincu: Upgrade to PSR-4