diff -u b/core/modules/block/src/Tests/BlockInterfaceTest.php b/core/modules/block/src/Tests/BlockInterfaceTest.php --- b/core/modules/block/src/Tests/BlockInterfaceTest.php +++ b/core/modules/block/src/Tests/BlockInterfaceTest.php @@ -109,7 +109,7 @@ $actual_form = $display_block->buildConfigurationForm(array(), $form_state); // Remove the visibility sections, as that just tests condition plugins. unset($actual_form['visibility'], $actual_form['visibility_tabs']); - $this->assertIdenticalWithSafeStrings($actual_form, $expected_form, 'Only the expected form elements were present.'); + $this->assertIdentical($this->castSafeStrings($actual_form), $this->castSafeStrings($expected_form), 'Only the expected form elements were present.'); $expected_build = array( '#children' => 'My custom display message.', diff -u b/core/modules/block_content/src/Tests/BlockContentListViewsTest.php b/core/modules/block_content/src/Tests/BlockContentListViewsTest.php --- b/core/modules/block_content/src/Tests/BlockContentListViewsTest.php +++ b/core/modules/block_content/src/Tests/BlockContentListViewsTest.php @@ -42,13 +42,13 @@ $this->assertEqual(count($elements), 4, 'Correct number of table header cells found.'); // Test the contents of each th cell. - $expected_items = [t('Block description'), t('Block type'), t('Updated'), t('Operations')]; + $expected_items = ['Block description', 'Block type', 'Updated', 'Operations']; foreach ($elements as $key => $element) { if ($element->xpath('a')) { - $this->assertIdenticalWithSafeStrings(trim((string) $element->xpath('a')[0]), $expected_items[$key]); + $this->assertIdentical(trim((string) $element->xpath('a')[0]), $expected_items[$key]); } else { - $this->assertIdenticalWithSafeStrings(trim((string) $element[0]), $expected_items[$key]); + $this->assertIdentical(trim((string) $element[0]), $expected_items[$key]); } } diff -u b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php --- b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php +++ b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php @@ -193,7 +193,7 @@ ); $breakpoint_groups = \Drupal::service('breakpoint.manager')->getGroups(); // Ensure the order is as expected. Should be sorted by label. - $this->assertIdenticalWithSafeStrings($expected, $breakpoint_groups); + $this->assertIdentical($expected, $this->castSafeStrings($breakpoint_groups)); $expected = array( 'breakpoint_theme_test' => 'theme', diff -u b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php --- b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php +++ b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php @@ -87,23 +87,23 @@ // Button groups array( array( - 'name' => t('Formatting'), + 'name' => 'Formatting', 'items' => array('Bold', 'Italic',), ), array( - 'name' => t('Links'), + 'name' => 'Links', 'items' => array('DrupalLink', 'DrupalUnlink',), ), array( - 'name' => t('Lists'), + 'name' => 'Lists', 'items' => array('BulletedList', 'NumberedList',), ), array( - 'name' => t('Media'), + 'name' => 'Media', 'items' => array('Blockquote', 'DrupalImage',), ), array( - 'name' => t('Tools'), + 'name' => 'Tools', 'items' => array('Source',), ), ), @@ -111,7 +111,7 @@ ), 'plugins' => array(), ); - $this->assertIdenticalWithSafeStrings($ckeditor->getDefaultSettings(), $expected_default_settings); + $this->assertIdentical($this->castSafeStrings($ckeditor->getDefaultSettings()), $expected_default_settings); // Keep the "CKEditor" editor selected and click the "Configure" button. $this->drupalPostAjaxForm(NULL, $edit, 'editor_configure'); @@ -279,7 +279,7 @@ $expected_settings['plugins']['stylescombo']['styles'] = ''; $editor = entity_load('editor', 'amazing_format'); $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists now.'); - $this->assertIdenticalWithSafeStrings($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.'); + $this->assertIdentical($this->castSafeStrings($expected_settings), $this->castSafeStrings($editor->getSettings()), 'The Editor config entity has the correct settings.'); } } diff -u b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php --- b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php +++ b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php @@ -107,12 +107,12 @@ $expected = array('formats' => array('filtered_html' => array( 'format' => 'filtered_html', 'editor' => 'ckeditor', - 'editorSettings' => $ckeditor_plugin->getJSSettings($editor), + 'editorSettings' => $this->castSafeStrings($ckeditor_plugin->getJSSettings($editor)), 'editorSupportsContentFiltering' => TRUE, 'isXssSafe' => FALSE, ))); $this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page."); - $this->assertIdenticalWithSafeStrings($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct."); + $this->assertIdentical($expected, $this->castSafeStrings($settings['editor']), "Text Editor module's JavaScript settings on the page are correct."); $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.'); $this->assertTrue(count($body) === 1, 'A body field exists.'); $this->assertTrue(count($format_selector) === 1, 'A single text format selector exists on the page.'); @@ -138,12 +138,12 @@ 'filtered_html' => array( 'format' => 'filtered_html', 'editor' => 'ckeditor', - 'editorSettings' => $ckeditor_plugin->getJSSettings($editor), + 'editorSettings' => $this->castSafeStrings($ckeditor_plugin->getJSSettings($editor)), 'editorSupportsContentFiltering' => TRUE, 'isXssSafe' => FALSE, ))); $this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page."); - $this->assertIdenticalWithSafeStrings($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct."); + $this->assertIdentical($expected, $this->castSafeStrings($settings['editor']), "Text Editor module's JavaScript settings on the page are correct."); $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.'); $this->assertTrue(in_array('ckeditor/drupal.ckeditor', explode(',', $settings['ajaxPageState']['libraries'])), 'CKEditor glue library is present.'); } diff -u b/core/modules/ckeditor/src/Tests/CKEditorTest.php b/core/modules/ckeditor/src/Tests/CKEditorTest.php --- b/core/modules/ckeditor/src/Tests/CKEditorTest.php +++ b/core/modules/ckeditor/src/Tests/CKEditorTest.php @@ -94,8 +94,9 @@ 'drupallink' => file_create_url('core/modules/ckeditor/js/plugins/drupallink/plugin.js'), ), ); + $expected_config = $this->castSafeStrings($expected_config); ksort($expected_config); - $this->assertIdenticalWithSafeStrings($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for default configuration.'); + $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for default configuration.'); // Customize the configuration: add button, have two contextually enabled // buttons, and configure a CKEditor plugin setting. @@ -116,7 +117,7 @@ $expected_config['drupalExternalPlugins']['llama_contextual_and_button'] = file_create_url('core/modules/ckeditor/tests/modules/js/llama_contextual_and_button.js'); $expected_config['contentsCss'][] = file_create_url('core/modules/ckeditor/tests/modules/ckeditor_test.css'); ksort($expected_config); - $this->assertIdenticalWithSafeStrings($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); + $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.'); // Change the allowed HTML tags; the "allowedContent" and "format_tags" // settings for CKEditor should automatically be updated as well. @@ -127,7 +128,7 @@ $expected_config['allowedContent']['pre'] = array('attributes' => TRUE, 'styles' => FALSE, 'classes' => TRUE); $expected_config['allowedContent']['h3'] = array('attributes' => TRUE, 'styles' => FALSE, 'classes' => TRUE); $expected_config['format_tags'] = 'p;h2;h3;h4;h5;h6;pre'; - $this->assertIdenticalWithSafeStrings($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); + $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.'); // Disable the filter_html filter: allow *all *tags. $format->setFilterConfig('filter_html', array('status' => 0)); @@ -136,7 +137,7 @@ $expected_config['allowedContent'] = TRUE; $expected_config['disallowedContent'] = FALSE; $expected_config['format_tags'] = 'p;h1;h2;h3;h4;h5;h6;pre'; - $this->assertIdenticalWithSafeStrings($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); + $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.'); // Enable the filter_test_restrict_tags_and_attributes filter. $format->setFilterConfig('filter_test_restrict_tags_and_attributes', array( @@ -205,7 +206,7 @@ ); $expected_config['format_tags'] = 'p'; ksort($expected_config); - $this->assertIdenticalWithSafeStrings($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); + $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.'); } /** @@ -216,7 +217,7 @@ // Default toolbar. $expected = $this->getDefaultToolbarConfig(); - $this->assertIdenticalWithSafeStrings($expected, $this->ckeditor->buildToolbarJSSetting($editor), '"toolbar" configuration part of JS settings built correctly for default toolbar.'); + $this->assertIdentical($expected, $this->castSafeStrings($this->ckeditor->buildToolbarJSSetting($editor)), '"toolbar" configuration part of JS settings built correctly for default toolbar.'); // Customize the configuration. $settings = $editor->getSettings(); @@ -224,7 +225,7 @@ $editor->setSettings($settings); $editor->save(); $expected[0]['items'][] = 'Strike'; - $this->assertIdenticalWithSafeStrings($expected, $this->ckeditor->buildToolbarJSSetting($editor), '"toolbar" configuration part of JS settings built correctly for customized toolbar.'); + $this->assertIdentical($expected, $this->castSafeStrings($this->ckeditor->buildToolbarJSSetting($editor)), '"toolbar" configuration part of JS settings built correctly for customized toolbar.'); // Enable the editor_test module, customize further. $this->enableModules(array('ckeditor_test')); @@ -236,7 +237,7 @@ $editor->save(); $expected[0]['name'] = 'JunkScience'; $expected[0]['items'][] = 'Llama'; - $this->assertIdenticalWithSafeStrings($expected, $this->ckeditor->buildToolbarJSSetting($editor), '"toolbar" configuration part of JS settings built correctly for customized toolbar with contrib module-provided CKEditor plugin.'); + $this->assertIdentical($expected, $this->castSafeStrings($this->ckeditor->buildToolbarJSSetting($editor)), '"toolbar" configuration part of JS settings built correctly for customized toolbar with contrib module-provided CKEditor plugin.'); } /** @@ -442,23 +443,23 @@ protected function getDefaultToolbarConfig() { return array( array( - 'name' => t('Formatting'), + 'name' => 'Formatting', 'items' => array('Bold', 'Italic',), ), array( - 'name' => t('Links'), + 'name' => 'Links', 'items' => array('DrupalLink', 'DrupalUnlink',), ), array( - 'name' => t('Lists'), + 'name' => 'Lists', 'items' => array('BulletedList', 'NumberedList',), ), array( - 'name' => t('Media'), + 'name' => 'Media', 'items' => array('Blockquote', 'DrupalImage',), ), array( - 'name' => t('Tools'), + 'name' => 'Tools', 'items' => array('Source',), ), '/', diff -u b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php --- b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php +++ b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php @@ -112,7 +112,7 @@ $expected = array( SafeMarkup::format('Entity type mismatch on rename. @old_type not equal to @new_type for existing configuration @old_name and staged configuration @new_name.', array('@old_type' => 'node_type', '@new_type' => 'config_test', '@old_name' => 'node.type.' . $content_type->id(), '@new_name' => 'config_test.dynamic.' . $test_entity_id)) ); - $this->assertIdenticalWithSafeStrings($expected, $this->configImporter->getErrors()); + $this->assertEqual($expected, $this->configImporter->getErrors()); } } @@ -155,7 +155,7 @@ $expected = array( SafeMarkup::format('Rename operation for simple configuration. Existing configuration @old_name and staged configuration @new_name.', array('@old_name' => 'config_test.old', '@new_name' => 'config_test.new')) ); - $this->assertIdenticalWithSafeStrings($expected, $this->configImporter->getErrors()); + $this->assertEqual($expected, $this->configImporter->getErrors()); } } diff -u b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php --- b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php +++ b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php @@ -69,7 +69,7 @@ $executable = new MigrateExecutable($migration, $this); $this->startCollectingMessages(); $executable->import(); - $this->assertIdenticalWithSafeStrings($this->migrateMessages['error'], array(SafeMarkup::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id())))); + $this->assertEqual($this->migrateMessages['error'], array(SafeMarkup::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id())))); $this->collectMessages = FALSE; } diff -u b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php --- b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php @@ -34,8 +34,8 @@ protected function assertEntity($id, $label) { $migration = $this->builtMigrations[$id]; $this->assertTrue($migration instanceof Migration); - $this->assertIdenticalWithSafeStrings($id, $migration->id()); - $this->assertIdenticalWithSafeStrings($label, $migration->label()); + $this->assertEqual($id, $migration->id()); + $this->assertEqual($label, $migration->label()); } /** diff -u b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php --- b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php +++ b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php @@ -73,7 +73,7 @@ // Test the contents of each th cell. $expected_items = array(t('Name'), t('Weight'), t('Operations')); foreach ($elements as $key => $element) { - $this->assertIdenticalWithSafeStrings((string) $element[0], $expected_items[$key]); + $this->assertEqual((string) $element[0], $expected_items[$key]); } // Look for test shortcuts in the table. diff -u b/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php --- b/core/modules/simpletest/src/TestBase.php +++ b/core/modules/simpletest/src/TestBase.php @@ -661,8 +661,7 @@ // We cast objects implementing SafeStringInterface to string ourself so as // to not rely on PHP casting them to string depending on what we're // comparing with. - $this->castSafeStrings($first, $second); - return $this->assert($first == $second, $message ? $message : SafeMarkup::format('Value @first is equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group); + return $this->assert($this->castSafeStrings($first) == $this->castSafeStrings($second), $message ? $message : SafeMarkup::format('Value @first is equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group); } /** @@ -691,37 +690,26 @@ } /** - * Casts SafeStringInterface objects into string in 2 compared values. + * Casts SafeStringInterface objects into strings. * - * @param string|array &$first - * The first value to act on. - * @param string|array &$second - * The second value to act on (optional). + * @param string|array $value + * The value to act on. * * @return mixed - * The input values, with SafeStringInterface objects casted to string. + * The input value, with SafeStringInterface objects casted to string. */ - protected function castSafeStrings(&$first, &$second = NULL) { - if ($first instanceof SafeStringInterface) { - $first = (string) $first; + protected function castSafeStrings($value) { + if ($value instanceof SafeStringInterface) { + $value = (string) $value; } - if ($second instanceof SafeStringInterface) { - $second = (string) $second; - } - if (is_array($first)) { - array_walk_recursive($first, function (&$first) { - if ($first instanceof SafeStringInterface) { - $first = (string) $first; - } - }); - } - if (is_array($second)) { - array_walk_recursive($second, function (&$second) { - if ($second instanceof SafeStringInterface) { - $second = (string) $second; + if (is_array($value)) { + array_walk_recursive($value, function (&$item) { + if ($item instanceof SafeStringInterface) { + $item = (string) $item; } }); } + return $value; } /** @@ -750,37 +738,6 @@ } /** - * Runs $this->assertIdentical() after casting safe string objects to string. - * - * This helper function assists with comparison of two values where the actual - * value may include objects implementing SafeStringInterface such as - * TranslationWrappers, and we want to refer to these objects as strings in - * the expected value. - * - * @param $first - * The first value to check. - * @param $second - * The second value to check. - * @param $message - * (optional) A message to display with the assertion. Do not translate - * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed - * variables in the message text, not t(). If left blank, a default message - * will be displayed. - * @param $group - * (optional) The group this message is in, which is displayed in a column - * in test output. Use 'Debug' to indicate this is debugging output. Do not - * translate this string. Defaults to 'Other'; most tests do not override - * this default. - * - * @return bool - * TRUE if the assertion succeeded, FALSE otherwise. - */ - protected function assertIdenticalWithSafeStrings($first, $second, $message = '', $group = 'Other') { - $this->castSafeStrings($first, $second); - $this->assertIdentical($first, $second, $message, $group); - } - - /** * Check to see if two values are not identical. * * @param $first diff -u b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php --- b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php +++ b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php @@ -107,7 +107,7 @@ t('Update the %entity_type entity type.', array('%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel())), ), ); - $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected); //, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected); //, 'EntityDefinitionUpdateManager reports the expected change summary.'); // Run the update and ensure the revision table is created. $this->entityDefinitionUpdateManager->applyUpdates(); @@ -146,7 +146,7 @@ t('Create the %field_name field.', array('%field_name' => t('A new base field'))), ), ); - $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), 'Column created in shared table for new_base_field.'); @@ -159,7 +159,7 @@ t('Update the %field_name field.', array('%field_name' => t('A new base field'))), ), ); - $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update_field__new_base_field'), 'Index created.'); @@ -172,7 +172,7 @@ t('Update the %field_name field.', array('%field_name' => t('A new base field'))), ), ); - $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertFalse($this->database->schema()->indexExists('entity_test_update', 'entity_test_update_field__new_base_field'), 'Index deleted.'); @@ -186,7 +186,7 @@ t('Update the %field_name field.', array('%field_name' => t('A new base field'))), ), ); - $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), 'Original column deleted in shared table for new_base_field.'); $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field__value'), 'Value column created in shared table for new_base_field.'); @@ -201,7 +201,7 @@ t('Delete the %field_name field.', array('%field_name' => t('A new base field'))), ), ); - $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field_value'), 'Value column deleted from shared table for new_base_field.'); $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field_format'), 'Format column deleted from shared table for new_base_field.'); @@ -220,7 +220,7 @@ t('Create the %field_name field.', array('%field_name' => t('A new bundle field'))), ), ); - $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertTrue($this->database->schema()->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table created for new_bundle_field.'); @@ -234,7 +234,7 @@ t('Update the %field_name field.', array('%field_name' => t('A new bundle field'))), ), ); - $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertTrue($this->database->schema()->fieldExists('entity_test_update__new_bundle_field', 'new_bundle_field_format'), 'Format column created in dedicated table for new_base_field.'); @@ -247,7 +247,7 @@ t('Delete the %field_name field.', array('%field_name' => t('A new bundle field'))), ), ); - $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertFalse($this->database->schema()->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table deleted for new_bundle_field.'); } @@ -489,7 +489,7 @@ t('Update the %entity_type entity type.', array('%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel())), ), ); - $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); // Run the update and ensure the new index is created. $this->entityDefinitionUpdateManager->applyUpdates(); @@ -504,7 +504,7 @@ t('Update the %entity_type entity type.', array('%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel())), ), ); - $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); // Run the update and ensure the index is deleted. $this->entityDefinitionUpdateManager->applyUpdates(); diff -u b/core/modules/system/src/Tests/Form/ValidationTest.php b/core/modules/system/src/Tests/Form/ValidationTest.php --- b/core/modules/system/src/Tests/Form/ValidationTest.php +++ b/core/modules/system/src/Tests/Form/ValidationTest.php @@ -293,7 +293,7 @@ $this->fail(format_string('The error message for the "@title" element with key "@key" was not found.', ['@title' => $message['title'], '@key' => $message['key']])); } else { - $this->assertIdenticalWithSafeStrings($message['message'], (string) $element[$delta]); + $this->assertEqual($message['message'], (string) $element[$delta]); } // Gather the element for checking the jump link section. diff -u b/core/modules/views/src/Tests/ModuleTest.php b/core/modules/views/src/Tests/ModuleTest.php --- b/core/modules/views/src/Tests/ModuleTest.php +++ b/core/modules/views/src/Tests/ModuleTest.php @@ -178,14 +178,14 @@ foreach ($all_views as $id => $view) { $expected_options[$id] = $view->label(); } - $this->assertIdenticalWithSafeStrings($expected_options, Views::getViewsAsOptions(TRUE), 'Expected options array was returned.'); + $this->assertIdentical($expected_options, $this->castSafeStrings(Views::getViewsAsOptions(TRUE)), 'Expected options array was returned.'); // Test the default. - $this->assertIdenticalWithSafeStrings($this->formatViewOptions($all_views), Views::getViewsAsOptions(), 'Expected options array for all views was returned.'); + $this->assertIdentical($this->formatViewOptions($all_views), $this->castSafeStrings(Views::getViewsAsOptions()), 'Expected options array for all views was returned.'); // Test enabled views. - $this->assertIdenticalWithSafeStrings($this->formatViewOptions($expected_enabled), Views::getViewsAsOptions(FALSE, 'enabled'), 'Expected enabled options array was returned.'); + $this->assertIdentical($this->formatViewOptions($expected_enabled), $this->castSafeStrings(Views::getViewsAsOptions(FALSE, 'enabled')), 'Expected enabled options array was returned.'); // Test disabled views. - $this->assertIdenticalWithSafeStrings($this->formatViewOptions($expected_disabled), Views::getViewsAsOptions(FALSE, 'disabled'), 'Expected disabled options array was returned.'); + $this->assertIdentical($this->formatViewOptions($expected_disabled), $this->castSafeStrings(Views::getViewsAsOptions(FALSE, 'disabled')), 'Expected disabled options array was returned.'); // Test the sort parameter. $all_views_sorted = $all_views; @@ -201,10 +201,10 @@ $expected_opt_groups = array(); foreach ($all_views as $view) { foreach ($view->get('display') as $display) { - $expected_opt_groups[$view->id()][$view->id() . ':' . $display['id']] = t('@view : @display', array('@view' => $view->id(), '@display' => $display['id'])); + $expected_opt_groups[$view->id()][$view->id() . ':' . $display['id']] = (string) t('@view : @display', array('@view' => $view->id(), '@display' => $display['id'])); } } - $this->assertIdenticalWithSafeStrings($expected_opt_groups, Views::getViewsAsOptions(FALSE, 'all', NULL, TRUE), 'Expected option array for an option group returned.'); + $this->assertIdentical($expected_opt_groups, $this->castSafeStrings(Views::getViewsAsOptions(FALSE, 'all', NULL, TRUE)), 'Expected option array for an option group returned.'); } /** @@ -241,7 +241,7 @@ // Test using the 'test' style plugin type only returns the test_style and // mapping_test plugins. $plugins = Views::fetchPluginNames('style', 'test'); - $this->assertIdenticalWithSafeStrings(array_keys($plugins), array('mapping_test', 'test_style', 'test_template_style')); + $this->assertIdentical(array_keys($plugins), array('mapping_test', 'test_style', 'test_template_style')); // Test a non existent style plugin type returns no plugins. $plugins = Views::fetchPluginNames('style', $this->randomString()); @@ -347,7 +347,7 @@ $expected_options = array(); foreach ($views as $view) { foreach ($view->get('display') as $display) { - $expected_options[$view->id() . ':' . $display['id']] = t('View: @view - Display: @display', + $expected_options[$view->id() . ':' . $display['id']] = (string) t('View: @view - Display: @display', array('@view' => $view->id(), '@display' => $display['id'])); } } only in patch2: unchanged: --- a/core/modules/simpletest/src/WebTestBase.php +++ b/core/modules/simpletest/src/WebTestBase.php @@ -1697,7 +1697,7 @@ protected function drupalPostForm($path, $edit, $submit, array $options = array( $submit = (string) $submit; } if (is_array($edit)) { - array_walk_recursive($edit, [$this, 'castSafeStrings']); + $edit = $this->castSafeStrings($edit); } $submit_matches = FALSE;