Skip to content

Commit 604277e

Browse files
committed
Merge branch '3.9.x' into 4.2.x
* 3.9.x: Run tests against PostgreSQL 17 (#6575) Fix broken links (#6572)
2 parents 516047c + 19a5a35 commit 604277e

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

.github/workflows/continuous-integration.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -224,23 +224,23 @@ jobs:
224224
- "8.1"
225225
postgres-version:
226226
- "10"
227-
- "15"
228227
- "16"
228+
- "17"
229229
extension:
230230
- "pgsql"
231231
- "pdo_pgsql"
232232
include:
233233
- php-version: "8.2"
234-
postgres-version: "16"
234+
postgres-version: "17"
235235
extension: "pgsql"
236236
- php-version: "8.3"
237-
postgres-version: "16"
237+
postgres-version: "17"
238238
extension: "pgsql"
239239
- php-version: "8.4"
240-
postgres-version: "16"
240+
postgres-version: "17"
241241
extension: "pgsql"
242242
- php-version: "8.4"
243-
postgres-version: "16"
243+
postgres-version: "17"
244244
extension: "pdo_pgsql"
245245

246246
services:

docs/en/reference/configuration.rst

+10-10
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ mysqli
249249
- ``ssl_ca`` (string): The path name to the certificate authority file to use for SSL encryption.
250250
- ``ssl_capath`` (string): The pathname to a directory that contains trusted SSL CA certificates in PEM format.
251251
- ``ssl_cipher`` (string): A list of allowable ciphers to use for SSL encryption.
252-
- ``driverOptions`` Any supported flags for mysqli found on `http://www.php.net/manual/en/mysqli.real-connect.php`
252+
- ``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>`_
253253

254254
pdo_pgsql / pgsql
255255
^^^^^^^^^^^^^^^^^
@@ -266,22 +266,22 @@ pdo_pgsql / pgsql
266266
- ``sslmode`` (string): Determines whether or with what priority
267267
a SSL TCP/IP connection will be negotiated with the server.
268268
See the list of available modes:
269-
`https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLMODE`
269+
`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>`_
270270
- ``sslrootcert`` (string): specifies the name of a file containing
271271
SSL certificate authority (CA) certificate(s). If the file exists,
272272
the server's certificate will be verified to be signed by one of these
273273
authorities.
274-
See https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLROOTCERT
274+
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>`_
275275
- ``sslcert`` (string): specifies the filename of the client SSL certificate.
276-
See `https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLCERT`
276+
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>`_
277277
- ``sslkey`` (string): specifies the location for the secret key used for the
278278
client certificate.
279-
See `https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLKEY`
279+
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>`_
280280
- ``sslcrl`` (string): specifies the filename of the SSL certificate
281281
revocation list (CRL).
282-
See `https://www.postgresql.org/docs/9.4/static/libpq-connect.html#LIBPQ-CONNECT-SSLCRL`
282+
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>`_
283283
- ``gssencmode`` (string): Optional GSS-encrypted channel/GSSEncMode configuration.
284-
See `https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-GSSENCMODE`
284+
See `www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-GSSENCMODE <https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-GSSENCMODE>`_
285285
- ``application_name`` (string): Name of the application that is
286286
connecting to database. Optional. It will be displayed at ``pg_stat_activity``.
287287

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

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

352352
Automatic platform version detection
353353
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)