tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #146 from simonwelsh/namespace-manifest 

BUGFIX Namespaced classes were always having their namespace prepended t...
This commit is contained in:
Sam Minnée 2012-01-06 15:58:46 -08:00
parent c6e1937021 f7516481b1
commit 2c770a6f8f
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/manifest/ClassManifest.php
View File

@ -354,7 +354,7 @@ class SS_ClassManifest {
$extends = isset($class['extends']) ? implode('', $class['extends']) : null;
$implements = isset($class['interfaces']) ? $class['interfaces'] : null;
if($extends && $extends[0] != '/\\') {
if($extends && $extends[0] != '\\') {
$extends = $namespace . $extends;
} elseif($extends) {
$extends = substr($extends, 1);

11
model/Aggregate.php
View File

@ -48,9 +48,12 @@ class Aggregate extends ViewableData {
if (!$class || $class == 'DataObject') {
$cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, array('aggregate'));
}
else {
$cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, ClassInfo::ancestry($class));
} else {
$tags = ClassInfo::ancestry($class);
foreach($tags as &$tag) {
$tag = preg_replace('/[^a-zA-Z0-9_]/', '_', $tag);
}
$cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, $tags);
}
}
@ -108,7 +111,7 @@ class Aggregate extends ViewableData {
if (!($result = $cache->load($cachekey))) {
$result = (string)$query->execute()->value(); if (!$result) $result = '0';
$cache->save($result, null, array('aggregate', $this->type));
$cache->save($result, null, array('aggregate', preg_replace('/[^a-zA-Z0-9_]/', '_', $this->type)));
}
return $result;

11
tests/core/manifest/NamespacedClassManifestTest.php
View File

@ -44,7 +44,8 @@ class NamespacedClassManifestTest extends SapphireTest {
'sapphire\test\classd' => "{$this->base}/module/classes/ClassD.php",
'sapphire\test\classe' => "{$this->base}/module/classes/ClassE.php",
'sapphire\test\classf' => "{$this->base}/module/classes/ClassF.php",
'sapphire\test\classg' => "{$this->base}/module/classes/ClassG.php"
'sapphire\test\classg' => "{$this->base}/module/classes/ClassG.php",
'sapphire\test\classh' => "{$this->base}/module/classes/ClassH.php"
);
$this->assertEquals($expect, $this->manifest->getClasses());
@ -52,13 +53,13 @@ class NamespacedClassManifestTest extends SapphireTest {
public function testGetClassNames() {
$this->assertEquals(
array('sapphire\test\classa', 'sapphire\test\classb', 'sapphire\test\classc', 'sapphire\test\classd', 'sapphire\test\classe', 'sapphire\test\classf', 'sapphire\test\classg'),
array('sapphire\test\classa', 'sapphire\test\classb', 'sapphire\test\classc', 'sapphire\test\classd', 'sapphire\test\classe', 'sapphire\test\classf', 'sapphire\test\classg', 'sapphire\test\classh'),
$this->manifest->getClassNames());
}
public function testGetDescendants() {
$expect = array(
'sapphire\test\classa' => array('sapphire\test\ClassB')
'sapphire\test\classa' => array('sapphire\test\ClassB', 'sapphire\test\ClassH'),
);
$this->assertEquals($expect, $this->manifest->getDescendants());
@ -66,8 +67,8 @@ class NamespacedClassManifestTest extends SapphireTest {
public function testGetDescendantsOf() {
$expect = array(
'SAPPHIRE\TEST\CLASSA' => array('sapphire\test\ClassB'),
'sapphire\test\classa' => array('sapphire\test\ClassB'),
'SAPPHIRE\TEST\CLASSA' => array('sapphire\test\ClassB', 'sapphire\test\ClassH'),
'sapphire\test\classa' => array('sapphire\test\ClassB', 'sapphire\test\ClassH'),
);
foreach ($expect as $class => $desc) {

8
tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassH.php Normal file
View File

@ -0,0 +1,8 @@
<?php
/**
* @ignore
*/
namespace sapphire\test;
class ClassH extends \sapphire\test\ClassA { }

1
view/SSTemplateParser.php.inc
View File

@ -490,6 +490,7 @@ class SSTemplateParser extends Parser {
$block = ++$res['subblocks'];
// Build the key for this block from the passed cache key, the block index, and the sha hash of the template itself
$key = "'" . sha1($sub['php']) . (isset($res['key']) && $res['key'] ? "_'.sha1(".$res['key'].")" : "'") . ".'_$block'";
$key = preg_replace('/[^a-zA-Z0-9_]/', '_', $key);
// Get any condition
$condition = isset($res['condition']) ? $res['condition'] : '';