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

BUGFIX #5337: Allow decoration of DataObject

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102081 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-04-05 23:33:53 +00:00
parent 6db693a09e
commit 20a61098c6
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Object.php
View File

@ -640,7 +640,7 @@ abstract class Object {
$this->class = get_class($this); $this->class = get_class($this);
// Don't bother checking some classes that should never be extended // Don't bother checking some classes that should never be extended
static $notExtendable = array('Object', 'ViewableData', 'DataObject', 'RequestHandler'); static $notExtendable = array('Object', 'ViewableData', 'RequestHandler');
if($extensionClasses = ClassInfo::ancestry($this->class)) foreach($extensionClasses as $class) { if($extensionClasses = ClassInfo::ancestry($this->class)) foreach($extensionClasses as $class) {
if(in_array($class, $notExtendable)) continue; if(in_array($class, $notExtendable)) continue;

4
core/model/DataObject.php
View File

@ -455,8 +455,6 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* Called by Object::__construct() once per class. * Called by Object::__construct() once per class.
*/ */
function defineMethods() { function defineMethods() {
if($this->class == 'DataObject') return;
parent::defineMethods(); parent::defineMethods();
// Define the extra db fields - this is only necessary for extensions added in the // Define the extra db fields - this is only necessary for extensions added in the
@ -470,6 +468,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
} }
} }
if($this->class == 'DataObject') return;
// Set up accessors for joined items // Set up accessors for joined items
if($manyMany = $this->many_many()) { if($manyMany = $this->many_many()) {
foreach($manyMany as $relationship => $class) { foreach($manyMany as $relationship => $class) {

21
tests/DataObjectDecoratorTest.php
View File

@ -10,6 +10,10 @@ class DataObjectDecoratorTest extends SapphireTest {
'DataObjectDecoratorTest_MyObject', 'DataObjectDecoratorTest_MyObject',
); );
protected $requiredExtensions = array(
'DataObject' => array( 'DataObjectDecoratorTest_AppliedToDO' ),
);
function testOneToManyAssociationWithDecorator() { function testOneToManyAssociationWithDecorator() {
// Fails in RestfulServerTest // Fails in RestfulServerTest
// Error: Object::__call() Method 'RelatedObjects' not found in class 'RestfulServerTest_Comment' // Error: Object::__call() Method 'RelatedObjects' not found in class 'RestfulServerTest_Comment'
@ -141,6 +145,17 @@ class DataObjectDecoratorTest extends SapphireTest {
$this->assertNotNull($member->dbObject('Website')); $this->assertNotNull($member->dbObject('Website'));
$this->assertType('Varchar', $member->dbObject('Website')); $this->assertType('Varchar', $member->dbObject('Website'));
} }
function testDecoratorCanBeAppliedToDataObject() {
$do = new DataObject();
$mo = new DataObjectDecoratorTest_MyObject();
$this->assertTrue($do->hasMethod('testMethodApplied'));
$this->assertTrue($mo->hasMethod('testMethodApplied'));
$this->assertEquals("hello world", $mo->testMethodApplied());
$this->assertEquals("hello world", $do->testMethodApplied());
}
} }
class DataObjectDecoratorTest_Member extends DataObject implements TestOnly { class DataObjectDecoratorTest_Member extends DataObject implements TestOnly {
@ -287,6 +302,12 @@ class DataObjectDecoratorTest_Faves extends DataObjectDecorator implements TestO
} }
} }
class DataObjectDecoratorTest_AppliedToDO extends DataObjectDecorator implements TestOnly {
public function testMethodApplied() {
return "hello world";
}
}
DataObject::add_extension('DataObjectDecoratorTest_MyObject', 'DataObjectDecoratorTest_Ext1'); DataObject::add_extension('DataObjectDecoratorTest_MyObject', 'DataObjectDecoratorTest_Ext1');
DataObject::add_extension('DataObjectDecoratorTest_MyObject', 'DataObjectDecoratorTest_Ext2'); DataObject::add_extension('DataObjectDecoratorTest_MyObject', 'DataObjectDecoratorTest_Ext2');
DataObject::add_extension('DataObjectDecoratorTest_MyObject', 'DataObjectDecoratorTest_Faves'); DataObject::add_extension('DataObjectDecoratorTest_MyObject', 'DataObjectDecoratorTest_Faves');