Merge branch 'master' into 3.0

Author: gsherwood

src/Tokenizers/PHP.php

@@ -864,6 +864,7 @@ protected function tokenize($string)
                 && $token[0] === T_STRING
                 && strtolower($token[1]) === 'trait'
                 && $tokens[($stackPtr - 1)][0] !== T_OBJECT_OPERATOR
+                && $tokens[($stackPtr - 1)][0] !== T_PAAMAYIM_NEKUDOTAYIM
             ) {
                 $finalTokens[$newStackPtr] = array(
                                               'content' => $token[1],