Unifiy function and method lexer definitions.#7154

Crell wants to merge 2 commits intophp:masterphp/php-src:masterfrom

Crell:func-method-lexerCrell/php-src:func-method-lexerCopy head branch name to clipboard