Commit 67f94062 authored by jchatard's avatar jchatard Committed by Adam Shepherd
Browse files

Issue #3262460 by jchatard, AdamPS: Revert PHP 7.4 requirement

parent fa7021d4
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@
  "type": "drupal-module",
  "license": "GPL-2.0-or-later",
  "require": {
    "php": ">=7.4",
    "html2text/html2text": "^4.0.1",
    "symfony/mailer": "^5.3.0",
    "tijsverkoyen/css-to-inline-styles": "^2.2"
+6 −2
Original line number Diff line number Diff line
@@ -13,14 +13,18 @@ class EmailAdjuster extends Plugin {

  /**
   * The plugin ID.
   *
   * @var string
   */
  public string $id;
  public $id;

  /**
   * The label of the plugin.
   *
   * @var string
   *
   * @ingroup plugin_translatable
   */
  public string $label;
  public $label;

}
+7 −3
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ class EmailBuilder extends Plugin {

  /**
   * The plugin ID.
   *
   * @var string
   */
  public string $id;
  public $id;

  /**
   * Array of sub-types.
@@ -24,11 +26,13 @@ class EmailBuilder extends Plugin {
   *
   * @var string[]
   */
  public array $sub_types = [];
  public $sub_types = [];

  /**
   * Whether the plugin is associated with a config entity.
   *
   * @var bool
   */
  public bool $has_entity = FALSE;
  public $has_entity = FALSE;

}
+3 −1
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ trait BaseEmailTrait {

  /**
   * The inner Symfony Email object.
   *
   * @var \Symfony\Component\Mime\Email
   */
  protected SymfonyEmail $inner;
  protected $inner;

  /**
   * The email subject.
+70 −16
Original line number Diff line number Diff line
@@ -14,45 +14,99 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Mime\Email as SymfonyEmail;

class Email implements InternalEmailInterface {

  use BaseEmailTrait;

  /**
   * The mailer.
   *
   * @var \Drupal\symfony_mailer\MailerInterface
   */
  protected MailerInterface $mailer;
  protected $mailer;

  /**
   * The renderer.
   *
   * @var \Drupal\Core\Render\RendererInterface
   */
  protected RendererInterface $renderer;
  protected $renderer;

  /**
   * The entity type manager.
   *
   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
   */
  protected EntityTypeManagerInterface $entityTypeManager;
  protected $entityTypeManager;

  /**
   * The theme manager.
   *
   * @var \Drupal\Core\Theme\ThemeManagerInterface
   */
  protected ThemeManagerInterface $themeManager;
  protected $themeManager;

  protected string $type;
  protected string $subType;
  protected string $entity_id;
  protected string $phase = 'preBuild';

  /**
   * @var string
   */
  protected $type;

  /**
   * @var string
   */
  protected $subType;

  /**
   * @var string
   */
  protected $entity_id;

  /**
   * @var string
   */
  protected $phase = 'preBuild';

  /**
   * @var \Drupal\symfony_mailer\Processor\EmailProcessorInterface[]
   */
  protected $body = [];
  protected array $processors = [];
  protected string $langcode;
  protected array $params = [];
  protected array $variables = [];
  protected string $theme = '';
  protected array $libraries = [];

  /**
   * @var array
   */
  protected $processors = [];

  /**
   * @var string
   */
  protected $langcode;

  /**
   * @var string[]
   */
  protected $params = [];

  /**
   * @var string[]
   */
  protected $variables = [];

  /**
   * @var string
   */
  protected $theme = '';

  /**
   * @var array
   */
  protected $libraries = [];

  /**
   * The mail transport DSN.
   *
   * @var string
   */
  protected string $transportDsn = '';
  protected $transportDsn = '';

  /**
   * Constructs the Email object.
Loading