adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making HtmlHelper not use ClassRegistry to access the View instance. Updating test cases.

Browse source
This commit is contained in:
mark_story 2010-07-14 22:26:42 -04:00
parent e0acd2131f
commit 7efe1636aa
2 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/view/helpers/html.php
View file

@ -379,8 +379,7 @@ class HtmlHelper extends AppHelper {
if ($options['inline']) {
return $out;
} else {
$view =& ClassRegistry::getObject('view');
$view->addScript($out);
$this->_View->addScript($out);
}
}
@ -445,8 +444,7 @@ class HtmlHelper extends AppHelper {
if ($options['inline']) {
return $out;
} else {
$view =& ClassRegistry::getObject('view');
$view->addScript($out);
$this->_View->addScript($out);
}
}

31
cake/tests/cases/libs/view/helpers/html.test.php
View file

@ -108,10 +108,9 @@ class HtmlHelperTest extends CakeTestCase {
* @return void
*/
function startTest() {
$view = new View(new TheHtmlTestController());
$this->Html = new HtmlHelper($view);
$this->View = $this->getMock('View', array('addScript'), array(new TheHtmlTestController()));
$this->Html = new HtmlHelper($this->View);
ClassRegistry::addObject('view', $view);
$this->_appEncoding = Configure::read('App.encoding');
$this->_asset = Configure::read('Asset');
$this->_debug = Configure::read('debug');
@ -128,7 +127,7 @@ class HtmlHelperTest extends CakeTestCase {
Configure::write('Asset', $this->_asset);
Configure::write('debug', $this->_debug);
ClassRegistry::flush();
unset($this->Html);
unset($this->Html, $this->View);
}
/**
@ -472,19 +471,16 @@ class HtmlHelperTest extends CakeTestCase {
$this->assertTags($result[1], $expected);
$this->assertEqual(count($result), 2);
ClassRegistry::removeObject('view');
$view = $this->getMock('View', array(), array(), '', false);
ClassRegistry::addObject('view', $view);
$view->expects($this->any())->method('addScript')->with($this->matchesRegularExpression('/css_in_head.css/'));
$this->View->expects($this->at(0))->method('addScript')
->with($this->matchesRegularExpression('/css_in_head.css/'));
$this->View->expects($this->at(1))
->method('addScript')
->with($this->matchesRegularExpression('/more_css_in_head.css/'));
$result = $this->Html->css('css_in_head', null, array('inline' => false));
$this->assertNull($result);
ClassRegistry::removeObject('view');
$view = $this->getMock('View', array(), array(), '', false);
ClassRegistry::addObject('view', $view);
$view->expects($this->any())
->method('addScript')
->with($this->matchesRegularExpression('/more_css_in_head.css/'));
$result = $this->Html->css('more_css_in_head', null, array('inline' => false));
$this->assertNull($result);
}
@ -610,10 +606,9 @@ class HtmlHelperTest extends CakeTestCase {
);
$this->assertTags($result, $expected);
ClassRegistry::removeObject('view');
$view = $this->getMock('View', array(), array(), '', false);
ClassRegistry::addObject('view', $view);
$view->expects($this->any())->method('addScript')->with($this->matchesRegularExpression('/script_in_head.js/'));
$this->View->expects($this->any())->method('addScript')
->with($this->matchesRegularExpression('/script_in_head.js/'));
$result = $this->Html->script('script_in_head', array('inline' => false));
$this->assertNull($result);
}