Merge branch 'refs/heads/master' into column_type_classes2

yiisoft · May 4, 2024 · 15352af · 15352af
2 parents 0eefbee + 8efbb3e
commit 15352af
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 44 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -26,7 +26,6 @@
 /.editorconfig      export-ignore
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
-/.scrutinizer.yml   export-ignore
 /phpunit.xml.dist   export-ignore
 /docs               export-ignore
 

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "php": "^8.0",
         "ext-mbstring": "*",
         "ext-pdo": "*",
-        "yiisoft/db": "^1.2",
+        "yiisoft/db": "dev-master",
         "yiisoft/json": "^1.0"
     },
     "require-dev": {

diff --git a/tests/CommandTest.php b/tests/CommandTest.php
@@ -156,7 +156,7 @@ public function testAlterColumn(): void
     public function testBatchInsert(
         string $table,
         array $columns,
-        array $values,
+        iterable $values,
         string $expected,
         array $expectedParams = [],
         int $insertedRow = 1