3.0 standards

PR as discussed in https://github.com/cakephp/cakephp/issues/3307