[4.0] Sync app setup

administrator/components/com_banners/Model/Tracks.php

@@ -483,7 +483,7 @@ public function getContent()
 
 			if ($this->getState('compressed'))
 			{
-				$app = \JFactory::getApplication('administrator');
+				$app = \JFactory::getApplication();
 
 				$files = array(
 					'track' => array(

administrator/components/com_categories/Model/Category.php

@@ -145,7 +145,7 @@ public function getTable($type = 'Category', $prefix = 'Administrator', $config
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$parentId = $app->input->getInt('parent_id');
 		$this->setState('category.parent_id', $parentId);

administrator/components/com_fields/Model/Field.php

@@ -823,7 +823,7 @@ protected function canEditState($record)
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');

administrator/components/com_installer/Model/Install.php

@@ -48,7 +48,7 @@ class Install extends Model
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$this->setState('message', $app->getUserState('com_installer.message'));
 		$this->setState('extension_message', $app->getUserState('com_installer.extension_message'));

administrator/components/com_languages/Model/Language.php

@@ -76,7 +76,7 @@ public function getTable($name = '', $prefix = '', $options = array())
 	 */
 	protected function populateState()
 	{
-		$app    = \JFactory::getApplication('administrator');
+		$app    = \JFactory::getApplication();
 		$params = ComponentHelper::getParams('com_languages');
 
 		// Load the User state.

administrator/components/com_menus/Model/Item.php

@@ -695,7 +695,7 @@ public function getItem($pk = null)
 		{
 
 			// Check if we are changing away from the actual link type.
-			if (MenusHelper::getLinkKey($table->link) !== MenusHelper::getLinkKey($link) && (int) $table->id === (int) $this->getState('item.id')) 
+			if (MenusHelper::getLinkKey($table->link) !== MenusHelper::getLinkKey($link) && (int) $table->id === (int) $this->getState('item.id'))
 			{
 				$table->link = $link;
 			}
@@ -942,7 +942,7 @@ protected function getReorderConditions($table)
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');

administrator/components/com_menus/Model/Items.php

@@ -79,7 +79,7 @@ public function __construct($config = array(), MvcFactoryInterface $factory = nu
 	 */
 	protected function populateState($ordering = 'a.lft', $direction = 'asc')
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
 

administrator/components/com_menus/Model/Menu.php

@@ -93,7 +93,7 @@ public function getTable($type = 'MenuType', $prefix = '\JTable', $config = arra
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$id = $app->input->getInt('id');

administrator/components/com_modules/Model/Module.php

@@ -104,7 +104,7 @@ public function __construct($config = array())
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');

administrator/components/com_modules/Model/Select.php

@@ -36,7 +36,7 @@ class Select extends ListModel
 	 */
 	protected function populateState($ordering = null, $direction = null)
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the filter state.
 		$clientId = $app->getUserState('com_modules.modules.client_id', 0);

administrator/components/com_plugins/Model/Plugin.php

@@ -222,7 +222,7 @@ protected function populateState()
 		// Execute the parent method.
 		parent::populateState();
 
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('extension_id');

administrator/components/com_tags/Model/Tag.php

@@ -94,7 +94,7 @@ protected function canEditState($record)
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$parentId = $app->input->getInt('parent_id');
 		$this->setState('tag.parent_id', $parentId);

administrator/components/com_templates/Model/Style.php

@@ -86,7 +86,7 @@ public function __construct($config = array(), MvcFactoryInterface $factory = nu
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');

administrator/components/com_templates/Model/Template.php

@@ -160,7 +160,7 @@ public function getDirectoryTree($dir)
 	protected function populateState()
 	{
 		jimport('joomla.filesystem.file');
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');

administrator/components/com_users/Model/Debuggroup.php

@@ -118,7 +118,7 @@ public function getItems()
 	 */
 	protected function populateState($ordering = 'a.lft', $direction = 'asc')
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Adjust the context to support modal layouts.
 		$layout = $app->input->get('layout', 'default');

administrator/components/com_users/Model/Debuguser.php

@@ -118,7 +118,7 @@ public function getItems()
 	 */
 	protected function populateState($ordering = 'a.lft', $direction = 'asc')
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Adjust the context to support modal layouts.
 		$layout = $app->input->get('layout', 'default');

administrator/components/com_users/Model/Users.php

@@ -70,7 +70,7 @@ public function __construct($config = array(), MvcFactoryInterface $factory = nu
 	 */
 	protected function populateState($ordering = 'a.name', $direction = 'asc')
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Adjust the context to support modal layouts.
 		if ($layout = $app->input->get('layout', 'default', 'cmd'))

administrator/includes/app.php

@@ -25,11 +25,14 @@
 
 require_once JPATH_BASE . '/includes/framework.php';
 
+/** @var \Joomla\DI\Container $container */
+$container = require JPATH_LIBRARIES . '/container.php';
+
 // Set profiler start time and memory usage and mark afterLoad in the profiler.
 JDEBUG ? JProfiler::getInstance('Application')->setStart($startTime, $startMem)->mark('afterLoad') : null;
 
-// Instantiate the application.
-$app = JFactory::getApplication('administrator');
+// Get the application from the container
+$app = $container->get(\Joomla\CMS\Application\AdministratorApplication::class);
 
 // Execute the application.
 $app->execute();

build/helpTOC.php

@@ -200,23 +200,32 @@ public function doExecute()
 	}
 }
 
+/** @var \Joomla\DI\Container $container */
+$container = require JPATH_LIBRARIES . '/container.php';
 
 // Set up the container
-JFactory::getContainer()->share(
+$container->share(
 	'MediawikiCli',
 	function (\Joomla\DI\Container $container)
 	{
-		return new MediawikiCli(
+		$app = new MediawikiCli(
 			null,
 			null,
 			null,
 			null,
 			$container->get(\Joomla\Event\DispatcherInterface::class),
 			$container
 		);
+
+		JFactory::$application = $app;
+
+		return $app;
 	},
 	true
 );
-$app = JFactory::getContainer()->get('MediawikiCli');
-JFactory::$application = $app;
+
+// Get the application from the container
+$app = $container->get('MediawikiCli');
+
+// Execute the application.
 $app->execute();

cli/deletefiles.php

@@ -64,22 +64,32 @@ protected function doExecute()
 	}
 }
 
+/** @var \Joomla\DI\Container $container */
+$container = require JPATH_LIBRARIES . '/container.php';
+
 // Set up the container
-JFactory::getContainer()->share(
+$container->share(
 	'DeletefilesCli',
 	function (\Joomla\DI\Container $container)
 	{
-		return new DeletefilesCli(
+		$app = new DeletefilesCli(
 			null,
 			null,
 			null,
 			null,
 			$container->get(\Joomla\Event\DispatcherInterface::class),
 			$container
 		);
+
+		JFactory::$application = $app;
+
+		return $app;
 	},
 	true
 );
-$app = JFactory::getContainer()->get('DeletefilesCli');
-JFactory::$application = $app;
+
+// Get the application from the container
+$app = $container->get('DeletefilesCli');
+
+// Execute the application.
 $app->execute();

cli/finder_indexer.php

@@ -360,22 +360,32 @@ private function getFilters()
 	}
 }
 
+/** @var \Joomla\DI\Container $container */
+$container = require JPATH_LIBRARIES . '/container.php';
+
 // Set up the container
-JFactory::getContainer()->share(
+$container->share(
 	'FinderCli',
 	function (\Joomla\DI\Container $container)
 	{
-		return new FinderCli(
+		$app = new FinderCli(
 			null,
 			null,
 			null,
 			null,
 			$container->get(\Joomla\Event\DispatcherInterface::class),
 			$container
 		);
+
+		\Joomla\CMS\Factory::$application = $app;
+
+		return $app;
 	},
 	true
 );
-$app = JFactory::getContainer()->get('FinderCli');
-JFactory::$application = $app;
+
+// Get the application from the container
+$app = $container->get('FinderCli');
+
+// Execute the application.
 $app->execute();

cli/garbagecron.php

@@ -44,22 +44,32 @@ protected function doExecute()
 	}
 }
 
+/** @var \Joomla\DI\Container $container */
+$container = require JPATH_LIBRARIES . '/container.php';
+
 // Set up the container
-JFactory::getContainer()->share(
+$container->share(
 	'GarbageCron',
 	function (\Joomla\DI\Container $container)
 	{
-		return new GarbageCron(
+		$app = new GarbageCron(
 			null,
 			null,
 			null,
 			null,
 			$container->get(\Joomla\Event\DispatcherInterface::class),
 			$container
 		);
+
+		\Joomla\CMS\Factory::$application = $app;
+
+		return $app;
 	},
 	true
 );
-$app = JFactory::getContainer()->get('GarbageCron');
-JFactory::$application = $app;
+
+// Get the application from the container
+$app = $container->get('GarbageCron');
+
+// Execute the application.
 $app->execute();

cli/update_cron.php

@@ -65,22 +65,32 @@ protected function doExecute()
 	}
 }
 
+/** @var \Joomla\DI\Container $container */
+$container = require JPATH_LIBRARIES . '/container.php';
+
 // Set up the container
-JFactory::getContainer()->share(
+$container->share(
 	'Updatecron',
 	function (\Joomla\DI\Container $container)
 	{
-		return new Updatecron(
+		$app = new Updatecron(
 			null,
 			null,
 			null,
 			null,
 			$container->get(\Joomla\Event\DispatcherInterface::class),
 			$container
 		);
+
+		\Joomla\CMS\Factory::$application = $app;
+
+		return $app;
 	},
 	true
 );
-$app = JFactory::getContainer()->get('Updatecron');
-JFactory::$application = $app;
+
+// Get the application from the container
+$app = $container->get('Updatecron');
+
+// Execute the application.
 $app->execute();

components/com_config/Model/Modules.php

@@ -31,7 +31,7 @@ class Modules extends Form
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');

components/com_contact/Model/Contact.php

@@ -62,7 +62,7 @@ class Contact extends Form
 	protected function populateState()
 	{
 		/** @var SiteApplication $app */
-		$app = \JFactory::getApplication('site');
+		$app = \JFactory::getApplication();
 
 		$this->setState('contact.id', $app->input->getInt('id'));
 		$this->setState('params', $app->getParams());

components/com_content/Model/Archive.php

@@ -83,7 +83,7 @@ protected function populateState($ordering = null, $direction = null)
 	protected function getListQuery()
 	{
 		$params           = $this->state->params;
-		$app              = JFactory::getApplication('site');
+		$app              = JFactory::getApplication();
 		$catids           = $app->input->getVar('catid', array());
 		$catids           = array_values(array_diff($catids, array('')));
 		$articleOrderDate = $params->get('order_date');

components/com_content/Model/Article.php

@@ -40,7 +40,7 @@ class Article extends Item
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('site');
+		$app = \JFactory::getApplication();
 
 		// Load state from the request.
 		$pk = $app->input->getInt('id');