Issue #3172039 by beatrizrodrigues, TR, jonathan1055: [9.1]... (bb7a0955) · Commits · project / rules

rules.module

+8 −8

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ function rules_user_login($account) {
		// list of arguments.
		$event = new UserLoginEvent($account);
		$event_dispatcher = \Drupal::service('event_dispatcher');
		$event_dispatcher->dispatch(UserLoginEvent::EVENT_NAME, $event);
		$event_dispatcher->dispatch($event, UserLoginEvent::EVENT_NAME);
		}

		/**
		@@ -110,7 +110,7 @@ function rules_user_logout($account) {
		// list of arguments.
		$event = new UserLogoutEvent($account, ['account' => $account]);
		$event_dispatcher = \Drupal::service('event_dispatcher');
		$event_dispatcher->dispatch(UserLogoutEvent::EVENT_NAME, $event);
		$event_dispatcher->dispatch($event, UserLogoutEvent::EVENT_NAME);
		}

		/**
		@@ -122,7 +122,7 @@ function rules_entity_view(array &$build, EntityInterface $entity, EntityViewDis
		$entity_type_id = $entity->getEntityTypeId();
		$event = new EntityEvent($entity, [$entity_type_id => $entity]);
		$event_dispatcher = \Drupal::service('event_dispatcher');
		$event_dispatcher->dispatch("rules_entity_view:$entity_type_id", $event);
		$event_dispatcher->dispatch($event, "rules_entity_view:$entity_type_id");
		}
		}

		@@ -138,7 +138,7 @@ function rules_entity_presave(EntityInterface $entity) {
		$entity_type_id . '_unchanged' => $entity->original,
		]);
		$event_dispatcher = \Drupal::service('event_dispatcher');
		$event_dispatcher->dispatch("rules_entity_presave:$entity_type_id", $event);
		$event_dispatcher->dispatch($event, "rules_entity_presave:$entity_type_id");
		}
		}

		@@ -151,7 +151,7 @@ function rules_entity_delete(EntityInterface $entity) {
		$entity_type_id = $entity->getEntityTypeId();
		$event = new EntityEvent($entity, [$entity_type_id => $entity]);
		$event_dispatcher = \Drupal::service('event_dispatcher');
		$event_dispatcher->dispatch("rules_entity_delete:$entity_type_id", $event);
		$event_dispatcher->dispatch($event, "rules_entity_delete:$entity_type_id");
		}
		}

		@@ -164,7 +164,7 @@ function rules_entity_insert(EntityInterface $entity) {
		$entity_type_id = $entity->getEntityTypeId();
		$event = new EntityEvent($entity, [$entity_type_id => $entity]);
		$event_dispatcher = \Drupal::service('event_dispatcher');
		$event_dispatcher->dispatch("rules_entity_insert:$entity_type_id", $event);
		$event_dispatcher->dispatch($event, "rules_entity_insert:$entity_type_id");
		}
		}

		@@ -180,7 +180,7 @@ function rules_entity_update(EntityInterface $entity) {
		$entity_type_id . '_unchanged' => $entity->original,
		]);
		$event_dispatcher = \Drupal::service('event_dispatcher');
		$event_dispatcher->dispatch("rules_entity_update:$entity_type_id", $event);
		$event_dispatcher->dispatch($event, "rules_entity_update:$entity_type_id");
		}
		}

		@@ -190,7 +190,7 @@ function rules_entity_update(EntityInterface $entity) {
		function rules_cron() {
		$event = new SystemCronEvent();
		$event_dispatcher = \Drupal::service('event_dispatcher');
		$event_dispatcher->dispatch(SystemCronEvent::EVENT_NAME, $event);
		$event_dispatcher->dispatch($event, SystemCronEvent::EVENT_NAME);
		}

		/**

src/Logger/RulesLog.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ class RulesLog implements LoggerInterface {

		// Dispatch logger_entry event.
		$event = new SystemLoggerEvent($logger_entry, ['logger_entry' => $logger_entry]);
		$this->dispatcher->dispatch(SystemLoggerEvent::EVENT_NAME, $event);
		$this->dispatcher->dispatch($event, SystemLoggerEvent::EVENT_NAME);
		}

		}

tests/src/Kernel/ConfigurableEventHandlerTest.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ class ConfigurableEventHandlerTest extends RulesKernelTestBase {
		$entity_type_id . '_unchanged' => $this->node,
		]);
		$event_dispatcher = $this->container->get('event_dispatcher');
		$event_dispatcher->dispatch("rules_entity_presave:$entity_type_id", $event);
		$event_dispatcher->dispatch($event, "rules_entity_presave:$entity_type_id");

		// Test that the action in the rule1 logged node value.
		$this->assertRulesDebugLogEntryExists(11, 1);

tests/src/Kernel/EventIntegrationTest.php

+5 −2

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		namespace Drupal\Tests\rules\Kernel;

		use Drupal\Component\EventDispatcher\Event;
		use Drupal\rules\Context\ContextConfig;
		use Drupal\user\Entity\User;
		use Symfony\Component\HttpKernel\KernelEvents;
		@@ -181,7 +182,8 @@ class EventIntegrationTest extends RulesKernelTestBase {
		}
		}
		// Manually trigger the initialization event.
		$dispatcher->dispatch(KernelEvents::REQUEST);
		$event = new Event();
		$dispatcher->dispatch($event, KernelEvents::REQUEST);

		// Test that the action in the rule logged something.
		$this->assertRulesDebugLogEntryExists('action called');
		@@ -216,7 +218,8 @@ class EventIntegrationTest extends RulesKernelTestBase {
		}
		}
		// Manually trigger the initialization event.
		$dispatcher->dispatch(KernelEvents::TERMINATE);
		$event = new Event();
		$dispatcher->dispatch($event, KernelEvents::TERMINATE);

		// Test that the action in the rule logged something.
		$this->assertRulesDebugLogEntryExists('action called');