Skip to content

Commit a1fdc6e

Browse files
greg0iregreg0ire
authored
Merge pull request #12073 from doctrine/3.5.x
Merge 3.5.x up into 3.6.x
2 parents d583460 + 2c01dac commit a1fdc6e

File tree

10 files changed

+459
-118
lines changed

10 files changed

+459
-118
lines changed

‎.doctrine-project.json

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,40 @@
1111
"slug": "latest",
1212
"upcoming": true
1313
},
14+
{
15+
"name": "3.6",
16+
"branchName": "3.6.x",
17+
"slug": "3.6",
18+
"upcoming": true
19+
},
1420
{
1521
"name": "3.5",
1622
"branchName": "3.5.x",
1723
"slug": "3.5",
18-
"upcoming": true
24+
"current": true
1925
},
2026
{
2127
"name": "3.4",
22-
"branchName": "3.4.x",
2328
"slug": "3.4",
24-
"current": true
29+
"maintained": false
2530
},
2631
{
2732
"name": "3.3",
28-
"branchName": "3.3.x",
2933
"slug": "3.3",
3034
"maintained": false
3135
},
3236
{
3337
"name": "3.2",
34-
"branchName": "3.2.x",
3538
"slug": "3.2",
3639
"maintained": false
3740
},
3841
{
3942
"name": "3.1",
40-
"branchName": "3.1.x",
4143
"slug": "3.1",
4244
"maintained": false
4345
},
4446
{
4547
"name": "3.0",
46-
"branchName": "3.0.x",
4748
"slug": "3.0",
4849
"maintained": false
4950
},
@@ -61,61 +62,51 @@
6162
},
6263
{
6364
"name": "2.19",
64-
"branchName": "2.19.x",
6565
"slug": "2.19",
6666
"maintained": false
6767
},
6868
{
6969
"name": "2.18",
70-
"branchName": "2.18.x",
7170
"slug": "2.18",
7271
"maintained": false
7372
},
7473
{
7574
"name": "2.17",
76-
"branchName": "2.17.x",
7775
"slug": "2.17",
7876
"maintained": false
7977
},
8078
{
8179
"name": "2.16",
82-
"branchName": "2.16.x",
8380
"slug": "2.16",
8481
"maintained": false
8582
},
8683
{
8784
"name": "2.15",
88-
"branchName": "2.15.x",
8985
"slug": "2.15",
9086
"maintained": false
9187
},
9288
{
9389
"name": "2.14",
94-
"branchName": "2.14.x",
9590
"slug": "2.14",
9691
"maintained": false
9792
},
9893
{
9994
"name": "2.13",
100-
"branchName": "2.13.x",
10195
"slug": "2.13",
10296
"maintained": false
10397
},
10498
{
10599
"name": "2.12",
106-
"branchName": "2.12.x",
107100
"slug": "2.12",
108101
"maintained": false
109102
},
110103
{
111104
"name": "2.11",
112-
"branchName": "2.11.x",
113105
"slug": "2.11",
114106
"maintained": false
115107
},
116108
{
117109
"name": "2.10",
118-
"branchName": "2.10.x",
119110
"slug": "2.10",
120111
"maintained": false
121112
}

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
| [4.0.x][4.0] | [3.5.x][3.5] | [3.4.x][3.4] | [2.21.x][2.21] | [2.20.x][2.20] |
1+
| [4.0.x][4.0] | [3.6.x][3.6] | [3.5.x][3.5] | [2.21.x][2.21] | [2.20.x][2.20] |
22
|:------------------------------------------------------:|:------------------------------------------------------:|:------------------------------------------------------:|:--------------------------------------------------------:|:--------------------------------------------------------:|
3-
| [![Build status][4.0 image]][4.0] | [![Build status][3.5 image]][3.5] | [![Build status][3.4 image]][3.4] | [![Build status][2.21 image]][2.21] | [![Build status][2.20 image]][2.20] |
4-
| [![Coverage Status][4.0 coverage image]][4.0 coverage] | [![Coverage Status][3.5 coverage image]][3.5 coverage] | [![Coverage Status][3.4 coverage image]][3.4 coverage] | [![Coverage Status][2.21 coverage image]][2.21 coverage] | [![Coverage Status][2.20 coverage image]][2.20 coverage] |
3+
| [![Build status][4.0 image]][4.0] | [![Build status][3.6 image]][3.6] | [![Build status][3.5 image]][3.5] | [![Build status][2.21 image]][2.21] | [![Build status][2.20 image]][2.20] |
4+
| [![Coverage Status][4.0 coverage image]][4.0 coverage] | [![Coverage Status][3.6 coverage image]][3.6 coverage] | [![Coverage Status][3.5 coverage image]][3.5 coverage] | [![Coverage Status][2.21 coverage image]][2.21 coverage] | [![Coverage Status][2.20 coverage image]][2.20 coverage] |
55

66
Doctrine ORM is an object-relational mapper for PHP 8.1+ that provides transparent persistence
77
for PHP objects. It sits on top of a powerful database abstraction layer (DBAL). One of its key features
@@ -20,14 +20,14 @@ without requiring unnecessary code duplication.
2020
[4.0]: https://github.com/doctrine/orm/tree/4.0.x
2121
[4.0 coverage image]: https://codecov.io/gh/doctrine/orm/branch/4.0.x/graph/badge.svg
2222
[4.0 coverage]: https://codecov.io/gh/doctrine/orm/branch/4.0.x
23+
[3.6 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=3.6.x
24+
[3.6]: https://github.com/doctrine/orm/tree/3.6.x
25+
[3.6 coverage image]: https://codecov.io/gh/doctrine/orm/branch/3.6.x/graph/badge.svg
26+
[3.6 coverage]: https://codecov.io/gh/doctrine/orm/branch/3.6.x
2327
[3.5 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=3.5.x
2428
[3.5]: https://github.com/doctrine/orm/tree/3.5.x
2529
[3.5 coverage image]: https://codecov.io/gh/doctrine/orm/branch/3.5.x/graph/badge.svg
2630
[3.5 coverage]: https://codecov.io/gh/doctrine/orm/branch/3.5.x
27-
[3.4 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=3.4.x
28-
[3.4]: https://github.com/doctrine/orm/tree/3.4.x
29-
[3.4 coverage image]: https://codecov.io/gh/doctrine/orm/branch/3.4.x/graph/badge.svg
30-
[3.4 coverage]: https://codecov.io/gh/doctrine/orm/branch/3.4.x
3131
[2.21 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=2.21.x
3232
[2.21]: https://github.com/doctrine/orm/tree/2.21.x
3333
[2.21 coverage image]: https://codecov.io/gh/doctrine/orm/branch/2.21.x/graph/badge.svg

0 commit comments

Comments
 (0)