mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Fixing failing tests in core helper group, closes #4946
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7213 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
8b493b2923
commit
63217b7e10
3 changed files with 6 additions and 2 deletions
|
@ -222,6 +222,8 @@ class HtmlHelper extends AppHelper {
|
|||
} elseif (isset($attributes['type']) && isset($types[$attributes['type']])) {
|
||||
$type = $types[$attributes['type']];
|
||||
unset($attributes['type']);
|
||||
} else {
|
||||
$type = array();
|
||||
}
|
||||
} elseif ($url !== null) {
|
||||
$inline = $url;
|
||||
|
|
|
@ -632,7 +632,7 @@ class HtmlHelperTest extends CakeTestCase {
|
|||
|
||||
$result = $this->Html->meta('atom', array('controller' => 'posts', 'ext' => 'xml'));
|
||||
$this->assertTags($result, array('link' => array('href' => 'preg:/.*\/posts\.xml/', 'type' => 'application/atom+xml', 'title' => 'atom')));
|
||||
|
||||
|
||||
$result = $this->Html->meta('non-existing');
|
||||
$this->assertTags($result, array('<meta'));
|
||||
|
||||
|
@ -800,7 +800,7 @@ class HtmlHelperTest extends CakeTestCase {
|
|||
* @return void
|
||||
*/
|
||||
function testPara() {
|
||||
$result = $this->Html->para('class-name');
|
||||
$result = $this->Html->para('class-name', '');
|
||||
$this->assertTags($result, array('p' => array('class' => 'class-name')));
|
||||
|
||||
$result = $this->Html->para('class-name', 'text');
|
||||
|
|
|
@ -81,6 +81,8 @@ class XmlHelperTest extends UnitTestCase {
|
|||
function setUp() {
|
||||
$this->Xml =& new XmlHelper();
|
||||
$this->Xml->beforeRender();
|
||||
$manager =& XmlManager::getInstance();
|
||||
$manager->namespaces = array();
|
||||
}
|
||||
/**
|
||||
* testAddNamespace method
|
||||
|
|
Loading…
Reference in a new issue