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

Make extending a missing element throw an exception

Browse source 
A layout extending a missing layout throws a missing-layout exception
A view extendinga missing view throws a missing-view exception
Now, an element extending a missing element throws a logic exception

in addition "absolute" paths can be used such that (using elements as an
example)

$this->extend('foo') - extends View/Elements/foo.ctp
$this->extend('/foo') - extends View/foo.ctp

Closes #2504
This commit is contained in:
AD7six 2012-01-25 12:43:55 +01:00
parent 154b001552
commit ecbe337052
4 changed files with 38 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1392,7 +1392,6 @@ TEXT;
$this->View->render('extend_loop'); $this->View->render('extend_loop');
} }
/** /**
* Test extend() in an element and a view. * Test extend() in an element and a view.
* *
@ -1411,6 +1410,17 @@ TEXT;
$this->assertEquals($expected, $content); $this->assertEquals($expected, $content);
} }
/**
* Extending an element which doesn't exist should throw a missing view exception
*
* @expectedException LogicException
* @return void
*/
public function testExtendMissingElement() {
$this->View->layout = false;
$this->View->render('extend_missing_element');
}
/** /**
* Test that setting arbitrary properties still works. * Test that setting arbitrary properties still works.
* *

2
lib/Cake/Test/test_app/View/Elements/extended_missing_element.ctp Normal file
View file

@ -0,0 +1,2 @@
<?php $this->extend('noneexistent_parent_element'); ?>
Element content.

1
lib/Cake/Test/test_app/View/Posts/extend_missing_element.ctp Normal file
View file

@ -0,0 +1 @@
<?php echo $this->element('extended_missing_element'); ?>

38
lib/Cake/View/View.php
View file

@ -662,24 +662,34 @@ class View extends Object {
* @param string $name The view or element to 'extend' the current one with. * @param string $name The view or element to 'extend' the current one with.
* @return void * @return void
* @throws LogicException when you extend a view with itself or make extend loops. * @throws LogicException when you extend a view with itself or make extend loops.
* @throws LogicException when you extend an element which doesn't exist
*/ */
public function extend($name) { public function extend($name) {
switch ($this->_currentType) { if ($name[0] === '/' || $this->_currentType === self::TYPE_VIEW) {
case self::TYPE_VIEW: $parent = $this->_getViewFileName($name);
$parent = $this->_getViewFileName($name); } else {
break; switch ($this->_currentType) {
case self::TYPE_ELEMENT: case self::TYPE_ELEMENT:
$parent = $this->_getElementFileName($name); $parent = $this->_getElementFileName($name);
break; if (!$parent) {
case self::TYPE_LAYOUT: list($plugin, $name) = $this->_pluginSplit($name);
$parent = $this->_getLayoutFileName($name); $paths = $this->_paths($plugin);
break; $defaultPath = $paths[0] . 'Elements' . DS;
throw new LogicException(__d(
'cake_dev',
'You cannot extend an element which does not exist (%s).',
$defaultPath . $name . $this->ext
));
}
break;
case self::TYPE_LAYOUT:
$parent = $this->_getLayoutFileName($name);
break;
default:
$parent = $this->_getViewFileName($name);
}
} }
if (!$parent) {
throw new LogicException(__d('cake_dev', 'The parent %s you specified doesn\'t exist.', $this->_currentType));
}
if ($parent == $this->_current) { if ($parent == $this->_current) {
throw new LogicException(__d('cake_dev', 'You cannot have views extend themselves.')); throw new LogicException(__d('cake_dev', 'You cannot have views extend themselves.'));
} }