Adding parameters to helper callbacks, these allow helpers to introsp…

…ect more on the view/layout being rendered.

Updating tests.

cake/libs/view/helper.php

@@ -801,9 +801,10 @@ public function output($str) {
  *
  * Overridden in subclasses.
  *
+ * @param string $viewFile The view file that is going to be rendered
  * @return void
  */
-	public function beforeRender() {
+	public function beforeRender($viewFile) {
 	}
 
 /**
@@ -812,29 +813,34 @@ public function beforeRender() {
  *
  * Overridden in subclasses.
  *
+ * @param string $viewFile The view file that was rendered.
+ * @param string $content The content of the rendered view.
  * @return void
  */
-	public function afterRender() {
+	public function afterRender($viewFile, $content) {
 	}
 
 /**
  * Before layout callback.  beforeLayout is called before the layout is rendered.
  *
  * Overridden in subclasses.
  *
+ * @param string $layoutFile The layout about to be rendered.
  * @return void
  */
-	public function beforeLayout() {
+	public function beforeLayout($layoutFile) {
 	}
 
 /**
  * After layout callback.  afterLayout is called after the layout has rendered.
  *
  * Overridden in subclasses.
  *
+ * @param string $layoutFile The layout file that was rendered.
+ * @param string $content The content of the rendered layout.
  * @return void
  */
-	public function afterLayout() {
+	public function afterLayout($layoutFile, $content) {
 	}
 
 /**

cake/libs/view/helpers/paginator.php

@@ -110,10 +110,10 @@ function __construct(View $View, $settings = array()) {
  *
  * @return void
  */
-	public function beforeRender() {
+	public function beforeRender($viewFile) {
 		$this->options['url'] = array_merge($this->request->params['pass'], $this->request->params['named']);
 
-		parent::beforeRender();
+		parent::beforeRender($viewFile);
 	}
 
 /**

cake/libs/view/view.php

@@ -391,9 +391,9 @@ public function render($action = null, $layout = null, $file = null) {
 		}
 
 		if ($action !== false && $viewFileName = $this->_getViewFileName($action)) {
-			$this->Helpers->trigger('beforeRender', array($this, $viewFileName));
+			$this->Helpers->trigger('beforeRender', array($viewFileName));
 			$out = $this->_render($viewFileName);
-			$this->Helpers->trigger('afterRender', array($this, $viewFileName, $out));
+			$this->Helpers->trigger('afterRender', array($viewFileName, $out));
 		}
 
 		if ($layout === null) {
@@ -437,7 +437,7 @@ public function renderLayout($content_for_layout, $layout = null) {
 		if (!$this->_helpersLoaded) {
 			$this->loadHelpers();
 		}
-		$this->Helpers->trigger('beforeLayout', array(&$this, $layoutFileName));
+		$this->Helpers->trigger('beforeLayout', array($layoutFileName));
 
 		$this->viewVars = array_merge($this->viewVars, array(
 			'content_for_layout' => $content_for_layout,
@@ -454,7 +454,7 @@ public function renderLayout($content_for_layout, $layout = null) {
 			throw new RuntimeException(sprintf(__("Error in layout %s, got no content."), $layoutFileName));
 		}
 
-		$this->Helpers->trigger('afterLayout', array(&$this, $layoutFileName, $this->output));
+		$this->Helpers->trigger('afterLayout', array($layoutFileName, $this->output));
 
 		return $this->output;
 	}

cake/tests/cases/libs/view/helpers/paginator.test.php

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