Expanded Contains to support also arrays (#1387)

Author: norberttech

examples/topics/transformations/when/code.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+use function Flow\ETL\DSL\{data_frame, from_array, lit, ref, to_stream, when};
+
+require __DIR__ . '/../../../autoload.php';
+
+data_frame()
+    ->read(from_array([
+        ['id' => 1, 'email' => '[email protected]', 'active' => true, 'tags' => ['foo', 'bar']],
+        ['id' => 2, 'email' => '[email protected]', 'active' => false, 'tags' => ['biz', 'bar']],
+        ['id' => 3, 'email' => '[email protected]', 'active' => true, 'tags' => ['bar', 'baz']],
+    ]))
+    ->collect()
+    ->withEntry(
+        'is_special',
+        when(
+            ref('active')->isTrue()->and(ref('tags')->contains('foo')),
+            lit(true),
+            lit(false)
+        )
+    )
+    ->write(to_stream(__DIR__ . '/output.txt', truncate: false))
+    ->run();

examples/topics/transformations/when/output.txt

@@ -0,0 +1,8 @@
++----+---------------------+--------+---------------+------------+
+| id |               email | active |          tags | is_special |
++----+---------------------+--------+---------------+------------+
+|  1 | [email protected] |   true | ["foo","bar"] |       true |
+|  2 | [email protected] |  false | ["biz","bar"] |      false |
+|  3 | [email protected] |   true | ["bar","baz"] |      false |
++----+---------------------+--------+---------------+------------+
+3 rows

src/core/etl/src/Flow/ETL/Function/Contains.php

@@ -4,6 +4,7 @@
 
 namespace Flow\ETL\Function;
 
+use function Flow\ETL\DSL\{type_array, type_string};
 use Flow\ETL\Row;
 
 final class Contains extends ScalarFunctionChain
@@ -16,13 +17,21 @@ public function __construct(
 
     public function eval(Row $row) : bool
     {
-        $haystack = (new Parameter($this->haystack))->asString($row);
+        $haystack = (new Parameter($this->haystack))->as($row, type_string(), type_array());
         $needle = (new Parameter($this->needle))->asString($row);
 
         if ($haystack === null || $needle === null) {
             return false;
         }
 
-        return \str_contains($haystack, $needle);
+        if (\is_string($haystack)) {
+            return \str_contains($haystack, $needle);
+        }
+
+        if (\is_array($haystack)) {
+            return \in_array($needle, $haystack, true);
+        }
+
+        return false;
     }
 }

src/core/etl/tests/Flow/ETL/Tests/Integration/Function/ContainsTest.php

@@ -5,7 +5,7 @@
 namespace Flow\ETL\Tests\Integration\Function;
 
 use function Flow\ETL\DSL\data_frame;
-use function Flow\ETL\DSL\{from_array, lit, ref, to_memory};
+use function Flow\ETL\DSL\{from_array, lit, not, ref, to_memory};
 use Flow\ETL\Memory\ArrayMemory;
 use Flow\ETL\Tests\FlowTestCase;
 
@@ -33,6 +33,29 @@ public function test_contains() : void
         );
     }
 
+    public function test_contains_on_array() : void
+    {
+        (data_frame())
+            ->read(
+                from_array(
+                    [
+                        ['key' => 'value', 'tags' => ['A', 'B']],
+                    ]
+                )
+            )
+            ->withEntry('contains', ref('tags')->contains(lit('A')))
+            ->drop('tags')
+            ->write(to_memory($memory = new ArrayMemory()))
+            ->run();
+
+        self::assertSame(
+            [
+                ['key' => 'value', 'contains' => true],
+            ],
+            $memory->dump()
+        );
+    }
+
     public function test_contains_on_non_string_key() : void
     {
         (data_frame())
@@ -76,4 +99,27 @@ public function test_contains_on_non_string_value() : void
             $memory->dump()
         );
     }
+
+    public function test_not_contains_on_array() : void
+    {
+        (data_frame())
+            ->read(
+                from_array(
+                    [
+                        ['key' => 'value', 'tags' => ['A', 'B']],
+                    ]
+                )
+            )
+            ->withEntry('contains', not(ref('tags')->contains(lit('A'))))
+            ->drop('tags')
+            ->write(to_memory($memory = new ArrayMemory()))
+            ->run();
+
+        self::assertSame(
+            [
+                ['key' => 'value', 'contains' => false],
+            ],
+            $memory->dump()
+        );
+    }
 }