Merge branch 'master' into phpcs-fixer

Author: gsherwood

CodeSniffer/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php

@@ -48,12 +48,6 @@ public function getErrorList()
                    6 => 1,
                   );
 
-        // The trait insteadof test will only work in PHP versions where traits exist
-        // and will throw errors in earlier versions.
-        if (version_compare(PHP_VERSION, '5.4.0') < 0) {
-            $errors[46] = 2;
-        }
-
         return $errors;
 
     }//end getErrorList()