diff -u b/core/lib/Drupal/Core/Database/StatementPrefetch.php b/core/lib/Drupal/Core/Database/StatementPrefetch.php
--- b/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@ -138,11 +138,11 @@
    * @param \PDO $pdo_connection
    *   PDO database handler.
    * @param \Drupal\Core\Database\Connection $connection
-   *   Drupal database connection object.
+   *   Database connection object.
    * @param string $query
    *   Database query string.
    * @param array $driver_options
-   *   (optional) Database driver options.
+   *  (optional) Database driver options.
    */
   public function __construct(\PDO $pdo_connection, Connection $connection, $query, array $driver_options = array()) {
     $this->pdoConnection = $pdo_connection;
@@ -398,8 +398,8 @@
    * See http://php.net/manual/pdo.constants.php for the definition of the
    * constants used.
    *
-   * @param  $fetch_style
-   *   (optional) One of the \PDO::FETCH_* constants.
+   * @param $fetch_style
+   *  (optional) One of the \PDO::FETCH_* constants.
    *
    * @return mixed
    *   Returns current row and sets record pointer to next record
@@ -429,12 +429,12 @@
   /**
    * Returns an entire single column of a result set as an indexed array.
    *
-   * @param  int $index
-   *    (optional) The index of the column number to fetch, if no value is
-   *    specified then by default first column would be returned.
+   * @param int $index
+   *   (optional) The index of the column number to fetch, if no value is
+   *   specified then by default first column would be returned.
    *
    * @return mixed
-   *    An indexed array, or FALSE if there is no result set.
+   *   An indexed array, or FALSE if there is no result set.
    */
   public function fetchColumn($index = 0) {
     if (isset($this->currentRow) && isset($this->columnNames[$index])) {
@@ -462,12 +462,12 @@
    * StatementInterface::setFetchMode() or stdClass if not specified.
    *
    * @param string $class_name
-   *    (optional) Name of class.
+   *   (optional) Name of class.
    * @param array $constructor_args
-   *    (optional) Constructor arguments.
+   *   (optional) Constructor arguments.
    *
    * @return mixed
-   *    result as an object or FALSE.
+   *   result as an object or FALSE.
    */
   public function fetchObject($class_name = NULL, $constructor_args = array()) {
     if (isset($this->currentRow)) {
@@ -511,14 +511,14 @@
   /**
    * Fetch an array containing all of the result set rows.
    *
-   * @param  mixed $fetch_style
-   *    (optional) One of the PDO::FETCH_* constants.
-   * @param  int $fetch_column
-   *    (optional) If $fetch_style is PDO::FETCH_COLUMN, the index of the
-   *    column to fetch.
-   * @param  mixed $constructor_args
-   *    (optional) If $constructor_args is PDO::FETCH_CLASS, the arguments
-   *    to pass to the constructor.
+   * @param mixed $fetch_style
+   *   (optional) One of the PDO::FETCH_* constants.
+   * @param int $fetch_column
+   *   (optional) If $fetch_style is PDO::FETCH_COLUMN, the index of the
+   *   column to fetch.
+   * @param mixed $constructor_args
+   *   (optional) If $constructor_args is PDO::FETCH_CLASS, the arguments
+   *   to pass to the constructor.
    *
    * @return array
    *   An array of result set.