Merge pull request #749 from TomHAnderson/feature/php-8.3

PHP 8.3 support
doctrine · Jan 25, 2024 · d9c7fa9 · d9c7fa9
2 parents f334b92 + f6a0ab1
commit d9c7fa9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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",

diff --git 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);