Rework CMS Application tree

Author: wilsonge

libraries/src/Application/CMSApplicationInterface.php

@@ -8,17 +8,20 @@
 
 namespace Joomla\CMS\Application;
 
+use Joomla\Application\ConfigurationAwareApplicationInterface;
 use Joomla\CMS\Extension\ExtensionManagerInterface;
 use Joomla\CMS\Menu\AbstractMenu;
 use Joomla\CMS\User\User;
-use Joomla\Session\SessionInterface;
+use Joomla\Input\Input;
 
 /**
  * Interface defining a Joomla! CMS Application class
  *
  * @since  4.0.0
+ * @note   In Joomla 4 this interface will no longer extend EventAwareInterface
+ * @property-read   Input  $input  The Joomla Input property. Deprecated for Joomla 5 in favour of the getInput() method
  */
-interface CMSApplicationInterface extends ExtensionManagerInterface
+interface CMSApplicationInterface extends ExtensionManagerInterface, ConfigurationAwareApplicationInterface, EventAwareInterface
 {
 	/**
 	 * Constant defining an enqueued emergency message
@@ -105,15 +108,6 @@ public function enqueueMessage($msg, $type = self::MSG_INFO);
 	 */
 	public function getMessageQueue();
 
-	/**
-	 * Execute the application.
-	 *
-	 * @return  void
-	 *
-	 * @since   4.0.0
-	 */
-	public function execute();
-
 	/**
 	 * Check the client interface by name.
 	 *
@@ -146,6 +140,15 @@ public function isCli();
 	 */
 	public function getIdentity();
 
+	/**
+	 * Method to get the application input object.
+	 *
+	 * @return  Input
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getInput(): Input;
+
 	/**
 	 * Gets the name of the current running application.
 	 *

libraries/src/Application/EventAwareInterface.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\Application;
+
+use Joomla\Event\DispatcherAwareInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Event\Event;
+
+/**
+ * Interface defining application that can throw Joomla 3.x style events
+ *
+ * @since       4.0.0
+ * @deprecated  5.0   This interface will be removed as the Joomla 3.x compatibility layer will be removed
+ */
+interface EventAwareInterface extends DispatcherAwareInterface
+{
+	/**
+	 * Get the event dispatcher.
+	 *
+	 * @return  DispatcherInterface
+	 *
+	 * @since   4.0.0
+	 * @throws  \UnexpectedValueException May be thrown if the dispatcher has not been set.
+	 */
+	public function getDispatcher();
+
+	/**
+	 * Calls all handlers associated with an event group.
+	 *
+	 * This is a legacy method, implementing old-style (Joomla! 3.x) plugin calls. It's best to go directly through the
+	 * Dispatcher and handle the returned EventInterface object instead of going through this method. This method is
+	 * deprecated and will be removed in Joomla! 5.x.
+	 *
+	 * This method will only return the 'result' argument of the event
+	 *
+	 * @param   string       $eventName  The event name.
+	 * @param   array|Event  $args       An array of arguments or an Event object (optional).
+	 *
+	 * @return  array  An array of results from each function call. Note this will be an empty array if no dispatcher is set.
+	 *
+	 * @since       4.0.0
+	 * @throws      \InvalidArgumentException
+	 * @deprecated  5.0
+	 */
+	public function triggerEvent($eventName, $args = []);
+}

libraries/src/Application/WebApplication.php

@@ -20,8 +20,6 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
 use Joomla\CMS\Version;
-use Joomla\Event\DispatcherAwareInterface;
-use Joomla\Event\DispatcherAwareTrait;
 use Joomla\Registry\Registry;
 use Joomla\Session\SessionEvent;
 use Psr\Http\Message\ResponseInterface;
@@ -31,9 +29,9 @@
  *
  * @since  2.5.0
  */
-abstract class WebApplication extends AbstractWebApplication implements DispatcherAwareInterface
+abstract class WebApplication extends AbstractWebApplication
 {
-	use DispatcherAwareTrait, EventAware, IdentityAware;
+	use EventAware, IdentityAware;
 
 	/**
 	 * The application document object.