' . str_repeat('x', 2100) . '
Drupal';
$output = drupal_html_to_text($input);
- // This awkward construct comes from includes/mail.inc lines 8-13.
- $eol = variable_get('mail_line_endings', MAIL_LINE_ENDINGS);
- // We must use strlen() rather than drupal_strlen() in order to count
- // octets rather than characters.
- $line_length_limit = 1000 - drupal_strlen($eol);
+ $eol = settings()->get('mail_line_endings', MAIL_LINE_ENDINGS);
+
$maximum_line_length = 0;
foreach (explode($eol, $output) as $line) {
// We must use strlen() rather than drupal_strlen() in order to count
diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php b/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
index bb72d29..155fdb8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
@@ -42,7 +42,7 @@ function setUp() {
parent::setUp();
// Set MailTestCase (i.e. this class) as the SMTP library
- variable_set('mail_system', array('default-system' => 'Drupal\system\Tests\Mail\MailTest'));
+ config('system.mail')->set('interface.default', 'Drupal\system\Tests\Mail\MailTest')->save();
}
/**
@@ -119,4 +119,3 @@ public function mail(array $message) {
self::$sent_message = $message;
}
}
-
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/MailUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/MailUpgradePathTest.php
new file mode 100644
index 0000000..68b9ab1
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/MailUpgradePathTest.php
@@ -0,0 +1,52 @@
+ 'Mail upgrade test',
+ 'description' => 'Tests upgrade of Mail backend configuration.',
+ 'group' => 'Upgrade path',
+ );
+ }
+
+ public function setUp() {
+ $this->databaseDumpFiles = array(
+ drupal_get_path('module', 'system') . '/tests/upgrade/drupal-7.bare.standard_all.database.php.gz',
+ drupal_get_path('module', 'system') . '/tests/upgrade/drupal-7.system.database.php',
+ );
+ parent::setUp();
+ }
+
+ /**
+ * Tests that mail backends are upgraded to their Drupal 8 equivalents.
+ */
+ function testMailSystemUpgrade() {
+ // Perform the upgrade without redirecting to check for pending updates,
+ // so that we can test for user warnings.
+ $this->performUpgrade(TRUE, FALSE);
+ // Ensure the user is informed about mail backends that need updating.
+ $this->assertText('The following mail backends need to be re-configured: MaillogMailSystem', 'User notified about outdated mail backends.');
+ $this->assertTrue($this->checkPendingUpdates(), 'The upgrade was completed successfully.');
+
+ // Get the new mailer definitions.
+ $mail_system = config('system.mail')->get('interface');
+
+ // Check that the default mailer has been changed to a PSR-0 definition.
+ $this->assertTrue($mail_system['default'] == 'Drupal\Core\Mail\PhpMail', 'Default mailer upgraded to Drupal 8 syntax.');
+
+ // Check that a custom mailer has been preserved through the upgrade.
+ $this->assertTrue($mail_system['maillog'] == 'MaillogMailSystem', 'Custom mail backend preserved during upgrade.');
+ }
+
+}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
index c4dda65..bdfdcff 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
@@ -195,12 +195,17 @@ protected function refreshVariables() {
/**
* Perform the upgrade.
*
- * @param $register_errors
+ * @param bool $register_errors
* Register the errors during the upgrade process as failures.
- * @return
+ * @param bool $check_pending_updates
+ * Check to make sure no updates are outstanding after an upgrade.
+ *
+ * @return bool
* TRUE if the upgrade succeeded, FALSE otherwise.
+ *
+ * @throws \Exception
*/
- protected function performUpgrade($register_errors = TRUE) {
+ protected function performUpgrade($register_errors = TRUE, $check_pending_updates = TRUE) {
// Load the first update screen.
$this->getUpdatePhp();
@@ -251,7 +256,22 @@ protected function performUpgrade($register_errors = TRUE) {
// don't process.
throw new Exception('Errors during update process.');
}
+ if ($check_pending_updates) {
+ return $this->checkPendingUpdates();
+ }
+
+ return TRUE;
+ }
+ /**
+ * Checks that no updates are pending at the end of an upgrade.
+ *
+ * @return bool
+ * TRUE if there are no pending updates, FALSE if not.
+ *
+ * @throws \Exception
+ */
+ protected function checkPendingUpdates() {
// Check if there still are pending updates.
$this->getUpdatePhp();
$this->drupalPost(NULL, array(), t('Continue'));
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 5a0aade..788465b 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -2214,6 +2214,45 @@ function system_update_8046() {
}
/**
+ * Converts mail settings to config.
+ *
+ * @ingroup config_upgrade
+ */
+function system_update_8047() {
+ // Update any mail interfaces to their Drupal 8 equivalents.
+ $old_mail_system_settings = update_variable_get('mail_system');
+
+ if ($old_mail_system_settings) {
+ $new_mail_system_settings = array();
+
+ foreach ($old_mail_system_settings as $key => $mailer_class) {
+ // Update old class name to PSR-0.
+ if ($mailer_class == 'DefaultMailSystem') {
+ $mailer_class = 'Drupal\Core\Mail\PhpMail';
+ }
+ // New default key.
+ if ($key == 'default-system') {
+ $new_mail_system_settings['default'] = $mailer_class;
+ unset($old_mail_system_settings[$key]);
+ }
+ }
+ if (count($old_mail_system_settings)) {
+ // Warn about non-core classes which may need to be updated.
+ drupal_set_message(t('The following mail backends need to be re-configured: @list', array('@list' => implode(', ', $old_mail_system_settings))), 'warning');
+ }
+
+ $new_mail_system_settings += $old_mail_system_settings;
+ // Save the updated variable, and let update_variables_to_config convert it.
+ if ($new_mail_system_settings) {
+ update_variable_set('mail_system', $new_mail_system_settings);
+ update_variables_to_config('system.mail', array(
+ 'mail_system' => 'interface',
+ ));
+ }
+ }
+}
+
+/**
* @} End of "defgroup updates-7.x-to-8.x".
* The next series of updates should start at 9000.
*/
diff --git a/core/modules/system/tests/upgrade/drupal-7.system.database.php b/core/modules/system/tests/upgrade/drupal-7.system.database.php
index 061540b..b0c032f 100644
--- a/core/modules/system/tests/upgrade/drupal-7.system.database.php
+++ b/core/modules/system/tests/upgrade/drupal-7.system.database.php
@@ -119,6 +119,10 @@
'name' => 'actions_max_stack',
'value' => 'i:42;',
))
+ ->values(array(
+ 'name' => 'mail_system',
+ 'value' => 'a:2:{s:14:"default-system";s:17:"DefaultMailSystem";s:7:"maillog";s:17:"MaillogMailSystem";}',
+))
->execute();
db_update('variable')