Commit dd9150be authored Dec 18, 2021 by spncr

Issue #3252198 by spncr, TR: Commit b09c1ed5 broke testing

Issue #3213917 by klaasvw, spncr: MandrillTemplateMap is missing config_export definition

parent 269bfe51

modules/mandrill_activity/src/Entity/MandrillActivity.php

+9 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,15 @@ use Drupal\mandrill_activity\MandrillActivityInterface;
		* links = {
		* "edit-form" = "/admin/config/services/mandrill/activity/{mandrill_activity}",
		* "delete-form" = "/admin/config/services/mandrill/activity/{mandrill_activity}/delete"
		* },
		* config_export = {
		* "id",
		* "label",
		* "entity_type",
		* "bundle",
		* "entity_path",
		* "email_property",
		* "enabled"
		* }
		* )
		*/

modules/mandrill_reports/src/MandrillReportsService.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ class MandrillReportsService implements MandrillReportsInterface {
		* @return object
		* Object representing the API-connected user.
		*/
		public function getUser(): object {
		public function getUser() {
		return $this->mandrillApi->getUser();
		}

modules/mandrill_reports/tests/src/Functional/MandrillReportsTestCase.php

+4 −4

Original line number	Diff line number	Diff line
		@@ -46,12 +46,12 @@ class MandrillReportsTestCase extends BrowserTestBase {
		*/
		public function testGetReportsData() {
		/* @var \Drupal\mandrill_reports\MandrillReportsService $reports */
		$reports = \Drupal::service('mandrill_reports.test.service');
		$mandrill_api = \Drupal::service('mandrill.test.api');

		$reports_data = [
		'user' => $reports->getUser(),
		'tags' => $reports->getTags(),
		'all_time_series' => $reports->getTagsAllTimeSeries(),
		'user' => $mandrill_api->getUser(),
		'tags' => $mandrill_api->getTags(),
		'all_time_series' => $mandrill_api->getTagsAllTimeSeries(),
		];

		$this->assertTrue(!empty($reports_data['user']), 'Tested user report data exists.');

modules/mandrill_template/src/Entity/MandrillTemplateMap.php

+8 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,14 @@ use Drupal\mandrill_template\MandrillTemplateMapInterface;
		* links = {
		* "edit-form" = "/admin/config/services/mandrill/templates/{mandrill_template_map}",
		* "delete-form" = "/admin/config/services/mandrill/templates/{mandrill_template_map}/delete"
		* },
		* config_export = {
		* "id",
		* "label",
		* "mailsystem_key",
		* "template_id",
		* "main_section",
		* "sections",
		* }
		* )
		*/

src/DrupalMailchimpTransactional.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ class DrupalMailchimpTransactional extends ApiClient {
		*
		* @var int
		*/
		protected int $timeout;
		protected $timeout;

		/**
		* {@inheritdoc}