Skip to content

Commit 720c586

Browse files
committed
Merge remote-tracking branch 'origin/5.x' into 5.next
2 parents c374fde + 9fc2d25 commit 720c586

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
"cakephp/bake": "^3.3",
3232
"cakephp/cakephp": "^5.3.0",
3333
"cakephp/cakephp-codesniffer": "^5.0",
34-
"phpunit/phpunit": "^11.5.3 || ^12.1.3"
34+
"phpunit/phpunit": "^11.5.3 || ^12.1.3 || ^13.0"
3535
},
3636
"suggest": {
3737
"cakephp/bake": "If you want to generate migrations.",
3838
"dereuromark/cakephp-ide-helper": "If you want to have IDE suggest/autocomplete when creating migrations."
3939
},
40-
"minimum-stability": "dev",
40+
"minimum-stability": "stable",
4141
"prefer-stable": true,
4242
"autoload": {
4343
"psr-4": {

‎docs/package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/TestCase/Db/Adapter/SqliteAdapterTest.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,13 @@ public function testCreateTableIndexWithWhere(): void
378378
->addIndex($index)
379379
->save();
380380
$queries = $this->out->messages();
381-
$indexQuery = $queries[2];
381+
$indexQuery = '';
382+
foreach ($queries as $query) {
383+
if (str_contains($query, 'CREATE UNIQUE INDEX "table1_email_index"')) {
384+
$indexQuery = $query;
385+
break;
386+
}
387+
}
382388
$this->assertStringContainsString('CREATE UNIQUE INDEX "table1_email_index"', $indexQuery);
383389
$this->assertStringContainsString('("email" ASC) WHERE is_verified = true', $indexQuery);
384390
}

0 commit comments

Comments
 (0)