Merge branch '3.0-clean-exceptions' of github.com:cakephp/cakephp into 3.0-clean-exceptions

src/View/HelperRegistry.php

@@ -61,7 +61,7 @@ class HelperRegistry extends ObjectRegistry {
 
 		try {
 			$this->load($helper);
-		} catch (Error\MissingHelperException $exception) {
+		} catch (Exception\MissingHelperException $exception) {
 			if ($this->_View->plugin) {
 				$this->load($this->_View->plugin . '.' . $helper);
 				return true;

tests/TestCase/View/ViewTest.php

@@ -543,7 +543,7 @@ class ViewTest extends TestCase {
 /**
  * Test that getViewFileName() protects against malicious directory traversal.
  *
- * @expectedException Cake\Core\Exception\Exception
+ * @expectedException \InvalidArgumentException
  * @return void
  */
 	public function testGetViewFileNameDirectoryTraversal() {
@@ -642,7 +642,7 @@ class ViewTest extends TestCase {
 /**
  * Test that getLayoutFileName() protects against malicious directory traversal.
  *
- * @expectedException Cake\Core\Exception\Exception
+ * @expectedException \InvalidArgumentException
  * @return void
  */
 	public function testGetLayoutFileNameDirectoryTraversal() {
@@ -1479,7 +1479,7 @@ class ViewTest extends TestCase {
  * Test that an exception gets thrown when you leave a block open at the end
  * of a view.
  *
- * @expectedException \Cake\Core\Exception\Exception
+ * @expectedException \LogicException
  * @return void
  */
 	public function testExceptionOnOpenBlock() {