adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-07 03:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More coding standard fixes

Browse source
This commit is contained in:
Nick Beeuwsaert 2014-06-27 18:03:29 +00:00
parent 6623a8a7f4
commit 733a610bf7
2 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -239,6 +239,7 @@ class TestObjectWithToString {
*/ */
class TestObjectWithoutToString { class TestObjectWithoutToString {
} }
/** /**
* Class TestViewEventListener * Class TestViewEventListener
* *
@ -246,26 +247,54 @@ class TestObjectWithoutToString {
*/ */
class TestViewEventListener implements CakeEventListener { class TestViewEventListener implements CakeEventListener {
/**
* type of view before rendering has occurred
*
* @var string
*/
public $beforeRenderViewType; public $beforeRenderViewType;
/**
* type of view after rendering has occurred
*
* @var string
*/
public $afterRenderViewType; public $afterRenderViewType;
/**
* implementedEvents method
*
* @return array
*/
public function implementedEvents() { public function implementedEvents() {
return array( return array(
'View.beforeRender' => 'beforeRender', 'View.beforeRender' => 'beforeRender',
'View.afterRender' => 'afterRender', 'View.afterRender' => 'afterRender'
); );
} }
/**
* beforeRender method
*
* @param CakeEvent $event the event being sent
* @return void
*/
public function beforeRender($event) { public function beforeRender($event) {
$this->beforeRenderViewType = $event->subject()->getCurrentType(); $this->beforeRenderViewType = $event->subject()->getCurrentType();
} }
/**
* afterRender method
*
* @param CakeEvent $event the event being sent
* @return void
*/
public function afterRender($event) { public function afterRender($event) {
$this->afterRenderViewType = $event->subject()->getCurrentType(); $this->afterRenderViewType = $event->subject()->getCurrentType();
} }
} }
/** /**
* ViewTest class * ViewTest class
* *
@ -853,7 +882,7 @@ class ViewTest extends CakeTestCase {
$this->assertEquals(View::TYPE_VIEW, $listener->afterRenderViewType); $this->assertEquals(View::TYPE_VIEW, $listener->afterRenderViewType);
$this->assertEquals($View->getCurrentType(), View::TYPE_VIEW); $this->assertEquals($View->getCurrentType(), View::TYPE_VIEW);
$View->element('test_element', array(), array("callbacks"=>true)); $View->element('test_element', array(), array('callbacks' => true));
$this->assertEquals($View->getCurrentType(), View::TYPE_VIEW); $this->assertEquals($View->getCurrentType(), View::TYPE_VIEW);
$this->assertEquals(View::TYPE_ELEMENT, $listener->beforeRenderViewType); $this->assertEquals(View::TYPE_ELEMENT, $listener->beforeRenderViewType);

4
lib/Cake/View/View.php
View file

@ -814,11 +814,11 @@ class View extends Object {
$this->viewVars = $data + $this->viewVars; $this->viewVars = $data + $this->viewVars;
} }
/** /**
* Retreived the current view type * Retrieve the current view type
* *
* @return string * @return string
*/ */
public function getCurrentType(){ public function getCurrentType() {
return $this->_currentType; return $this->_currentType;
} }
/** /**