[4.0] Restructuring Installation, splitting up SQL

installation/src/Controller/InstallationController.php

@@ -12,6 +12,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\Utilities\ArrayHelper;
@@ -39,7 +40,11 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	{
 		parent::__construct($config, $factory, $app, $input);
 
-		$this->registerTask('remove', 'backup');
+		$this->registerTask('populate1', 'populate');
+		$this->registerTask('populate2', 'populate');
+		$this->registerTask('populate3', 'populate');
+		$this->registerTask('custom1', 'populate');
+		$this->registerTask('custom2', 'populate');
 		$this->registerTask('removeFolder', 'delete');
 	}
 
@@ -77,98 +82,125 @@ public function dbcheck()
 	}
 
 	/**
-	 * Config task.
+	 * Create DB task.
 	 *
 	 * @return  void
 	 *
 	 * @since   4.0.0
 	 */
-	public function config()
+	public function create()
 	{
 		$this->checkValidToken();
 
-		/** @var \Joomla\CMS\Installation\Model\SetupModel $setUpModel */
-		$setUpModel = $this->getModel('Setup');
-
-		// Get the options from the session
-		$options = $setUpModel->getOptions();
-
 		$r = new \stdClass;
-		$r->view = 'remove';
 
-		/** @var \Joomla\CMS\Installation\Model\ConfigurationModel $configurationModel */
-		$configurationModel = $this->getModel('Configuration');
+		/** @var \Joomla\CMS\Installation\Model\DatabaseModel $databaseModel */
+		$databaseModel = $this->getModel('Database');
 
-		// Attempt to setup the configuration.
+		// Create Db
 		try
 		{
-			$setupDone = $configurationModel->setup($options);
+			$dbCreated = $databaseModel->createDatabase();
 		}
 		catch (\RuntimeException $e)
 		{
 			$this->app->enqueueMessage($e->getMessage(), 'error');
 
-			$setupDone = false;
+			$dbCreated = false;
 		}
 
-		if (!$setupDone)
+		if (!$dbCreated)
 		{
 			$r->view = 'setup';
 		}
+		else
+		{
+			if (!$databaseModel->handleOldDatabase())
+			{
+				$r->view = 'setup';
+			}
+		}
 
 		$this->sendJsonResponse($r);
 	}
 
 	/**
-	 * Database task.
+	 * Populate the database.
 	 *
 	 * @return  void
 	 *
 	 * @since   4.0.0
 	 */
-	public function database()
+	public function populate()
 	{
 		$this->checkValidToken();
-
-		/** @var \Joomla\CMS\Installation\Model\SetupModel $model */
-		$model = $this->getModel('Setup');
-		$model->checkForm('setup');
+		$step = $this->getTask();
+		/** @var \Joomla\CMS\Installation\Model\DatabaseModel $model */
+		$model = $this->getModel('Database');
 
 		$r = new \stdClass;
+		$db = $model->initialise();
+		$files = [
+			'populate1' => 'base',
+			'populate2' => 'supports',
+			'populate3' => 'extensions',
+			'custom1' => 'localise',
+			'custom2' => 'custom'
+		];
+
+		$schema = $files[$step];
+		$serverType = $db->getServerType();
+
+		if (in_array($step, ['custom1', 'custom2']) && !is_file('sql/' . $serverType . '/' . $schema . '.sql'))
+		{
+			$this->sendJsonResponse($r);
 
-		// Attempt to create the database tables
-		/** @var \Joomla\CMS\Installation\Model\DatabaseModel $dbModel */
-		$dbModel = $this->getModel('Database');
+			return;
+		}
 
-		if (!$dbModel->initialise() || !$dbModel->installCmsData())
+		if (!isset($files[$step]))
 		{
-			$r->view = 'database';
+			$r->view = 'setup';
+			Factory::getApplication()->enqueueMessage(Text::_('INSTL_SAMPLE_DATA_NOT_FOUND'), 'error');
+			$this->sendJsonResponse($r);
+		}
+
+		// Attempt to populate the database with the given file.
+		if (!$model->createTables($schema))
+		{
+			$r->view = 'setup';
 		}
 
 		$this->sendJsonResponse($r);
 	}
 
 	/**
-	 * Backup task.
+	 * Config task.
 	 *
 	 * @return  void
 	 *
 	 * @since   4.0.0
 	 */
-	public function backup()
+	public function config()
 	{
 		$this->checkValidToken();
 
+		/** @var \Joomla\CMS\Installation\Model\SetupModel $setUpModel */
+		$setUpModel = $this->getModel('Setup');
+
+		// Get the options from the session
+		$options = $setUpModel->getOptions();
+
 		$r = new \stdClass;
-		$r->view = 'install';
+		$r->view = 'remove';
 
-		/** @var \Joomla\CMS\Installation\Model\DatabaseModel $model */
-		$model = $this->getModel('Database');
+		/** @var \Joomla\CMS\Installation\Model\ConfigurationModel $configurationModel */
+		$configurationModel = $this->getModel('Configuration');
 
-		// Attempt to handle the old database.
-		if (!$model->handleOldDatabase())
+		// Attempt to setup the configuration.
+		if (!$configurationModel->setup($options))
 		{
-			$r->view = 'database';
+			$r->view = 'setup';
 		}
 
 		$this->sendJsonResponse($r);