Merge branch '3.8.x' into 4.0.x

* 3.8.x:
  Fix deprecation message Parameter::STRING -> ParameterType::STRING (doctrine#6264)
  Fix connection setup example in `PrimaryReadReplicaConnection` (doctrine#6253)
  PHPStan 1.10.56, PHPUnit 9.6.15, PHPCS 3.8.1 (doctrine#6263)
  Switch to absolute paths
  Indent explanation under toctree
  Use different toctrees for different sections
  PHP CodeSniffer 3.8.0 (doctrine#6238)
  Allow Symfony 7 in require-dev (doctrine#6148)

UPGRADE.md

@@ -1381,7 +1381,7 @@ The `Connection::ARRAY_PARAM_OFFSET` constant has been marked as internal. It wi
 
 ## Deprecated using NULL as prepared statement parameter type.
 
-Omit the type or use `Parameter::STRING` instead.
+Omit the type or use `ParameterType::STRING` instead.
 
 ## Deprecated passing asset names as assets in `AbstractPlatform` and `AbstractSchemaManager` methods.
 

composer.json

@@ -40,15 +40,15 @@
         "doctrine/coding-standard": "12.0.0",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.2",
-        "phpstan/phpstan": "1.10.42",
+        "phpstan/phpstan": "1.10.56",
         "phpstan/phpstan-phpunit": "1.3.15",
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpunit": "10.4.2",
         "psalm/plugin-phpunit": "0.18.4",
         "slevomat/coding-standard": "8.13.1",
-        "squizlabs/php_codesniffer": "3.7.2",
-        "symfony/cache": "^6.3.8",
-        "symfony/console": "^5.4|^6.3",
+        "squizlabs/php_codesniffer": "3.8.1",
+        "symfony/cache": "^6.3.8|^7.0",
+        "symfony/console": "^5.4|^6.3|^7.0",
         "vimeo/psalm": "5.16.0"
     },
     "suggest": {

docs/en/sidebar.rst

@@ -1,23 +1,41 @@
-.. toctree::
-    :depth: 3
-
-    reference/introduction
-    reference/architecture
-    reference/configuration
-    reference/data-retrieval-and-manipulation
-    reference/query-builder
-    reference/transactions
-    reference/platforms
-    reference/types
-    reference/schema-manager
-    reference/schema-representation
-    reference/security
-    reference/supporting-other-databases
-    reference/portability
-    reference/caching
-    reference/known-vendor-issues
-    reference/testing
-
-    explanation/implicit-indexes
-
-    how-to/postgresql-identity-migration
+.. toc::
+
+   .. tocheader:: Reference
+
+   .. toctree::
+      :depth: 3
+
+      /reference/introduction
+      /reference/architecture
+      /reference/configuration
+      /reference/data-retrieval-and-manipulation
+      /reference/query-builder
+      /reference/transactions
+      /reference/platforms
+      /reference/types
+      /reference/schema-manager
+      /reference/schema-representation
+      /reference/security
+      /reference/supporting-other-databases
+      /reference/portability
+      /reference/caching
+      /reference/known-vendor-issues
+      /reference/testing
+
+.. toc::
+
+   .. tocheader:: Explanation
+
+   .. toctree::
+      :depth: 3
+
+      /explanation/implicit-indexes
+
+.. toc::
+
+   .. tocheader:: How To
+
+   .. toctree::
+      :depth: 3
+
+      /how-to/postgresql-identity-migration

src/Connections/PrimaryReadReplicaConnection.php

@@ -67,8 +67,8 @@
  *    'driver' => 'pdo_mysql',
  *    'primary' => array('user' => '', 'password' => '', 'host' => '', 'dbname' => ''),
  *    'replica' => array(
- *        array('user' => 'replica1', 'password', 'host' => '', 'dbname' => ''),
- *        array('user' => 'replica2', 'password', 'host' => '', 'dbname' => ''),
+ *        array('user' => 'replica1', 'password' => '', 'host' => '', 'dbname' => ''),
+ *        array('user' => 'replica2', 'password' => '', 'host' => '', 'dbname' => ''),
  *    )
  * ));
  *