Clean up code style, ArrayAccess test.

See #178
This commit is contained in:
Justin Hileman
2013-12-06 19:45:20 -08:00
parent 0c85d19509
commit 04b016016e
2 changed files with 29 additions and 11 deletions
+1
View File
@@ -149,6 +149,7 @@ class Mustache_Context
return $stack[$i][$id];
}
}
return '';
}
}
+26 -9
View File
@@ -71,8 +71,6 @@ class Mustache_Test_ContextTest extends PHPUnit_Framework_TestCase
$string = 'some arbitrary string';
$access = new Mustache_Test_TestArrayAccess($arr);
$context->push($dummy);
$this->assertEquals('dummy', $context->find('name'));
@@ -97,8 +95,16 @@ class Mustache_Test_ContextTest extends PHPUnit_Framework_TestCase
$this->assertEquals('see', $context->findDot('a.b.c'));
$this->assertEquals('<foo>', $context->find('foo'));
$this->assertEquals('<bar>', $context->findDot('bar'));
}
$context = new Mustache_Context($arr);
public function testArrayAccessFind()
{
$access = new Mustache_Test_TestArrayAccess(array(
'a' => array('b' => array('c' => 'see')),
'b' => 'bee',
));
$context = new Mustache_Context($access);
$this->assertEquals('bee', $context->find('b'));
$this->assertEquals('see', $context->findDot('a.b.c'));
$this->assertEquals(null, $context->findDot('a.b.c.d'));
@@ -125,27 +131,38 @@ class Mustache_Test_TestDummy
}
}
class Mustache_Test_TestArrayAccess implements arrayaccess {
class Mustache_Test_TestArrayAccess implements ArrayAccess
{
private $container = array();
public function __construct($array) {
public function __construct($array)
{
foreach ($array as $key => $value) {
$this->container[$key] = $value;
}
}
public function offsetSet($offset, $value) {
public function offsetSet($offset, $value)
{
if (is_null($offset)) {
$this->container[] = $value;
} else {
$this->container[$offset] = $value;
}
}
public function offsetExists($offset) {
public function offsetExists($offset)
{
return isset($this->container[$offset]);
}
public function offsetUnset($offset) {
public function offsetUnset($offset)
{
unset($this->container[$offset]);
}
public function offsetGet($offset) {
public function offsetGet($offset)
{
return isset($this->container[$offset]) ? $this->container[$offset] : null;
}
}