Conditional deprecation message

doctrine · Apr 5, 2021 · c8f1a38 · c8f1a38
1 parent 12f497d
commit c8f1a38
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/Query/QueryBuilder.php b/src/Query/QueryBuilder.php
@@ -335,17 +335,22 @@ public function executeStatement(): int
      */
     public function execute()
     {
+        if ($this->type === self::SELECT) {
+            Deprecation::trigger(
+                'doctrine/dbal',
+                'https://github.com/doctrine/dbal/pull/4578',
+                'QueryBuilder::execute is deprecated, instead use QueryBuilder::executeQuery'
+            );
+
+            return $this->connection->executeQuery($this->getSQL(), $this->params, $this->paramTypes);
+        }
+
         Deprecation::trigger(
             'doctrine/dbal',
             'https://github.com/doctrine/dbal/pull/4578',
-            'QueryBuilder::execute is deprecated, instead use QueryBuilder::executeQuery (for SELECT) or' .
-            'QueryBuilder::executeStatement (for INSERT, UPDATE, DELETE).'
+            'QueryBuilder::execute is deprecated, instead use QueryBuilder::executeStatement'
         );
 
-        if ($this->type === self::SELECT) {
-            return $this->connection->executeQuery($this->getSQL(), $this->params, $this->paramTypes);
-        }
-
         return $this->connection->executeStatement($this->getSQL(), $this->params, $this->paramTypes);
     }