Commit 4d1ce551 authored by Project Update Bot's avatar Project Update Bot Committed by Adam Shepherd
Browse files

Issue #3289911 by Project Update Bot: Automated Drupal 10 compatibility fixes

parent 8b985a52

modules/symfony_mailer_bc/symfony_mailer_bc.module

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ use Drupal\symfony_mailer\Annotation\EmailBuilder; 
 * Implements hook_theme().

 */

function symfony_mailer_bc_theme($existing, $type, $theme, $path) {

  $templateDir = drupal_get_path('module', 'symfony_mailer_bc') . '/templates';

  $templateDir = \Drupal::service('extension.list.module')->getPath('symfony_mailer_bc') . '/templates';

  $hooks = [];

  foreach (glob("$templateDir/email--*") as $template) {

    $theme = strtr(basename($template, '.html.twig'), '-', '_');

modules/symfony_mailer_bc/tests/src/Functional/TestBcMail.php

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ class TestBcMail extends SymfonyMailerTestBase { 
  /**

   * {@inheritdoc}

   */

  protected function setUp() {

  protected function setUp(): void {

    parent::setUp();

    $this->adminUser = $this->drupalCreateUser([

      'administer mailer',

tests/src/Functional/SymfonyMailerTestBase.php

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ abstract class SymfonyMailerTestBase extends BrowserTestBase { 
  /**

   * {@inheritdoc}

   */

  protected function setUp() {

  protected function setUp(): void {

    parent::setUp();

    $this->config('system.site')->set('name', $this->siteName)->save();

    $this->adminUser = $this->drupalCreateUser(['administer mailer']);
@@ -52,7 +52,7 @@ abstract class SymfonyMailerTestBase extends BrowserTestBase { 
  /**

   * {@inheritdoc}

   */

  protected function tearDown() {

  protected function tearDown(): void {

    parent::tearDown();

    // @todo Test for no mail not working?

    $this->noMail();