Merge pull request #1570 from cakephp/issue-4030

2.4 - Load helpers at View construction.

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

@@ -334,6 +334,8 @@ object(View) {
 	response => object(CakeResponse) {}
 	elementCache => 'default'
 	elementCacheSettings => array()
+	Html => object(HtmlHelper) {}
+	Form => object(FormHelper) {}
 	int => (int) 2
 	float => (float) 1.333
 
@@ -358,7 +360,6 @@ TEXT;
 	)
 	[protected] _scripts => array()
 	[protected] _paths => array()
-	[protected] _helpersLoaded => false
 	[protected] _parents => array()
 	[protected] _current => null
 	[protected] _currentType => ''

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

@@ -975,7 +975,7 @@ class HelperTest extends CakeTestCase {
 		$Helper->OtherHelper;
 
 		$result = $this->View->Helpers->enabled();
-		$expected = array();
+		$expected = array('Html');
 		$this->assertEquals($expected, $result, 'Helper helpers were attached to the collection.');
 	}
 

lib/Cake/Test/Case/View/JsonViewTest.php

@@ -53,6 +53,25 @@ class JsonViewTest extends CakeTestCase {
 		$this->assertSame('application/json', $Response->type());
 	}
 
+/**
+ * Test that rendering with _serialize does not load helpers
+ *
+ * @return void
+ */
+	public function testRenderSerializeNoHelpers() {
+		$Request = new CakeRequest();
+		$Response = new CakeResponse();
+		$Controller = new Controller($Request, $Response);
+		$Controller->helpers = array('Html');
+		$Controller->set(array(
+			'_serialize' => 'tags',
+			'tags' => array('cakephp', 'framework')
+		));
+		$View = new JsonView($Controller);
+		$View->render();
+		$this->assertFalse(isset($View->Html), 'No helper loaded.');
+	}
+
 /**
  * Test render with an array in _serialize
  *
@@ -146,8 +165,8 @@ class JsonViewTest extends CakeTestCase {
 			)
 		);
 		$Controller->set('user', $data);
+		$Controller->helpers = array('Paginator');
 		$View = new JsonView($Controller);
-		$View->helpers = array('Paginator');
 		$output = $View->render('index');
 
 		$expected = array('user' => 'fake', 'list' => array('item1', 'item2'), 'paging' => array('page' => 2));

lib/Cake/Test/Case/View/XmlViewTest.php

@@ -79,6 +79,25 @@ class XmlViewTest extends CakeTestCase {
 		$this->assertSame($expected, $output);
 	}
 
+/**
+ * Test that rendering with _serialize does not load helpers
+ *
+ * @return void
+ */
+	public function testRenderSerializeNoHelpers() {
+		$Request = new CakeRequest();
+		$Response = new CakeResponse();
+		$Controller = new Controller($Request, $Response);
+		$Controller->helpers = array('Html');
+		$Controller->set(array(
+			'_serialize' => 'tags',
+			'tags' => array('cakephp', 'framework')
+		));
+		$View = new XmlView($Controller);
+		$View->render();
+		$this->assertFalse(isset($View->Html), 'No helper loaded.');
+	}
+
 /**
  * Test render with an array in _serialize
  *

lib/Cake/View/JsonView.php

@@ -72,6 +72,18 @@ class JsonView extends View {
 		}
 	}
 
+/**
+ * Skip loading helpers if this is a _serialize based view.
+ *
+ * @return void
+ */
+	public function loadHelpers() {
+		if (isset($this->viewVars['_serialize'])) {
+			return;
+		}
+		parent::loadHelpers();
+	}
+
 /**
  * Render a JSON view.
  *

lib/Cake/View/View.php

@@ -253,13 +253,6 @@ class View extends Object {
  */
 	protected $_paths = array();
 
-/**
- * Indicate that helpers have been loaded.
- *
- * @var boolean
- */
-	protected $_helpersLoaded = false;
-
 /**
  * The names of views and their parents used with View::extend();
  *
@@ -347,6 +340,7 @@ class View extends Object {
 		}
 		$this->Helpers = new HelperCollection($this);
 		$this->Blocks = new ViewBlock();
+		$this->loadHelpers();
 		parent::__construct();
 	}
 
@@ -460,9 +454,6 @@ class View extends Object {
 		if ($this->hasRendered) {
 			return true;
 		}
-		if (!$this->_helpersLoaded) {
-			$this->loadHelpers();
-		}
 		$this->Blocks->set('content', '');
 
 		if ($view !== false && $viewFileName = $this->_getViewFileName($view)) {
@@ -511,9 +502,6 @@ class View extends Object {
 			return $this->Blocks->get('content');
 		}
 
-		if (!$this->_helpersLoaded) {
-			$this->loadHelpers();
-		}
 		if (empty($content)) {
 			$content = $this->Blocks->get('content');
 		}
@@ -881,7 +869,6 @@ class View extends Object {
 			list(, $class) = pluginSplit($properties['class']);
 			$this->{$class} = $this->Helpers->load($properties['class'], $properties['settings']);
 		}
-		$this->_helpersLoaded = true;
 	}
 
 /**
@@ -1194,9 +1181,6 @@ class View extends Object {
  * @return string
  */
 	protected function _renderElement($file, $data, $options) {
-		if (!$this->_helpersLoaded) {
-			$this->loadHelpers();
-		}
 		if ($options['callbacks']) {
 			$this->getEventManager()->dispatch(new CakeEvent('View.beforeRender', $this, array($file)));
 		}

lib/Cake/View/XmlView.php

@@ -72,6 +72,18 @@ class XmlView extends View {
 		}
 	}
 
+/**
+ * Skip loading helpers if this is a _serialize based view.
+ *
+ * @return void
+ */
+	public function loadHelpers() {
+		if (isset($this->viewVars['_serialize'])) {
+			return;
+		}
+		parent::loadHelpers();
+	}
+
 /**
  * Render a XML view.
  *