From 2e95d37987e2da5db8e8f7a02fa83e5cf13d8fea Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Wed, 6 Dec 2023 16:12:21 -0700 Subject: [PATCH 1/5] Updated composer and workflow for php 8.3 --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/continuous-integration.yml | 1 + .github/workflows/static-analysis.yml | 2 +- composer.json | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 3e2408e6..064cba96 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -13,4 +13,4 @@ jobs: name: "Coding Standards" uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.5.1" with: - php-version: '8.2' + php-version: '8.3' diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 33d6b1e5..ef0d9622 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -20,6 +20,7 @@ jobs: - "8.0" - "8.1" - "8.2" + - "8.3" dbal-version: - "2.13.0" - "3.3.0" diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 09d41234..3a51c02e 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -13,4 +13,4 @@ jobs: name: "Static Analysis" uses: "doctrine/.github/.github/workflows/static-analysis.yml@1.5.1" with: - php-version: '8.2' + php-version: '8.3' diff --git a/composer.json b/composer.json index 7573731f..5c873cd0 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ } }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "ext-json": "*", "doctrine/dbal": "^2.13.7 || ^3.3.2", "doctrine/doctrine-laminas-hydrator": "^3.0.0", From 6f946eaf6632169ba6f28581667c26b2cf271c0b Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Thu, 18 Jan 2024 16:21:56 -0700 Subject: [PATCH 2/5] Empty commit From 2f117719b2adeffb3adb1bd6dddabc56f17b1a02 Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Fri, 19 Jan 2024 15:43:47 -0700 Subject: [PATCH 3/5] Updated testDefineDependencyFactoryServicesFromConfig to confirm to new signature in migrations. Check failure on line 308 in lib/Doctrine/Migrations/DependencyFactory.php Roave BC Check The parameter $service of Doctrine\Migrations\DependencyFactory#setService() changed from no type to a non-contravariant object| https://github.com/doctrine/migrations/pull/1363/files#diff-7b97541a9d8f1fd4102229408221c25b9785ad7d9b47cdfcba644ee93a00a0ffR308 --- tests/Service/MigrationsCommandFactoryTest.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/Service/MigrationsCommandFactoryTest.php b/tests/Service/MigrationsCommandFactoryTest.php index 3bf6c380..dd8bf6c4 100644 --- a/tests/Service/MigrationsCommandFactoryTest.php +++ b/tests/Service/MigrationsCommandFactoryTest.php @@ -96,24 +96,26 @@ public function testDefineDependencyFactoryServicesFromConfig(): void ); } - $factory = new MigrationsCommandFactory('diff'); - $config = [ + $entityManager = self::createMock(EntityManagerInterface::class); + $serviceLocator = self::createMock(ServiceManager::class); + + $factory = new MigrationsCommandFactory('diff'); + $config = [ 'doctrine' => [ 'migrations_configuration' => [ 'orm_default' => [ - 'dependency_factory_services' => ['myId' => 'myService'], + 'dependency_factory_services' => ['test' => 'locator.service'], ], ], ], ]; - $entityManager = self::createMock(EntityManagerInterface::class); - $serviceLocator = self::createMock(ServiceManager::class); + $serviceLocator->expects(self::exactly(3)) ->method('get') ->willReturnMap([ ['config', $config], ['doctrine.entitymanager.orm_default', $entityManager], - ['myService', 'test'], + ['locator.service', new stdClass()], ]); $factory($serviceLocator, DiffCommand::class); From 188a70aeb8792796b5ff985d3e8b188c8ca80bf9 Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Fri, 19 Jan 2024 15:52:10 -0700 Subject: [PATCH 4/5] actions coding standards and static analysis set to 8.2 --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 064cba96..3e2408e6 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -13,4 +13,4 @@ jobs: name: "Coding Standards" uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.5.1" with: - php-version: '8.3' + php-version: '8.2' diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 3a51c02e..09d41234 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -13,4 +13,4 @@ jobs: name: "Static Analysis" uses: "doctrine/.github/.github/workflows/static-analysis.yml@1.5.1" with: - php-version: '8.3' + php-version: '8.2' From f6a0ab1900bfd16058fbb285048ff145843204fe Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Thu, 25 Jan 2024 12:44:23 -0700 Subject: [PATCH 5/5] Correct workflows to use 8.3 --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 3e2408e6..064cba96 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -13,4 +13,4 @@ jobs: name: "Coding Standards" uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.5.1" with: - php-version: '8.2' + php-version: '8.3' diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 09d41234..3a51c02e 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -13,4 +13,4 @@ jobs: name: "Static Analysis" uses: "doctrine/.github/.github/workflows/static-analysis.yml@1.5.1" with: - php-version: '8.2' + php-version: '8.3'