Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.3.x up into 5.0.x #6582

Merged
merged 20 commits into from
Nov 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
24cebe6
Deprecate Table::removeForeignKey() and ::removeUniqueConstraint()
morozov Oct 20, 2024
5b90d9a
Inherit issue templates from the centralized repository
greg0ire Oct 20, 2024
db467f0
Cover scenario `BEGIN TRANSACTION; COMMIT; BEGIN TRANSACTION; --failure`
simPod Oct 19, 2024
8078003
Merge pull request #6560 from morozov/deprecate-remove-object
morozov Oct 21, 2024
b753557
Merge pull request #6562 from simPod/cover-failure
greg0ire Oct 21, 2024
b72f7d6
Deprecate dropping columns referenced by constraints
morozov Oct 20, 2024
53bde79
Run tests with MySQL 9.1 (#6568)
derrabus Oct 22, 2024
1103c4f
Merge pull request #6559 from morozov/deprecate-drop-column-with-cons…
greg0ire Oct 22, 2024
ab44df6
Merge remote-tracking branch 'origin/3.9.x' into 4.2.x
greg0ire Oct 22, 2024
7fc3811
Merge pull request #6561 from greg0ire/inherit-issue-templates
greg0ire Oct 23, 2024
afcd624
Merge pull request #6570 from greg0ire/4.2.x
greg0ire Oct 23, 2024
22e878d
Fix broken links (#6572)
SchmidtClaudia Oct 24, 2024
9715fe1
Remove non thrown exception from phpdoc (#6574)
Tofandel Oct 25, 2024
516047c
Fix bigint PHP_INT_MIN/PHP_INT_MAX string to int convert (#6410)
mvorisek Oct 25, 2024
19a5a35
Run tests against PostgreSQL 17 (#6575)
IndraGunawan Oct 25, 2024
604277e
Merge branch '3.9.x' into 4.2.x
derrabus Oct 25, 2024
b35f818
Rename column in indexes and constraints
morozov Oct 23, 2024
4b084f6
Merge pull request #6578 from morozov/rename-column-in-indexes-and-co…
morozov Oct 31, 2024
e77da49
Merge pull request #6581 from doctrine/4.2.x
greg0ire Nov 2, 2024
ab2c0ca
Merge remote-tracking branch 'origin/4.3.x' into 5.0.x
greg0ire Nov 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions .github/ISSUE_TEMPLATE/Bug.md

This file was deleted.

17 changes: 0 additions & 17 deletions .github/ISSUE_TEMPLATE/Feature_Request.md

This file was deleted.

20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/Support_Question.md

This file was deleted.

16 changes: 8 additions & 8 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,23 +224,23 @@ jobs:
- "8.1"
postgres-version:
- "12"
- "15"
- "16"
- "17"
extension:
- "pgsql"
- "pdo_pgsql"
include:
- php-version: "8.2"
postgres-version: "16"
postgres-version: "17"
extension: "pgsql"
- php-version: "8.3"
postgres-version: "16"
postgres-version: "17"
extension: "pgsql"
- php-version: "8.4"
postgres-version: "16"
postgres-version: "17"
extension: "pgsql"
- php-version: "8.4"
postgres-version: "16"
postgres-version: "17"
extension: "pdo_pgsql"

services:
Expand Down Expand Up @@ -370,7 +370,7 @@ jobs:
- "8.3"
mysql-version:
- "8.0"
- "9.0"
- "9.1"
extension:
- "mysqli"
- "pdo_mysql"
Expand Down Expand Up @@ -399,10 +399,10 @@ jobs:
custom-entrypoint: >-
--entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
- php-version: "8.4"
mysql-version: "9.0"
mysql-version: "9.1"
extension: "mysqli"
- php-version: "8.4"
mysql-version: "9.0"
mysql-version: "9.1"
extension: "pdo_mysql"

services:
Expand Down
11 changes: 11 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ all drivers and middleware.
* Upgrade to MySQL 8.0 or later.
* Upgrade to Postgres 12 or later.

# Upgrade to 4.3

## Deprecated dropping columns referenced by constraints

Dropping columns that are referenced by constraints is deprecated. The constraints should be dropped first.

## Deprecated `Table::removeForeignKey()` and `::removeUniqueConstraint()`

The usage of `Table::removeForeignKey()` and `::removeUniqueConstraint()` is deprecated. Use `Table::dropForeignKey()`
and `::dropUniqueConstraint()` respectively instead.

# Upgrade to 4.2

## Support for new PDO subclasses on PHP 8.4
Expand Down
20 changes: 10 additions & 10 deletions docs/en/reference/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ mysqli
- ``ssl_ca`` (string): The path name to the certificate authority file to use for SSL encryption.
- ``ssl_capath`` (string): The pathname to a directory that contains trusted SSL CA certificates in PEM format.
- ``ssl_cipher`` (string): A list of allowable ciphers to use for SSL encryption.
- ``driverOptions`` Any supported flags for mysqli found on `http://www.php.net/manual/en/mysqli.real-connect.php`
- ``driverOptions`` Any supported flags for mysqli found on `www.php.net/manual/en/mysqli.real-connect.php <https://www.php.net/manual/en/mysqli.real-connect.php>`_

pdo_pgsql / pgsql
^^^^^^^^^^^^^^^^^
Expand All @@ -266,22 +266,22 @@ pdo_pgsql / pgsql
- ``sslmode`` (string): Determines whether or with what priority
a SSL TCP/IP connection will be negotiated with the server.
See the list of available modes:
`https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLMODE`
`www.postgresql.org/docs/9.4/libpq-connect.html#LIBPQ-CONNECT-SSLMODE <https://www.postgresql.org/docs/9.4/libpq-connect.html#LIBPQ-CONNECT-SSLMODE>`_
- ``sslrootcert`` (string): specifies the name of a file containing
SSL certificate authority (CA) certificate(s). If the file exists,
the server's certificate will be verified to be signed by one of these
authorities.
See https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLROOTCERT
See `www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLROOTCERT <https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLROOTCERT>`_
- ``sslcert`` (string): specifies the filename of the client SSL certificate.
See `https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLCERT`
See `www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLCERT <https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLCERT>`_
- ``sslkey`` (string): specifies the location for the secret key used for the
client certificate.
See `https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLKEY`
See `www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLKEY <https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLKEY>`_
- ``sslcrl`` (string): specifies the filename of the SSL certificate
revocation list (CRL).
See `https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLCRL`
See `www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLCRL <https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLCRL>`_
- ``gssencmode`` (string): Optional GSS-encrypted channel/GSSEncMode configuration.
See `https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-GSSENCMODE`
See `www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-GSSENCMODE <https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-GSSENCMODE>`_
- ``application_name`` (string): Name of the application that is
connecting to database. Optional. It will be displayed at ``pg_stat_activity``.

Expand Down Expand Up @@ -316,7 +316,7 @@ pdo_oci / oci8
add the INSTANCE_NAME parameter in the connection. It is generally used
to connect to an Oracle RAC server to select the name of a particular instance.
- ``connectstring`` (string): Complete Easy Connect connection descriptor,
see https://docs.oracle.com/database/121/NETAG/naming.htm. When using this option,
see `docs.oracle.com/en/database/oracle/oracle-database/23/netag/configuring-naming-methods.html <https://docs.oracle.com/en/database/oracle/oracle-database/23/netag/configuring-naming-methods.html>`_. When using this option,
you will still need to provide the ``user`` and ``password`` parameters, but the other
parameters will no longer be used. Note that when using this parameter, the ``getHost``
and ``getPort`` methods from ``Doctrine\DBAL\Connection`` will no longer function as expected.
Expand All @@ -335,7 +335,7 @@ pdo_sqlsrv / sqlsrv
- ``host`` (string): Hostname of the database to connect to.
- ``port`` (integer): Port of the database to connect to.
- ``dbname`` (string): Name of the database/schema to connect to.
- ``driverOptions`` (array): Any supported options found on `https://learn.microsoft.com/en-us/sql/connect/php/connection-options`
- ``driverOptions`` (array): Any supported options found on `learn.microsoft.com/en-us/sql/connect/php/connection-options <https://learn.microsoft.com/en-us/sql/connect/php/connection-options>`_

ibm_db2
^^^^^^^
Expand All @@ -347,7 +347,7 @@ ibm_db2
- ``host`` (string): Hostname of the database to connect to.
- ``port`` (integer): Port of the database to connect to.
- ``persistent`` (boolean): Whether to establish a persistent connection.
- ``driverOptions`` (array): Any supported options found on `https://www.php.net/manual/en/function.db2-connect.php#refsect1-function.db2-connect-parameters`
- ``driverOptions`` (array): Any supported options found on `www.php.net/manual/en/function.db2-connect.php#refsect1-function.db2-connect-parameters <https://www.php.net/manual/en/function.db2-connect.php#refsect1-function.db2-connect-parameters>`_

Automatic platform version detection
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
17 changes: 17 additions & 0 deletions psalm.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@

<!-- TODO for PHPUnit 11 -->
<referencedMethod name="PHPUnit\Framework\TestCase::iniSet"/>

<!--
https://github.com/doctrine/dbal/pull/6560
TODO: remove in 5.0.0
-->
<referencedMethod name="Doctrine\DBAL\Schema\Table::removeForeignKey" />
<referencedMethod name="Doctrine\DBAL\Schema\Table::removeUniqueConstraint" />
</errorLevel>
</DeprecatedMethod>
<DocblockTypeContradiction>
Expand Down Expand Up @@ -119,6 +126,12 @@
<file name="tests/Types/DateIntervalTest.php"/>
</errorLevel>
</InaccessibleProperty>
<InvalidCast>
<errorLevel type="suppress">
<!-- See https://github.com/vimeo/psalm/issues/10995 -->
<file name="src/Types/BigIntType.php"/>
</errorLevel>
</InvalidCast>
<InvalidArgument>
<errorLevel type="suppress">
<!-- We're testing with invalid input here. -->
Expand Down Expand Up @@ -173,6 +186,8 @@
</MoreSpecificReturnType>
<NoValue>
<errorLevel type="suppress">
<!-- See https://github.com/vimeo/psalm/issues/10995 -->
<file name="src/Types/BigIntType.php"/>
<!--
This error looks bogus.
-->
Expand Down Expand Up @@ -279,6 +294,8 @@
<!-- Ignore isset() checks in destructors. -->
<file name="src/Driver/PgSQL/Connection.php"/>
<file name="src/Driver/PgSQL/Statement.php"/>
<!-- See https://github.com/vimeo/psalm/issues/10995 -->
<file name="src/Types/BigIntType.php"/>
</errorLevel>
</TypeDoesNotContainType>
<UndefinedClass>
Expand Down
Loading