refactor for PHP-7.2