Skip to content

Commit

Permalink
Merge branch '3.7.x' into 3.8.x
Browse files Browse the repository at this point in the history
* 3.7.x:
  Fix connection setup example in `PrimaryReadReplicaConnection` (#6253)
  PHPStan 1.10.56, PHPUnit 9.6.15, PHPCS 3.8.1 (#6263)
  Switch to absolute paths
  Indent explanation under toctree
  Use different toctrees for different sections
  PHP CodeSniffer 3.8.0 (#6238)
  Allow Symfony 7 in require-dev (#6148)
  • Loading branch information
derrabus committed Jan 18, 2024
2 parents 3dedcdd + 3a34a86 commit 98f458c
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 27 deletions.
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
"doctrine/coding-standard": "12.0.0",
"fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2023.1",
"phpstan/phpstan": "1.10.42",
"phpstan/phpstan": "1.10.56",
"phpstan/phpstan-strict-rules": "^1.5",
"phpunit/phpunit": "9.6.13",
"phpunit/phpunit": "9.6.15",
"psalm/plugin-phpunit": "0.18.4",
"slevomat/coding-standard": "8.13.1",
"squizlabs/php_codesniffer": "3.7.2",
"symfony/cache": "^5.4|^6.0",
"symfony/console": "^4.4|^5.4|^6.0",
"squizlabs/php_codesniffer": "3.8.1",
"symfony/cache": "^5.4|^6.0|^7.0",
"symfony/console": "^4.4|^5.4|^6.0|^7.0",
"vimeo/psalm": "4.30.0"
},
"suggest": {
Expand Down
51 changes: 31 additions & 20 deletions docs/en/sidebar.rst
Original file line number Diff line number Diff line change
@@ -1,22 +1,33 @@
.. toctree::
:depth: 3
.. toc::

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
.. tocheader:: Reference

explanation/dc2type-comments
explanation/implicit-indexes
.. 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/dc2type-comments
/explanation/implicit-indexes
4 changes: 2 additions & 2 deletions src/Connections/PrimaryReadReplicaConnection.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' => ''),
* )
* ));
*
Expand Down

0 comments on commit 98f458c

Please sign in to comment.