Remove redundant checks

yiisoft · Nov 23, 2023 · 5136e62 · 5136e62
1 parent 56363cb
commit 5136e62
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/Driver/Pdo/AbstractPdoCommand.php b/src/Driver/Pdo/AbstractPdoCommand.php
@@ -265,19 +265,18 @@ protected function logQuery(string $rawSql, string $category): void
 
     protected function queryInternal(int $queryMode): mixed
     {
-        $rawSql = '';
-
-        if ($this->logger !== null || $this->profiler !== null) {
-            $rawSql = $this->getRawSql();
-        }
-
         $logCategory = self::class . '::' . $this->getQueryMode($queryMode);
 
-        $this->logQuery($rawSql, $logCategory);
+        $this->logger?->log(LogLevel::INFO, $rawSql = $this->getRawSql(), [$logCategory]);
 
         $queryContext = new CommandContext(__METHOD__, $logCategory, $this->getSql(), $this->getParams());
 
-        $this->profiler?->begin($rawSql, $queryContext);
+        /**
+         * @psalm-var string $rawSql
+         * @psalm-suppress RedundantConditionGivenDocblockType
+         * @psalm-suppress DocblockTypeContradiction
+         */
+        $this->profiler?->begin($rawSql ??= $this->getRawSql(), $queryContext);
         try {
             /** @psalm-var mixed $result */
             $result = parent::queryInternal($queryMode);