Merge branch '3.5.x' into 3.6.x

* 3.5.x: PHPStan 1.9.14
doctrine · Jan 27, 2023 · e4f65b5 · e4f65b5
2 parents 267985c + 30dc170
commit e4f65b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
     "require-dev": {
         "doctrine/coding-standard": "11.1.0",
         "jetbrains/phpstorm-stubs": "2022.3",
-        "phpstan/phpstan": "1.9.11",
+        "phpstan/phpstan": "1.9.14",
         "phpstan/phpstan-strict-rules": "^1.4",
         "phpunit/phpunit": "9.5.28",
         "psalm/plugin-phpunit": "0.18.4",

diff --git a/src/Query/QueryBuilder.php b/src/Query/QueryBuilder.php
@@ -1545,7 +1545,7 @@ private function getSQLForJoins($fromAlias, array &$knownAliases): string
         if (isset($this->sqlParts['join'][$fromAlias])) {
             foreach ($this->sqlParts['join'][$fromAlias] as $join) {
                 if (array_key_exists($join['joinAlias'], $knownAliases)) {
-                    throw QueryException::nonUniqueAlias($join['joinAlias'], array_keys($knownAliases));
+                    throw QueryException::nonUniqueAlias((string) $join['joinAlias'], array_keys($knownAliases));
                 }
 
                 $sql .= ' ' . strtoupper($join['joinType'])