Merge branch '4.0.x' into 4.1.x

* 4.0.x:
  Fix example for QB delete and update in doc block
  Bump doctrine/.github from 5.0.0 to 5.0.1 (#6391)
  PHPStan 1.10.67, PHPUnit 9.6.19, PHPCS 3.9.2 (#6387)
  Fix "Plugin 'mysql_native_password' is not loaded" (#6388)
  Run tests against MySQL 8.4 (#6386)

.github/workflows/coding-standards.yml

@@ -25,4 +25,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.1"

.github/workflows/continuous-integration.yml

@@ -353,7 +353,6 @@ jobs:
         mysql-version:
           - "5.7"
           - "8.0"
-          - "8.3"
         extension:
           - "mysqli"
           - "pdo_mysql"
@@ -370,6 +369,16 @@ jobs:
           - php-version: "8.3"
             mysql-version: "8.0"
             extension: "pdo_mysql"
+          - php-version: "8.1"
+            mysql-version: "8.4"
+            extension: "mysqli"
+            custom-entrypoint: >-
+              --entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
+          - php-version: "8.1"
+            mysql-version: "8.4"
+            extension: "pdo_mysql"
+            custom-entrypoint: >-
+              --entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
 
     services:
       mysql:

composer.json

@@ -40,13 +40,13 @@
         "doctrine/coding-standard": "12.0.0",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.2",
-        "phpstan/phpstan": "1.10.58",
-        "phpstan/phpstan-phpunit": "1.3.15",
+        "phpstan/phpstan": "1.10.67",
+        "phpstan/phpstan-phpunit": "1.3.16",
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpunit": "10.5.9",
         "psalm/plugin-phpunit": "0.18.4",
         "slevomat/coding-standard": "8.13.1",
-        "squizlabs/php_codesniffer": "3.9.0",
+        "squizlabs/php_codesniffer": "3.9.2",
         "symfony/cache": "^6.3.8|^7.0",
         "symfony/console": "^5.4|^6.3|^7.0",
         "vimeo/psalm": "5.21.1"

src/Query/QueryBuilder.php

@@ -580,8 +580,8 @@ public function addSelect(string $expression, string ...$expressions): self
      *
      * <code>
      *     $qb = $conn->createQueryBuilder()
-     *         ->delete('users', 'u')
-     *         ->where('u.id = :user_id')
+     *         ->delete('users')
+     *         ->where('users.id = :user_id')
      *         ->setParameter(':user_id', 1);
      * </code>
      *
@@ -606,9 +606,9 @@ public function delete(string $table): self
      *
      * <code>
      *     $qb = $conn->createQueryBuilder()
-     *         ->update('counters', 'c')
-     *         ->set('c.value', 'c.value + 1')
-     *         ->where('c.id = ?');
+     *         ->update('counters')
+     *         ->set('counters.value', 'counters.value + 1')
+     *         ->where('counters.id = ?');
      * </code>
      *
      * @param string $table The table whose rows are subject to the update.