public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Single variable for traits and enums

pull/3831/head
Fred Emmott 2015-03-09 10:05:12 -07:00
parent cb1ea889d6
commit bdf51ab16d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Composer/Autoload/ClassMapGenerator.php
View File

@ -112,10 +112,9 @@ class ClassMapGenerator
*/ */
private static function findClasses($path) private static function findClasses($path)
{ {
$traits = version_compare(PHP_VERSION, '5.4', '<') ? '' : '|trait'; $extraTypes = version_compare(PHP_VERSION, '5.4', '<') ? '' : '|trait';
$enums = '';
if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.3', '>=')) { if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.3', '>=')) {
$enums = '|enum'; $extraTypes .= '|enum';
} }
try { try {
@ -133,7 +132,7 @@ class ClassMapGenerator
} }
// return early if there is no chance of matching anything in this file // return early if there is no chance of matching anything in this file
if (!preg_match('{\b(?:class|interface'.$traits.$enums.')\s}i', $contents)) { if (!preg_match('{\b(?:class|interface'.$extraTypes.')\s}i', $contents)) {
return array(); return array();
} }
@ -158,7 +157,7 @@ class ClassMapGenerator
preg_match_all('{ preg_match_all('{
(?: (?:
\b(?<![\$:>])(?P<type>class|interface'.$traits.$enums.') \s+ (?P<name>[a-zA-Z_\x7f-\xff:][a-zA-Z0-9_\x7f-\xff:\-]*) \b(?<![\$:>])(?P<type>class|interface'.$extraTypes.') \s+ (?P<name>[a-zA-Z_\x7f-\xff:][a-zA-Z0-9_\x7f-\xff:\-]*)
| \b(?<![\$:>])(?P<ns>namespace) (?P<nsname>\s+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(?:\s*\\\\\s*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*)? \s*[\{;] | \b(?<![\$:>])(?P<ns>namespace) (?P<nsname>\s+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(?:\s*\\\\\s*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*)? \s*[\{;]
) )
}ix', $contents, $matches); }ix', $contents, $matches);