Filter 'select' extended with path functionality.

Smoren · Nov 16, 2023 · 89d1768 · 89d1768
1 parent 93030ac
commit 89d1768
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 4 deletions.
diff --git a/src/Components/Schemator.php b/src/Components/Schemator.php
@@ -108,6 +108,14 @@ public function setPathDelimiter(string $value): void
         $this->pathDelimiter = $value;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getPathDelimiter(): string
+    {
+        return $this->pathDelimiter;
+    }
+
     /**
      * @inheritDoc
      */

diff --git a/src/Filters/BaseFiltersStorage.php b/src/Filters/BaseFiltersStorage.php
@@ -10,6 +10,7 @@
 use Smoren\Schemator\Helpers\RuleHelper;
 use Smoren\Schemator\Interfaces\FilterContextInterface;
 use Smoren\Schemator\Interfaces\FiltersStorageInterface;
+use Smoren\Schemator\Structs\FilterContext;
 
 /**
  * Class BaseFiltersStorage
@@ -56,9 +57,11 @@ public static function select(FilterContextInterface $context, ...$args): array
         }
 
         $result = [];
+        $pathDelimiter = $context->getSchemator()->getPathDelimiter();
 
+        /** @var string $arg */
         foreach ($args as $arg) {
-            $result[$arg] = $source[$arg] ?? null;
+            $result[str_replace($pathDelimiter, '_', $arg)] = $context->getSchemator()->getValue($source, $arg);
         }
 
         return $result;

diff --git a/src/Interfaces/SchematorInterface.php b/src/Interfaces/SchematorInterface.php
@@ -37,6 +37,12 @@ public function getValue($source, $key);
      */
     public function setPathDelimiter(string $value): void;
 
+    /**
+     * Getter for pathDelimiter property
+     * @return string
+     */
+    public function getPathDelimiter(): string;
+
     /**
      * Setter for errorsLevelMask property
      * @param BitmapInterface $value new value

diff --git a/tests/unit/Schemator/SchematorTest.php b/tests/unit/Schemator/SchematorTest.php
@@ -824,12 +824,16 @@ public function testGetValueWithFilters()
         $this->assertNull($schemator->getValue($input, ['mynull', ['replace', [[0, '<=', 122]]]]));
     }
 
-    public function testFilterSelect()
+    public function testFilterSelectStrict()
     {
         $source = [
             'id' => 100,
             'name' => 'Test',
             'description' => 'A lot of text',
+            'city' => [
+                'id' => 10,
+                'name' => 'London',
+            ],
         ];
 
         $schemator = SchematorFactory::createBuilder()
@@ -840,8 +844,22 @@ public function testFilterSelect()
         $result = $schemator->convert($source, ['test' => [null, ['select', 'id', 'name']]]);
         $this->assertEquals(['test' => ['id' => 100, 'name' => 'Test']], $result);
 
-        $result = $schemator->convert($source, ['test' => [null, ['select', 'id', 'unknown']]]);
-        $this->assertEquals(['test' => ['id' => 100, 'unknown' => null]], $result);
+        $result = $schemator->convert($source, ['test' => [null, ['select', 'id', 'name', 'city.name']]]);
+        $this->assertEquals(['test' => ['id' => 100, 'name' => 'Test', 'city_name' => 'London']], $result);
+
+        try {
+            $schemator->convert($source, ['test' => [null, ['select', 'id', 'unknown']]]);
+            $this->assertTrue(false);
+        } catch (SchematorException $e) {
+            $this->assertEquals(SchematorException::CANNOT_GET_VALUE, $e->getCode());
+        }
+
+        try {
+            $schemator->convert($source, ['test' => [null, ['select', 'id', 'city.unknown']]]);
+            $this->assertTrue(false);
+        } catch (SchematorException $e) {
+            $this->assertEquals(SchematorException::CANNOT_GET_VALUE, $e->getCode());
+        }
 
         try {
             $schemator->convert($source, ['test' => ['id', ['select', 'id', 'unknown']]]);
@@ -861,6 +879,38 @@ public function testFilterSelect()
         $this->assertEquals('100: Test', $result);
     }
 
+    public function testFilterSelectNonStrict()
+    {
+        $source = [
+            'id' => 100,
+            'name' => 'Test',
+            'description' => 'A lot of text',
+        ];
+
+        $schemator = SchematorFactory::createBuilder()
+            ->withFilters(new BaseFiltersStorage())
+            ->get();
+
+        $result = $schemator->convert($source, ['test' => [null, ['select', 'id', 'name']]]);
+        $this->assertEquals(['test' => ['id' => 100, 'name' => 'Test']], $result);
+
+        $result = $schemator->convert($source, ['test' => [null, ['select', 'id', 'unknown']]]);
+        $this->assertEquals(['test' => ['id' => 100, 'unknown' => null]], $result);
+
+        $result = $schemator->convert($source, ['test' => [null, ['select', 'id', 'city.unknown']]]);
+        $this->assertEquals(['test' => ['id' => 100, 'city_unknown' => null]], $result);
+
+        $result = $schemator->convert($source, [
+            null => [
+                null,
+                ['select', 'id', 'name'],
+                ['implode', ': '],
+            ]
+        ]);
+
+        $this->assertEquals('100: Test', $result);
+    }
+
     public function testErrorsLevel()
     {
         $schemator = SchematorFactory::create();