Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/2957'
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#2957
  • Loading branch information
@weierophinney
weierophinney committed Nov 19, 2012
88 parents d28282e + ac4b6c0 + a19a8c2 + 188fa4d + a41bbf0 + a29bbbc + 941280d + d691226 + e547023 + d91c234 + 006ef75 + 69d1518 + 7dc0d1a + a995715 + e780008 + e810876 + 9e4090a + 269bf01 + 3a1f2fd + 0cab32d + 704cc7f + e20c9e6 + a0dfc1a + 76b3e1c + fd429e8 + 187ea79 + 2b43ea6 + e3b1be1 + 19f0ef6 + 33bf9c0 + 3729984 + a5ce396 + 698dbe0 + 0efca0b + 08b2a78 + ddaa846 + 7fe4493 + 0da7331 + 7226b1d + 851904c + a2eb795 + f658a03 + de83270 + 806df8a + 4e7ff23 + 409b768 + 1b97191 + d2649e3 + f0162d1 + 6f01416 + a2b3753 + 1786961 + d157fcb + 4444c37 + 192d20c + 811122b + 3a2cf9b + eb2029b + 7a6edab + 8d8a05d + c1ddf21 + 0090b4d + ef80e35 + 59b30de + 4656098 + 377b920 + ccba82c + 5d2770e + 41714a1 + 8adef43 + a78628f + b35fa7a + 3953c79 + aa28e42 + 38f9a49 + 47ed633 + 0a6bf6e + b61d89d + a1fbb6f + 238512b + f40a328 + 62dc143 + 328df3b + e12fe2d + e34a942 + 04e956d + 0ebadc5 + 3c86a67 commit 32cf329
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 142 deletions.
66 changes: 23 additions & 43 deletions src/Helper/Partial.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@

namespace Zend\View\Helper;

use Traversable;
use Zend\View\Exception;
use Zend\View\Model\ModelInterface;

/**
* Helper for rendering a template fragment in its own variable scope.
Expand All @@ -28,61 +30,39 @@ class Partial extends AbstractHelper

/**
* Renders a template fragment within a variable scope distinct from the
* calling View object.
* calling View object. It proxies to view's render function
*
* If no arguments are passed, returns the helper instance.
*
* If the $model is an array, it is passed to the view object's assign()
* method.
*
* If the $model is an object, it first checks to see if the object
* implements a 'toArray' method; if so, it passes the result of that
* method to to the view object's assign() method. Otherwise, the result of
* get_object_vars() is passed.
*
* @param string $name Name of view script
* @param array $model Variables to populate in the view
* @param string|ModelInterface $name Name of view script, or a view model
* @param array|object $values Variables to populate in the view
* @return string|Partial
* @throws Exception\RuntimeException
*/
public function __invoke($name = null, $model = null)
public function __invoke($name = null, $values = null)
{
if (0 == func_num_args()) {
return $this;
}

$view = $this->cloneView();
if (isset($this->partialCounter)) {
$view->partialCounter = $this->partialCounter;
// If we were passed only a view model, just render it.
if ($name instanceof ModelInterface) {
return $this->getView()->render($name);
}

if (!empty($model)) {
if (is_array($model)) {
$view->vars()->assign($model);
} elseif (is_object($model)) {
if (null !== ($objectKey = $this->getObjectKey())) {
$view->vars()->offsetSet($objectKey, $model);
} elseif (method_exists($model, 'toArray')) {
$view->vars()->assign($model->toArray());
} else {
$view->vars()->assign(get_object_vars($model));
}
if (is_scalar($values)) {
$values = array();
} elseif ($values instanceof ModelInterface) {
$values = $values->getVariables();
} elseif (is_object($values)) {
if (null !== ($objectKey = $this->getObjectKey())) {
$values = array($objectKey => $values);
} elseif (method_exists($values, 'toArray')) {
$values = $values->toArray();
} else {
$values = get_object_vars($values);
}
}

return $view->render($name);
}

/**
* Clone the current View
*
* @return \Zend\View\Renderer\RendererInterface
*/
public function cloneView()
{
$view = clone $this->view;
$view->setVars(array());
return $view;
return $this->getView()->render($name, $values);
}

/**
Expand All @@ -95,10 +75,10 @@ public function setObjectKey($key)
{
if (null === $key) {
$this->objectKey = null;
} else {
$this->objectKey = (string) $key;
return $this;
}

$this->objectKey = (string) $key;
return $this;
}

Expand Down
43 changes: 29 additions & 14 deletions src/Helper/PartialLoop.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@

namespace Zend\View\Helper;

use Iterator;
use Traversable;
use Zend\Stdlib\ArrayUtils;
use Zend\View\Exception;

/**
Expand All @@ -22,9 +24,9 @@
*/
class PartialLoop extends Partial
{

/**
* Marker to where the pointer is at in the loop
*
* @var integer
*/
protected $partialCounter = 0;
Expand All @@ -36,40 +38,53 @@ class PartialLoop extends Partial
* If no arguments are provided, returns object instance.
*
* @param string $name Name of view script
* @param array $model Variables to populate in the view
* @param array $values Variables to populate in the view
* @return string
* @throws Exception\InvalidArgumentException
*/
public function __invoke($name = null, $model = null)
public function __invoke($name = null, $values = null)
{
if (0 == func_num_args()) {
return $this;
}

if (!is_array($model)
&& (!$model instanceof Traversable)
&& (is_object($model) && !method_exists($model, 'toArray'))
if (!is_array($values)
&& (!$values instanceof Traversable)
&& (is_object($values) && !method_exists($values, 'toArray'))
) {
throw new Exception\InvalidArgumentException('PartialLoop helper requires iterable data');
}

if (is_object($model)
&& (!$model instanceof Traversable)
&& method_exists($model, 'toArray')
if (is_object($values)
&& (!$values instanceof Traversable)
&& method_exists($values, 'toArray')
) {
$model = $model->toArray();
$values = $values->toArray();
}

if ($values instanceof Iterator) {
$values = ArrayUtils::iteratorToArray($values);
}

$content = '';
// reset the counter if it's called again
$this->partialCounter = 0;
foreach ($model as $item) {
// increment the counter variable
$this->partialCounter++;
$content = '';

foreach ($values as $item) {
$this->partialCounter++;
$content .= parent::__invoke($name, $item);
}

return $content;
}

/**
* Get the partial counter
*
* @return int
*/
public function getPartialCounter()
{
return $this->partialCounter;
}
}
27 changes: 7 additions & 20 deletions test/Helper/PartialLoopTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public function testEmptyArrayPassedToPartialLoopShouldNotThrowException()
/**
* @group ZF-2737
*/
public function testPartialLoopIncramentsPartialCounter()
public function testPartialLoopIncrementsPartialCounter()
{
$data = array(
array('message' => 'foo'),
Expand All @@ -258,15 +258,8 @@ public function testPartialLoopIncramentsPartialCounter()
$view->resolver()->addPath($this->basePath . '/application/views/scripts');
$this->helper->setView($view);

$result = $this->helper->__invoke('partialLoopCouter.phtml', $data);
foreach ($data as $key => $item) {
$string = sprintf(
'This is an iteration: %s, pointer at %d',
$item['message'],
$key + 1
);
$this->assertContains($string, $result, $result);
}
$this->helper->__invoke('partialLoopCouter.phtml', $data);
$this->assertEquals(4, $this->helper->getPartialCounter());
}

/**
Expand All @@ -285,17 +278,11 @@ public function testPartialLoopPartialCounterResets()
$view->resolver()->addPath($this->basePath . '/application/views/scripts');
$this->helper->setView($view);

$result = $this->helper->__invoke('partialLoopCouter.phtml', $data);
foreach ($data as $key=>$item) {
$string = 'This is an iteration: ' . $item['message'] . ', pointer at ' . ($key+1);
$this->assertContains($string, $result);
}
$this->helper->__invoke('partialLoopCouter.phtml', $data);
$this->assertEquals(4, $this->helper->getPartialCounter());

$result = $this->helper->__invoke('partialLoopCouter.phtml', $data);
foreach ($data as $key=>$item) {
$string = 'This is an iteration: ' . $item['message'] . ', pointer at ' . ($key+1);
$this->assertContains($string, $result);
}
$this->helper->__invoke('partialLoopCouter.phtml', $data);
$this->assertEquals(4, $this->helper->getPartialCounter());
}
}

Expand Down
95 changes: 30 additions & 65 deletions test/Helper/PartialTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

use PHPUnit_Framework_TestCase as TestCase;
use Zend\View\Helper\Partial;
use Zend\View\Model\ViewModel;
use Zend\View\Renderer\PhpRenderer as View;

/**
Expand Down Expand Up @@ -94,34 +95,6 @@ public function testSetViewSetsViewProperty()
$this->assertSame($view, $this->helper->getView());
}

/**
* @return void
*/
public function testCloneViewReturnsDifferentViewInstance()
{
$view = new View();
$this->helper->setView($view);
$clone = $this->helper->cloneView();
$this->assertNotSame($view, $clone);
$this->assertTrue($clone instanceof View);
}

/**
* @return void
*/
public function testCloneViewClearsViewVariables()
{
$view = new View();
$view->foo = 'bar';
$this->helper->setView($view);

$clone = $this->helper->cloneView();
$clonedVars = $clone->vars();

$this->assertEquals(0, count($clonedVars));
$this->assertNull($clone->vars()->foo);
}

public function testObjectModelWithPublicPropertiesSetsViewVariables()
{
$model = new \stdClass();
Expand Down Expand Up @@ -154,55 +127,47 @@ public function testObjectModelWithToArraySetsViewVariables()
}
}

public function testObjectModelSetInObjectKeyWhenKeyPresent()
{
$this->helper->setObjectKey('foo');
$model = new \stdClass();
$model->footest = 'bar';
$model->bartest = 'baz';

$view = new View;
$view->resolver()->addPath($this->basePath . '/application/views/scripts');
$this->helper->setView($view);
$return = $this->helper->__invoke('partialObj.phtml', $model);

$this->assertNotContains('No object model passed', $return);

foreach (get_object_vars($model) as $key => $value) {
$string = sprintf('%s: %s', $key, $value);
$this->assertContains($string, $return, "Checking for '$return' containing '$string'");
}
}

public function testPassingNoArgsReturnsHelperInstance()
{
$test = $this->helper->__invoke();
$this->assertSame($this->helper, $test);
}

public function testObjectKeyIsNullByDefault()
public function testCanPassViewModelAsSecondArgument()
{
$this->assertNull($this->helper->getObjectKey());
}
$model = new ViewModel(array(
'foo' => 'bar',
'bar' => 'baz',
));

public function testCanSetObjectKey()
{
$this->testObjectKeyIsNullByDefault();
$this->helper->setObjectKey('foo');
$this->assertEquals('foo', $this->helper->getObjectKey());
}
$view = new View();
$view->resolver()->addPath($this->basePath . '/application/views/scripts');
$this->helper->setView($view);
$return = $this->helper->__invoke('partialVars.phtml', $model);

public function testCanSetObjectKeyToNullValue()
{
$this->testCanSetObjectKey();
$this->helper->setObjectKey(null);
$this->assertNull($this->helper->getObjectKey());
foreach ($model->getVariables() as $key => $value) {
$string = sprintf('%s: %s', $key, $value);
$this->assertContains($string, $return);
}
}

public function testSetObjectKeyImplementsFluentInterface()
public function testCanPassViewModelAsSoleArgument()
{
$test = $this->helper->setObjectKey('foo');
$this->assertSame($this->helper, $test);
$model = new ViewModel(array(
'foo' => 'bar',
'bar' => 'baz',
));
$model->setTemplate('partialVars.phtml');

$view = new View();
$view->resolver()->addPath($this->basePath . '/application/views/scripts');
$this->helper->setView($view);
$return = $this->helper->__invoke($model);

foreach ($model->getVariables() as $key => $value) {
$string = sprintf('%s: %s', $key, $value);
$this->assertContains($string, $return);
}
}
}

Expand Down

0 comments on commit 32cf329

Please sign in to comment.