Verified Commit 53416da2 authored by Dave Long's avatar Dave Long
Browse files

Merged 10.3.9.

parents b5c897f4 f2093af4

composer.lock

+2 −2
Original line number Diff line number Diff line
@@ -9618,8 +9618,8 @@ 
    },

    "prefer-stable": true,

    "prefer-lowest": false,

    "platform": [],

    "platform-dev": [],

    "platform": {},

    "platform-dev": {},

    "platform-overrides": {

        "php": "8.1.0"

    },

core/lib/Drupal/Core/Ajax/MessageCommand.php

+7 −3
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


namespace Drupal\Core\Ajax;



use Drupal\Component\Render\MarkupInterface;

use Drupal\Component\Utility\Xss;

use Drupal\Core\Asset\AttachedAssets;



/**
@@ -68,7 +70,7 @@ class MessageCommand implements CommandInterface, CommandWithAttachedAssetsInter 
  /**

   * The message text.

   *

   * @var string

   * @var string|\Drupal\Component\Render\MarkupInterface

   */

  protected $message;
@@ -96,7 +98,7 @@ class MessageCommand implements CommandInterface, CommandWithAttachedAssetsInter 
  /**

   * Constructs a MessageCommand object.

   *

   * @param string $message

   * @param string|\Drupal\Component\Render\MarkupInterface $message

   *   The text of the message.

   * @param string|null $wrapper_query_selector

   *   The query selector of the element to display messages in when they
@@ -120,7 +122,9 @@ public function __construct($message, $wrapper_query_selector = NULL, array $opt 
  public function render() {

    return [

      'command' => 'message',

      'message' => $this->message,

      'message' => $this->message instanceof MarkupInterface

        ? (string) $this->message

        : Xss::filterAdmin($this->message),

      'messageWrapperQuerySelector' => $this->wrapperQuerySelector,

      'messageOptions' => $this->options,

      'clearPrevious' => $this->clearPrevious,

core/lib/Drupal/Core/Config/StorageComparer.php

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


use Drupal\Component\Datetime\Time;

use Drupal\Component\Datetime\TimeInterface;

use Drupal\Core\Cache\CacheBackendInterface;

use Drupal\Core\Cache\MemoryBackend;

use Drupal\Core\Cache\NullBackend;

use Drupal\Core\Config\Entity\ConfigDependencyManager;
@@ -85,7 +86,7 @@ class StorageComparer implements StorageComparerInterface { 
   *

   * @var \Drupal\Core\Cache\CacheBackendInterface

   */

  protected $targetCacheStorage;

  protected CacheBackendInterface $targetCacheStorage;



  /**

   * Indicates whether the target storage should be wrapped in a cache.

core/lib/Drupal/Core/Database/Query/Select.php

+9 −0
Original line number Diff line number Diff line
@@ -800,6 +800,15 @@ protected function prepareCountQuery() { 
   * {@inheritdoc}

   */

  public function __toString() {

    if (!is_array($this->fields) ||

      !is_array($this->expressions) ||

      !is_array($this->tables) ||

      !is_array($this->order) ||

      !is_array($this->group) ||

      !is_array($this->union)) {

      throw new \UnexpectedValueException();

    }



    // For convenience, we compile the query ourselves if the caller forgot

    // to do it. This allows constructs like "(string) $query" to work. When

    // the query will be executed, it will be recompiled using the proper

core/lib/Drupal/Core/Database/Query/Update.php

+6 −0
Original line number Diff line number Diff line
@@ -164,6 +164,12 @@ public function execute() { 
   *   The prepared statement.

   */

  public function __toString() {

    if (!is_array($this->fields) ||

      !is_array($this->arguments) ||

      !is_array($this->expressionFields)) {

      throw new \UnexpectedValueException();

    }



    // Create a sanitized comment string to prepend to the query.

    $comments = $this->connection->makeComment($this->comments);