Skip to content

Commit

Permalink
Merge pull request #749 from TomHAnderson/feature/php-8.3
Browse files Browse the repository at this point in the history
PHP 8.3 support
  • Loading branch information
driehle authored Jan 25, 2024
2 parents f334b92 + f6a0ab1 commit d9c7fa9
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-version: '8.2'
php-version: '8.3'
1 change: 1 addition & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
- "8.0"
- "8.1"
- "8.2"
- "8.3"
dbal-version:
- "2.13.0"
- "3.3.0"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
name: "Static Analysis"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-version: '8.2'
php-version: '8.3'
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 8 additions & 6 deletions tests/Service/MigrationsCommandFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit d9c7fa9

Please sign in to comment.