Merge branch '4.0-dev' into j4finder_termsphrases

administrator/components/com_modules/Extension/ModulesComponent.php

@@ -18,7 +18,7 @@
 /**
  * Component class for com_modules
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 class ModulesComponent extends Component implements MVCFactoryServiceInterface
 {

administrator/manifests/files/joomla.xml

@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.0.0-alpha3</version>
+	<version>4.0.0-alpha4-dev</version>
 	<creationDate>May 2018</creationDate>
 
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>

composer.json

@@ -77,6 +77,7 @@
         "phpmailer/phpmailer": "~6.0",
         "psr/link": "~1.0",
         "symfony/console": "3.4.*",
+        "symfony/debug": "3.4.*",
         "symfony/web-link": "3.4.*",
         "symfony/yaml": "3.4.*"
     },

installation/language/en-GB/en-GB.ini

@@ -33,7 +33,7 @@ INSTL_DATABASE_HOST_DESC="Enter the Host Name, usually \"localhost\" or a name p
 INSTL_DATABASE_HOST_LABEL="Host Name"
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="We were not able to create the file. Please manually create a file named "%1$s" and upload it to the "%2$s" folder of your Joomla site."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="In order to confirm that you are the owner of this website please delete the file named "%1$s" we have created in the "%2$s" folder of your Joomla site."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. <a href="_QQ_"%s"_QQ_">Please read the documentation</a> for more information."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. <a href=\"%s\">Please read the documentation</a> for more information."
 INSTL_DATABASE_NAME_DESC="Enter the database name."
 INSTL_DATABASE_NAME_LABEL="Database Name"
 INSTL_DATABASE_NO_SCHEMA="No database schema exists for this database type."

installation/language/en-US/en-US.ini

@@ -273,7 +273,7 @@ WARNING="Warning"
 JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection abort has occurred while fetching the JSON data."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="No content was returned."
 JLIB_JS_AJAX_ERROR_OTHER="An error has occurred while fetching the JSON data: HTTP %s status code."
-JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:<br><code style="_QQ_"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;"_QQ_">%s</code>"
+JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
 JLIB_JS_AJAX_ERROR_TIMEOUT="A timeout has occurred while fetching the JSON data."
 
 ; Field password messages

installation/src/Application/InstallationApplication.php

@@ -15,6 +15,7 @@
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Document\HtmlDocument;
 use Joomla\CMS\Document\FactoryInterface;
+use Joomla\CMS\Exception\ExceptionHandler;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Input\Input;
 use Joomla\CMS\Language\LanguageHelper;
@@ -232,24 +233,31 @@ protected function doExecute()
 	 */
 	public function execute()
 	{
-		// Perform application routines.
-		$this->doExecute();
-
-		// If we have an application document object, render it.
-		if ($this->document instanceof Document)
+		try
 		{
-			// Render the application output.
-			$this->render();
-		}
+			// Perform application routines.
+			$this->doExecute();
+
+			// If we have an application document object, render it.
+			if ($this->document instanceof Document)
+			{
+				// Render the application output.
+				$this->render();
+			}
 
-		// If gzip compression is enabled in configuration and the server is compliant, compress the output.
-		if ($this->get('gzip') && !ini_get('zlib.output_compression') && (ini_get('output_handler') != 'ob_gzhandler'))
+			// If gzip compression is enabled in configuration and the server is compliant, compress the output.
+			if ($this->get('gzip') && !ini_get('zlib.output_compression') && (ini_get('output_handler') != 'ob_gzhandler'))
+			{
+				$this->compress();
+			}
+
+			// Send the application response.
+			$this->respond();
+		}
+		catch (\Throwable $throwable)
 		{
-			$this->compress();
+			ExceptionHandler::render($throwable);
 		}
-
-		// Send the application response.
-		$this->respond();
 	}
 
 	/**

installation/src/View/Remove/HtmlView.php

@@ -25,31 +25,31 @@ class HtmlView extends DefaultView
 	 * Is the Joomla Version a development version?
 	 *
 	 * @var    boolean
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $development;
 
 	/**
 	 * List of language choices to install
 	 *
 	 * @var    array
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $items;
 
 	/**
 	 * Full list of recommended PHP Settings
 	 *
 	 * @var    array
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $phpsettings;
 
 	/**
 	 * Array of PHP config options
 	 *
 	 * @var    array
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $phpoptions;
 

layouts/joomla/toolbar/basic.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

layouts/joomla/toolbar/dropdown.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

libraries/bootstrap.php

@@ -53,7 +53,7 @@
 require_once JPATH_LIBRARIES . '/classmap.php';
 
 // Register the global exception handler.
-set_exception_handler(['JErrorPage', 'render']);
+\Symfony\Component\Debug\ExceptionHandler::register(false);
 
 // Register the error handler which processes E_USER_DEPRECATED errors
 set_error_handler(['JErrorPage', 'handleUserDeprecatedErrors'], E_USER_DEPRECATED);

libraries/src/Application/CMSApplication.php

@@ -14,6 +14,8 @@
 use Joomla\CMS\Authentication\Authentication;
 use Joomla\CMS\Event\AbstractEvent;
 use Joomla\CMS\Event\BeforeExecuteEvent;
+use Joomla\CMS\Event\ErrorEvent;
+use Joomla\CMS\Exception\ExceptionHandler;
 use Joomla\CMS\Extension\ExtensionManagerTrait;
 use Joomla\CMS\Input\Input;
 use Joomla\CMS\Language\Language;
@@ -347,50 +349,67 @@ public function enqueueMessage($msg, $type = self::MSG_INFO)
 	 */
 	public function execute()
 	{
-		$this->createExtensionNamespaceMap();
+		try
+		{
+			$this->createExtensionNamespaceMap();
 
-		PluginHelper::importPlugin('system');
+			PluginHelper::importPlugin('system');
 
-		// Trigger the onBeforeExecute event.
-		$this->triggerEvent(
-			'onBeforeExecute',
-			AbstractEvent::create(
+			// Trigger the onBeforeExecute event.
+			$this->triggerEvent(
 				'onBeforeExecute',
 				[
 					'subject'    => $this,
 					'eventClass' => BeforeExecuteEvent::class,
 					'container'  => $this->getContainer()
 				]
-			)
-		);
+			);
 
-		// Mark beforeExecute in the profiler.
-		JDEBUG ? $this->profiler->mark('beforeExecute event dispatched') : null;
+			// Mark beforeExecute in the profiler.
+			JDEBUG ? $this->profiler->mark('beforeExecute event dispatched') : null;
 
-		// Perform application routines.
-		$this->doExecute();
+			// Perform application routines.
+			$this->doExecute();
 
-		// If we have an application document object, render it.
-		if ($this->document instanceof \JDocument)
-		{
-			// Render the application output.
-			$this->render();
-		}
+			// If we have an application document object, render it.
+			if ($this->document instanceof \JDocument)
+			{
+				// Render the application output.
+				$this->render();
+			}
 
-		// If gzip compression is enabled in configuration and the server is compliant, compress the output.
-		if ($this->get('gzip') && !ini_get('zlib.output_compression') && ini_get('output_handler') !== 'ob_gzhandler')
-		{
-			$this->compress();
+			// If gzip compression is enabled in configuration and the server is compliant, compress the output.
+			if ($this->get('gzip') && !ini_get('zlib.output_compression') && ini_get('output_handler') !== 'ob_gzhandler')
+			{
+				$this->compress();
+
+				// Trigger the onAfterCompress event.
+				$this->triggerEvent('onAfterCompress');
+			}
 
-			// Trigger the onAfterCompress event.
-			$this->triggerEvent('onAfterCompress');
+			// Send the application response.
+			$this->respond();
+
+			// Trigger the onAfterRespond event.
+			$this->triggerEvent('onAfterRespond');
 		}
+		catch (\Throwable $throwable)
+		{
+			/** @var ErrorEvent $event */
+			$event = AbstractEvent::create(
+				'onError',
+				[
+					'subject'     => $throwable,
+					'eventClass'  => ErrorEvent::class,
+					'application' => $this,
+				]
+			);
 
-		// Send the application response.
-		$this->respond();
+			// Trigger the onError event.
+			$this->triggerEvent('onError', $event);
 
-		// Trigger the onAfterRespond event.
-		$this->triggerEvent('onAfterRespond');
+			ExceptionHandler::render($event->getError());
+		}
 	}
 
 	/**