Skip to content

Commit 89df96c

Browse files
committed
Merge branch '4.4.x' into 5.0.x
* 4.4.x: [DOC] mysqli supports persistent connections (#7011) Update branch metadata
2 parents 9a20ccf + 355469d commit 89df96c

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

.doctrine-project.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,23 @@
1111
"slug": "latest",
1212
"upcoming": true
1313
},
14+
{
15+
"name": "4.4",
16+
"branchName": "4.4.x",
17+
"slug": "4.4",
18+
"upcoming": true
19+
},
1420
{
1521
"name": "4.3",
1622
"branchName": "4.3.x",
1723
"slug": "4.3",
18-
"upcoming": true
24+
"current": true
1925
},
2026
{
2127
"name": "4.2",
2228
"branchName": "4.2.x",
2329
"slug": "4.2",
24-
"current": true
30+
"maintained": false
2531
},
2632
{
2733
"name": "4.1",

README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Doctrine DBAL
22

3-
| [5.0-dev][5.0] | [4.3-dev][4.3] | [4.2][4.2] | [3.10][3.10] | [3.9][3.9] |
3+
| [5.0-dev][5.0] | [4.4-dev][4.4] | [4.3][4.3] | [3.10][3.10] | [3.9][3.9] |
44
|:---------------------------------------------------:|:---------------------------------------------------:|:---------------------------------------------------:|:-----------------------------------------------------:|:---------------------------------------------------:|
5-
| [![GitHub Actions][GA 5.0 image]][GA 5.0] | [![GitHub Actions][GA 4.3 image]][GA 4.3] | [![GitHub Actions][GA 4.2 image]][GA 4.2] | [![GitHub Actions][GA 3.10 image]][GA 3.10] | [![GitHub Actions][GA 3.9 image]][GA 3.9] |
6-
| [![AppVeyor][AppVeyor 5.0 image]][AppVeyor 5.0] | [![AppVeyor][AppVeyor 4.3 image]][AppVeyor 4.3] | [![AppVeyor][AppVeyor 4.2 image]][AppVeyor 4.2] | [![AppVeyor][AppVeyor 3.10 image]][AppVeyor 3.10] | [![AppVeyor][AppVeyor 3.9 image]][AppVeyor 3.9] |
7-
| [![Code Coverage][Coverage 5.0 image]][CodeCov 5.0] | [![Code Coverage][Coverage 4.3 image]][CodeCov 4.3] | [![Code Coverage][Coverage 4.2 image]][CodeCov 4.2] | [![Code Coverage][Coverage 3.10 image]][CodeCov 3.10] | [![Code Coverage][Coverage 3.9 image]][CodeCov 3.9] |
5+
| [![GitHub Actions][GA 5.0 image]][GA 5.0] | [![GitHub Actions][GA 4.4 image]][GA 4.4] | [![GitHub Actions][GA 4.3 image]][GA 4.3] | [![GitHub Actions][GA 3.10 image]][GA 3.10] | [![GitHub Actions][GA 3.9 image]][GA 3.9] |
6+
| [![AppVeyor][AppVeyor 5.0 image]][AppVeyor 5.0] | [![AppVeyor][AppVeyor 4.4 image]][AppVeyor 4.4] | [![AppVeyor][AppVeyor 4.3 image]][AppVeyor 4.3] | [![AppVeyor][AppVeyor 3.10 image]][AppVeyor 3.10] | [![AppVeyor][AppVeyor 3.9 image]][AppVeyor 3.9] |
7+
| [![Code Coverage][Coverage 5.0 image]][CodeCov 5.0] | [![Code Coverage][Coverage 4.4 image]][CodeCov 4.4] | [![Code Coverage][Coverage 4.3 image]][CodeCov 4.3] | [![Code Coverage][Coverage 3.10 image]][CodeCov 3.10] | [![Code Coverage][Coverage 3.9 image]][CodeCov 3.9] |
88

99
Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features for database schema introspection and schema management.
1010

@@ -22,6 +22,14 @@ Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features f
2222
[GA 5.0]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A5.0.x
2323
[GA 5.0 image]: https://github.com/doctrine/dbal/actions/workflows/continuous-integration.yml/badge.svg?branch=5.0.x
2424

25+
[Coverage 4.4 image]: https://codecov.io/gh/doctrine/dbal/branch/4.4.x/graph/badge.svg
26+
[4.4]: https://github.com/doctrine/dbal/tree/4.4.x
27+
[CodeCov 4.4]: https://codecov.io/gh/doctrine/dbal/branch/4.4.x
28+
[AppVeyor 4.4]: https://ci.appveyor.com/project/doctrine/dbal/branch/4.4.x
29+
[AppVeyor 4.4 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/4.4.x?svg=true
30+
[GA 4.4]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A4.4.x
31+
[GA 4.4 image]: https://github.com/doctrine/dbal/actions/workflows/continuous-integration.yml/badge.svg?branch=4.4.x
32+
2533
[Coverage 4.3 image]: https://codecov.io/gh/doctrine/dbal/branch/4.3.x/graph/badge.svg
2634
[4.3]: https://github.com/doctrine/dbal/tree/4.3.x
2735
[CodeCov 4.3]: https://codecov.io/gh/doctrine/dbal/branch/4.3.x
@@ -30,14 +38,6 @@ Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features f
3038
[GA 4.3]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A4.3.x
3139
[GA 4.3 image]: https://github.com/doctrine/dbal/actions/workflows/continuous-integration.yml/badge.svg?branch=4.3.x
3240

33-
[Coverage 4.2 image]: https://codecov.io/gh/doctrine/dbal/branch/4.2.x/graph/badge.svg
34-
[4.2]: https://github.com/doctrine/dbal/tree/4.2.x
35-
[CodeCov 4.2]: https://codecov.io/gh/doctrine/dbal/branch/4.2.x
36-
[AppVeyor 4.2]: https://ci.appveyor.com/project/doctrine/dbal/branch/4.2.x
37-
[AppVeyor 4.2 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/4.2.x?svg=true
38-
[GA 4.2]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A4.2.x
39-
[GA 4.2 image]: https://github.com/doctrine/dbal/actions/workflows/continuous-integration.yml/badge.svg?branch=4.2.x
40-
4141
[Coverage 3.10 image]: https://codecov.io/gh/doctrine/dbal/branch/3.10.x/graph/badge.svg
4242
[3.10]: https://github.com/doctrine/dbal/tree/3.10.x
4343
[CodeCov 3.10]: https://codecov.io/gh/doctrine/dbal/branch/3.10.x

docs/en/reference/configuration.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ mysqli
242242
- ``dbname`` (string): Name of the database/schema to connect to.
243243
- ``unix_socket`` (string): Name of the socket used to connect to
244244
the database.
245+
- ``persistent`` (boolean): Whether to establish a persistent connection.
245246
- ``charset`` (string): The charset used when connecting to the
246247
database.
247248
- ``ssl_key`` (string): The path name to the key file to use for SSL encryption.

0 commit comments

Comments
 (0)