adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Starting the extend() feature.

Browse source 
Adding a simple test case.
Still need to add callbacks around every view fragment rendered.
Without that CacheHelper will not be able to cache extended views
correctly.
This commit is contained in:
mark_story 2011-09-22 21:07:21 -04:00
parent b866c00318
commit b6919a0268
2 changed files with 86 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/Cake/Test/Case/View/ViewTest.php
View file

@ -1025,4 +1025,22 @@ class ViewTest extends CakeTestCase {
$this->assertEquals(array('test', 'test1'), $this->View->blocks());
}
/**
* Test nested extended views.
*
* @return void
*/
public function testExtendNested() {
$this->View->layout = false;
$content = $this->View->render('nested_extends');
$expected = <<<TEXT
This is the second parent.
This is the first parent.
This is the first template.
Sidebar Content.
TEXT;
$this->assertEquals($expected, $content);
}
}

75
lib/Cake/View/View.php
View file

@ -246,6 +246,27 @@ class View extends Object {
*/
protected $_helpersLoaded = false;
/**
* The names of views and their parents used with View::extend();
*
* @var array
*/
protected $_parents = array();
/**
* The currently rendering view file.
*
* @var string
*/
protected $_current = null;
/**
* Content stack, used for nested templates that all use View::extend();
*
* @var array
*/
protected $_stack = array();
/**
* Constructor
*
@ -399,7 +420,14 @@ class View extends Object {
* - `scripts_for_layout` - Contains content added with addScript() as well as any content in
* the 'meta', 'css', and 'script' blocks. They are appended in that order.
*
* `$scripts_for_layout` is deprecated and will be removed in CakePHP 3.0
* Deprecated features:
*
* - `$scripts_for_layout` is deprecated and will be removed in CakePHP 3.0.
* Use the block features instead. `meta`, `css` and `script` will be populated
* by the matching methods on HtmlHelper.
* - `$title_for_layout` is deprecated and will be removed in CakePHP 3.0
* - `$content_for_layout` is deprecated and will be removed in CakePHP 3.0.
* Use the `content` block instead.
*
* @param string $content_for_layout Content to render in a view, wrapped by the surrounding layout.
* @param string $layout Layout name
@ -605,6 +633,16 @@ class View extends Object {
$this->__activeBlock = null;
}
/**
* Provides view or element extension/inheritance. Views can extends a
* parent view and populate blocks in the parent template.
*
* @param string $name The view or element to 'extend' the current one with.
*/
public function extend($name) {
$this->_parents[$this->_current] = $this->_getViewFileName($name);
}
/**
* Adds a script block or other element to be inserted in $scripts_for_layout in
* the `<head />` of a document layout
@ -711,17 +749,40 @@ class View extends Object {
/**
* Renders and returns output for given view filename with its
* array of data.
* array of data. Handles parent/extended views.
*
* @param string $___viewFn Filename of the view
* @param array $___dataForView Data to include in rendered view. If empty the current View::$viewVars will be used.
* @param string $viewFile Filename of the view
* @param array $data Data to include in rendered view. If empty the current View::$viewVars will be used.
* @return string Rendered output
*/
protected function _render($___viewFn, $___dataForView = array()) {
if (empty($___dataForView)) {
$___dataForView = $this->viewVars;
protected function _render($viewFile, $data = array()) {
if (empty($data)) {
$data = $this->viewVars;
}
$this->_current = $viewFile;
$content = $this->_evaluate($viewFile, $data);
if (isset($this->_parents[$viewFile])) {
$this->_stack[] = $this->fetch('content');
$this->assign('content', $content);
$content = $this->_render($this->_parents[$viewFile], $data);
$this->assign('content', array_pop($this->_stack));
}
return $content;
}
/**
* Sandbox method to evaluate a template / view script in.
*
* @param string $___viewFn Filename of the view
* @param array $___dataForView Data to include in rendered view.
* If empty the current View::$viewVars will be used.
* @return string Rendered output
*/
protected function _evaluate($___viewFn, $___dataForView) {
extract($___dataForView, EXTR_SKIP);
ob_start();