Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2575599 by jaredsmith, joshi.rohit100, dawehner, xjm, alexpott, plach, Berdir, Sutharsan, borisson_, justAChris, stefan.r, joelpittet, Ryan Weal: Remove !placeholder in ContactPersonalTest and Drupal\migrate\Plugin\migrate\id_map\Sql

8.0.x
xjm 2015-09-27 18:27:45 +02:00
parent e8b5f46813
commit a85c80faaa
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/modules/contact/src/Tests/ContactPersonalTest.php
View File

@ -8,6 +8,7 @@
namespace Drupal\contact\Tests; namespace Drupal\contact\Tests;
use Drupal\Component\Utility\SafeMarkup; use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\PlainTextOutput;
use Drupal\Core\Session\AccountInterface; use Drupal\Core\Session\AccountInterface;
use Drupal\simpletest\WebTestBase; use Drupal\simpletest\WebTestBase;
use Drupal\user\RoleInterface; use Drupal\user\RoleInterface;
@ -79,12 +80,13 @@ class ContactPersonalTest extends WebTestBase {
$this->assertEqual($mail['reply-to'], $this->webUser->getEmail()); $this->assertEqual($mail['reply-to'], $this->webUser->getEmail());
$this->assertEqual($mail['key'], 'user_mail'); $this->assertEqual($mail['key'], 'user_mail');
$variables = array( $variables = array(
'!site-name' => $this->config('system.site')->get('name'), '@site-name' => $this->config('system.site')->get('name'),
'!subject' => $message['subject[0][value]'], '@subject' => $message['subject[0][value]'],
'!recipient-name' => $this->contactUser->getUsername(), '@recipient-name' => $this->contactUser->getUsername(),
); );
$this->assertEqual($mail['subject'], t('[!site-name] !subject', $variables), 'Subject is in sent message.'); $subject = PlainTextOutput::renderFromHtml(t('[@site-name] @subject', $variables));
$this->assertTrue(strpos($mail['body'], 'Hello ' . $variables['!recipient-name']) !== FALSE, 'Recipient name is in sent message.'); $this->assertEqual($mail['subject'], $subject, 'Subject is in sent message.');
$this->assertTrue(strpos($mail['body'], 'Hello ' . $variables['@recipient-name']) !== FALSE, 'Recipient name is in sent message.');
$this->assertTrue(strpos($mail['body'], $this->webUser->getUsername()) !== FALSE, 'Sender name is in sent message.'); $this->assertTrue(strpos($mail['body'], $this->webUser->getUsername()) !== FALSE, 'Sender name is in sent message.');
$this->assertTrue(strpos($mail['body'], $message['message[0][value]']) !== FALSE, 'Message body is in sent message.'); $this->assertTrue(strpos($mail['body'], $message['message[0][value]']) !== FALSE, 'Message body is in sent message.');

4
core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
View File

@ -507,8 +507,8 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
// A NULL key value will fail. // A NULL key value will fail.
if (!isset($source_id_values[$field_name])) { if (!isset($source_id_values[$field_name])) {
$this->message->display(t( $this->message->display(t(
'Could not save to map table due to NULL value for key field !field', 'Could not save to map table due to NULL value for key field @field',
array('!field' => $field_name)), 'error'); array('@field' => $field_name)), 'error');
return; return;
} }
$keys[$key_name] = $source_id_values[$field_name]; $keys[$key_name] = $source_id_values[$field_name];