diff --git a/core/includes/install.inc b/core/includes/install.inc index 308432cb10c234ee9b3fd874319321296fbd20a7..7ee2c6b53e83d475b7eef54fe278abab5cff2d44 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -1103,6 +1103,9 @@ function db_run_tasks($driver) { * * @param $driver * The name of the driver. + * + * @return \Drupal\Core\Database\Install\Tasks + * A class defining the requirements and tasks for installing the database. */ function db_installer_object($driver) { // We cannot use Database::getConnection->getDriverClass() here, because diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php index 1d048831bab8219d68dd065af071e08fdc25fb5b..5a1f1aeafc6b77d46ff17af9342631ef6c2efa57 100644 --- a/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php +++ b/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php @@ -24,22 +24,21 @@ class Tasks extends InstallTasks { protected $pdoDriver = 'mysql'; /** - * Returns a human-readable name string for MySQL and equivalent databases. + * {@inheritdoc} */ public function name() { return t('MySQL, MariaDB, Percona Server, or equivalent'); } /** - * Returns the minimum version for MySQL. + * {@inheritdoc} */ public function minimumVersion() { return '5.0.15'; } /** - * Check database connection and attempt to create database if the database is - * missing. + * {@inheritdoc} */ protected function connect() { try { diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php index bb309017314c88511801f52aa408a2f8f43706c2..06cc2b073e6cd135bdf4b48d00ffc5dda3747210 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php @@ -13,11 +13,18 @@ use Drupal\Core\Database\DatabaseNotFoundException; /** - * PostgreSQL specific install functions + * Specifies installation tasks for PostgreSQL databases. */ class Tasks extends InstallTasks { + + /** + * {@inheritdoc} + */ protected $pdoDriver = 'pgsql'; + /** + * Constructs a \Drupal\Core\Database\Driver\pgsql\Install\Tasks object. + */ public function __construct() { $this->tasks[] = array( 'function' => 'checkEncoding', @@ -33,17 +40,22 @@ public function __construct() { ); } + /** + * {@inheritdoc} + */ public function name() { return t('PostgreSQL'); } + /** + * {@inheritdoc} + */ public function minimumVersion() { return '8.3'; } /** - * Check database connection and attempt to create database if the database is - * missing. + * {@inheritdoc} */ protected function connect() { try { diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php index 1079688562ff282e65888950eaa6dbd35a09ef33..08aa250329631eefe78a3952ed09b0f2251329de 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php @@ -12,22 +12,34 @@ use Drupal\Core\Database\DatabaseNotFoundException; use Drupal\Core\Database\Install\Tasks as InstallTasks; +/** + * Specifies installation tasks for SQLite databases. + */ class Tasks extends InstallTasks { + + /** + * {@inheritdoc} + */ protected $pdoDriver = 'sqlite'; + /** + * {@inheritdoc} + */ public function name() { return t('SQLite'); } /** - * Minimum engine version. - * - * @todo Consider upping to 3.6.8 in Drupal 8 to get SAVEPOINT support. + * {@inheritdoc} */ public function minimumVersion() { + // @todo Consider upping to 3.6.8 in Drupal 8 to get SAVEPOINT support. return '3.3.7'; } + /** + * {@inheritdoc} + */ public function getFormOptions($database) { $form = parent::getFormOptions($database); @@ -43,8 +55,7 @@ public function getFormOptions($database) { } /** - * Check database connection and attempt to create database if the database is - * missing. + * {@inheritdoc} */ protected function connect() { try { diff --git a/core/lib/Drupal/Core/Database/Install/Tasks.php b/core/lib/Drupal/Core/Database/Install/Tasks.php index 4ff0b712c977e3b604acca7e01102b8604304df1..df58c256273bce840dbb30ca2d4c264d5ccd0ae7 100644 --- a/core/lib/Drupal/Core/Database/Install/Tasks.php +++ b/core/lib/Drupal/Core/Database/Install/Tasks.php @@ -16,6 +16,13 @@ */ abstract class Tasks { + /** + * The name of the PDO driver this database type requires. + * + * @var string + */ + protected $pdoDriver; + /** * Structure that describes each task to run. *