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

Merge pull request #3831 from fredemmott/autoload-hack-enums 

Add support for using classmap to autoload Hack enums
pull/3840/head
Jordi Boggiano 2015-03-09 23:06:06 +00:00
parent b296e654eb 23d5e30fbc
commit d571874461
5 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,10 @@ 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';
if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.3', '>=')) {
$extraTypes .= '|enum';
}
try { try {
$contents = @php_strip_whitespace($path); $contents = @php_strip_whitespace($path);
@ -129,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.')\s}i', $contents)) { if (!preg_match('{\b(?:class|interface'.$extraTypes.')\s}i', $contents)) {
return array(); return array();
} }
@ -154,7 +157,7 @@ class ClassMapGenerator
preg_match_all('{ preg_match_all('{
(?: (?:
\b(?<![\$:>])(?P<type>class|interface'.$traits.') \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);
@ -170,6 +173,12 @@ class ClassMapGenerator
if ($name[0] === ':') { if ($name[0] === ':') {
// This is an XHP class, https://github.com/facebook/xhp // This is an XHP class, https://github.com/facebook/xhp
$name = 'xhp'.substr(str_replace(array('-', ':'), array('_', '__'), $name), 1); $name = 'xhp'.substr(str_replace(array('-', ':'), array('_', '__'), $name), 1);
} else if ($matches['type'][$i] === 'enum') {
// In Hack, something like:
// enum Foo: int { HERP = '123'; }
// The regex above captures the colon, which isn't part of
// the class name.
$name = rtrim($name, ':');
} }
$classes[] = ltrim($namespace . $name, '\\'); $classes[] = ltrim($namespace . $name, '\\');
} }

7
tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
View File

@ -74,6 +74,13 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
'Foo\\CBar' => __DIR__.'/Fixtures/php5.4/traits.php', 'Foo\\CBar' => __DIR__.'/Fixtures/php5.4/traits.php',
)); ));
} }
if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.3', '>=')) {
$data[] = array(__DIR__.'/Fixtures/hhvm3.3', array(
'FooEnum' => __DIR__.'/Fixtures/hhvm3.3/HackEnum.php',
'Foo\BarEnum' => __DIR__.'/Fixtures/hhvm3.3/NamespacedHackEnum.php',
'GenericsClass' => __DIR__.'/Fixtures/hhvm3.3/Generics.php',
));
}
return $data; return $data;
} }

4
tests/Composer/Test/Autoload/Fixtures/hhvm3.3/Generics.php Normal file
View File

@ -0,0 +1,4 @@
<?hh
class GenericsClass<Tk, Tv> {
}

6
tests/Composer/Test/Autoload/Fixtures/hhvm3.3/HackEnum.php Normal file
View File

@ -0,0 +1,6 @@
<?hh
enum FooEnum: int {
HERP = 1;
DERP = 2;
}

7
tests/Composer/Test/Autoload/Fixtures/hhvm3.3/NamespacedHackEnum.php Normal file
View File

@ -0,0 +1,7 @@
<?hh
namespace Foo;
enum BarEnum: string {
HERP = 'DERP';
}