diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php index 59c504c21..303389158 100644 --- a/lib/Cake/Test/Case/View/ViewTest.php +++ b/lib/Cake/Test/Case/View/ViewTest.php @@ -1257,6 +1257,19 @@ class ViewTest extends CakeTestCase { $this->assertEquals('Block content', $result); } +/** + * Test prepending to a block with append. + * + * @return void + */ + public function testBlockPrepend() { + $this->View->assign('test', 'Block'); + $this->View->prepend('test', 'Before '); + + $result = $this->View->fetch('test'); + $this->assertEquals('Before Block', $result); + } + /** * You should be able to append to undefined blocks. * @@ -1268,6 +1281,17 @@ class ViewTest extends CakeTestCase { $this->assertEquals('Unknown', $result); } +/** + * You should be able to prepend to undefined blocks. + * + * @return void + */ + public function testBlockPrependUndefined() { + $this->View->prepend('test', 'Unknown'); + $result = $this->View->fetch('test'); + $this->assertEquals('Unknown', $result); + } + /** * setting an array should cause an exception. * diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php index 3e7137bca..51d486128 100644 --- a/lib/Cake/View/View.php +++ b/lib/Cake/View/View.php @@ -599,17 +599,31 @@ class View extends Object { } /** - * Append to an existing or new block. Appending to a new + * Append to an existing or new block. Appending to a new * block will create the block. * * @param string $name Name of the block * @param string $value The content for the block. * @return void * @throws CakeException when you use non-string values. - * @see ViewBlock::append() + * @see ViewBlock::concat() */ public function append($name, $value = null) { - return $this->Blocks->append($name, $value); + return $this->Blocks->concat($name, $value); + } + +/** + * Prepend to an existing or new block. Prepending to a new + * block will create the block. + * + * @param string $name Name of the block + * @param string $value The content for the block. + * @return void + * @throws CakeException when you use non-string values. + * @see ViewBlock::concat() + */ + public function prepend($name, $value = null) { + return $this->Blocks->concat($name, $value, ViewBlock::PREPEND); } /** diff --git a/lib/Cake/View/ViewBlock.php b/lib/Cake/View/ViewBlock.php index baf08ad21..c41fe4eee 100644 --- a/lib/Cake/View/ViewBlock.php +++ b/lib/Cake/View/ViewBlock.php @@ -23,6 +23,20 @@ */ class ViewBlock { +/** + * Append content + * + * @constant APPEND + */ + const APPEND = 'append'; + +/** + * Prepend content + * + * @constant PREPEND + */ + const PREPEND = 'prepend'; + /** * Block content. An array of blocks indexed by name. * @@ -72,6 +86,39 @@ class ViewBlock { } } +/** + * Concat content to an existing or new block. + * Concating to a new block will create the block. + * + * Calling concat() without a value will create a new capturing + * block that needs to be finished with View::end(). The content + * of the new capturing context will be added to the existing block context. + * + * @param string $name Name of the block + * @param string $value The content for the block + * @param string $mode If ViewBlock::APPEND content will be appended to existing content. + * If ViewBlock::PREPEND it will be prepended. + * @return void + * @throws CakeException when you use non-string values. + */ + public function concat($name, $value = null, $mode = ViewBlock::APPEND) { + if (isset($value)) { + if (!is_string($value)) { + throw new CakeException(__d('cake_dev', '$value must be a string.')); + } + if (!isset($this->_blocks[$name])) { + $this->_blocks[$name] = ''; + } + if ($mode === ViewBlock::PREPEND) { + $this->_blocks[$name] = $value . $this->_blocks[$name]; + } else { + $this->_blocks[$name] .= $value; + } + } else { + $this->start($name); + } + } + /** * Append to an existing or new block. Appending to a new * block will create the block. @@ -84,19 +131,10 @@ class ViewBlock { * @param string $value The content for the block. * @return void * @throws CakeException when you use non-string values. + * @deprecated As of 2.3 use ViewBlock::concat() instead. */ public function append($name, $value = null) { - if (isset($value)) { - if (!is_string($value)) { - throw new CakeException(__d('cake_dev', '$value must be a string.')); - } - if (!isset($this->_blocks[$name])) { - $this->_blocks[$name] = ''; - } - $this->_blocks[$name] .= $value; - } else { - $this->start($name); - } + $this->concat($name, $value); } /**