Verified Commit d39fc225 authored by Dave Long's avatar Dave Long
Browse files

Issue #3402293 by dww, mstrelan, smustgrave: Fix strict type errors: Convert... 

Issue #3402293 by dww, mstrelan, smustgrave: Fix strict type errors: Convert FormattableMarkup to strings (simple replacement) in core/modules/*/tests/src/Kernel/*

(cherry picked from commit df70716e)
parent 75c747bf

core/modules/dblog/tests/src/Kernel/DbLogTest.php

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


namespace Drupal\Tests\dblog\Kernel;



use Drupal\Component\Render\FormattableMarkup;

use Drupal\Core\Database\Database;

use Drupal\KernelTests\KernelTestBase;

use Drupal\Tests\dblog\Functional\FakeLogEntries;
@@ -40,7 +39,7 @@ public function testDbLogCron() { 
    $this->generateLogEntries($row_limit + 10);

    // Verify that the database log row count exceeds the row limit.

    $count = Database::getConnection()->select('watchdog')->countQuery()->execute()->fetchField();

    $this->assertGreaterThan($row_limit, $count, new FormattableMarkup('Dblog row count of @count exceeds row limit of @limit', ['@count' => $count, '@limit' => $row_limit]));

    $this->assertGreaterThan($row_limit, $count, "Dblog row count of $count exceeds row limit of $row_limit");



    // Get the number of enabled modules. Cron adds a log entry for each module.

    $implementation_count = 0;
@@ -52,12 +51,13 @@ function (callable $hook, string $module) use (&$implementation_count) { 
    );



    $cron_detailed_count = $this->runCron();

    $this->assertEquals($implementation_count + 2, $cron_detailed_count, new FormattableMarkup('Cron added @count of @expected new log entries', ['@count' => $cron_detailed_count, '@expected' => $implementation_count + 2]));

    $expected_count = $implementation_count + 2;

    $this->assertEquals($expected_count, $cron_detailed_count, "Cron added $cron_detailed_count of $expected_count new log entries");



    // Test disabling of detailed cron logging.

    $this->config('system.cron')->set('logging', 0)->save();

    $cron_count = $this->runCron();

    $this->assertEquals(1, $cron_count, new FormattableMarkup('Cron added @count of @expected new log entries', ['@count' => $cron_count, '@expected' => 1]));

    $this->assertEquals(1, $cron_count, "Cron added $cron_count of 1 new log entries");

  }



  /**

core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php

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


namespace Drupal\Tests\field\Kernel\EntityReference;



use Drupal\Component\Render\FormattableMarkup;

use Drupal\Core\Cache\Cache;

use Drupal\Core\Cache\CacheableMetadata;

use Drupal\Core\Field\FieldStorageDefinitionInterface;
@@ -163,7 +162,7 @@ public function testAccess() { 
        ->view($referencing_entity, 'default');



      // Verify the un-accessible item still exists.

      $this->assertEquals($this->referencedEntity->id(), $referencing_entity->{$field_name}->target_id, new FormattableMarkup('The un-accessible item still exists after @name formatter was executed.', ['@name' => $name]));

      $this->assertEquals($this->referencedEntity->id(), $referencing_entity->{$field_name}->target_id, "The un-accessible item still exists after $name formatter was executed.");

    }

  }
@@ -215,7 +214,7 @@ public function testEntityFormatter() { 
    $this->assertSame('default | ' . $this->referencedEntity->label() . $expected_rendered_name_field_1 . $expected_rendered_body_field_1, (string) $build[0]['#markup'], sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));

    $expected_cache_tags = Cache::mergeTags(\Drupal::entityTypeManager()->getViewBuilder($this->entityType)->getCacheTags(), $this->referencedEntity->getCacheTags());

    $expected_cache_tags = Cache::mergeTags($expected_cache_tags, FilterFormat::load('full_html')->getCacheTags());

    $this->assertEquals($expected_cache_tags, $build[0]['#cache']['tags'], new FormattableMarkup('The @formatter formatter has the expected cache tags.', ['@formatter' => $formatter]));

    $this->assertEquals($expected_cache_tags, $build[0]['#cache']['tags'], "The $formatter formatter has the expected cache tags.");



    // Test the second field item.

    $expected_rendered_name_field_2 = '

core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php

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


namespace Drupal\Tests\field\Kernel;



use Drupal\Component\Render\FormattableMarkup;

use Drupal\field\Entity\FieldConfig;

use Drupal\field\Entity\FieldStorageConfig;
@@ -59,17 +58,17 @@ public function testFieldAttachSaveLoad() { 
    $this->assertCount($cardinality, $entity->{$this->fieldTestData->field_name}, 'Current revision: expected number of values');

    for ($delta = 0; $delta < $cardinality; $delta++) {

      // The field value loaded matches the one inserted or updated.

      $this->assertEquals($values[$current_revision][$delta]['value'], $entity->{$this->fieldTestData->field_name}[$delta]->value, new FormattableMarkup('Current revision: expected value %delta was found.', ['%delta' => $delta]));

      $this->assertEquals($values[$current_revision][$delta]['value'], $entity->{$this->fieldTestData->field_name}[$delta]->value, "Current revision: expected value $delta was found.");

    }



    // Confirm each revision loads the correct data.

    foreach (array_keys($values) as $revision_id) {

      $entity = $storage->loadRevision($revision_id);

      // Number of values per field loaded equals the field cardinality.

      $this->assertCount($cardinality, $entity->{$this->fieldTestData->field_name}, new FormattableMarkup('Revision %revision_id: expected number of values.', ['%revision_id' => $revision_id]));

      $this->assertCount($cardinality, $entity->{$this->fieldTestData->field_name}, "Revision $revision_id: expected number of values.");

      for ($delta = 0; $delta < $cardinality; $delta++) {

        // The field value loaded matches the one inserted or updated.

        $this->assertEquals($values[$revision_id][$delta]['value'], $entity->{$this->fieldTestData->field_name}[$delta]->value, new FormattableMarkup('Revision %revision_id: expected value %delta was found.', ['%revision_id' => $revision_id, '%delta' => $delta]));

        $this->assertEquals($values[$revision_id][$delta]['value'], $entity->{$this->fieldTestData->field_name}[$delta]->value, "Revision $revision_id: expected value $delta was found.");

      }

    }

  }
@@ -140,7 +139,7 @@ public function testFieldAttachLoadMultiple() { 
          continue;

        }

        // The field value loaded matches the one inserted.

        $this->assertEquals($values[$index][$field_name], $entity->{$field_name}->value, new FormattableMarkup('Entity %index: expected value was found.', ['%index' => $index]));

        $this->assertEquals($values[$index][$field_name], $entity->{$field_name}->value, "Entity $index: expected value was found.");

      }

    }

  }

core/modules/field/tests/src/Kernel/FieldDataCountTest.php

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


namespace Drupal\Tests\field\Kernel;



use Drupal\Component\Render\FormattableMarkup;

use Drupal\Core\Database\Database;

use Drupal\Core\Entity\Sql\SqlContentEntityStorage;

use Drupal\entity_test\Entity\EntityTest;
@@ -139,7 +138,7 @@ public function testEntityCountAndHasData() { 
    /** @var \Drupal\Core\Entity\RevisionableStorageInterface $storage */

    $storage = $this->container->get('entity_type.manager')->getStorage($entity_type);

    $entity = $storage->loadRevision($first_revision);

    $this->assertCount($cardinality, $entity->{$this->fieldTestData->field_name_2}, new FormattableMarkup('Revision %revision_id: expected number of values.', ['%revision_id' => $first_revision]));

    $this->assertCount($cardinality, $entity->{$this->fieldTestData->field_name_2}, "Revision $first_revision: expected number of values.");

  }



  /**

core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php

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


namespace Drupal\Tests\field\Kernel;



use Drupal\Component\Render\FormattableMarkup;

use Drupal\entity_test\Entity\EntityTest;

use Drupal\field\Entity\FieldConfig;

use Drupal\field\Entity\FieldStorageConfig;
@@ -69,11 +68,11 @@ public function testImportDelete() { 
    $active = $this->container->get('config.storage');

    $sync = $this->container->get('config.storage.sync');

    $this->copyConfig($active, $sync);

    $this->assertTrue($sync->delete($field_storage_config_name), new FormattableMarkup('Deleted field storage: @field_storage', ['@field_storage' => $field_storage_config_name]));

    $this->assertTrue($sync->delete($field_storage_config_name_2), new FormattableMarkup('Deleted field storage: @field_storage', ['@field_storage' => $field_storage_config_name_2]));

    $this->assertTrue($sync->delete($field_config_name), new FormattableMarkup('Deleted field: @field', ['@field' => $field_config_name]));

    $this->assertTrue($sync->delete($field_config_name_2a), new FormattableMarkup('Deleted field: @field', ['@field' => $field_config_name_2a]));

    $this->assertTrue($sync->delete($field_config_name_2b), new FormattableMarkup('Deleted field: @field', ['@field' => $field_config_name_2b]));

    $this->assertTrue($sync->delete($field_storage_config_name), "Deleted field storage: $field_storage_config_name");

    $this->assertTrue($sync->delete($field_storage_config_name_2), "Deleted field storage: $field_storage_config_name_2");

    $this->assertTrue($sync->delete($field_config_name), "Deleted field: $field_config_name");

    $this->assertTrue($sync->delete($field_config_name_2a), "Deleted field: $field_config_name_2a");

    $this->assertTrue($sync->delete($field_config_name_2b), "Deleted field: $field_config_name_2b");



    $deletes = $this->configImporter()->getUnprocessedConfiguration('delete');

    $this->assertCount(5, $deletes, 'Importing configuration will delete 3 fields and 2 field storages.');