tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1280 from silverstripe-rebelalliance/feature/config

Browse Source 
FIX Parsing heredoc, nowdoc & comments in ConfigStaticManifest
This commit is contained in:
Sam Minnée 2013-03-12 16:45:11 -07:00
commit 8b2a911c80
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/manifest/ConfigStaticManifest.php
View File

@ -268,6 +268,9 @@ class SS_ConfigStaticManifest_Parser {
else if($type == ';' || $type == ',' || $type == '=') { else if($type == ';' || $type == ',' || $type == '=') {
break; break;
} }
else if($type == T_COMMENT || $type == T_DOC_COMMENT) {
// NOP
}
else { else {
user_error('Unexpected token when building static manifest: '.print_r($token, true), E_USER_ERROR); user_error('Unexpected token when building static manifest: '.print_r($token, true), E_USER_ERROR);
} }
@ -315,9 +318,17 @@ class SS_ConfigStaticManifest_Parser {
$this->statics[$class] = array(); $this->statics[$class] = array();
} }
$value = trim($value);
if ($value) {
$value = eval('static $temp = '.$value.";\n".'return $temp'.";\n");
}
else {
$value = null;
}
$this->statics[$class][$variable] = array( $this->statics[$class][$variable] = array(
'access' => $access, 'access' => $access,
'value' => eval('return '.$value.';') 'value' => $value
); );
if($token == ',') $this->parseStatic($access, $class); if($token == ',') $this->parseStatic($access, $class);

45
tests/core/manifest/ConfigStaticManifestTest.php
View File

@ -20,9 +20,20 @@ class ConfigStaticManifestTest extends SapphireTest {
static $sfloat = 2.5; static $sfloat = 2.5;
static $sstring = 'string'; static $sstring = 'string';
static $sarray = array(1, 2, array(3, 4), 5); static $sarray = array(1, 2, array(3, 4), 5);
static $sheredoc = <<<DOC
heredoc
DOC;
static $snowdoc = <<<'DOC'
nowdoc
DOC;
// Assigning multiple values // Assigning multiple values
static $onone, $onull = null, $oint = 1, $ofloat = 2.5, $ostring = 'string', $oarray = array(1, 2, array(3, 4), 5); static $onone, $onull = null, $oint = 1, $ofloat = 2.5, $ostring = 'string', $oarray = array(1, 2, array(3, 4), 5), $oheredoc = <<<DOC
heredoc
DOC
, $onowdoc = <<<'DOC'
nowdoc
DOC;
static static
$mnone, $mnone,
@ -34,7 +45,25 @@ class ConfigStaticManifestTest extends SapphireTest {
1, 2, 1, 2,
array(3, 4), array(3, 4),
5 5
); ),
$mheredoc = <<<DOC
heredoc
DOC
,
$mnowdoc = <<<'DOC'
nowdoc
DOC;
static /* Has comment inline */ $commented_int = 1, /* And here */ $commented_string = 'string';
static
/**
* Has docblock inline
*/
$docblocked_int = 1,
/** And here */
$docblocked_string = 'string';
// Should ignore static methpds // Should ignore static methpds
static function static_method() {} static function static_method() {}
@ -90,6 +119,8 @@ class ConfigStaticManifestTest extends SapphireTest {
'float', 'float',
'string', 'string',
'array', 'array',
'heredoc',
'nowdoc'
); );
$prepends = array( $prepends = array(
@ -111,6 +142,16 @@ class ConfigStaticManifestTest extends SapphireTest {
} }
} }
public function testIgnoreComments() {
$statics = $this->parseSelf()->getStatics();
$this->assertEquals(self::$commented_int, $statics[__CLASS__]['commented_int']['value']);
$this->assertEquals(self::$commented_string, $statics[__CLASS__]['commented_string']['value']);
$this->assertEquals(self::$docblocked_int, $statics[__CLASS__]['docblocked_int']['value']);
$this->assertEquals(self::$docblocked_string, $statics[__CLASS__]['docblocked_string']['value']);
}
public function testIgnoresMethodStatics() { public function testIgnoresMethodStatics() {
$statics = $this->parseSelf()->getStatics(); $statics = $this->parseSelf()->getStatics();
$this->assertNull(@$statics[__CLASS__]['method_static']); $this->assertNull(@$statics[__CLASS__]['method_static']);