Fixed normalisation for expression fields

php-etl · Jun 28, 2024 · 8a35000 · 8a35000
1 parent 1e738f2
commit 8a35000
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 12 deletions.
diff --git a/src/Cloud/Pipeline.php b/src/Cloud/Pipeline.php
@@ -35,11 +35,20 @@ public static function fromLegacyConfiguration(array $configuration): DTO\Pipeli
                     $code = $stepConfig['code'] ?? sprintf('step%d', $order);
                     unset($stepConfig['name'], $stepConfig['code']);
 
-                    array_walk_recursive($stepConfig, function (&$value): void {
-                        if ($value instanceof Expression) {
-                            $value = '@='.$value;
+                    array_walk_recursive(
+                        $stepConfig,
+                        function (&$value, $key) {
+                            if ($value instanceof Expression && $key === 'expression') {
+                                $value = (string) $value;
+                            }
+
+                            if ($value instanceof Expression) {
+                                $value = '@=' . $value;
+                            }
+
+                            return $value;
                         }
-                    });
+                    );
 
                     return new DTO\Step(
                         $name,

diff --git a/src/Cloud/Workflow.php b/src/Cloud/Workflow.php
@@ -40,11 +40,20 @@ function (array $config, int $order) {
                             $code = $config['pipeline']['code'] ?? sprintf('pipeline%d', $order);
                             unset($config['pipeline']['name'], $config['pipeline']['code']);
 
-                            array_walk_recursive($config, function (&$value): void {
-                                if ($value instanceof Expression) {
-                                    $value = '@='.$value;
+                            array_walk_recursive(
+                                $config,
+                                function (&$value, $key) {
+                                    if ($value instanceof Expression && $key === 'expression') {
+                                        $value = (string) $value;
+                                    }
+
+                                    if ($value instanceof Expression) {
+                                        $value = '@=' . $value;
+                                    }
+
+                                    return $value;
                                 }
-                            });
+                            );
 
                             return new DTO\Workflow\Pipeline(
                                 $name,
@@ -70,11 +79,20 @@ function (array $config, int $order) {
                             $code = $config['action']['code'] ?? sprintf('action%d', $order);
                             unset($config['action']['name'], $config['action']['code']);
 
-                            array_walk_recursive($config, function (&$value): void {
-                                if ($value instanceof Expression) {
-                                    $value = '@='.$value;
+                            array_walk_recursive(
+                                $config,
+                                function (&$value, $key) {
+                                    if ($value instanceof Expression && $key === 'expression') {
+                                        $value = (string) $value;
+                                    }
+
+                                    if ($value instanceof Expression) {
+                                        $value = '@=' . $value;
+                                    }
+
+                                    return $value;
                                 }
-                            });
+                            );
 
                             $configuration = $config['action'];
                             unset($config['action']);