Skip to content

Commit c054db4

Browse files
authored
Merge branch 'master' into improve-annotation
2 parents 003d4e8 + 102ee3a commit c054db4

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- Enh #779: Specify result type of `QueryInterface::all()`, `CommandInterface::queryAll()` and
88
`DbArrayHelper::populate()` methods to `array[]` (@vjik)
99
- Enh #779: Specify populate closure type in `BatchQueryResultInterface` (@vjik)
10+
- Enh #778: Deprecate unnecessary argument `$rawSql` of `AbstractCommand::internalExecute()` (@Tigrov)
1011

1112
## 1.2.0 November 12, 2023
1213

src/Command/AbstractCommand.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ abstract protected function internalGetQueryResult(int $queryMode): mixed;
548548
/**
549549
* Executes a prepared statement.
550550
*
551-
* @param string|null $rawSql The rawSql if it has been created.
551+
* @param string|null $rawSql Deprecated. Use `null` value. Will be removed in version 2.0.0.
552552
*
553553
* @throws Exception
554554
* @throws Throwable
@@ -581,7 +581,7 @@ protected function queryInternal(int $queryMode): mixed
581581
$isReadMode = $this->isReadMode($queryMode);
582582
$this->prepare($isReadMode);
583583

584-
$this->internalExecute($this->getRawSql());
584+
$this->internalExecute(null);
585585

586586
/** @psalm-var mixed $result */
587587
$result = $this->internalGetQueryResult($queryMode);

src/Driver/Pdo/AbstractPdoCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ protected function getQueryMode(int $queryMode): string
186186
*
187187
* It's a wrapper around {@see PDOStatement::execute()} to support transactions and retry handlers.
188188
*
189-
* @param string|null $rawSql The rawSql if it has been created.
189+
* @param string|null $rawSql Deprecated. Use `null` value. Will be removed in version 2.0.0.
190190
*
191191
* @throws Exception
192192
* @throws Throwable

0 commit comments

Comments
 (0)