Update failing tests caused by changes in view events.

Update failing view & helper tests. Account for the various API changes
in the Event system and simplify tests by changing which objects are
mocked.

lib/Cake/Test/TestCase/Utility/DebuggerTest.php

@@ -365,7 +365,6 @@ public function testExportVar() {
 	[protected] _currentType => ''
 	[protected] _stack => array()
 	[protected] _eventManager => object(Cake\Event\EventManager) {}
-	[protected] _eventManagerConfigured => false
 }
 TEXT;
 

lib/Cake/Test/TestCase/View/Helper/CacheHelperTest.php

@@ -120,16 +120,16 @@ public function testLayoutCacheParsingNoTagsInView() {
 
 		$View = new View($this->Controller);
 		$result = $View->render('index');
-		$this->assertNotRegExp('/cake:nocache/', $result);
-		$this->assertNotRegExp('/php echo/', $result);
+		$this->assertNotContains('cake:nocache', $result);
+		$this->assertNotContains('<?php echo', $result);
 
 		$filename = CACHE . 'views/cachetest_cache_parsing.php';
 		$this->assertTrue(file_exists($filename));
 
 		$contents = file_get_contents($filename);
-		$this->assertRegExp('/php echo \$variable/', $contents);
-		$this->assertRegExp('/php echo microtime()/', $contents);
-		$this->assertRegExp('/clark kent/', $result);
+		$this->assertContains('<?php echo $variable', $contents);
+		$this->assertContains('<?php echo microtime()', $contents);
+		$this->assertContains('clark kent', $result);
 
 		unlink($filename);
 	}
@@ -547,14 +547,7 @@ public function testAfterRenderConditions() {
 			->with('posts/index', 'content')
 			->will($this->returnValue(''));
 
-		$Cache->afterRenderFile('posts/index', 'content');
-
-		Configure::write('Cache.check', false);
-		$Cache->afterRender('posts/index');
-
-		Configure::write('Cache.check', true);
-		$View->cacheAction = false;
-		$Cache->afterRender('posts/index');
+		$Cache->afterRenderFile(null, 'posts/index', 'content');
 	}
 
 /**
@@ -574,14 +567,14 @@ public function testAfterLayoutConditions() {
 			->with('posts/index', $View->fetch('content'))
 			->will($this->returnValue(''));
 
-		$Cache->afterLayout('posts/index');
+		$Cache->afterLayout(null, 'posts/index');
 
 		Configure::write('Cache.check', false);
-		$Cache->afterLayout('posts/index');
+		$Cache->afterLayout(null, 'posts/index');
 
 		Configure::write('Cache.check', true);
 		$View->cacheAction = false;
-		$Cache->afterLayout('posts/index');
+		$Cache->afterLayout(null, 'posts/index');
 	}
 
 /**

lib/Cake/Test/TestCase/View/Helper/PaginatorHelperTest.php

@@ -741,7 +741,7 @@ public function testPassedArgsMergingWithUrlOptions() {
 
 		$this->Paginator->request->params['pass'] = array(2);
 		$this->Paginator->request->query = array('foo' => 'bar', 'x' => 'y');
-		$this->Paginator->beforeRender('posts/index');
+		$this->Paginator->beforeRender(null, 'posts/index');
 
 		$result = $this->Paginator->sort('title');
 		$expected = array(

lib/Cake/Test/TestCase/View/HelperTest.php

@@ -984,12 +984,14 @@ public function testThatHelperHelpersAreNotAttached() {
 		), App::RESET);
 		Plugin::loadAll();
 
+		$events = $this->getMock('\Cake\Event\EventManager');
+		$this->View->setEventManager($events);
+
+		$events->expects($this->never())
+			->method('attach');
+
 		$Helper = new TestHelper($this->View);
 		$Helper->OtherHelper;
-
-		$result = $this->View->Helpers->enabled();
-		$expected = array();
-		$this->assertEquals($expected, $result, 'Helper helpers were attached to the collection.');
 	}
 
 /**

lib/Cake/Test/TestCase/View/ViewTest.php

@@ -699,13 +699,16 @@ public function testElementInexistent3() {
  *
  */
 	public function testElementCallbacks() {
-		$mock = $this->getMock('Cake\View\Helper', [], [$this->View]);
-		$mock->expects($this->at(0))->method('beforeRender');
-		$mock->expects($this->at(1))->method('afterRender');
-		$this->View->Helpers->set('Test', $mock);
-		$this->View->Helpers->enable('Test');
+		$count = 0;
+		$callback = function ($event, $file) use (&$count) {
+			$count++;
+		};
+		$events = $this->View->getEventManager();
+		$events->attach($callback, 'View.beforeRender');
+		$events->attach($callback, 'View.afterRender');
 
 		$this->View->element('test_element', array(), array('callbacks' => true));
+		$this->assertEquals(2, $count);
 	}
 
 /**
@@ -854,18 +857,20 @@ public function testLazyLoadHelpers() {
  */
 	public function testHelperCallbackTriggering() {
 		$View = new View($this->PostsController);
-		$View->helpers = array();
-		$View->Helpers = $this->getMock('Cake\View\HelperCollection', array('trigger'), array($View));
 
-		$View->Helpers->expects($this->at(0))->method('trigger')
+		$manager = $this->getMock('Cake\Event\EventManager');
+		$View->setEventManager($manager);
+
+		$manager->expects($this->at(0))->method('dispatch')
 			->with(
 				$this->logicalAnd(
 					$this->isInstanceOf('Cake\Event\Event'),
 					$this->attributeEqualTo('_name', 'View.beforeRender'),
 					$this->attributeEqualTo('_subject', $View)
 				)
 			);
-		$View->Helpers->expects($this->at(1))->method('trigger')
+
+		$manager->expects($this->at(1))->method('dispatch')
 			->with(
 				$this->logicalAnd(
 					$this->isInstanceOf('Cake\Event\Event'),
@@ -874,15 +879,16 @@ public function testHelperCallbackTriggering() {
 				)
 			);
 
-		$View->Helpers->expects($this->at(2))->method('trigger')
+		$manager->expects($this->at(2))->method('dispatch')
 			->with(
 				$this->logicalAnd(
 					$this->isInstanceOf('Cake\Event\Event'),
 					$this->attributeEqualTo('_name', 'View.afterRenderFile'),
 					$this->attributeEqualTo('_subject', $View)
 				)
 			);
-		$View->Helpers->expects($this->at(3))->method('trigger')
+
+		$manager->expects($this->at(3))->method('dispatch')
 			->with(
 				$this->logicalAnd(
 					$this->isInstanceOf('Cake\Event\Event'),
@@ -891,7 +897,7 @@ public function testHelperCallbackTriggering() {
 				)
 			);
 
-		$View->Helpers->expects($this->at(4))->method('trigger')
+		$manager->expects($this->at(4))->method('dispatch')
 			->with(
 				$this->logicalAnd(
 					$this->isInstanceOf('Cake\Event\Event'),
@@ -900,7 +906,7 @@ public function testHelperCallbackTriggering() {
 				)
 			);
 
-		$View->Helpers->expects($this->at(5))->method('trigger')
+		$manager->expects($this->at(5))->method('dispatch')
 			->with(
 				$this->logicalAnd(
 					$this->isInstanceOf('Cake\Event\Event'),
@@ -909,7 +915,7 @@ public function testHelperCallbackTriggering() {
 				)
 			);
 
-		$View->Helpers->expects($this->at(6))->method('trigger')
+		$manager->expects($this->at(6))->method('dispatch')
 			->with(
 				$this->logicalAnd(
 					$this->isInstanceOf('Cake\Event\Event'),
@@ -918,7 +924,7 @@ public function testHelperCallbackTriggering() {
 				)
 			);
 
-		$View->Helpers->expects($this->at(7))->method('trigger')
+		$manager->expects($this->at(7))->method('dispatch')
 			->with(
 				$this->logicalAnd(
 					$this->isInstanceOf('Cake\Event\Event'),

lib/Cake/View/Helper.php

@@ -46,6 +46,7 @@
  * - `afterLayout(Event $event, $layoutFile)` - afterLayout is called after the layout has rendered.
  * - `beforeRenderFile(Event $event, $viewFile)` - Called before any view fragment is rendered.
  * - `afterRenderFile(Event $event, $viewFile, $content)` - Called after any view fragment is rendered.
+ *   If a listener returns a non-null value, the output of the rendered file will be set to that.
  *
  * @package       Cake.View
  */

lib/Cake/View/Helper/CacheHelper.php

@@ -64,10 +64,11 @@ protected function _enabled() {
 /**
  * Parses the view file and stores content for cache file building.
  *
+ * @param Cake\Event\Event $event The event instance.
  * @param string $viewFile
  * @return void
  */
-	public function afterRenderFile($viewFile, $output) {
+	public function afterRenderFile($event, $viewFile, $output) {
 		if ($this->_enabled()) {
 			return $this->_parseContent($viewFile, $output);
 		}
@@ -76,10 +77,11 @@ public function afterRenderFile($viewFile, $output) {
 /**
  * Parses the layout file and stores content for cache file building.
  *
+ * @param Cake\Event\Event $event The event instance.
  * @param string $layoutFile
  * @return void
  */
-	public function afterLayout($layoutFile) {
+	public function afterLayout($event, $layoutFile) {
 		if ($this->_enabled()) {
 			$this->_View->assign(
 				'content',

lib/Cake/View/Helper/PaginatorHelper.php

@@ -64,15 +64,15 @@ class PaginatorHelper extends Helper {
 /**
  * Before render callback. Overridden to merge passed args with url options.
  *
+ * @param Cake\Event\Event $event The event instance.
  * @param string $viewFile
  * @return void
  */
-	public function beforeRender($viewFile) {
+	public function beforeRender($event, $viewFile) {
 		$this->options['url'] = array_merge($this->request->params['pass']);
 		if (!empty($this->request->query)) {
 			$this->options['url']['?'] = $this->request->query;
 		}
-		parent::beforeRender($viewFile);
 	}
 
 /**

lib/Cake/View/View.php

@@ -362,6 +362,18 @@ public function getEventManager() {
 		return $this->_eventManager;
 	}
 
+/**
+ * Set the Eventmanager used by View.
+ *
+ * Primarily useful for testing.
+ *
+ * @param Cake\Event\EventManager $eventManager.
+ * @return void
+ */
+	public function setEventManager(EventManager $eventManager) {
+		$this->_eventManager = $eventManager;
+	}
+
 /**
  * Renders a piece of PHP with provided parameters and returns HTML, XML, or any other string.
  *
@@ -854,9 +866,10 @@ protected function _render($viewFile, $data = array()) {
 		$content = $this->_evaluate($viewFile, $data);
 
 		$afterEvent = new Event('View.afterRenderFile', $this, array($viewFile, $content));
-		$afterEvent->modParams = 1;
 		$eventManager->dispatch($afterEvent);
-		$content = $afterEvent->data[1];
+		if (isset($afterEvent->result)) {
+			$content = $afterEvent->result;
+		}
 
 		if (isset($this->_parents[$viewFile])) {
 			$this->_stack[] = $this->fetch('content');