Pull merge.

[yaffs-website] / web / core / lib / Drupal / Core / Database / Query / SelectInterface.php

diff --git a/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php b/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php
index 59b15d0790c1938d0766c68991d9c8edafe3b876..e740b7496c530d8df4c2d9f38072dbad103740b0 100644 (file)
--- a/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -95,7 +95,7 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    * Note that this method must be called by reference as well:
    *
    * @code
-   * $fields =& $query->getTables();
+   * $tables =& $query->getTables();
    * @endcode
    *
    * @return
@@ -346,6 +346,8 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    *   db_query('A')->rightJoin('B') is identical to
    *   db_query('B')->leftJoin('A'). This functionality has been deprecated
    *   because SQLite does not support it.
+   *
+   * @see https://www.drupal.org/node/2765249
    */
   public function rightJoin($table, $alias = NULL, $condition = NULL, $arguments = []);
 
@@ -402,10 +404,10 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    *   on.
    *
    *   Example:
-   *   <code>
+   *   @code
    *   $query->addExpression('SUBSTRING(thread, 1, (LENGTH(thread) - 1))', 'order_field');
    *   $query->orderBy('order_field', 'ASC');
-   *   </code>
+   *   @endcode
    * @param $direction
    *   The direction to sort. Legal values are "ASC" and "DESC". Any other value
    *   will be converted to "ASC".