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

Merge pull request #2945 from fabpot/classmap-hotfix 

fixed class map generator when using a heredoc with spaces
pull/2948/head
Jordi Boggiano 2014-04-28 17:57:52 +02:00
parent 0f9bda3e37 12421dd6b7
commit 29c39cc266
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@ class ClassMapGenerator
} }
// strip heredocs/nowdocs // strip heredocs/nowdocs
$contents = preg_replace('{<<<\'?(\w+)\'?(?:\r\n|\n|\r)(?:.*?)(?:\r\n|\n|\r)\\1(?=\r\n|\n|\r|;)}s', 'null', $contents); $contents = preg_replace('{<<<\s*(\'?)(\w+)\\1(?:\r\n|\n|\r)(?:.*?)(?:\r\n|\n|\r)\\2(?=\r\n|\n|\r|;)}s', 'null', $contents);
// strip strings // strip strings
$contents = preg_replace('{"[^"\\\\]*(\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(\\\\.[^\'\\\\]*)*\'}s', 'null', $contents); $contents = preg_replace('{"[^"\\\\]*(\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(\\\\.[^\'\\\\]*)*\'}s', 'null', $contents);
// strip leading non-php code if needed // strip leading non-php code if needed

22
tests/Composer/Test/Autoload/Fixtures/classmap/StripNoise.php
View File

@ -15,12 +15,30 @@ class Fail2
} }
A A
. <<<'TEST' . <<< AB
class Fail3 class Fail3
{ {
} }
TEST; AB
. <<<'TEST'
class Fail4
{
}
TEST
. <<< 'ANOTHER'
class Fail5
{
}
ANOTHER
. <<< 'ONEMORE'
class Fail6
{
}
ONEMORE;
} }
public function test2() public function test2()