Merge pull request #7198 from mbabker/Throwable

Change PHP 7 Exception handling to catch Throwable

libraries/cms/error/page.php

@@ -19,18 +19,18 @@ class JErrorPage
 	/**
 	 * Render the error page based on an exception.
 	 *
-	 * @param   object  $error  An Exception or BaseException (PHP 7+) object for which to render the error page.
+	 * @param   object  $error  An Exception or Throwable (PHP 7+) object for which to render the error page.
 	 *
 	 * @return  void
 	 *
 	 * @since   3.0
 	 */
 	public static function render($error)
 	{
-		$expectedClass = PHP_MAJOR_VERSION >= 7 ? 'BaseException' : 'Exception';
+		$expectedClass = PHP_MAJOR_VERSION >= 7 ? 'Throwable' : 'Exception';
 		$isException   = $error instanceof $expectedClass;
 
-		// In PHP 5, the $error object should be an instance of Exception; PHP 7 should be a BaseException
+		// In PHP 5, the $error object should be an instance of Exception; PHP 7 should be a Throwable implementation
 		if ($isException)
 		{
 			try

libraries/joomla/document/error/error.php

@@ -53,7 +53,7 @@ public function __construct($options = array())
 	 */
 	public function setError($error)
 	{
-		$expectedClass = PHP_MAJOR_VERSION >= 7 ? 'BaseException' : 'Exception';
+		$expectedClass = PHP_MAJOR_VERSION >= 7 ? 'Throwable' : 'Exception';
 
 		if ($error instanceof $expectedClass)
 		{

tests/unit/suites/libraries/cms/error/JErrorPageTest.php

@@ -64,8 +64,8 @@ public function testEnsureTheErrorPageIsCorrectlyRenderedWithEngineExceptions()
 			$this->markTestSkipped('Test only applies to PHP 7+');
 		}
 
-		// Create an Exception to inject into the method
-		$exception = new EngineException('Testing JErrorPage::render()', 500);
+		// Create an Error to inject into the method
+		$exception = new Error('Testing JErrorPage::render()', 500);
 
 		// The render method echoes the output, so catch it in a buffer
 		ob_start();