Commit aa51520a authored by Sascha Grossenbacher's avatar Sascha Grossenbacher Committed by Sascha Grossenbacher
Browse files

Issue #3288711 by taniachque, Project Update Bot, Berdir: Automated Drupal 10 compatibility fixes

parent 302ad112

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    "type": "drupal-module",

    "license": "GPL-2.0",

    "require": {

        "drupal/core": "^8.7.7 || ^9"

        "drupal/core": "^9.4 || ^10"

    },

    "require-dev": {

        "drupal/simplenews": "~2.0",

js/monitoring.sensor.overview.js

+3 −3
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 
   */

  Drupal.behaviors.tableFilterByText = {

    attach: function (context, settings) {

      var $input = $('input.table-filter-text').once('table-filter-text');

      var $select_category = $('select.table-filter-select-category').once('table-filter-select-category');

      var $select_sensor_type = $('select.table-filter-select-sensor-type').once('table-filter-select-sensor-type');

      var $input = $(once('table-filter-text', 'input.table-filter-text'));

      var $select_category = $(once('table-filter-select-category', 'select.table-filter-select-category'));

      var $select_sensor_type = $(once('table-filter-select-sensor-type', 'select.table-filter-select-sensor-type');

      var $table = $($input.attr('data-table'));

      var $rows;

      var $details;

modules/demo/monitoring_demo.install

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ function monitoring_demo_install() { 
  $sensor_manager->enableSensor('monitoring_disappeared_sensors');



  // Generate some image style derivative errors.

  $file = file_save_data($random->name());

  $file = \Drupal::service('file.repository')->writeData($random->name(), 'public://');

  /** @var \Drupal\file\FileUsage\FileUsageInterface $usage */

  $usage = \Drupal::service('file.usage');

  foreach ($nodes as $node) {
@@ -127,7 +127,7 @@ function monitoring_demo_install() { 
      ]

    );

  }

  $file = file_save_data($random->name());

  $file = \Drupal::service('file.repository')->writeData($random->name(), 'public://');

  \Drupal::logger('image')->notice('Source image at %source_image_path not found while trying to generate derivative image at %derivative_path.', [

      '%source_image_path' => $file->getFileUri(),

      '%derivative_path' => 'hash://styles/preview/5678.jpeg',

modules/demo/tests/src/Functional/MonitoringDemoTest.php

+10 −10
Original line number Diff line number Diff line
@@ -16,22 +16,22 @@ class MonitoringDemoTest extends MonitoringTestBase { 
   *

   * @var string[]

   */

  public static $modules = ['monitoring_demo'];

  protected static $modules = ['monitoring_demo'];



  /**

   * Asserts the demo instructions on the frontpage.

   */

  public function testInstalled() {

    $this->drupalGet('');

    $this->assertText('Monitoring');

    $this->assertText(t('Welcome to the Monitoring demo installation.'));

    $this->assertLink(t('Monitoring sensors overview'));

    $this->assertLink(t('Monitoring sensors settings'));

    $this->assertText(t('Sensor example: "Installed modules"'));

    $this->assertLink(t('Configure'));

    $this->assertLink(t('Uninstall'), 0);

    $this->assertLink(t('Uninstall'), 1);

    $this->assertText(t('Drush integration - open up your console and type in # drush monitoring-sensor-config'));

    $this->assertSession()->pageTextContains('Monitoring');

    $this->assertSession()->pageTextContains(t('Welcome to the Monitoring demo installation.'));

    $this->assertSession()->linkExists(t('Monitoring sensors overview'));

    $this->assertSession()->linkExists(t('Monitoring sensors settings'));

    $this->assertSession()->pageTextContains(t('Sensor example: "Installed modules"'));

    $this->assertSession()->linkExists(t('Configure'));

    $this->assertSession()->linkExists(t('Uninstall'), 0);

    $this->assertSession()->linkExists(t('Uninstall'), 1);

    $this->assertSession()->pageTextContains(t('Drush integration - open up your console and type in # drush monitoring-sensor-config'));

  }



}

modules/monitoring_mail/tests/src/Kernel/MonitoringMailKernelTest.php

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class MonitoringMailKernelTest extends MonitoringUnitTestBase { 
  /**

   * {@inheritdoc}

   */

  protected function setUp() {

  protected function setUp(): void {

    parent::setUp();



    $this->installSchema('dblog', ['watchdog']);