Added DataFrame::fromArray method

flow-php · Feb 11, 2024 · 1580877 · 1580877
1 parent 5f04b07
commit 1580877
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/src/adapter/etl-adapter-doctrine/src/Flow/ETL/Adapter/Doctrine/DbalLimitOffsetExtractor.php b/src/adapter/etl-adapter-doctrine/src/Flow/ETL/Adapter/Doctrine/DbalLimitOffsetExtractor.php
@@ -61,6 +61,11 @@ public function extract(FlowContext $context) : \Generator
             if (\method_exists($countQuery, 'resetOrderBy')) {
                 $countQuery->resetOrderBy();
             } else {
+                /**
+                 * @psalm-suppress UndefinedMethod
+                 *
+                 * @phpstan-ignore-next-line
+                 */
                 $countQuery->resetQueryPart('orderBy');
             }
 

diff --git a/src/core/etl/src/Flow/ETL/DataFrame.php b/src/core/etl/src/Flow/ETL/DataFrame.php
@@ -73,10 +73,9 @@ public function __construct(private Pipeline $pipeline, Config $configuration)
     }
 
     /**
-     * @throws \JsonException
-     * @throws RuntimeException
+     * @throws InvalidArgumentException
      */
-    public static function fromJson(string $json) : self
+    public static function fromArray(array $definition) : self
     {
         $namespaces = [
             DSLNamespace::global(new DenyAll()),
@@ -103,12 +102,7 @@ public static function fromJson(string $json) : self
                 )
             );
 
-            try {
-                $results = (new Executor())
-                    ->execute($builder->parse(\json_decode($json, true, 512, JSON_THROW_ON_ERROR)));
-            } catch (\JsonException $exception) {
-                throw new InvalidFileFormatException('json', 'unknown');
-            }
+            $results = (new Executor())->execute($builder->parse($definition));
 
             if (\count($results) !== 1) {
                 throw new InvalidArgumentException('Invalid JSON, please make sure that there is only one data_frame function');
@@ -124,6 +118,19 @@ public static function fromJson(string $json) : self
         }
     }
 
+    /**
+     * @throws \JsonException
+     * @throws InvalidArgumentException
+     */
+    public static function fromJson(string $json) : self
+    {
+        try {
+            return self::fromArray(\json_decode($json, true, 512, JSON_THROW_ON_ERROR));
+        } catch (\JsonException $exception) {
+            throw new InvalidFileFormatException('json', 'unknown');
+        }
+    }
+
     /**
      * @lazy
      *