Improve and add tests

yiisoft · Feb 20, 2025 · dd625f9 · dd625f9
1 parent 07ca473
commit dd625f9
Show file tree

Hide file tree

Showing 11 changed files with 139 additions and 8 deletions.
diff --git a/src/Schema/Data/AbstractLazyArray.php b/src/Schema/Data/AbstractLazyArray.php
@@ -6,10 +6,10 @@
 
 use ArrayAccess;
 use Countable;
+use InvalidArgumentException;
 use JsonSerializable;
 use IteratorAggregate;
 use Yiisoft\Db\Constant\ColumnType;
-use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Schema\Column\ColumnInterface;
 
 use function array_map;
@@ -94,7 +94,7 @@ protected function prepareValue(): void
             $value = $this->parse($this->value);
 
             if ($value === null) {
-                throw new InvalidConfigException('Array value must be a valid string representation.');
+                throw new InvalidArgumentException('Array value must be a valid string representation.');
             }
 
             $this->value = $this->phpTypecast($value);

diff --git a/src/Schema/Data/AbstractLazyArrayStructured.php b/src/Schema/Data/AbstractLazyArrayStructured.php
@@ -6,9 +6,9 @@
 
 use ArrayAccess;
 use Countable;
+use InvalidArgumentException;
 use JsonSerializable;
 use IteratorAggregate;
-use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Schema\Column\ColumnInterface;
 
 use function is_string;
@@ -102,7 +102,7 @@ protected function prepareValue(): void
             $value = $this->parse($this->value);
 
             if ($value === null) {
-                throw new InvalidConfigException('Structured value must be a valid string representation.');
+                throw new InvalidArgumentException('Structured value must be a valid string representation.');
             }
 
             $this->value = $this->phpTypecast($value);

diff --git a/src/Schema/Data/LazyArrayJson.php b/src/Schema/Data/LazyArrayJson.php
@@ -6,9 +6,11 @@
 
 use ArrayAccess;
 use Countable;
+use InvalidArgumentException;
 use IteratorAggregate;
 use JsonSerializable;
 
+use function is_array;
 use function is_string;
 use function json_decode;
 
@@ -44,7 +46,13 @@ public function __construct(
     protected function prepareValue(): void
     {
         if (is_string($this->value)) {
-            $this->value = json_decode($this->value, true, 512, JSON_THROW_ON_ERROR);
+            $value = json_decode($this->value, true, 512, JSON_THROW_ON_ERROR);
+
+            if (!is_array($value)) {
+                throw new InvalidArgumentException('JSON value must be a valid string array representation.');
+            }
+
+            $this->value = $value;
         }
     }
 }
diff --git a/tests/Db/Expression/ArrayExpressionBuilderTest.php b/tests/Db/Expression/ArrayExpressionBuilderTest.php
@@ -12,6 +12,7 @@
 use Yiisoft\Db\Expression\ArrayExpression;
 use Yiisoft\Db\Expression\ArrayExpressionBuilder;
 use Yiisoft\Db\Query\Query;
+use Yiisoft\Db\Schema\Data\LazyArray;
 use Yiisoft\Db\Schema\Data\LazyArrayInterface;
 use Yiisoft\Db\Schema\Data\LazyArrayJson;
 use Yiisoft\Db\Tests\Support\TestTrait;
@@ -28,8 +29,11 @@ public static function buildProvider(): array
         return [
             [[1, 2, 3], '[1,2,3]'],
             [new ArrayIterator(['a', 'b', 'c']), '["a","b","c"]'],
+            [new LazyArray('[1,2,3]'), '[1,2,3]'],
             [new LazyArrayJson('[1,2,3]'), '[1,2,3]'],
             [['a' => 1, 'b' => null], '{"a":1,"b":null}'],
+            ['[1,2,3]', '[1,2,3]'],
+            ['{"a":1,"b":null}', '{"a":1,"b":null}'],
         ];
     }
 
@@ -47,6 +51,19 @@ public function testBuild(iterable|LazyArrayInterface|string $value, string $exp
         $this->assertEquals([':qp0' => new Param($expected, DataType::STRING)], $params);
     }
 
+    public function testBuildNull(): void
+    {
+        $db = $this->getConnection();
+        $qb = $db->getQueryBuilder();
+
+        $params = [];
+        $builder = new ArrayExpressionBuilder($qb);
+        $expression = new ArrayExpression(null);
+
+        $this->assertSame('NULL', $builder->build($expression, $params));
+        $this->assertSame([], $params);
+    }
+
     public function testBuildQueryExpression(): void
     {
         $db = $this->getConnection();

diff --git a/tests/Db/Expression/JsonExpressionBuilderTest.php b/tests/Db/Expression/JsonExpressionBuilderTest.php
@@ -12,7 +12,9 @@
 use Yiisoft\Db\Expression\JsonExpression;
 use Yiisoft\Db\Expression\JsonExpressionBuilder;
 use Yiisoft\Db\Query\Query;
+use Yiisoft\Db\Schema\Data\LazyArray;
 use Yiisoft\Db\Schema\Data\LazyArrayJson;
+use Yiisoft\Db\Schema\Data\LazyArrayStructured;
 use Yiisoft\Db\Tests\Support\TestTrait;
 
 /**
@@ -30,8 +32,12 @@ public static function buildProvider(): array
             [true, 'true'],
             [[1, 2, 3], '[1,2,3]'],
             [new ArrayIterator(['a', 'b', 'c']), '["a","b","c"]'],
+            [new LazyArray('[1,2,3]'), '[1,2,3]'],
             [new LazyArrayJson('[1,2,3]'), '[1,2,3]'],
+            [new LazyArrayStructured('["5","USD"]'), '["5","USD"]'],
             [['a' => 1, 'b' => null, 'c' => ['d' => 'e']], '{"a":1,"b":null,"c":{"d":"e"}}'],
+            ['[1,2,3]', '[1,2,3]'],
+            ['{"a":1,"b":null,"c":{"d":"e"}}', '{"a":1,"b":null,"c":{"d":"e"}}'],
         ];
     }
 

diff --git a/tests/Db/Expression/StructuredExpressionBuilderTest.php b/tests/Db/Expression/StructuredExpressionBuilderTest.php
@@ -14,6 +14,7 @@
 use Yiisoft\Db\Query\Query;
 use Yiisoft\Db\Schema\Column\AbstractStructuredColumn;
 use Yiisoft\Db\Schema\Column\ColumnBuilder;
+use Yiisoft\Db\Schema\Data\LazyArrayJson;
 use Yiisoft\Db\Schema\Data\LazyArrayStructured;
 use Yiisoft\Db\Tests\Support\TestTrait;
 
@@ -35,8 +36,10 @@ public static function buildProvider(): array
             [[5, 'USD'], null, '[5,"USD"]'],
             [new ArrayIterator(['5', 'USD']), $column, '["5","USD"]'],
             [new LazyArrayStructured('["5","USD"]'), $column, '["5","USD"]'],
+            [new LazyArrayJson('["5","USD"]'), $column, '["5","USD"]'],
             [['value' => '5', 'currency_code' => 'USD'], $column, '["5","USD"]'],
             [(object) ['value' => '5', 'currency_code' => 'USD'], 'currency_money', '["5","USD"]'],
+            ['["5","USD"]', null, '["5","USD"]'],
         ];
     }
 
@@ -54,6 +57,19 @@ public function testBuild(array|object|string $value, AbstractStructuredColumn|s
         $this->assertEquals([':qp0' => new Param($expected, DataType::STRING)], $params);
     }
 
+    public function testBuildNull(): void
+    {
+        $db = $this->getConnection();
+        $qb = $db->getQueryBuilder();
+
+        $params = [];
+        $builder = new StructuredExpressionBuilder($qb);
+        $expression = new StructuredExpression(null);
+
+        $this->assertSame('NULL', $builder->build($expression, $params));
+        $this->assertSame([], $params);
+    }
+
     public function testBuildQueryExpression(): void
     {
         $db = $this->getConnection();

diff --git a/tests/Db/Helper/DbArrayHelperTest.php b/tests/Db/Helper/DbArrayHelperTest.php
@@ -5,8 +5,10 @@
 namespace Yiisoft\Db\Tests\Db\Helper;
 
 use Closure;
+use PHPUnit\Framework\Attributes\DataProviderExternal;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Db\Helper\DbArrayHelper;
+use Yiisoft\Db\Tests\Provider\DbArrayHelperProvider;
 
 /**
  * @group db
@@ -101,4 +103,10 @@ public function testIndexWithClosureIndexByAndArrangeBy(): void
             ],
         ], DbArrayHelper::index($rows, fn ($row) => $row['key'], ['key']));
     }
+
+    #[DataProviderExternal(DbArrayHelperProvider::class, 'toArray')]
+    public function testToArray(array|object $value, array $expected): void
+    {
+        $this->assertSame($expected, DbArrayHelper::toArray($value));
+    }
 }
diff --git a/tests/Db/Schema/Data/LazyArrayJsonTest.php b/tests/Db/Schema/Data/LazyArrayJsonTest.php
@@ -4,10 +4,10 @@
 
 namespace Yiisoft\Db\Tests\Db\Schema\Data;
 
+use InvalidArgumentException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Db\Schema\Data\LazyArrayJson;
-use Yiisoft\Db\Tests\Support\TestTrait;
 
 use function iterator_to_array;
 
@@ -16,8 +16,6 @@
  */
 final class LazyArrayJsonTest extends TestCase
 {
-    use TestTrait;
-
     public static function valueProvider(): array
     {
         return [
@@ -84,4 +82,14 @@ public function testIterator(string $value, array $expected): void
 
         $this->assertSame($expected, iterator_to_array($lazyArray));
     }
+
+    public function testNullValue()
+    {
+        $lazyArray = new LazyArrayJson('null');
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('JSON value must be a valid string array representation.');
+
+        $lazyArray->getValue();
+    }
 }
diff --git a/tests/Db/Schema/Data/LazyArrayStructuredTest.php b/tests/Db/Schema/Data/LazyArrayStructuredTest.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Tests\Db\Schema\Data;
+
+use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
+use Yiisoft\Db\Schema\Data\LazyArrayStructured;
+
+/**
+ * @group db
+ */
+final class LazyArrayStructuredTest extends TestCase
+{
+    public function testNullValue()
+    {
+        $lazyArray = new LazyArrayStructured('null');
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Structured value must be a valid string representation.');
+
+        $lazyArray->getValue();
+    }
+}
diff --git a/tests/Db/Schema/Data/LazyArrayTest.php b/tests/Db/Schema/Data/LazyArrayTest.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Tests\Db\Schema\Data;
+
+use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
+use Yiisoft\Db\Schema\Data\LazyArray;
+
+/**
+ * @group db
+ */
+final class LazyArrayTest extends TestCase
+{
+    public function testNullValue()
+    {
+        $lazyArray = new LazyArray('null');
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Array value must be a valid string representation.');
+
+        $lazyArray->getValue();
+    }
+}
diff --git a/tests/Provider/DbArrayHelperProvider.php b/tests/Provider/DbArrayHelperProvider.php
@@ -4,6 +4,9 @@
 
 namespace Yiisoft\Db\Tests\Provider;
 
+use ArrayIterator;
+use Yiisoft\Db\Schema\Data\LazyArrayJson;
+
 class DbArrayHelperProvider
 {
     public static function index(): array
@@ -123,4 +126,19 @@ public static function indexWithIndexBy(): array
             ],
         ];
     }
+
+    public static function toArray(): array
+    {
+        return [
+            [[], []],
+            [['key' => 'value'], ['key' => 'value']],
+            [(object) [], []],
+            [(object) ['key' => 'value'], ['key' => 'value']],
+            [new ArrayIterator([]), []],
+            [new ArrayIterator(['key' => 'value']), ['key' => 'value']],
+            [new LazyArrayJson('[]'), []],
+            [new LazyArrayJson('[1,2,3]'), [1, 2, 3]],
+            [new LazyArrayJson('{"key":"value"}'), ['key' => 'value']],
+        ];
+    }
 }