From 8f605c652a85d33c7145997722f7aac22c33312e Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Wed, 26 Oct 2022 15:09:12 +0200 Subject: [PATCH 1/2] Remove reference to deprecated DriverChain from docs (#10179) --- docs/en/reference/advanced-configuration.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/reference/advanced-configuration.rst b/docs/en/reference/advanced-configuration.rst index a27d277ff37..eedba2e6a76 100644 --- a/docs/en/reference/advanced-configuration.rst +++ b/docs/en/reference/advanced-configuration.rst @@ -404,15 +404,15 @@ Multiple Metadata Sources When using different components using Doctrine ORM you may end up with them using two different metadata drivers, for example XML and -YAML. You can use the DriverChain Metadata implementations to +YAML. You can use the MappingDriverChain Metadata implementations to aggregate these drivers based on namespaces: .. code-block:: php addDriver($xmlDriver, 'Doctrine\Tests\Models\Company'); $chain->addDriver($yamlDriver, 'Doctrine\Tests\ORM\Mapping'); From 552d98d554f3ffc7adc8469f4e223753364cb775 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Wed, 26 Oct 2022 15:12:52 +0200 Subject: [PATCH 2/2] Bump CI to PHP 8.2 and latest database versions (#10180) --- .github/workflows/continuous-integration.yml | 40 +++++++------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 42df06e5361..423cdecdbea 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -47,11 +47,11 @@ jobs: - php-version: "8.0" dbal-version: "2.13" extension: "pdo_sqlite" - - php-version: "8.1" + - php-version: "8.2" dbal-version: "3@dev" extension: "pdo_sqlite" - - php-version: "8.1" - dbal-version: "3@dev" + - php-version: "8.2" + dbal-version: "default" extension: "sqlite3" steps: @@ -102,19 +102,19 @@ jobs: strategy: matrix: php-version: - - "8.1" + - "8.2" dbal-version: - "default" + - "3@dev" postgres-version: - - "9.6" - - "14" + - "15" include: - php-version: "8.0" dbal-version: "2.13" postgres-version: "14" - php-version: "8.2" - dbal-version: "3@dev" - postgres-version: "14" + dbal-version: "default" + postgres-version: "9.6" services: postgres: @@ -168,11 +168,12 @@ jobs: strategy: matrix: php-version: - - "8.1" + - "8.2" dbal-version: - "default" + - "3@dev" mariadb-version: - - "10.6" + - "10.9" extension: - "mysqli" - "pdo_mysql" @@ -181,14 +182,6 @@ jobs: dbal-version: "2.13" mariadb-version: "10.6" extension: "pdo_mysql" - - php-version: "8.2" - dbal-version: "3@dev" - mariadb-version: "10.6" - extension: "pdo_mysql" - - php-version: "8.2" - dbal-version: "3@dev" - mariadb-version: "10.6" - extension: "mysqli" services: mariadb: @@ -244,9 +237,10 @@ jobs: strategy: matrix: php-version: - - "8.1" + - "8.2" dbal-version: - "default" + - "3@dev" mysql-version: - "5.7" - "8.0" @@ -258,14 +252,6 @@ jobs: dbal-version: "2.13" mysql-version: "8.0" extension: "pdo_mysql" - - php-version: "8.2" - dbal-version: "3@dev" - mysql-version: "8.0" - extension: "mysqli" - - php-version: "8.2" - dbal-version: "3@dev" - mysql-version: "8.0" - extension: "pdo_mysql" services: mysql: