Some PSR coding standards fixes and Entity date types fixes