Switch statement order
Fix PHP error

Was calling function statically, so need to make method static