Merge branch 'master' into improve-annotation

yiisoft · Nov 21, 2023 · c054db4 · c054db4
2 parents 003d4e8 + 102ee3a
commit c054db4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Enh #779: Specify result type of `QueryInterface::all()`, `CommandInterface::queryAll()` and
   `DbArrayHelper::populate()` methods to `array[]` (@vjik)
 - Enh #779: Specify populate closure type in `BatchQueryResultInterface` (@vjik)
+- Enh #778: Deprecate unnecessary argument `$rawSql` of `AbstractCommand::internalExecute()` (@Tigrov)
 
 ## 1.2.0 November 12, 2023
 

diff --git a/src/Command/AbstractCommand.php b/src/Command/AbstractCommand.php
@@ -548,7 +548,7 @@ abstract protected function internalGetQueryResult(int $queryMode): mixed;
     /**
      * Executes a prepared statement.
      *
-     * @param string|null $rawSql The rawSql if it has been created.
+     * @param string|null $rawSql Deprecated. Use `null` value. Will be removed in version 2.0.0.
      *
      * @throws Exception
      * @throws Throwable
@@ -581,7 +581,7 @@ protected function queryInternal(int $queryMode): mixed
         $isReadMode = $this->isReadMode($queryMode);
         $this->prepare($isReadMode);
 
-        $this->internalExecute($this->getRawSql());
+        $this->internalExecute(null);
 
         /** @psalm-var mixed $result */
         $result = $this->internalGetQueryResult($queryMode);

diff --git a/src/Driver/Pdo/AbstractPdoCommand.php b/src/Driver/Pdo/AbstractPdoCommand.php
@@ -186,7 +186,7 @@ protected function getQueryMode(int $queryMode): string
      *
      * It's a wrapper around {@see PDOStatement::execute()} to support transactions and retry handlers.
      *
-     * @param string|null $rawSql The rawSql if it has been created.
+     * @param string|null $rawSql Deprecated. Use `null` value. Will be removed in version 2.0.0.
      *
      * @throws Exception
      * @throws Throwable