Merge pull request doctrine#1887 from MatTheCat/datepoint-type

Author: ostrolucky

.github/workflows/coding-standards.yml

@@ -12,6 +12,6 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.3.0"
     with:
       composer-options: "--prefer-dist --prefer-stable"

.github/workflows/composer-lint.yml

@@ -15,4 +15,4 @@ on:
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@7.3.0"

.github/workflows/documentation.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@7.3.0"

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.3.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.3.0"

.github/workflows/test-dev-stability.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.2"
+          - "8.4"
         dependencies:
           - "highest"
         stability:
@@ -39,10 +39,6 @@ jobs:
           extensions: "pdo_sqlite"
           tools: "flex"
 
-      - name: "Require symfony/messenger"
-        run: "composer require --dev symfony/messenger --no-update"
-        if: "${{ startsWith(matrix.symfony-require, '4.') }}"
-
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v3"
         with:

composer.json

@@ -45,9 +45,9 @@
     "require-dev": {
         "doctrine/annotations": "^1 || ^2",
         "doctrine/cache": "^1.11 || ^2.0",
-        "doctrine/coding-standard": "^12",
+        "doctrine/coding-standard": "^13",
         "doctrine/deprecations": "^1.0",
-        "doctrine/orm": "^2.17 || ^3.0",
+        "doctrine/orm": "^2.17 || ^3.1",
         "friendsofphp/proxy-manager-lts": "^1.0",
         "phpstan/phpstan": "2.1.1",
         "phpstan/phpstan-phpunit": "2.0.3",

docs/en/configuration.rst

@@ -217,6 +217,8 @@ Configuration Reference
                 proxy_namespace:              Proxies
                 # Enables the new implementation of proxies based on lazy ghosts instead of using the legacy implementation
                 enable_lazy_ghost_objects:    false
+                identity_generation_preferences:
+                    Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity
 
                 entity_managers:
 

src/DependencyInjection/DoctrineExtension.php

@@ -39,7 +39,6 @@
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Doctrine\Persistence\Mapping\Driver\PHPDriver;
 use Doctrine\Persistence\Mapping\Driver\StaticPHPDriver;
-use Doctrine\Persistence\Reflection\RuntimeReflectionProperty;
 use InvalidArgumentException;
 use LogicException;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
@@ -65,7 +64,7 @@
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
 use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
-use Symfony\Component\VarExporter\LazyGhostTrait;
+use Symfony\Component\VarExporter\ProxyHelper;
 
 use function array_intersect_key;
 use function array_keys;
@@ -77,7 +76,6 @@
 use function reset;
 use function sprintf;
 use function str_replace;
-use function trait_exists;
 use function trigger_deprecation;
 
 /**
@@ -561,19 +559,12 @@ protected function ormLoad(array $config, ContainerBuilder $container)
         $container->setParameter('doctrine.default_entity_manager', $config['default_entity_manager']);
 
         if ($config['enable_lazy_ghost_objects'] ?? false) {
-            if (! trait_exists(LazyGhostTrait::class)) {
+            if (! class_exists(ProxyHelper::class)) {
                 throw new LogicException(
                     'Lazy ghost objects cannot be enabled because the "symfony/var-exporter" library'
                     . ' is not installed. Please run "composer require symfony/var-exporter".',
                 );
             }
-
-            if (! class_exists(RuntimeReflectionProperty::class)) {
-                throw new LogicException(
-                    'Lazy ghost objects cannot be enabled because the "doctrine/persistence" library'
-                    . ' version 3.1 or higher is not installed. Please run "composer update doctrine/persistence".',
-                );
-            }
         } elseif (! method_exists(ProxyFactory::class, 'resetUninitializedProxy')) {
             throw new LogicException(
                 'Lazy ghost objects cannot be disabled for ORM 3.',

src/DoctrineBundle.php

@@ -16,6 +16,7 @@
 use Doctrine\ORM\Proxy\Autoloader;
 use Doctrine\ORM\Proxy\DefaultProxyClassNameResolver;
 use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\DoctrineValidationPass;
+use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterDatePointTypePass;
 use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
 use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterUidTypePass;
 use Symfony\Bridge\Doctrine\DependencyInjection\Security\UserProvider\EntityFactory;
@@ -27,6 +28,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 use function assert;
+use function class_exists;
 use function clearstatcache;
 use function dirname;
 use function spl_autoload_unregister;
@@ -36,8 +38,7 @@ class DoctrineBundle extends Bundle
 {
     private Closure|null $autoloader = null;
 
-    /** @return void */
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
@@ -73,10 +74,15 @@ public function process(ContainerBuilder $container): void
         $container->addCompilerPass(new RemoveLoggingMiddlewarePass());
         $container->addCompilerPass(new MiddlewaresPass());
         $container->addCompilerPass(new RegisterUidTypePass());
+
+        if (! class_exists(RegisterDatePointTypePass::class)) {
+            return;
+        }
+
+        $container->addCompilerPass(new RegisterDatePointTypePass());
     }
 
-    /** @return void */
-    public function boot()
+    public function boot(): void
     {
         // Register an autoloader for proxies to avoid issues when unserializing them
         // when the ORM is used.
@@ -124,8 +130,7 @@ public function boot()
         $this->autoloader = Autoloader::register($dir, $namespace, $proxyGenerator);
     }
 
-    /** @return void */
-    public function shutdown()
+    public function shutdown(): void
     {
         if ($this->autoloader !== null) {
             spl_autoload_unregister($this->autoloader);
@@ -157,8 +162,7 @@ public function shutdown()
         }
     }
 
-    /** @return void */
-    public function registerCommands(Application $application)
+    public function registerCommands(Application $application): void
     {
     }