Skip to content

Commit

Permalink
Merge branch 'master' into deprecate-schema-methods
Browse files Browse the repository at this point in the history
vjik authored Feb 3, 2024
2 parents 721b36c + 4a08ca3 commit 84a115c
Showing 7 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -28,4 +28,4 @@ jobs:
os: >-
['ubuntu-latest']
php: >-
['8.1', '8.2']
['8.1', '8.2', '8.3']
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
- Enh #789: Remove unnecessary type casting to array in `AbstractDMLQueryBuilder::getTableUniqueColumnNames()` (@Tigrov)
- Enh #795: Allow to use `DMLQueryBuilderInterface::batchInsert()` method with empty columns (@Tigrov)
- Enh #794: Add message type to log context (@darkdef)
- Enh #802: Minor refactoring of `SchemaCache`, `AbstractPdoCommand` and `AbstractDDLQueryBuilder` (@Tigrov)
- Enh #801: Deprecate `AbstractSchema::normalizeRowKeyCase()` method (@Tigrov)
- Enh #801: Deprecate `SchemaInterface::getRawTableName()` and add `QuoterInterface::getRawTableName()` method (@Tigrov)
- Enh #801: Deprecate `SchemaInterface::isReadQuery()` and add `DbStringHelper::isReadQuery()` method (@Tigrov)
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
"issues": "https://github.com/yiisoft/db/issues/issues?state=open",
"forum": "https://www.yiiframework.com/forum/",
"wiki": "https://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii",
"irc": "ircs://irc.libera.chat:6697/yii",
"chat": "https://t.me/yii3en",
"source": "https://github.com/yiisoft/db"
},
@@ -34,7 +34,7 @@
"rector/rector": "^0.19",
"roave/infection-static-analysis-plugin": "^1.16",
"spatie/phpunit-watcher": "^1.23",
"vimeo/psalm": "^4.30|^5.12",
"vimeo/psalm": "^4.30|^5.20",
"yiisoft/aliases": "^3.0",
"yiisoft/cache-file": "^3.1",
"yiisoft/di": "^1.0",
1 change: 1 addition & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
@@ -16,5 +16,6 @@
</projectFiles>
<issueHandlers>
<MixedAssignment errorLevel="suppress" />
<RiskyTruthyFalsyComparison errorLevel="suppress" />
</issueHandlers>
</psalm>
4 changes: 2 additions & 2 deletions src/Cache/SchemaCache.php
Original file line number Diff line number Diff line change
@@ -201,12 +201,12 @@ private function normalize(mixed $key): string
if (is_string($key) || is_int($key)) {
$key = (string)$key;
$length = mb_strlen($key, '8bit');
return (strpbrk($key, '{}()/\@:') || $length < 1 || $length > 64) ? md5($key) : $key;
return (strpbrk($key, '{}()/\@:') !== false || $length < 1 || $length > 64) ? md5($key) : $key;
}

$key = json_encode($key);

if (!$key) {
if ($key === false) {
throw new PsrInvalidArgumentException('Invalid key. ' . json_last_error_msg());
}

2 changes: 1 addition & 1 deletion src/Driver/Pdo/AbstractPdoCommand.php
Original file line number Diff line number Diff line change
@@ -211,7 +211,7 @@ protected function internalExecute(string|null $rawSql): void
}
break;
} catch (PDOException $e) {
$rawSql = $rawSql ?: $this->getRawSql();
$rawSql ??= $this->getRawSql();
$e = (new ConvertException($e, $rawSql))->run();

if ($this->retryHandler === null || !($this->retryHandler)($e, $attempt)) {
2 changes: 1 addition & 1 deletion src/QueryBuilder/AbstractDDLQueryBuilder.php
Original file line number Diff line number Diff line change
@@ -159,7 +159,7 @@ public function createIndex(
string $indexType = null,
string $indexMethod = null
): string {
return 'CREATE ' . ($indexType ? ($indexType . ' ') : '') . 'INDEX '
return 'CREATE ' . (!empty($indexType) ? $indexType . ' ' : '') . 'INDEX '
. $this->quoter->quoteTableName($name)
. ' ON ' . $this->quoter->quoteTableName($table)
. ' (' . $this->queryBuilder->buildColumns($columns) . ')';

0 comments on commit 84a115c

Please sign in to comment.