Skip to content

Commit 227efd4

Browse files
committed
Merge tag '2.11.0' into oracle122
Release [2.11.0](https://github.com/doctrine/dbal/milestone/77) 2.11.0 ====== - Total issues resolved: **7** - Total pull requests resolved: **55** - Total contributors: **8** Improvement,Prepared Statements,SQL Server,Types,pdo_sqlsrv,sqlsrv ------------------------------------------------------------------ - [4274: Support ASCII parameter binding](doctrine#4274) thanks to @gjdanis Documentation ------------- - [4271: Add explanation about implicit indexes](doctrine#4271) thanks to @greg0ire Deprecation,Error Handling -------------------------- - [4253: Deprecate DBAL\DBALException in favor of DBAL\Exception](doctrine#4253) thanks to @morozov CI -- - [4251: Setup automatic release workflow](doctrine#4251) thanks to @greg0ire Deprecation,Schema Managers --------------------------- - [4230: Deprecate the functionality of dropping client connections when dropping a database](doctrine#4230) thanks to @morozov Deprecation,Platforms --------------------- - [4229: Deprecate more AbstractPlatform methods](doctrine#4229) thanks to @morozov - [4132: Deprecate AbstractPlatform::fixSchemaElementName()](doctrine#4132) thanks to @morozov Improvement,Test Suite ---------------------- - [4215: Remove test group configuration leftovers](doctrine#4215) thanks to @morozov - [4080: Update PHPUnit to 9.2](doctrine#4080) thanks to @morozov - [4079: Forward compatibility with PHPUnit 9.3](doctrine#4079) thanks to @morozov - [3923: Removed performance tests](doctrine#3923) thanks to @morozov Deprecation,Schema ------------------ - [4213: Deprecate the Synchronizer package](doctrine#4213) thanks to @morozov Blocker,Improvement,PHP,Test Suite ---------------------------------- - [4201: Update PHPUnit to 9.3](doctrine#4201) thanks to @morozov Blocker,PHP,Test Suite ---------------------- - [4196: The test suite uses the deprecated at() matcher](doctrine#4196) thanks to @morozov Connections,Deprecation,Documentation ------------------------------------- - [4175: Additional deprecation note for PrimaryReplicaConnection::query()](doctrine#4175) thanks to @morozov Connections,Deprecation,Prepared Statements ------------------------------------------- - [4165: Deprecated usage of wrapper components as implementations of driver-level interfaces](doctrine#4165) thanks to @morozov - [4020: Deprecated Connection::project(), Statement::errorCode() and errorInfo()](doctrine#4020) thanks to @morozov Connections,Deprecation ----------------------- - [4163: Deprecate duplicate and ambiguous wrapper connection methods](doctrine#4163) thanks to @morozov Error Handling,Improvement,Types -------------------------------- - [4145: Add TypeRegistry constructor](doctrine#4145) thanks to @morozov Deprecation,Drivers,Improvement,pdo_mysql,pdo_oci,pdo_pgsql,pdo_sqlite,pdo_sqlsrv --------------------------------------------------------------------------------- - [4144: Deprecate classes in Driver\PDO* namespaces](doctrine#4144) thanks to @morozov Connections,Documentation,Improvement ------------------------------------- - [4139: Mark connection constructors internal](doctrine#4139) thanks to @morozov Deprecation,Drivers,Error Handling ---------------------------------- - [4137: Deprecate driver exception conversion APIs](doctrine#4137) thanks to @morozov - [4112: Deprecate DriverException::getErrorCode()](doctrine#4112) thanks to @morozov Configuration,Connections,Deprecation,Error Handling ---------------------------------------------------- - [4134: Deprecate some DBALException factory methods](doctrine#4134) thanks to @morozov Code Style,Documentation ------------------------ - [4133: Fix more issues introduced by the deprecation of driver classes](doctrine#4133) thanks to @morozov BC Break,Drivers,Error Handling,pdo_sqlsrv,sqlsrv ------------------------------------------------- - [4131: Restore the PortWithoutHost exception parent class](doctrine#4131) thanks to @morozov Code Style,Improvement,Static Analysis -------------------------------------- - [4123: Remove the no longer needed error suppressions](doctrine#4123) thanks to @morozov Deprecation,Drivers,Error Handling,Improvement ---------------------------------------------- - [4118: Deprecate ExceptionConverterDriver](doctrine#4118) thanks to @morozov Bug,Connections,Improvement,Prepared Statements ----------------------------------------------- - [4117: Fixes for the recently introduced driver-level deprecations](doctrine#4117) thanks to @morozov Connections,Deprecation,Platform Detection ------------------------------------------ - [4114: Deprecate ServerInfoAwareConnection#requiresQueryForServerVersion() as an implementation detail](doctrine#4114) thanks to @morozov Deprecation,Prepared Statements,SQL Parser,oci8 ----------------------------------------------- - [4110: Mark non-interface OCI8 driver methods internal](doctrine#4110) thanks to @morozov Connections,Deprecation,Drivers,Improvement,Prepared Statements --------------------------------------------------------------- - [4100: Deprecate inconsistently and ambiguously named driver-level classes](doctrine#4100) thanks to @morozov Connections,Improvement ----------------------- - [4092: Remove Connection::$isConnected](doctrine#4092) thanks to @morozov Configuration,Connections ------------------------- - [4086: Mark Connection::getParams() internal](doctrine#4086) thanks to @morozov Bug,Drivers,ibm_db2 ------------------- - [4085: The IBM DB2 driver Exception class must implement the DriverException interface](doctrine#4085) thanks to @morozov PHP --- - [4078: Bump PHP requirement to 7.3 as of DBAL 2.11.0](doctrine#4078) thanks to @morozov Connections,Databases,Deprecation,Drivers ----------------------------------------- - [4068: Deprecate Driver::getDatabase()](doctrine#4068) thanks to @morozov Deprecation,Improvement,Portability ----------------------------------- - [4061: Deprecated platform-specific portability mode constants](doctrine#4061) thanks to @morozov - [4054: &doctrine#91;doctrineGH-4052&doctrine#93; Deprecate MasterSlaveConnection and rename to PrimaryReplicaConnection](doctrine#4054) thanks to @beberlei and @albe - [4017: Improve help of dbal:run-sql command](doctrine#4017) thanks to @ostrolucky Code Style,Improvement ---------------------- - [4050: Update doctrine/coding-standard to 8.0](doctrine#4050) thanks to @morozov Cache,Deprecation,Improvement,Prepared Statements ------------------------------------------------- - [4049: Replace forward-compatible ResultStatement interfaces with Result](doctrine#4049) thanks to @morozov Cache,Improvement,Prepared Statements ------------------------------------- - [4048: Make caching layer not rely on closeCursor()](doctrine#4048) thanks to @morozov Deprecation,Improvement,Prepared Statements ------------------------------------------- - [4037: Introduce Statement::fetchFirstColumn()](doctrine#4037) thanks to @morozov - [4019: Deprecated the concept of the fetch mode](doctrine#4019) thanks to @morozov Bug,Documentation,Improvement,Prepared Statements ------------------------------------------------- - [4034: Additional changes based on the discussion in doctrine#4007](doctrine#4034) thanks to @morozov Connections,Console,Improvement ------------------------------- - [3956: allow using multiple connections for CLI commands](doctrine#3956) thanks to @dmaicher Deprecation,Logging ------------------- - [3935: Deprecate EchoSQLLogger](doctrine#3935) thanks to @morozov Improvement,Packaging --------------------- - [3924: Actualize the content of the .gitattributes file](doctrine#3924) thanks to @morozov Azure,Deprecation,Drivers,Drizzle,MariaDB,Platforms,PostgreSQL,SQL Anywhere,SQL Server,Sharding,pdo_ibm ------------------------------------------------------------------------------------------------------- - [3905: Deprecate the usage of the legacy platforms and drivers](doctrine#3905) thanks to @morozov Deprecation,Query ----------------- - [3864: CompositeExpression and()/or() factory methods](doctrine#3864) thanks to @BenMorel - [3853: Deprecate calling QueryBuilder methods with an array argument](doctrine#3853) thanks to @BenMorel and @morozov Deprecation,Tools ----------------- - [3861: Deprecated the usage of the Version class](doctrine#3861) thanks to @morozov Improvement,Query ----------------- - [3852: First parameter of ExpressionBuilder::and/or() mandatory](doctrine#3852) thanks to @BenMorel Deprecation,Improvement,Query ----------------------------- - [3851: Rename andX() / orX() methods](doctrine#3851) thanks to @BenMorel - [3850: Prepare CompositeExpression for immutability](doctrine#3850) thanks to @BenMorel # gpg: Signature made Mon Sep 21 01:47:31 2020 # gpg: using DSA key 1BEDEE0A820BC30D858F9F0C2C3A645671828132 # gpg: Can't check signature: No public key # Conflicts: # README.md # lib/Doctrine/DBAL/Driver/AbstractOracleDriver.php # lib/Doctrine/DBAL/Driver/OCI8/Driver.php # lib/Doctrine/DBAL/Version.php
2 parents f87ab3e + 0d4e1a8 commit 227efd4

File tree

294 files changed

+7249
-2554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+7249
-2554
lines changed

.doctrine-project.json

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,27 @@
1111
"slug": "latest",
1212
"upcoming": true
1313
},
14+
{
15+
"name": "2.11",
16+
"branchName": "2.11.x",
17+
"slug": "2.11",
18+
"current": true,
19+
"aliases": [
20+
"current",
21+
"stable"
22+
]
23+
},
1424
{
1525
"name": "2.10",
16-
"branchName": "master",
26+
"branchName": "2.10.x",
1727
"slug": "2.10",
18-
"upcoming": true
28+
"maintained": false
1929
},
2030
{
2131
"name": "2.9",
2232
"branchName": "2.9",
2333
"slug": "2.9",
24-
"current": true,
25-
"aliases": [
26-
"current",
27-
"stable"
28-
]
34+
"maintained": false
2935
},
3036
{
3137
"name": "2.8",

.gitattributes

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
/.appveyor.yml export-ignore
2+
/composer.lock export-ignore
3+
/docs export-ignore
4+
/.doctrine-project.json export-ignore
25
/.gitattributes export-ignore
36
/.github export-ignore
47
/.gitignore export-ignore
5-
/.travis.yml export-ignore
6-
/build.properties export-ignore
7-
/build.xml export-ignore
8-
/composer.lock export-ignore
9-
/docs export-ignore
108
/phpcs.xml.dist export-ignore
119
/phpstan.neon.dist export-ignore
1210
/phpunit.xml.dist export-ignore
1311
/run-all.sh export-ignore
12+
/SECURITY.md export-ignore
1413
/tests export-ignore
14+
/.travis.yml export-ignore
15+
/UPGRADE.md export-ignore
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: "Automatic Releases"
2+
3+
on:
4+
milestone:
5+
types:
6+
- "closed"
7+
8+
jobs:
9+
release:
10+
name: "Git tag, release & create merge-up PR"
11+
runs-on: "ubuntu-20.04"
12+
13+
steps:
14+
- name: "Checkout"
15+
uses: "actions/checkout@v2"
16+
17+
- name: "Release"
18+
uses: "laminas/[email protected]"
19+
with:
20+
command-name: "laminas:automatic-releases:release"
21+
env:
22+
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
23+
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
24+
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
25+
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
26+
27+
- name: "Create Merge-Up Pull Request"
28+
uses: "laminas/[email protected]"
29+
with:
30+
command-name: "laminas:automatic-releases:create-merge-up-pull-request"
31+
env:
32+
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
33+
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
34+
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
35+
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
36+
37+
- name: "Create and/or Switch to new Release Branch"
38+
uses: "laminas/automatic-releases@v1"
39+
with:
40+
command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
41+
env:
42+
"GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
43+
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
44+
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
45+
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

.travis.yml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -33,43 +33,6 @@ jobs:
3333
php: 7.3
3434
env: DB=sqlite
3535

36-
- stage: Test
37-
php: 7.2
38-
env: DB=mysql.docker IMAGE=mysql:8.0
39-
- stage: Test
40-
php: 7.2
41-
env: DB=mysqli.docker IMAGE=mysql:8.0
42-
- stage: Test
43-
php: 7.2
44-
env: DB=mariadb.docker IMAGE=mariadb:10.3
45-
- stage: Test
46-
php: 7.2
47-
env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.3
48-
- stage: Test
49-
php: 7.2
50-
env: DB=pgsql POSTGRESQL_VERSION=11.0
51-
sudo: required
52-
before_script:
53-
- bash ./tests/travis/install-postgres-11.sh
54-
- stage: Test
55-
php: 7.2
56-
env: DB=sqlite
57-
- stage: Test
58-
php: 7.2
59-
env: DB=sqlsrv
60-
sudo: required
61-
before_script:
62-
- bash ./tests/travis/install-sqlsrv-dependencies.sh
63-
- bash ./tests/travis/install-mssql-sqlsrv.sh
64-
- bash ./tests/travis/install-mssql.sh
65-
- stage: Test
66-
php: 7.2
67-
env: DB=pdo_sqlsrv
68-
sudo: required
69-
before_script:
70-
- bash ./tests/travis/install-sqlsrv-dependencies.sh
71-
- bash ./tests/travis/install-mssql-pdo_sqlsrv.sh
72-
- bash ./tests/travis/install-mssql.sh
7336
- stage: Test
7437
php: 7.3
7538
env: DB=mysql.docker IMAGE=mysql:5.7

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ $table->addUniqueIndex(
4040

4141
## Original README from doctrine/dbal:
4242

43-
| [Master][Master] | [2.10][2.10] |
43+
| [Master][Master] | [2.11][2.11] |
4444
|:----------------:|:----------:|
45-
| [![Build status][Master image]][Master] | [![Build status][2.10 image]][2.10] |
46-
| [![GitHub Actions][GA master image]][GA master] | [![GitHub Actions][GA 2.10 image]][GA 2.10] |
47-
| [![AppVeyor][AppVeyor master image]][AppVeyor master] | [![AppVeyor][AppVeyor 2.10 image]][AppVeyor 2.10]
48-
| [![Code Coverage][Coverage image]][CodeCov Master] | [![Code Coverage][Coverage 2.10 image]][CodeCov 2.10] |
45+
| [![Build status][Master image]][Master] | [![Build status][2.11 image]][2.11] |
46+
| [![GitHub Actions][GA master image]][GA master] | [![GitHub Actions][GA 2.11 image]][GA 2.11] |
47+
| [![AppVeyor][AppVeyor master image]][AppVeyor master] | [![AppVeyor][AppVeyor 2.11 image]][AppVeyor 2.11] |
48+
| [![Code Coverage][Coverage image]][CodeCov Master] | [![Code Coverage][Coverage 2.11 image]][CodeCov 2.11] |
4949

5050
Powerful database abstraction layer with many features for database schema introspection, schema management and PDO abstraction.
5151

@@ -64,11 +64,11 @@ Powerful database abstraction layer with many features for database schema intro
6464
[GA master]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3Amaster
6565
[GA master image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg
6666

67-
[2.10 image]: https://img.shields.io/travis/doctrine/dbal/2.10.x.svg?style=flat-square
68-
[Coverage 2.10 image]: https://codecov.io/gh/doctrine/dbal/branch/2.10.x/graph/badge.svg
69-
[2.10]: https://github.com/doctrine/dbal/tree/2.10.x
70-
[CodeCov 2.10]: https://codecov.io/gh/doctrine/dbal/branch/2.10.x
71-
[AppVeyor 2.10]: https://ci.appveyor.com/project/doctrine/dbal/branch/2.10.x
72-
[AppVeyor 2.10 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/2.10.x?svg=true
73-
[GA 2.10]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A2.10.x
74-
[GA 2.10 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=2.10.x
67+
[2.11 image]: https://img.shields.io/travis/doctrine/dbal/2.11.x.svg?style=flat-square
68+
[Coverage 2.11 image]: https://codecov.io/gh/doctrine/dbal/branch/2.11.x/graph/badge.svg
69+
[2.11]: https://github.com/doctrine/dbal/tree/2.11.x
70+
[CodeCov 2.11]: https://codecov.io/gh/doctrine/dbal/branch/2.11.x
71+
[AppVeyor 2.11]: https://ci.appveyor.com/project/doctrine/dbal/branch/2.11.x
72+
[AppVeyor 2.11 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/2.11.x?svg=true
73+
[GA 2.11]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A2.11.x
74+
[GA 2.11 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=2.11.x

0 commit comments

Comments
 (0)