Merge branch '3.8.x' into 4.0.x

* 3.8.x: PHPStan 1.10.42 (doctrine#6223) Fix typo
derrabus · Nov 19, 2023 · 2fdd2f9 · 2fdd2f9
2 parents 8861620 + 493c768
commit 2fdd2f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -935,8 +935,8 @@ The following methods have been removed.
 
 ## Deprecated lock-related `AbstractPlatform` methods
 
-The usage of `AbstractPlatform::getReadLockSQL()`, `::getWriteLockSQL()` and `::getForUpdateSQL` is deprecated as this
-API is not portable. Use `QueryBuilder::forUpdate()` as a replacement for the latter.
+The usage of `AbstractPlatform::getReadLockSQL()`, `::getWriteLockSQL()` and `::getForUpdateSQL()` is deprecated as
+this API is not portable. Use `QueryBuilder::forUpdate()` as a replacement for the latter.
 
 ## Deprecated `AbstractMySQLPlatform` methods
 

diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
         "doctrine/coding-standard": "12.0.0",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.2",
-        "phpstan/phpstan": "1.10.41",
+        "phpstan/phpstan": "1.10.42",
         "phpstan/phpstan-phpunit": "1.3.15",
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpunit": "10.4.2",