Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/HelperLocatorFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ public function __construct($encoding = null, $flags = null)
* @return HelperLocator
*
*/
public function newInstance()
public function newInstance(array $helpers = array(), array $input_helpers = array())
{
$escaper = $this->escaper;
$input = $this->newInputInstance();
return new HelperLocator(array(
$input = $this->newInputInstance($input_helpers);
return new HelperLocator(array_replace(array(
'a' => function () use ($escaper) { return new Helper\Anchor($escaper); },
'anchor' => function () use ($escaper) { return new Helper\Anchor($escaper); },
'aRaw' => function () use ($escaper) { return new Helper\AnchorRaw($escaper); },
Expand All @@ -82,7 +82,7 @@ public function newInstance()
'title' => function () use ($escaper) { return new Helper\Title($escaper); },
'ul' => function () use ($escaper) { return new Helper\Ul($escaper); },
'void' => function () use ($escaper) { return new Helper\VoidTag($escaper); }
));
), $helpers));
}

/**
Expand All @@ -92,10 +92,10 @@ public function newInstance()
* @return Helper\Input
*
*/
public function newInputInstance()
public function newInputInstance(array $helpers = array())
{
$escaper = $this->escaper;
return new Helper\Input(array(
return new Helper\Input(array_replace(array(
'button' => function () use ($escaper) { return new Helper\Input\Generic($escaper); },
'checkbox' => function () use ($escaper) { return new Helper\Input\Checkbox($escaper); },
'color' => function () use ($escaper) { return new Helper\Input\Generic($escaper); },
Expand All @@ -121,6 +121,6 @@ public function newInputInstance()
'time' => function () use ($escaper) { return new Helper\Input\Generic($escaper); },
'url' => function () use ($escaper) { return new Helper\Input\Generic($escaper); },
'week' => function () use ($escaper) { return new Helper\Input\Generic($escaper); },
));
), $helpers));
}
}
21 changes: 21 additions & 0 deletions tests/HelperLocatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,25 @@ public function test()
$this->setExpectedException('Aura\Html\Exception\HelperNotFound');
$this->helper_locator->get('noSuchHelper');
}

public function testFactoryAddHelpers()
{
$factory = new HelperLocatorFactory;
$override = array('a' => function () {
return new Helper\MockHelper;
});
$helpers = $factory->newInstance($override);
$expect = 'Aura\Html\Helper\MockHelper';
$actual = $helpers->get('a');
$this->assertInstanceOf($expect, $actual);


$additional = array('mockHelper' => function () {
return new Helper\MockHelper;
});
$helpers = $factory->newInstance($additional);
$expect = 'Aura\Html\Helper\MockHelper';
$actual = $helpers->get('mockHelper');
$this->assertInstanceOf($expect, $actual);
}
}