[4.0] Sync app setup

administrator/includes/app.php

@@ -25,11 +25,17 @@
 
 require_once JPATH_BASE . '/includes/framework.php';
 
+/** @var \Joomla\DI\Container $container */
+$container = require JPATH_LIBRARIES . '/container.php';
+
+// Set the container as global one
+\Joomla\CMS\Factory::$container = $container;
+
 // 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

@@ -215,22 +215,35 @@ public function doExecute()
 	}
 }
 
+/** @var \Joomla\DI\Container $container */
+$container = require JPATH_LIBRARIES . '/container.php';
+
+// Set the container as global one
+\Joomla\CMS\Factory::$container = $container;
+
 // 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/finder_indexer.php

@@ -360,22 +360,35 @@ private function getFilters()
 	}
 }
 
+/** @var \Joomla\DI\Container $container */
+$container = require JPATH_LIBRARIES . '/container.php';
+
+// Set the container as global one
+\Joomla\CMS\Factory::$container = $container;
+
 // 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();

includes/app.php

@@ -25,11 +25,17 @@
 
 require_once JPATH_BASE . '/includes/framework.php';
 
+/** @var \Joomla\DI\Container $container */
+$container = require JPATH_LIBRARIES . '/container.php';
+
+// Set the container as global one
+\Joomla\CMS\Factory::$container = $container;
+
 // 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('site');
+// Get the application from the container
+$app = $container->get(\Joomla\CMS\Application\SiteApplication::class);
 
 // Execute the application.
 $app->execute();

libraries/container.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package    Joomla.Libraries
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access.
+defined('_JEXEC') or die;
+
+$container = (new \Joomla\DI\Container)
+	->registerServiceProvider(new \Joomla\CMS\Service\Provider\Application)
+	->registerServiceProvider(new \Joomla\CMS\Service\Provider\Database)
+	->registerServiceProvider(new \Joomla\CMS\Service\Provider\Dispatcher)
+	->registerServiceProvider(new \Joomla\CMS\Service\Provider\Form)
+	->registerServiceProvider(new \Joomla\CMS\Service\Provider\Document)
+	->registerServiceProvider(new \Joomla\CMS\Service\Provider\Menu)
+	->registerServiceProvider(new \Joomla\CMS\Service\Provider\Session)
+	->registerServiceProvider(new \Joomla\CMS\Service\Provider\Toolbar);
+
+return $container;

libraries/src/Application/CMSApplicationInterface.php

@@ -8,6 +8,7 @@
 
 namespace Joomla\CMS\Application;
 
+use Joomla\CMS\Language\Language;
 use Joomla\CMS\User\User;
 use Joomla\Session\SessionInterface;
 
@@ -132,6 +133,15 @@ public function isClient($identifier);
 	 */
 	public function getSession();
 
+	/**
+	 * Method to get the application language object.
+	 *
+	 * @return  Language  The language object
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getLanguage();
+
 	/**
 	 * Flag if the application instance is a CLI or web based application.
 	 *

libraries/src/Document/Document.php

@@ -319,7 +319,8 @@ public function __construct($options = array())
 	 *
 	 * @return  static  The document object.
 	 *
-	 * @since   11.1
+	 * @since       11.1
+	 * @deprecated  5.0 Use the document factory
 	 */
 	public static function getInstance($type = 'html', $attributes = array())
 	{

libraries/src/Factory.php

@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Cache\Cache;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Document\Document;
@@ -38,7 +38,7 @@ abstract class Factory
 	/**
 	 * Global application object
 	 *
-	 * @var    CMSApplication
+	 * @var    CMSApplicationInterface
 	 * @since  11.1
 	 */
 	public static $application = null;
@@ -63,8 +63,9 @@ abstract class Factory
 	/**
 	 * Global container object
 	 *
-	 * @var    Container
-	 * @since  4.0
+	 * @var         Container
+	 * @since       4.0
+	 * @deprecated  5.0 Don't us it, it is needed for the transition period
 	 */
 	public static $container = null;
 
@@ -118,18 +119,10 @@ abstract class Factory
 	public static $mailer = null;
 
 	/**
-	 * Get an application object.
+	 * Get the global application object.
 	 *
-	 * Returns the global {@link CMSApplication} object, only creating it if it doesn't already exist.
+	 * @return  CMSApplicationInterface object
 	 *
-	 * @param   mixed      $id         A client identifier or name.
-	 * @param   array      $config     An optional associative array of configuration settings.
-	 * @param   string     $prefix     Application prefix
-	 * @param   Container  $container  An optional dependency injection container to inject into the application.
-	 *
-	 * @return  CMSApplication object
-	 *
-	 * @see     JApplication
 	 * @since   11.1
 	 * @throws  \Exception
 	 */
@@ -202,9 +195,14 @@ public static function getConfig($file = null, $type = 'PHP', $namespace = '')
 	 *
 	 * Returns the global service container object, only creating it if it doesn't already exist.
 	 *
+	 * This method exists to bridge the CMS architecture to a service injection based structure.
+	 * Use of this method outside of service factory methods (i.e. a static getInstance() method
+	 * or a method which builds class services) is highly discouraged.
+	 *
 	 * @return  Container
 	 *
-	 * @since   4.0
+	 * @since       4.0
+	 * @deprecated  5.0 For the current state it is not known when this function will be removed
 	 */
 	public static function getContainer(): Container
 	{
@@ -511,7 +509,8 @@ protected static function createConfig($file, $type = 'PHP', $namespace = '')
 	 *
 	 * @return  Container
 	 *
-	 * @since   4.0
+	 * @since       4.0
+	 * @deprecated  See Factory::getContainer()
 	 */
 	protected static function createContainer(): Container
 	{

libraries/src/Filter/InputFilter.php

@@ -29,7 +29,7 @@ class InputFilter extends BaseInputFilter
 	 * @var    integer
 	 * @since  3.5
 	 */
-	public $stripUSC = 0;
+	private $stripUSC = 0;
 
 	/**
 	 * Constructor for inputFilter class. Only first parameter is required.
@@ -49,37 +49,6 @@ public function __construct($tagsArray = array(), $attrArray = array(), $tagsMet
 
 		// Assign member variables
 		$this->stripUSC = $stripUSC;
-
-		/**
-		 * If Unicode Supplementary Characters stripping is not set we have to check with the database driver. If the
-		 * driver does not support USCs (i.e. there is no utf8mb4 support) we will enable USC stripping.
-		 */
-		if ($this->stripUSC === -1)
-		{
-			try
-			{
-				// Get the database driver
-				$db = \JFactory::getDbo();
-
-				if ($db instanceof UTF8MB4SupportInterface)
-				{
-					// This trick is required to let the driver determine the utf-8 multibyte support
-					$db->connect();
-
-					// And now we can decide if we should strip USCs
-					$this->stripUSC = $db->hasUTF8mb4Support() ? 0 : 1;
-				}
-				else
-				{
-					$this->stripUSC = 1;
-				}
-			}
-			catch (\RuntimeException $e)
-			{
-				// Could not connect to the database. Strip USC to be on the safe side.
-				$this->stripUSC = 1;
-			}
-		}
 	}
 
 	/**
@@ -139,7 +108,7 @@ public static function &getInstance($tagsArray = array(), $attrArray = array(),
 	public function clean($source, $type = 'string')
 	{
 		// Strip Unicode Supplementary Characters when requested to do so
-		if ($this->stripUSC)
+		if ($this->isStripUSC())
 		{
 			// Alternatively: preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xE2\xAF\x91", $source) but it'd be slower.
 			$source = $this->stripUSC($source);
@@ -528,4 +497,50 @@ protected function stripUSC($source)
 
 		return preg_replace('/[\xF0-\xF7].../s', "\xE2\xAF\x91", $source);
 	}
+
+	/**
+	 * Returns if USC should be stripped.
+	 *
+	 * @return  boolean  If USC should be stripped
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private function isStripUSC()
+	{
+		// Flag is set
+		if ($this->stripUSC != -1)
+		{
+			return $this->stripUSC;
+		}
+
+		/**
+		 * If Unicode Supplementary Characters stripping is not set we have to check with the database driver. If the
+		 * driver does not support USCs (i.e. there is no utf8mb4 support) we will enable USC stripping.
+		 */
+		try
+		{
+			// Get the database driver
+			$db = \JFactory::getDbo();
+
+			if ($db instanceof UTF8MB4SupportInterface)
+			{
+				// This trick is required to let the driver determine the utf-8 multibyte support
+				$db->connect();
+
+				// And now we can decide if we should strip USCs
+				$this->stripUSC = $db->hasUTF8mb4Support() ? 0 : 1;
+			}
+			else
+			{
+				$this->stripUSC = 1;
+			}
+		}
+		catch (\RuntimeException $e)
+		{
+			// Could not connect to the database. Strip USC to be on the safe side.
+			$this->stripUSC = 1;
+		}
+
+		return $this->stripUSC === 1;
+	}
 }

libraries/src/Menu/AbstractMenu.php

@@ -92,6 +92,7 @@ public function __construct($options = array())
 	 *
 	 * @since   1.5
 	 * @throws  \Exception
+	 * @deprecated  5.0 Use the menu factory instead
 	 */
 	public static function getInstance($client, $options = array())
 	{

libraries/src/Pathway/Pathway.php

@@ -51,8 +51,9 @@ class Pathway
 	 *
 	 * @return  Pathway  A Pathway object.
 	 *
-	 * @since   1.5
-	 * @throws  \RuntimeException
+	 * @since       1.5
+	 * @throws      \RuntimeException
+	 * @deprecated  5.0 Instantiate the object directly
 	 */
 	public static function getInstance($client, $options = array())
 	{