Merge pull request #616 from tienvx/isolate-transition-expression-fro…

…m-commands-values Isolate transition expression from commands values
tienvx · Apr 27, 2022 · 827514b · 827514b
2 parents fe84f38 + 5651459
commit 827514b
Show file tree

Hide file tree

Showing 37 changed files with 362 additions and 207 deletions.
diff --git a/src/Command/CommandPreprocessor.php b/src/Command/CommandPreprocessor.php
@@ -2,24 +2,24 @@
 
 namespace Tienvx\Bundle\MbtBundle\Command;
 
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\Command;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 class CommandPreprocessor implements CommandPreprocessorInterface
 {
-    public function process(CommandInterface $command, ColorInterface $color): CommandInterface
+    public function process(CommandInterface $command, ValuesInterface $values): CommandInterface
     {
         $processed = new Command();
         $processed->setCommand($command->getCommand());
         $processed->setTarget(
             $command->getTarget()
-                ? $this->replaceVariables($command->getTarget(), $color->getValues())
+                ? $this->replaceVariables($command->getTarget(), $values->getValues())
                 : $command->getTarget()
         );
         $processed->setValue(
             $command->getValue()
-                ? $this->replaceVariables($command->getValue(), $color->getValues())
+                ? $this->replaceVariables($command->getValue(), $values->getValues())
                 : $command->getValue()
         );
 
@@ -28,8 +28,10 @@ public function process(CommandInterface $command, ColorInterface $color): Comma
 
     protected function replaceVariables(string $text, array $values): string
     {
-        return preg_replace_callback('/\$\{(.*?)\}/', function ($matches) use ($values) {
-            return $values[$matches[1]] ?? $matches[1];
-        }, $text);
+        return preg_replace_callback(
+            '/\$\{(.*?)\}/',
+            fn (array $matches): string => $values[$matches[1]] ?? $matches[1],
+            $text
+        );
     }
 }
diff --git a/src/Command/CommandPreprocessorInterface.php b/src/Command/CommandPreprocessorInterface.php
@@ -2,10 +2,10 @@
 
 namespace Tienvx\Bundle\MbtBundle\Command;
 
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 interface CommandPreprocessorInterface
 {
-    public function process(CommandInterface $command, ColorInterface $color): CommandInterface;
+    public function process(CommandInterface $command, ValuesInterface $values): CommandInterface;
 }
diff --git a/src/Command/CommandRunnerInterface.php b/src/Command/CommandRunnerInterface.php
@@ -3,8 +3,8 @@
 namespace Tienvx\Bundle\MbtBundle\Command;
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 interface CommandRunnerInterface
 {
@@ -35,5 +35,5 @@ public function validateTarget(CommandInterface $command): bool;
 
     public function supports(CommandInterface $command): bool;
 
-    public function run(CommandInterface $command, ColorInterface $color, RemoteWebDriver $driver): void;
+    public function run(CommandInterface $command, ValuesInterface $values, RemoteWebDriver $driver): void;
 }
diff --git a/src/Command/CommandRunnerManager.php b/src/Command/CommandRunnerManager.php
@@ -3,8 +3,8 @@
 namespace Tienvx\Bundle\MbtBundle\Command;
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 class CommandRunnerManager implements CommandRunnerManagerInterface
 {
@@ -43,11 +43,11 @@ public function validateTarget(CommandInterface $command): bool
         return false;
     }
 
-    public function run(CommandInterface $command, ColorInterface $color, RemoteWebDriver $driver): void
+    public function run(CommandInterface $command, ValuesInterface $values, RemoteWebDriver $driver): void
     {
         foreach ($this->runners as $runner) {
             if ($runner instanceof CommandRunnerInterface && $runner->supports($command)) {
-                $runner->run($this->commandPreprocessor->process($command, $color), $color, $driver);
+                $runner->run($this->commandPreprocessor->process($command, $values), $values, $driver);
                 break;
             }
         }

diff --git a/src/Command/CommandRunnerManagerInterface.php b/src/Command/CommandRunnerManagerInterface.php
@@ -3,8 +3,8 @@
 namespace Tienvx\Bundle\MbtBundle\Command;
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 interface CommandRunnerManagerInterface
 {
@@ -16,5 +16,5 @@ public function getCommandsRequireValue(): array;
 
     public function validateTarget(CommandInterface $command): bool;
 
-    public function run(CommandInterface $command, ColorInterface $color, RemoteWebDriver $driver): void;
+    public function run(CommandInterface $command, ValuesInterface $values, RemoteWebDriver $driver): void;
 }
diff --git a/src/Command/Runner/AlertCommandRunner.php b/src/Command/Runner/AlertCommandRunner.php
@@ -3,9 +3,9 @@
 namespace Tienvx\Bundle\MbtBundle\Command\Runner;
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Command\CommandRunner;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 class AlertCommandRunner extends CommandRunner
 {
@@ -38,7 +38,7 @@ public function getCommandsRequireValue(): array
         return [];
     }
 
-    public function run(CommandInterface $command, ColorInterface $color, RemoteWebDriver $driver): void
+    public function run(CommandInterface $command, ValuesInterface $values, RemoteWebDriver $driver): void
     {
         switch ($command->getCommand()) {
             case self::ACCEPT_ALERT:

diff --git a/src/Command/Runner/AssertionRunner.php b/src/Command/Runner/AssertionRunner.php
@@ -4,9 +4,9 @@
 
 use Exception;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Command\CommandRunner;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 class AssertionRunner extends CommandRunner
 {
@@ -72,11 +72,11 @@ public function getCommandsRequireValue(): array
         ];
     }
 
-    public function run(CommandInterface $command, ColorInterface $color, RemoteWebDriver $driver): void
+    public function run(CommandInterface $command, ValuesInterface $values, RemoteWebDriver $driver): void
     {
         switch ($command->getCommand()) {
             case self::ASSERT:
-                $actual = $color->getValue($command->getTarget());
+                $actual = $values->getValue($command->getTarget());
                 $this->assert(
                     $actual === $command->getValue(),
                     sprintf('Actual value "%s" did not match "%s"', $actual, $command->getValue())

diff --git a/src/Command/Runner/KeyboardCommandRunner.php b/src/Command/Runner/KeyboardCommandRunner.php
@@ -3,9 +3,9 @@
 namespace Tienvx\Bundle\MbtBundle\Command\Runner;
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Command\CommandRunner;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 class KeyboardCommandRunner extends CommandRunner
 {
@@ -30,7 +30,7 @@ public function getCommandsRequireValue(): array
         return [];
     }
 
-    public function run(CommandInterface $command, ColorInterface $color, RemoteWebDriver $driver): void
+    public function run(CommandInterface $command, ValuesInterface $values, RemoteWebDriver $driver): void
     {
         switch ($command->getCommand()) {
             case self::TYPE:

diff --git a/src/Command/Runner/MouseCommandRunner.php b/src/Command/Runner/MouseCommandRunner.php
@@ -5,9 +5,9 @@
 use Exception;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\WebDriverPoint;
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Command\CommandRunner;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 class MouseCommandRunner extends CommandRunner
 {
@@ -72,7 +72,7 @@ public function getCommandsRequireValue(): array
         ];
     }
 
-    public function run(CommandInterface $command, ColorInterface $color, RemoteWebDriver $driver): void
+    public function run(CommandInterface $command, ValuesInterface $values, RemoteWebDriver $driver): void
     {
         switch ($command->getCommand()) {
             case self::ADD_SELECTION:

diff --git a/src/Command/Runner/ScriptCommandRunner.php b/src/Command/Runner/ScriptCommandRunner.php
@@ -3,9 +3,9 @@
 namespace Tienvx\Bundle\MbtBundle\Command\Runner;
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Command\CommandRunner;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 class ScriptCommandRunner extends CommandRunner
 {
@@ -35,7 +35,7 @@ public function getCommandsRequireValue(): array
         ];
     }
 
-    public function run(CommandInterface $command, ColorInterface $color, RemoteWebDriver $driver): void
+    public function run(CommandInterface $command, ValuesInterface $values, RemoteWebDriver $driver): void
     {
         switch ($command->getCommand()) {
             case self::RUN_SCRIPT:
@@ -44,13 +44,13 @@ public function run(CommandInterface $command, ColorInterface $color, RemoteWebD
             case self::EXECUTE_SCRIPT:
                 $value = $driver->executeScript($command->getTarget());
                 if ($command->getValue()) {
-                    $color->setValue($command->getValue(), $value);
+                    $values->setValue($command->getValue(), $value);
                 }
                 break;
             case self::EXECUTE_ASYNC_SCRIPT:
                 $value = $driver->executeAsyncScript($command->getTarget());
                 if ($command->getValue()) {
-                    $color->setValue($command->getValue(), $value);
+                    $values->setValue($command->getValue(), $value);
                 }
                 break;
             default:

diff --git a/src/Command/Runner/StoreCommandRunner.php b/src/Command/Runner/StoreCommandRunner.php
@@ -3,9 +3,9 @@
 namespace Tienvx\Bundle\MbtBundle\Command\Runner;
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Command\CommandRunner;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 class StoreCommandRunner extends CommandRunner
 {
@@ -58,48 +58,48 @@ public function getCommandsRequireValue(): array
         ];
     }
 
-    public function run(CommandInterface $command, ColorInterface $color, RemoteWebDriver $driver): void
+    public function run(CommandInterface $command, ValuesInterface $values, RemoteWebDriver $driver): void
     {
         switch ($command->getCommand()) {
             case self::STORE:
-                $color->setValue($command->getValue(), $command->getTarget());
+                $values->setValue($command->getValue(), $command->getTarget());
                 break;
             case self::STORE_ATTRIBUTE:
                 list($elementLocator, $attributeName) = explode('@', $command->getTarget(), 2);
-                $color->setValue(
+                $values->setValue(
                     $command->getValue(),
                     $driver->findElement($this->getSelector($elementLocator))->getAttribute($attributeName)
                 );
                 break;
             case self::STORE_ELEMENT_COUNT:
-                $color->setValue(
+                $values->setValue(
                     $command->getValue(),
                     count($driver->findElements($this->getSelector($command->getTarget())))
                 );
                 break;
             case self::STORE_JSON:
-                $color->setValue(
+                $values->setValue(
                     $command->getValue(),
                     json_decode($command->getTarget())
                 );
                 break;
             case self::STORE_TEXT:
-                $color->setValue(
+                $values->setValue(
                     $command->getValue(),
                     $driver->findElement($this->getSelector($command->getTarget()))->getText()
                 );
                 break;
             case self::STORE_TITLE:
-                $color->setValue($command->getTarget(), $driver->getTitle());
+                $values->setValue($command->getTarget(), $driver->getTitle());
                 break;
             case self::STORE_VALUE:
-                $color->setValue(
+                $values->setValue(
                     $command->getValue(),
                     $driver->findElement($this->getSelector($command->getTarget()))->getAttribute('value')
                 );
                 break;
             case self::STORE_WINDOW_HANDLE:
-                $color->setValue($command->getTarget(), $driver->getWindowHandle());
+                $values->setValue($command->getTarget(), $driver->getWindowHandle());
                 break;
             default:
                 break;

diff --git a/src/Command/Runner/WaitCommandRunner.php b/src/Command/Runner/WaitCommandRunner.php
@@ -4,9 +4,9 @@
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\WebDriverExpectedCondition;
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Command\CommandRunner;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 class WaitCommandRunner extends CommandRunner
 {
@@ -39,7 +39,7 @@ public function getCommandsRequireValue(): array
         return $this->getAllCommands();
     }
 
-    public function run(CommandInterface $command, ColorInterface $color, RemoteWebDriver $driver): void
+    public function run(CommandInterface $command, ValuesInterface $values, RemoteWebDriver $driver): void
     {
         switch ($command->getCommand()) {
             case self::WAIT_FOR_ELEMENT_EDITABLE:

diff --git a/src/Command/Runner/WindowCommandRunner.php b/src/Command/Runner/WindowCommandRunner.php
@@ -6,9 +6,9 @@
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\WebDriverDimension;
 use Facebook\WebDriver\WebDriverExpectedCondition;
-use SingleColorPetrinet\Model\ColorInterface;
 use Tienvx\Bundle\MbtBundle\Command\CommandRunner;
 use Tienvx\Bundle\MbtBundle\Model\Model\Revision\CommandInterface;
+use Tienvx\Bundle\MbtBundle\Model\ValuesInterface;
 
 class WindowCommandRunner extends CommandRunner
 {
@@ -44,7 +44,7 @@ public function getCommandsRequireValue(): array
         return [];
     }
 
-    public function run(CommandInterface $command, ColorInterface $color, RemoteWebDriver $driver): void
+    public function run(CommandInterface $command, ValuesInterface $values, RemoteWebDriver $driver): void
     {
         switch ($command->getCommand()) {
             case self::OPEN:

diff --git a/src/Model/Model/Revision/Transition.php b/src/Model/Model/Revision/Transition.php
@@ -11,6 +11,7 @@ class Transition implements TransitionInterface
 
     protected string $label = '';
     protected ?string $guard = null;
+    protected ?string $expression = null;
     protected array $fromPlaces = [];
     protected array $toPlaces = [];
 
@@ -23,6 +24,7 @@ public function __unserialize(array $data)
     {
         $this->label = $data['label'];
         $this->guard = $data['guard'];
+        $this->expression = $data['expression'];
         $this->fromPlaces = $data['fromPlaces'];
         $this->toPlaces = $data['toPlaces'];
         $this->commands = array_map([CommandFactory::class, 'createFromArray'], $data['commands']);
@@ -48,6 +50,16 @@ public function setGuard(?string $guard): void
         $this->guard = $guard;
     }
 
+    public function getExpression(): ?string
+    {
+        return $this->expression;
+    }
+
+    public function setExpression(?string $expression): void
+    {
+        $this->expression = $expression;
+    }
+
     public function getFromPlaces(): array
     {
         return $this->fromPlaces;
@@ -91,6 +103,7 @@ public function toArray(): array
         return [
             'label' => $this->label,
             'guard' => $this->guard,
+            'expression' => $this->expression,
             'fromPlaces' => $this->fromPlaces,
             'toPlaces' => $this->toPlaces,
             'commands' => array_map(fn (CommandInterface $command) => $command->toArray(), $this->commands),

diff --git a/src/Model/Model/Revision/TransitionInterface.php b/src/Model/Model/Revision/TransitionInterface.php
@@ -12,6 +12,10 @@ public function getGuard(): ?string;
 
     public function setGuard(?string $guard): void;
 
+    public function getExpression(): ?string;
+
+    public function setExpression(?string $expression): void;
+
     public function getCommands(): array;
 
     public function setCommands(array $commands): void;