[4.0] [GSoC 2018] CLI Update Project

includes/framework.php

@@ -18,7 +18,16 @@
 	|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10)
 	|| (file_exists(JPATH_INSTALLATION . '/index.php') && (false === (new Version)->isInDevelopmentState())))
 {
-	if (file_exists(JPATH_INSTALLATION . '/index.php'))
+	// Prevents the script from falling back to $_SERVER['REQUEST_URI'] as it will throw an error in CLI mode.
+	if (php_sapi_name() === 'cli')
+	{
+		// This is been defined because some core scripts needs it defined.
+		define('JDEBUG', false);
+
+		// We pass control back to the calling script - joomla.php to allow commands like core:install to run
+		return;
+	}
+	elseif (file_exists(JPATH_INSTALLATION . '/index.php'))
 	{
 		header('Location: ' . substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')) . 'installation/index.php');
 

installation/src/Form/Field/Installation/PrefixField.php

@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Installation\Helper\DatabaseHelper;
 
 /**
  * Database Prefix field.
@@ -45,36 +46,17 @@ protected function getInput()
 		$disabled  = (string) $this->element['disabled'] === 'true' ? ' disabled="disabled"' : '';
 
 		// Make sure somebody doesn't put in a too large prefix size value.
-		if ($size > 10)
+		if ($size > 15)
 		{
-			$size = 10;
+			$size = 15;
 		}
 
 		// If a prefix is already set, use it instead.
 		$session = Factory::getSession()->get('setup.options', array());
 
 		if (empty($session['db_prefix']))
 		{
-			// Create the random prefix.
-			$prefix  = '';
-			$chars   = range('a', 'z');
-			$numbers = range(0, 9);
-
-			// We want the fist character to be a random letter.
-			shuffle($chars);
-			$prefix .= $chars[0];
-
-			// Next we combine the numbers and characters to get the other characters.
-			$symbols = array_merge($numbers, $chars);
-			shuffle($symbols);
-
-			for ($i = 0, $j = $size - 1; $i < $j; ++$i)
-			{
-				$prefix .= $symbols[$i];
-			}
-
-			// Add in the underscore.
-			$prefix .= '_';
+			$prefix = DatabaseHelper::getPrefix();
 		}
 		else
 		{

installation/src/Helper/DatabaseHelper.php

@@ -69,4 +69,38 @@ public static function getDbo($driver, $host, $user, $password, $database, $pref
 
 		return $db;
 	}
+
+	/**
+	 * Generates random prefix string for DB table
+	 *
+	 * @param   int  $size  Size of the Prefix
+	 *
+	 * @return string
+	 *
+	 * @since 4.0
+	 */
+	public static function getPrefix(int $size = 15)
+	{
+		// Create the random prefix.
+		$chars   = range('a', 'z');
+		$numbers = range(0, 9);
+
+		// We want the first character to be a random letter.
+		shuffle($chars);
+		$prefix = $chars[0];
+
+		// Next we combine the numbers and characters to get the other characters.
+		$symbols = array_merge($numbers, $chars);
+		shuffle($symbols);
+
+		for ($i = 1, $j = $size - 1; $i < $j; ++$i)
+		{
+			$prefix .= $symbols[$i];
+		}
+
+		// Add in the underscore.
+		$prefix .= '_';
+
+		return $prefix;
+	}
 }

installation/src/Model/DatabaseModel.php

@@ -575,7 +575,7 @@ public function createTables($options)
 		$serverType = $db->getServerType();
 
 		// Set the appropriate schema script based on UTF-8 support.
-		$schema = 'sql/' . $serverType . '/joomla.sql';
+		$schema = JPATH_INSTALLATION . '/sql/' . $serverType . '/joomla.sql';
 
 		// Check if the schema is a valid file
 		if (!is_file($schema))
@@ -700,7 +700,7 @@ public function createTables($options)
 		}
 
 		// Load the localise.sql for translating the data in joomla.sql.
-		$dblocalise = 'sql/' . $serverType . '/localise.sql';
+		$dblocalise = JPATH_INSTALLATION . '/sql/' . $serverType . '/localise.sql';
 
 		if (is_file($dblocalise))
 		{
@@ -722,7 +722,7 @@ public function createTables($options)
 		}
 
 		// Handle default backend language setting. This feature is available for localized versions of Joomla.
-		$languages = Factory::getApplication()->getLocaliseAdmin($db);
+		$languages = $this->getLocaliseAdmin($db);
 
 		if (in_array($options->language, $languages['admin']) || in_array($options->language, $languages['site']))
 		{
@@ -767,6 +767,109 @@ public function createTables($options)
 		return $return;
 	}
 
+	/**
+	 * Returns the installed language in the administrative and frontend area.
+	 *
+	 * @param   DatabaseInterface  $db  Database driver.
+	 *
+	 * @return  array  Array with installed language packs in admin and site area.
+	 *
+	 * @since   4.0
+	 */
+	public function getLocaliseAdmin(DatabaseInterface $db = null)
+	{
+		$langfiles = [];
+
+		// If db connection, fetch them from the database.
+		if ($db)
+		{
+			foreach (LanguageHelper::getInstalledLanguages() as $clientId => $languages)
+			{
+				$clientName = $clientId === 0 ? 'site' : 'admin';
+
+				foreach ($languages as $language)
+				{
+					$langfiles[$clientName][] = $language->element;
+				}
+			}
+
+			return $langfiles;
+		}
+
+		// Read the folder names in the site and admin area.
+		return [
+			'site' => Folder::folders(LanguageHelper::getLanguagePath(JPATH_SITE)),
+			'admin' => Folder::folders(LanguageHelper::getLanguagePath(JPATH_ADMINISTRATOR)),
+		];
+	}
+
+	/**
+	 * Method to install the sample data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 */
+	public function installSampleData()
+	{
+		$db = Factory::getDbo();
+
+		// Build the path to the sample data file.
+		$type = $db->getServerType();
+
+		if (Factory::getApplication()->input->get('sample_file', ''))
+		{
+			$sample_file = Factory::getApplication()->input->get('sample_file', '');
+		}
+		else
+		{
+			$sample_file = 'sample_testing.sql';
+		}
+
+		$data = JPATH_INSTALLATION . '/sql/' . $type . '/' . $sample_file;
+
+		// Attempt to import the database schema if one is chosen.
+		if ($sample_file != '')
+		{
+			if (!file_exists($data))
+			{
+				Factory::getApplication()->enqueueMessage(Text::sprintf('INSTL_DATABASE_FILE_DOES_NOT_EXIST', $data), 'error');
+
+				return false;
+			}
+			elseif (!$this->populateDatabase($db, $data))
+			{
+				return false;
+			}
+
+			$this->postInstallSampleData($db, $sample_file);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Sample data tables and data post install process.
+	 *
+	 * @param   \JDatabaseDriver  $db              Database connector object $db*.
+	 * @param   string            $sampleFileName  The sample dats filename.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function postInstallSampleData($db, $sampleFileName = '')
+	{
+		// Update the sample data user ids.
+		$this->updateUserIds($db);
+
+		// If not joomla sample data for testing, update the sample data dates.
+		if ($sampleFileName !== 'sample_testing.sql')
+		{
+			$this->updateDates($db);
+		}
+	}
+
 	/**
 	 * Method to install the cms data.
 	 *

libraries/bootstrap.php

@@ -83,3 +83,9 @@ class_exists('\\Joomla\\CMS\\Autoload\\ClassLoader');
 
 // Register the PasswordHash library.
 JLoader::register('PasswordHash', JPATH_PLATFORM . '/phpass/PasswordHash.php');
+
+// Registers the Installation namespace
+if (file_exists(JPATH_INSTALLATION . '/index.php'))
+{
+	JLoader::registerNamespace('Joomla\\CMS\\Installation', JPATH_INSTALLATION . '/src', false, false, 'psr4');
+}

libraries/src/Application/ConsoleApplication.php

@@ -14,6 +14,7 @@
 use Joomla\CMS\Extension\ExtensionManagerTrait;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Version;
 use Joomla\Console\Application;
 use Joomla\DI\Container;
 use Joomla\DI\ContainerAwareTrait;
@@ -22,6 +23,8 @@
 use Joomla\Event\DispatcherInterface;
 use Joomla\Registry\Registry;
 use Joomla\Session\SessionInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
@@ -57,6 +60,14 @@ class ConsoleApplication extends Application implements DispatcherAwareInterface
 	 */
 	private $session;
 
+	/**
+	 * The client identifier.
+	 *
+	 * @var    integer
+	 * @since  4.0
+	 */
+	protected $clientId = 4;
+
 	/**
 	 * Class constructor.
 	 *
@@ -163,8 +174,11 @@ public function execute()
 		$this->createExtensionNamespaceMap();
 
 		// Import CMS plugin groups to be able to subscribe to events
-		PluginHelper::importPlugin('system');
-		PluginHelper::importPlugin('console');
+		if (file_exists(JPATH_CONFIGURATION . '/configuration.php'))
+		{
+			PluginHelper::importPlugin('system');
+			PluginHelper::importPlugin('console');
+		}
 
 		parent::execute();
 	}
@@ -307,6 +321,31 @@ public function setSession(SessionInterface $session): self
 		return $this;
 	}
 
+
+	/**
+	 * Flush the media version to refresh versionable assets
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0
+	 */
+	public function flushAssets()
+	{
+		(new Version)->refreshMediaVersion();
+	}
+
+	/**
+	 * Gets the client id of the current running application.
+	 *
+	 * @return  integer  A client identifier.
+	 *
+	 * @since   4.0
+	 */
+	public function getClientId()
+	{
+		return $this->clientId;
+	}
+
 	/**
 	 * Returns the application \JMenu object.
 	 *