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

API CHANGE: Remove ArrayData::forTemplate(), because it has little usefulness corrupts ViewableData customisation.

This commit is contained in:
Dominik Beerbohm 2012-02-09 19:57:27 +01:00 committed by Sam Minnee
parent dc439ed0e2
commit edf6cd6d83
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/core/ArrayDataTest.php
View File

@ -62,11 +62,6 @@ class ArrayDataTest extends SapphireTest {
// $arrayData = new ArrayData($array);
}
function testForTemplateWorks() {
$arrayData = new ArrayData(array('b' => 'bunny'));
$this->assertEquals("array (\n 'b' => 'bunny',\n)", $arrayData->forTemplate());
}
function testSetField() {
$arrayData = new ArrayData(array());

21
tests/view/ViewableDataTest.php
View File

@ -55,22 +55,28 @@ class ViewableDataTest extends SapphireTest {
$this->assertEquals('test', $viewableData->XML_val('test'));
$this->assertEquals('casted', $viewableData->XML_val('alwaysCasted'));
$this->assertEquals('overwritten', $newViewableData->XML_val('test'));
$this->assertEquals('overwritten', $newViewableData->XML_val('alwaysCasted'));
$this->assertEquals('castable', $viewableData->forTemplate());
$this->assertEquals('castable', $newViewableData->forTemplate());
}
public function testObjectCustomise() {
$viewableData = new ViewableDataTest_Castable();
$newViewableData = $viewableData->customise(new ViewableDataTest_RequiresCasting());
$this->assertEquals('test', $viewableData->XML_val('test'));
$this->assertEquals('casted', $viewableData->XML_val('alwaysCasted'));
$this->assertEquals('overwritten', $newViewableData->XML_val('test'));
$this->assertEquals('casted', $newViewableData->XML_val('alwaysCasted'));
$this->assertEquals('castable', $viewableData->forTemplate());
$this->assertEquals('casted', $newViewableData->forTemplate());
}
public function testRAWVal() {
$data = new ViewableDataTest_Castable();
$data->test = 'This & This';
@ -161,7 +167,10 @@ class ViewableDataTest_Castable extends ViewableData {
public function castedUnsafeXML() {
return $this->unsafeXML();
}
public function forTemplate() {
return 'castable';
}
}
class ViewableDataTest_RequiresCasting extends ViewableData {

7
view/ArrayData.php
View File

@ -101,13 +101,6 @@ class ArrayData extends ViewableData {
return $obj;
}
/**
* This is pretty crude, but it helps diagnose error situations
*/
function forTemplate() {
return var_export($this->array, true);
}
/**
* @deprecated 3.0 Use {@link ArrayData::toMap()}.
*/