From 4e49b63140ef78712e26922269ae80b052bdf0df Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 8 Jun 2014 14:51:57 -0400
Subject: [PATCH] Raise exceptions on missing elements.

We should be avoiding trigger_error() in Cake3, and instead use
exceptions.
---
 src/View/Error/MissingElementException.php | 30 ++++++++++++++++++++++
 src/View/View.php                          |  5 ++--
 tests/TestCase/View/ViewTest.php           | 15 ++---------
 3 files changed, 35 insertions(+), 15 deletions(-)
 create mode 100644 src/View/Error/MissingElementException.php

diff --git a/src/View/Error/MissingElementException.php b/src/View/Error/MissingElementException.php
new file mode 100644
index 00000000000..170370b277d
--- /dev/null
+++ b/src/View/Error/MissingElementException.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/2.0/en/development/testing.html
+ * @since         3.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+namespace Cake\View\Error;
+
+use Cake\Error\Exception;
+
+/**
+ * Used when an element file cannot be found.
+ */
+class MissingElementException extends Exception {
+
+/**
+ * Message template
+ *
+ * @var string
+ */
+	protected $_messageTemplate = 'Element file "%s" is missing.';
+
+}
diff --git a/src/View/View.php b/src/View/View.php
index 1a0bc5c9f72..f318bede5a7 100644
--- a/src/View/View.php
+++ b/src/View/View.php
@@ -375,8 +375,9 @@ public function __construct(Request $request = null, Response $response = null,
  *   - `key` - Used to define the key used in the Cache::write(). It will be prefixed with `element_`
  * - `callbacks` - Set to true to fire beforeRender and afterRender helper callbacks for this element.
  *   Defaults to false.
- * - `ignoreMissing` - Used to allow missing elements. Set to true to not trigger notices.
+ * - `ignoreMissing` - Used to allow missing elements. Set to true to not throw exceptions.
  * @return string Rendered Element
+ * @throws
  */
 	public function element($name, array $data = array(), array $options = array()) {
 		$file = $plugin = null;
@@ -401,7 +402,7 @@ public function element($name, array $data = array(), array $options = array())
 			list ($plugin, $name) = pluginSplit($name, true);
 			$name = str_replace('/', DS, $name);
 			$file = $plugin . 'Element' . DS . $name . $this->_ext;
-			trigger_error(sprintf('Element Not Found: %s', $file), E_USER_NOTICE);
+			throw new Error\MissingElementException($file);
 		}
 	}
 
diff --git a/tests/TestCase/View/ViewTest.php b/tests/TestCase/View/ViewTest.php
index de97f945e90..99fe50f4522 100644
--- a/tests/TestCase/View/ViewTest.php
+++ b/tests/TestCase/View/ViewTest.php
@@ -98,17 +98,6 @@ public function index() {
  */
 class TestThemeView extends View {
 
-/**
- * renderElement method
- *
- * @param string $name Element name.
- * @param array $params Params list.
- * @return string The given name
- */
-	public function renderElement($name, $params = array()) {
-		return $name;
-	}
-
 /**
  * getViewFileName method
  *
@@ -653,7 +642,7 @@ public function testElement() {
 /**
  * Test elementInexistent method
  *
- * @expectedException PHPUnit_Framework_Error_Notice
+ * @expectedException Cake\View\Error\MissingElementException
  * @return void
  */
 	public function testElementInexistent() {
@@ -663,7 +652,7 @@ public function testElementInexistent() {
 /**
  * Test elementInexistent3 method
  *
- * @expectedException PHPUnit_Framework_Error_Notice
+ * @expectedException Cake\View\Error\MissingElementException
  * @return void
  */
 	public function testElementInexistent3() {