tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-30 00:19:25 +02:00
Code Issues Projects Releases Wiki Activity

FIX Comments ignored by classmanifest (#6619)

Browse Source
This commit is contained in:
Daniel Hensby 2017-02-14 21:46:04 +00:00 committed by Sam Minnée
parent 86a590fc9d
commit 7122e1fde7
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/manifest/ClassManifest.php
View File

@ -61,16 +61,16 @@ class SS_ClassManifest {
public static function get_namespaced_class_parser() { public static function get_namespaced_class_parser() {
return new TokenisedRegularExpression(array( return new TokenisedRegularExpression(array(
0 => T_CLASS, 0 => T_CLASS,
1 => T_WHITESPACE, 1 => array(T_WHITESPACE, 'optional' => true),
2 => array(T_STRING, 'can_jump_to' => array(8, 16), 'save_to' => 'className'), 2 => array(T_STRING, 'can_jump_to' => array(8, 16), 'save_to' => 'className'),
3 => T_WHITESPACE, 3 => array(T_WHITESPACE, 'optional' => true),
4 => T_EXTENDS, 4 => T_EXTENDS,
5 => T_WHITESPACE, 5 => array(T_WHITESPACE, 'optional' => true),
6 => array(T_NS_SEPARATOR, 'save_to' => 'extends[]', 'optional' => true), 6 => array(T_NS_SEPARATOR, 'save_to' => 'extends[]', 'optional' => true),
7 => array(T_STRING, 'save_to' => 'extends[]', 'can_jump_to' => array(6, 16)), 7 => array(T_STRING, 'save_to' => 'extends[]', 'can_jump_to' => array(6, 16)),
8 => T_WHITESPACE, 8 => array(T_WHITESPACE, 'optional' => true),
9 => T_IMPLEMENTS, 9 => T_IMPLEMENTS,
10 => T_WHITESPACE, 10 => array(T_WHITESPACE, 'optional' => true),
11 => array(T_NS_SEPARATOR, 'save_to' => 'interfaces[]', 'optional' => true), 11 => array(T_NS_SEPARATOR, 'save_to' => 'interfaces[]', 'optional' => true),
12 => array(T_STRING, 'can_jump_to' => array(11, 16), 'save_to' => 'interfaces[]'), 12 => array(T_STRING, 'can_jump_to' => array(11, 16), 'save_to' => 'interfaces[]'),
13 => array(T_WHITESPACE, 'optional' => true), 13 => array(T_WHITESPACE, 'optional' => true),
@ -87,7 +87,7 @@ class SS_ClassManifest {
public static function get_namespace_parser() { public static function get_namespace_parser() {
return new TokenisedRegularExpression(array( return new TokenisedRegularExpression(array(
0 => T_NAMESPACE, 0 => T_NAMESPACE,
1 => T_WHITESPACE, 1 => array(T_WHITESPACE, 'optional' => true),
2 => array(T_NS_SEPARATOR, 'save_to' => 'namespaceName[]', 'optional' => true), 2 => array(T_NS_SEPARATOR, 'save_to' => 'namespaceName[]', 'optional' => true),
3 => array(T_STRING, 'save_to' => 'namespaceName[]', 'can_jump_to' => 2), 3 => array(T_STRING, 'save_to' => 'namespaceName[]', 'can_jump_to' => 2),
4 => array(T_WHITESPACE, 'optional' => true), 4 => array(T_WHITESPACE, 'optional' => true),
@ -101,7 +101,7 @@ class SS_ClassManifest {
public static function get_interface_parser() { public static function get_interface_parser() {
return new TokenisedRegularExpression(array( return new TokenisedRegularExpression(array(
0 => T_INTERFACE, 0 => T_INTERFACE,
1 => T_WHITESPACE, 1 => array(T_WHITESPACE, 'optional' => true),
2 => array(T_STRING, 'save_to' => 'interfaceName') 2 => array(T_STRING, 'save_to' => 'interfaceName')
)); ));
} }
@ -119,7 +119,7 @@ class SS_ClassManifest {
public static function get_imported_namespace_parser() { public static function get_imported_namespace_parser() {
return new TokenisedRegularExpression(array( return new TokenisedRegularExpression(array(
0 => T_USE, 0 => T_USE,
1 => T_WHITESPACE, 1 => array(T_WHITESPACE, 'optional' => true),
2 => array(T_NS_SEPARATOR, 'save_to' => 'importString[]', 'optional' => true), 2 => array(T_NS_SEPARATOR, 'save_to' => 'importString[]', 'optional' => true),
3 => array(T_STRING, 'save_to' => 'importString[]', 'can_jump_to' => array(2, 8)), 3 => array(T_STRING, 'save_to' => 'importString[]', 'can_jump_to' => array(2, 8)),
4 => array(T_WHITESPACE, 'save_to' => 'importString[]'), 4 => array(T_WHITESPACE, 'save_to' => 'importString[]'),

3
core/manifest/TokenisedRegularExpression.php
View File

@ -102,6 +102,9 @@ class TokenisedRegularExpression {
} }
else return true; else return true;
} }
else if (in_array($tokens[$tokenPos][0], array(T_COMMENT, T_DOC_COMMENT, T_WHITESPACE))) {
return $this->matchFrom($tokenPos + 1, $expressionPos, $tokens, $matches);
}
return false; return false;

3
tests/core/manifest/ClassManifestTest.php
View File

@ -41,6 +41,7 @@ class ClassManifestTest extends SapphireTest {
'classb' => "{$this->base}/module/classes/ClassB.php", 'classb' => "{$this->base}/module/classes/ClassB.php",
'classc' => "{$this->base}/module/classes/ClassC.php", 'classc' => "{$this->base}/module/classes/ClassC.php",
'classd' => "{$this->base}/module/classes/ClassD.php", 'classd' => "{$this->base}/module/classes/ClassD.php",
'classe' => "{$this->base}/module/classes/ClassE.php",
'sstemplateparser' => FRAMEWORK_PATH."/view/SSTemplateParser.php", 'sstemplateparser' => FRAMEWORK_PATH."/view/SSTemplateParser.php",
'sstemplateparseexception' => FRAMEWORK_PATH."/view/SSTemplateParser.php" 'sstemplateparseexception' => FRAMEWORK_PATH."/view/SSTemplateParser.php"
); );
@ -49,7 +50,7 @@ class ClassManifestTest extends SapphireTest {
public function testGetClassNames() { public function testGetClassNames() {
$this->assertEquals( $this->assertEquals(
array('sstemplateparser', 'sstemplateparseexception', 'classa', 'classb', 'classc', 'classd'), array('sstemplateparser', 'sstemplateparseexception', 'classa', 'classb', 'classc', 'classd', 'classe'),
$this->manifest->getClassNames()); $this->manifest->getClassNames());
} }

8
tests/core/manifest/fixtures/classmanifest/module/classes/ClassE.php Normal file
View File

@ -0,0 +1,8 @@
<?php
/**
* @ignore
*/
class/* */ClassE /** */ //test
{
}