diff --git a/src/Context/ContextHandlerIntegrityTrait.php b/src/Context/ContextHandlerIntegrityTrait.php
index 8760146e736b0c5fe69393205d3c4f5468b2c570..31b4c231b6e4b30b5080185fdb6240515c7e186b 100644
--- a/src/Context/ContextHandlerIntegrityTrait.php
+++ b/src/Context/ContextHandlerIntegrityTrait.php
@@ -10,7 +10,6 @@ use Drupal\rules\Context\ContextDefinitionInterface as RulesContextDefinitionInt
use Drupal\rules\Context\ContextProviderInterface;
//@codingStandardsIgnoreEnd
use Drupal\rules\Exception\IntegrityException;
-use Drupal\rules\Engine\ExecutionMetadataStateInterface;
use Drupal\rules\Engine\IntegrityViolation;
use Drupal\rules\Engine\IntegrityViolationList;
@@ -26,7 +25,7 @@ trait ContextHandlerIntegrityTrait {
*
* @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
* The plugin with its defined context.
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
+ * @param \Drupal\rules\Context\ExecutionMetadataStateInterface $metadata_state
* The current configuration state with all defined variables that are
* available.
*
diff --git a/src/Context/ContextHandlerTrait.php b/src/Context/ContextHandlerTrait.php
index 215b2510b2ac9e8b030de252874531c697bd8514..37ccb908b706e71874bb2331b52c8a0cdf38ddbb 100644
--- a/src/Context/ContextHandlerTrait.php
+++ b/src/Context/ContextHandlerTrait.php
@@ -4,8 +4,6 @@ namespace Drupal\rules\Context;
use Drupal\Component\Plugin\Exception\ContextException;
use Drupal\Core\Plugin\ContextAwarePluginInterface as CoreContextAwarePluginInterface;
-use Drupal\rules\Engine\ExecutionMetadataStateInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
use Drupal\rules\Exception\EvaluationException;
use Drupal\rules\Exception\IntegrityException;
@@ -38,7 +36,7 @@ trait ContextHandlerTrait {
*
* @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
* The plugin that is populated with context values.
- * @param \Drupal\rules\Engine\ExecutionStateInterface $state
+ * @param \Drupal\rules\Context\ExecutionStateInterface $state
* The execution state containing available variables.
*
* @throws \Drupal\rules\Exception\EvaluationException
@@ -111,7 +109,7 @@ trait ContextHandlerTrait {
*
* @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
* The plugin that is prepared.
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
+ * @param \Drupal\rules\Context\ExecutionMetadataStateInterface $metadata_state
* The metadata state, prepared for the current expression.
*
* @throws \Drupal\Component\Plugin\Exception\ContextException
@@ -146,7 +144,7 @@ trait ContextHandlerTrait {
/**
* Gets definitions of all selected data at configuration time.
*
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
+ * @param \Drupal\rules\Context\ExecutionMetadataStateInterface $metadata_state
* The metadata state.
*
* @return \Drupal\Core\TypedData\DataDefinitionInterface[]
@@ -179,7 +177,7 @@ trait ContextHandlerTrait {
*
* @param string $context_name
* The name of the context.
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
+ * @param \Drupal\rules\Context\ExecutionMetadataStateInterface $metadata_state
* The metadata state containing metadata about available variables.
*
* @return \Drupal\Core\TypedData\DataDefinitionInterface|null
@@ -201,7 +199,7 @@ trait ContextHandlerTrait {
*
* @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
* The context aware plugin of which to add provided context.
- * @param \Drupal\rules\Engine\ExecutionStateInterface $state
+ * @param \Drupal\rules\Context\ExecutionStateInterface $state
* The Rules state where the context variables are added.
*/
protected function addProvidedContext(CoreContextAwarePluginInterface $plugin, ExecutionStateInterface $state) {
@@ -227,7 +225,7 @@ trait ContextHandlerTrait {
*
* @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
* The context aware plugin of which to add provided context.
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
+ * @param \Drupal\rules\Context\ExecutionMetadataStateInterface $metadata_state
* The execution metadata state to add variables to.
*/
protected function addProvidedContextDefinitions(CoreContextAwarePluginInterface $plugin, ExecutionMetadataStateInterface $metadata_state) {
@@ -257,7 +255,7 @@ trait ContextHandlerTrait {
*
* @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
* The context aware plugin.
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
+ * @param \Drupal\rules\Context\ExecutionMetadataStateInterface $metadata_state
* The execution metadata state.
*/
protected function assertMetadata(CoreContextAwarePluginInterface $plugin, ExecutionMetadataStateInterface $metadata_state) {
@@ -282,7 +280,7 @@ trait ContextHandlerTrait {
*
* @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
* The plugin to process the context data on.
- * @param \Drupal\rules\Engine\ExecutionStateInterface $rules_state
+ * @param \Drupal\rules\Context\ExecutionStateInterface $rules_state
* The current Rules execution state with context variables.
*/
protected function processData(CoreContextAwarePluginInterface $plugin, ExecutionStateInterface $rules_state) {
@@ -310,7 +308,7 @@ trait ContextHandlerTrait {
* The current value.
* @param array $processors
* An array mapping processor plugin IDs to their configuration.
- * @param \Drupal\rules\Engine\ExecutionStateInterface $rules_state
+ * @param \Drupal\rules\Context\ExecutionStateInterface $rules_state
* The current Rules execution state with context variables.
*
* @return mixed
diff --git a/src/Context/DataProcessorInterface.php b/src/Context/DataProcessorInterface.php
index 0fab75a11217e5815e513775674b8f55a98d2ea3..224f59ac4617379417e505a1dd9410b3372bc458 100644
--- a/src/Context/DataProcessorInterface.php
+++ b/src/Context/DataProcessorInterface.php
@@ -2,8 +2,6 @@
namespace Drupal\rules\Context;
-use Drupal\rules\Engine\ExecutionStateInterface;
-
/**
* Interface for Rules data processor plugins.
*/
@@ -14,7 +12,7 @@ interface DataProcessorInterface {
*
* @param mixed $value
* The value to process.
- * @param \Drupal\rules\Engine\ExecutionStateInterface $rules_state
+ * @param \Drupal\rules\Context\ExecutionStateInterface $rules_state
* The current Rules execution state containing all context variables.
*
* @return mixed
diff --git a/src/Engine/ExecutionMetadataState.php b/src/Context/ExecutionMetadataState.php
similarity index 97%
rename from src/Engine/ExecutionMetadataState.php
rename to src/Context/ExecutionMetadataState.php
index dbc5d8a31e2e92b0cb7fd208e3f8471e1c0ad2f1..610731aba58ccba0b42763377a2d046fbd456d8a 100644
--- a/src/Engine/ExecutionMetadataState.php
+++ b/src/Context/ExecutionMetadataState.php
@@ -1,10 +1,9 @@
<?php
-namespace Drupal\rules\Engine;
+namespace Drupal\rules\Context;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\rules\Context\GlobalContextRepositoryTrait;
use Drupal\rules\Exception\IntegrityException;
use Drupal\typed_data\DataFetcherTrait;
use Drupal\typed_data\Exception\TypedDataException;
diff --git a/src/Engine/ExecutionMetadataStateInterface.php b/src/Context/ExecutionMetadataStateInterface.php
similarity index 98%
rename from src/Engine/ExecutionMetadataStateInterface.php
rename to src/Context/ExecutionMetadataStateInterface.php
index b61e0d35bc18b34cbc7073c0c198f7fa4261c8f1..5ec8bfaa9047b1e4a941d0cd81d89b3bf3d4bba7 100644
--- a/src/Engine/ExecutionMetadataStateInterface.php
+++ b/src/Context/ExecutionMetadataStateInterface.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\rules\Engine;
+namespace Drupal\rules\Context;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\TypedData\DataDefinitionInterface;
diff --git a/src/Engine/ExecutionState.php b/src/Context/ExecutionState.php
similarity index 97%
rename from src/Engine/ExecutionState.php
rename to src/Context/ExecutionState.php
index 9bf8a1628e546e3867cb17e429c55e5ad09fd73d..3600645ed08fc1e12a0e41f62ad93dcc246e6e1f 100644
--- a/src/Engine/ExecutionState.php
+++ b/src/Context/ExecutionState.php
@@ -1,12 +1,10 @@
<?php
-namespace Drupal\rules\Engine;
+namespace Drupal\rules\Context;
use Drupal\Core\TypedData\Exception\MissingDataException;
use Drupal\Core\TypedData\TypedDataInterface;
use Drupal\Core\TypedData\TypedDataTrait;
-use Drupal\rules\Context\ContextDefinitionInterface;
-use Drupal\rules\Context\GlobalContextRepositoryTrait;
use Drupal\rules\Exception\EvaluationException;
use Drupal\rules\Exception\InvalidArgumentException;
use Drupal\typed_data\DataFetcherTrait;
@@ -28,6 +26,8 @@ class ExecutionState implements ExecutionStateInterface {
* @var array
*
* @todo Implement recursion prevention from D7.
+ * @todo Move this out of Context namespace?
+ * @see https://www.drupal.org/project/rules/issues/2677094
*/
static protected $blocked = [];
diff --git a/src/Engine/ExecutionStateInterface.php b/src/Context/ExecutionStateInterface.php
similarity index 94%
rename from src/Engine/ExecutionStateInterface.php
rename to src/Context/ExecutionStateInterface.php
index 7757316ae8f5bb59b126178c6555000bd79c892c..8496062e09c6dd3c72dad189d9c6264150b92728 100644
--- a/src/Engine/ExecutionStateInterface.php
+++ b/src/Context/ExecutionStateInterface.php
@@ -1,12 +1,11 @@
<?php
-namespace Drupal\rules\Engine;
+namespace Drupal\rules\Context;
use Drupal\Core\TypedData\TypedDataInterface;
-use Drupal\rules\Context\ContextDefinitionInterface;
/**
- * Defines an interface for the rules state.
+ * Defines an interface for the execution context state.
*/
interface ExecutionStateInterface {
@@ -67,7 +66,7 @@ interface ExecutionStateInterface {
public function getVariableValue($name);
/**
- * Checks if a variable exists by name in the Rules state.
+ * Checks if a variable exists by name in the execution state.
*
* @param string $name
* The variable name.
diff --git a/src/Engine/ConditionExpressionContainer.php b/src/Engine/ConditionExpressionContainer.php
index 7b05191dfbf9d82bd391060e4761f1e3d96c1ebe..be12c08595f3885e8bb1869d29d80607b82eee69 100644
--- a/src/Engine/ConditionExpressionContainer.php
+++ b/src/Engine/ConditionExpressionContainer.php
@@ -5,6 +5,7 @@ namespace Drupal\rules\Engine;
use Drupal\Core\Logger\LoggerChannelInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\rules\Context\ContextConfig;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Exception\InvalidExpressionException;
/**
diff --git a/src/Engine/ExpressionBase.php b/src/Engine/ExpressionBase.php
index cbfc41b34f2d1d39ba44ce7442ebb15f96197b04..7a96385bbb5b90f87f7a6af7ad9566285cfed945 100644
--- a/src/Engine/ExpressionBase.php
+++ b/src/Engine/ExpressionBase.php
@@ -3,6 +3,7 @@
namespace Drupal\rules\Engine;
use Drupal\Core\Plugin\PluginBase;
+use Drupal\rules\Context\ExecutionState;
/**
* Base class for rules expressions.
diff --git a/src/Engine/ExpressionContainerBase.php b/src/Engine/ExpressionContainerBase.php
index 86b4fb7ad22046e31cdfc3037b2bec918117cd74..a757202079375c096e5f081b0dcd66316a6659f5 100644
--- a/src/Engine/ExpressionContainerBase.php
+++ b/src/Engine/ExpressionContainerBase.php
@@ -3,6 +3,7 @@
namespace Drupal\rules\Engine;
use Drupal\rules\Context\ContextConfig;
+use Drupal\rules\Context\ExecutionMetadataStateInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
diff --git a/src/Engine/ExpressionInterface.php b/src/Engine/ExpressionInterface.php
index d74479a1885460361a3e79c28fa0a0faf30163c1..77052b12fea6aac0abac9e106387a8f754e2771d 100644
--- a/src/Engine/ExpressionInterface.php
+++ b/src/Engine/ExpressionInterface.php
@@ -6,6 +6,8 @@ use Drupal\Component\Plugin\ConfigurableInterface;
use Drupal\Component\Plugin\DependentPluginInterface;
use Drupal\Component\Plugin\PluginInspectionInterface;
use Drupal\Core\Executable\ExecutableInterface;
+use Drupal\rules\Context\ExecutionMetadataStateInterface;
+use Drupal\rules\Context\ExecutionStateInterface;
/**
* Defines the interface for Rules expressions.
@@ -19,7 +21,7 @@ interface ExpressionInterface extends ExecutableInterface, ConfigurableInterface
*
* Note that this does not auto-save any changes.
*
- * @param \Drupal\rules\Engine\ExecutionStateInterface $state
+ * @param \Drupal\rules\Context\ExecutionStateInterface $state
* The state with all the execution variables in it.
*
* @return null|bool
@@ -114,7 +116,7 @@ interface ExpressionInterface extends ExecutableInterface, ConfigurableInterface
* This allows for efficient integrity checks of expression trees; e.g. see
* \Drupal\rules\Engine\ActionExpressionContainer::checkIntegrity().
*
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
+ * @param \Drupal\rules\Context\ExecutionMetadataStateInterface $metadata_state
* The execution metadata state, prepared until right before this
* expression.
* @param bool $apply_assertions
@@ -145,7 +147,7 @@ interface ExpressionInterface extends ExecutableInterface, ConfigurableInterface
* $until = NULL reflects the execution metadata state at the end of the
* expression execution.
*
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
+ * @param \Drupal\rules\Context\ExecutionMetadataStateInterface $metadata_state
* The execution metadata state, prepared until right before this
* expression.
* @param \Drupal\rules\Engine\ExpressionInterface $until
diff --git a/src/Engine/RulesComponent.php b/src/Engine/RulesComponent.php
index 0e798f6d4fa51f0b91a2a68e6e639cc96cda1980..2daf03cfb01c38f8b490f13afac1e4bf04c5949d 100644
--- a/src/Engine/RulesComponent.php
+++ b/src/Engine/RulesComponent.php
@@ -5,6 +5,8 @@ namespace Drupal\rules\Engine;
use Drupal\Core\Entity\DependencyTrait;
use Drupal\rules\Context\ContextDefinition;
use Drupal\rules\Context\ContextDefinitionInterface;
+use Drupal\rules\Context\ExecutionMetadataState;
+use Drupal\rules\Context\ExecutionState;
use Drupal\rules\Exception\LogicException;
/**
@@ -16,7 +18,7 @@ class RulesComponent {
/**
* The rules execution state.
*
- * @var \Drupal\rules\Engine\ExecutionStateInterface
+ * @var \Drupal\rules\Context\ExecutionStateInterface
*/
protected $state;
@@ -124,7 +126,7 @@ class RulesComponent {
/**
* Gets the execution state.
*
- * @return \Drupal\rules\Engine\ExecutionStateInterface
+ * @return \Drupal\rules\Context\ExecutionStateInterface
* The execution state for this component.
*/
public function getState() {
@@ -294,7 +296,7 @@ class RulesComponent {
* Describes the metadata state before execution - only context definitions
* are set as variables.
*
- * @return \Drupal\rules\Engine\ExecutionMetadataStateInterface
+ * @return \Drupal\rules\Context\ExecutionMetadataStateInterface
* The execution metadata state populated with context definitions.
*/
public function getMetadataState() {
diff --git a/src/EventSubscriber/GenericEventSubscriber.php b/src/EventSubscriber/GenericEventSubscriber.php
index d358f182adfa085fccfb6bf7d9c2ca45a58710c4..ca4cc3a38c1ad23494e853e8aa5d8a4fa0d69bfc 100644
--- a/src/EventSubscriber/GenericEventSubscriber.php
+++ b/src/EventSubscriber/GenericEventSubscriber.php
@@ -4,9 +4,9 @@ namespace Drupal\rules\EventSubscriber;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Logger\LoggerChannelInterface;
+use Drupal\rules\Context\ExecutionState;
use Drupal\rules\Core\RulesConfigurableEventHandlerInterface;
use Drupal\rules\Core\RulesEventManager;
-use Drupal\rules\Engine\ExecutionState;
use Drupal\rules\Engine\RulesComponentRepositoryInterface;
use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
diff --git a/src/Plugin/RulesDataProcessor/NumericOffset.php b/src/Plugin/RulesDataProcessor/NumericOffset.php
index b6c97d28fba9fefd2c3b572550e1273a63ba61f7..1c58aeb7700e3eba28bdbe84ab6dacba684f3428 100644
--- a/src/Plugin/RulesDataProcessor/NumericOffset.php
+++ b/src/Plugin/RulesDataProcessor/NumericOffset.php
@@ -4,7 +4,7 @@ namespace Drupal\rules\Plugin\RulesDataProcessor;
use Drupal\Core\Plugin\PluginBase;
use Drupal\rules\Context\DataProcessorInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
+use Drupal\rules\Context\ExecutionStateInterface;
/**
* A data processor for applying numerical offsets.
diff --git a/src/Plugin/RulesDataProcessor/TokenProcessor.php b/src/Plugin/RulesDataProcessor/TokenProcessor.php
index c9e2fd660671ecc2b2d1d22626c7f97bb7fb5435..92f93b29b8dabf52ec0cf593f6f6db45848f7a6a 100644
--- a/src/Plugin/RulesDataProcessor/TokenProcessor.php
+++ b/src/Plugin/RulesDataProcessor/TokenProcessor.php
@@ -5,7 +5,7 @@ namespace Drupal\rules\Plugin\RulesDataProcessor;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Plugin\PluginBase;
use Drupal\rules\Context\DataProcessorInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\typed_data\PlaceholderResolverInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/src/Plugin/RulesExpression/ActionExpression.php b/src/Plugin/RulesExpression/ActionExpression.php
index b1bc217b4234c34e938f3cb869ce1251a10ff3b4..455ec0a63cc03e05e3c95e8e500d8271fb2ff3e5 100644
--- a/src/Plugin/RulesExpression/ActionExpression.php
+++ b/src/Plugin/RulesExpression/ActionExpression.php
@@ -5,10 +5,10 @@ namespace Drupal\rules\Plugin\RulesExpression;
use Drupal\Core\Logger\LoggerChannelInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\rules\Context\DataProcessorManager;
+use Drupal\rules\Context\ExecutionMetadataStateInterface;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Core\RulesActionManagerInterface;
use Drupal\rules\Engine\ActionExpressionInterface;
-use Drupal\rules\Engine\ExecutionMetadataStateInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
use Drupal\rules\Engine\ExpressionBase;
use Drupal\rules\Engine\ExpressionInterface;
use Drupal\rules\Context\ContextHandlerIntegrityTrait;
diff --git a/src/Plugin/RulesExpression/ActionSetExpression.php b/src/Plugin/RulesExpression/ActionSetExpression.php
index e4ca4b4f5cb7fbc9c1350a149fe4a458a5d5e2d0..5b4014573c7070f1f4dce6d786bfb1c270f58ef2 100644
--- a/src/Plugin/RulesExpression/ActionSetExpression.php
+++ b/src/Plugin/RulesExpression/ActionSetExpression.php
@@ -2,8 +2,8 @@
namespace Drupal\rules\Plugin\RulesExpression;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Engine\ActionExpressionContainer;
-use Drupal\rules\Engine\ExecutionStateInterface;
/**
* Holds a set of actions and executes all of them.
diff --git a/src/Plugin/RulesExpression/AndExpression.php b/src/Plugin/RulesExpression/AndExpression.php
index d3d5ac9b73e7d129241334bc5c42b46b51310e52..366ecad575e22315867e03d469451b9b813f3920 100644
--- a/src/Plugin/RulesExpression/AndExpression.php
+++ b/src/Plugin/RulesExpression/AndExpression.php
@@ -2,8 +2,8 @@
namespace Drupal\rules\Plugin\RulesExpression;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Engine\ConditionExpressionContainer;
-use Drupal\rules\Engine\ExecutionStateInterface;
/**
* Evaluates a group of conditions with a logical AND.
diff --git a/src/Plugin/RulesExpression/ConditionExpression.php b/src/Plugin/RulesExpression/ConditionExpression.php
index 0098cbd777cbd55dca077d6976e9379a0d1ffc2f..2a011bfbe388d7b6afe9d8ae346580d7919e4bec 100644
--- a/src/Plugin/RulesExpression/ConditionExpression.php
+++ b/src/Plugin/RulesExpression/ConditionExpression.php
@@ -5,10 +5,10 @@ namespace Drupal\rules\Plugin\RulesExpression;
use Drupal\Core\Logger\LoggerChannelInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\rules\Context\DataProcessorManager;
+use Drupal\rules\Context\ExecutionMetadataStateInterface;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Core\ConditionManager;
use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Engine\ExecutionMetadataStateInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
use Drupal\rules\Engine\ExpressionBase;
use Drupal\rules\Engine\ExpressionInterface;
use Drupal\rules\Context\ContextHandlerIntegrityTrait;
diff --git a/src/Plugin/RulesExpression/LoopExpression.php b/src/Plugin/RulesExpression/LoopExpression.php
index ea6782d0fab31b042bc302e74993812e260c8232..aa74786426d4026b0591ee4c812d4abc755c27a5 100644
--- a/src/Plugin/RulesExpression/LoopExpression.php
+++ b/src/Plugin/RulesExpression/LoopExpression.php
@@ -3,9 +3,9 @@
namespace Drupal\rules\Plugin\RulesExpression;
use Drupal\Core\TypedData\ListDataDefinitionInterface;
+use Drupal\rules\Context\ExecutionMetadataStateInterface;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Engine\ActionExpressionContainer;
-use Drupal\rules\Engine\ExecutionMetadataStateInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
use Drupal\rules\Engine\IntegrityViolationList;
use Drupal\rules\Exception\IntegrityException;
diff --git a/src/Plugin/RulesExpression/OrExpression.php b/src/Plugin/RulesExpression/OrExpression.php
index b1a2a1b746abb5a77df2f290f2a406697bc82921..0be90968c8992247322beb7dde96ae5133ed4bf2 100644
--- a/src/Plugin/RulesExpression/OrExpression.php
+++ b/src/Plugin/RulesExpression/OrExpression.php
@@ -2,8 +2,8 @@
namespace Drupal\rules\Plugin\RulesExpression;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Engine\ConditionExpressionContainer;
-use Drupal\rules\Engine\ExecutionStateInterface;
/**
* Evaluates a group of conditions with a logical OR.
diff --git a/src/Plugin/RulesExpression/RuleExpression.php b/src/Plugin/RulesExpression/RuleExpression.php
index 3b181ce9f6cefeb9a37288a0139c5fc76ec93ec6..4684f7998621fa8668e38050ddcbd959ac57807f 100644
--- a/src/Plugin/RulesExpression/RuleExpression.php
+++ b/src/Plugin/RulesExpression/RuleExpression.php
@@ -5,12 +5,12 @@ namespace Drupal\rules\Plugin\RulesExpression;
use Drupal\Core\Logger\LoggerChannelInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\rules\Context\ContextConfig;
+use Drupal\rules\Context\ExecutionMetadataStateInterface;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Engine\ActionExpressionContainerInterface;
use Drupal\rules\Engine\ActionExpressionInterface;
use Drupal\rules\Engine\ConditionExpressionContainerInterface;
use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Engine\ExecutionMetadataStateInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
use Drupal\rules\Engine\ExpressionBase;
use Drupal\rules\Engine\ExpressionInterface;
use Drupal\rules\Engine\ExpressionManagerInterface;
diff --git a/tests/src/Kernel/RulesEngineTest.php b/tests/src/Kernel/RulesEngineTest.php
index 1a285f0fc769c4dd245a4ee7ae3b77af33841568..dd6627d97093062ee8181e2702ed8414738d64a2 100644
--- a/tests/src/Kernel/RulesEngineTest.php
+++ b/tests/src/Kernel/RulesEngineTest.php
@@ -5,8 +5,8 @@ namespace Drupal\Tests\rules\Kernel;
use Drupal\rules\Core\ConditionManager;
use Drupal\rules\Context\ContextConfig;
use Drupal\rules\Context\ContextDefinition;
+use Drupal\rules\Context\ExecutionState;
use Drupal\rules\Engine\RulesComponent;
-use Drupal\rules\Engine\ExecutionState;
/**
* Test using the Rules API to create and evaluate rules.
diff --git a/tests/src/Unit/ActionSetExpressionTest.php b/tests/src/Unit/ActionSetExpressionTest.php
index 0c899a355dd5114913ac5db4f7f13d1c7fb0babb..cccd934cfea85730ef132eade403753eccb9634e 100644
--- a/tests/src/Unit/ActionSetExpressionTest.php
+++ b/tests/src/Unit/ActionSetExpressionTest.php
@@ -2,8 +2,8 @@
namespace Drupal\Tests\rules\Unit;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Engine\ActionExpressionInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
use Drupal\rules\Plugin\RulesExpression\ActionSetExpression;
use Drupal\rules\Plugin\RulesExpression\ActionExpression;
use Prophecy\Argument;
diff --git a/tests/src/Unit/AndExpressionTest.php b/tests/src/Unit/AndExpressionTest.php
index 6867027b7e82277ffaf0e8e2bd0a1b1b5fdad892..11918b8d13070573263c791686d09ed2843356b8 100644
--- a/tests/src/Unit/AndExpressionTest.php
+++ b/tests/src/Unit/AndExpressionTest.php
@@ -2,8 +2,8 @@
namespace Drupal\Tests\rules\Unit;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
use Drupal\rules\Plugin\RulesExpression\AndExpression;
use Prophecy\Argument;
diff --git a/tests/src/Unit/ConditionExpressionTest.php b/tests/src/Unit/ConditionExpressionTest.php
index ac3476844f2f6a14268e4b013083ef8ce16d06b7..7fa70eab3d74999247755cb0c5e1004734e3c80b 100644
--- a/tests/src/Unit/ConditionExpressionTest.php
+++ b/tests/src/Unit/ConditionExpressionTest.php
@@ -8,9 +8,9 @@ use Drupal\Tests\UnitTestCase;
use Drupal\rules\Context\DataProcessorInterface;
use Drupal\rules\Context\ContextConfig;
use Drupal\rules\Context\DataProcessorManager;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Core\ConditionManager;
use Drupal\rules\Core\RulesConditionInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
use Drupal\rules\Plugin\RulesExpression\ConditionExpression;
use Prophecy\Argument;
diff --git a/tests/src/Unit/ContextHandlerTraitTest.php b/tests/src/Unit/ContextHandlerTraitTest.php
index 1ae881cab6f90e920b79cc8084486f825c4323ff..77f38a06c8c05485822a0e04610243298a7ac9ec 100644
--- a/tests/src/Unit/ContextHandlerTraitTest.php
+++ b/tests/src/Unit/ContextHandlerTraitTest.php
@@ -6,7 +6,7 @@ use Drupal\Core\Plugin\ContextAwarePluginInterface;
use Drupal\rules\Context\ContextConfig;
use Drupal\rules\Context\ContextDefinitionInterface;
use Drupal\rules\Context\ContextHandlerTrait;
-use Drupal\rules\Engine\ExecutionStateInterface;
+use Drupal\rules\Context\ExecutionStateInterface;
/**
* @coversDefaultClass \Drupal\rules\Context\ContextHandlerTrait
diff --git a/tests/src/Unit/Integration/Engine/PrepareExecutionMetadataStateTest.php b/tests/src/Unit/Integration/Engine/PrepareExecutionMetadataStateTest.php
index 3a9a80945ceb88dc70cc1ec27987d9e06324b22f..58e88c009af7272bcb379eebe1895bb432ef52b5 100644
--- a/tests/src/Unit/Integration/Engine/PrepareExecutionMetadataStateTest.php
+++ b/tests/src/Unit/Integration/Engine/PrepareExecutionMetadataStateTest.php
@@ -4,7 +4,7 @@ namespace Drupal\Tests\rules\Unit\Integration\Engine;
use Drupal\rules\Context\ContextConfig;
use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\ExecutionMetadataState;
+use Drupal\rules\Context\ExecutionMetadataState;
use Drupal\rules\Engine\RulesComponent;
use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
diff --git a/tests/src/Unit/Integration/Engine/RulesComponentTest.php b/tests/src/Unit/Integration/Engine/RulesComponentTest.php
index 2394ddce65146d309ddffe006836ba1fe8d9174a..d3c4bb9450cb2a0a765c64d09b9f8d4ea2fc6174 100644
--- a/tests/src/Unit/Integration/Engine/RulesComponentTest.php
+++ b/tests/src/Unit/Integration/Engine/RulesComponentTest.php
@@ -5,7 +5,7 @@ namespace Drupal\Tests\rules\Unit\Integration\Engine;
use Drupal\rules\Context\ContextConfig;
use Drupal\rules\Context\ContextDefinition;
use Drupal\rules\Engine\RulesComponent;
-use Drupal\rules\Engine\ExecutionStateInterface;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
/**
diff --git a/tests/src/Unit/OrExpressionTest.php b/tests/src/Unit/OrExpressionTest.php
index 2e6b602c461f08362df055980a72c083cfa44226..2a4b0c9c3f2ee27cf730998a5e09b97d21decad9 100644
--- a/tests/src/Unit/OrExpressionTest.php
+++ b/tests/src/Unit/OrExpressionTest.php
@@ -2,8 +2,8 @@
namespace Drupal\Tests\rules\Unit;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
use Drupal\rules\Plugin\RulesExpression\OrExpression;
use Prophecy\Argument;
diff --git a/tests/src/Unit/RuleExpressionTest.php b/tests/src/Unit/RuleExpressionTest.php
index 17c2636ecd7a3cced2fede04ad777d80258ed86e..84a4a8596a3fa3e14e0b4aa67101ee5f280ec774 100644
--- a/tests/src/Unit/RuleExpressionTest.php
+++ b/tests/src/Unit/RuleExpressionTest.php
@@ -2,8 +2,8 @@
namespace Drupal\Tests\rules\Unit;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
use Drupal\rules\Engine\ExpressionManagerInterface;
use Drupal\rules\Plugin\RulesExpression\ActionSetExpression;
use Drupal\rules\Plugin\RulesExpression\RuleExpression;
diff --git a/tests/src/Unit/RulesConditionContainerTest.php b/tests/src/Unit/RulesConditionContainerTest.php
index aed083264225a075085e3e8983c9349954db7d16..4a23b1b1da431e5caf3153069e174ee937635fdb 100644
--- a/tests/src/Unit/RulesConditionContainerTest.php
+++ b/tests/src/Unit/RulesConditionContainerTest.php
@@ -3,9 +3,9 @@
namespace Drupal\Tests\rules\Unit;
use Drupal\Core\Logger\LoggerChannelInterface;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Engine\ConditionExpressionContainer;
use Drupal\rules\Engine\ExpressionManagerInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
/**
* @coversDefaultClass \Drupal\rules\Engine\ConditionExpressionContainer
diff --git a/tests/src/Unit/RulesUnitTestBase.php b/tests/src/Unit/RulesUnitTestBase.php
index 52f602a4c94b45fe5ad2c15fdd4a5c9e1bde5050..bfb4cfdea11bc6329d14699223dda87dbc2e9639 100644
--- a/tests/src/Unit/RulesUnitTestBase.php
+++ b/tests/src/Unit/RulesUnitTestBase.php
@@ -3,9 +3,9 @@
namespace Drupal\Tests\rules\Unit;
use Drupal\Core\Logger\LoggerChannelInterface;
+use Drupal\rules\Context\ExecutionStateInterface;
use Drupal\rules\Engine\ActionExpressionInterface;
use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
use Drupal\rules\Engine\ExpressionManagerInterface;
use Drupal\Tests\UnitTestCase;
use Prophecy\Argument;