doctrine

Author: soyuka

composer.json

@@ -129,7 +129,7 @@
         "doctrine/cache": "^1.11 || ^2.1",
         "doctrine/common": "^3.2.2",
         "doctrine/dbal": "^4.0",
-        "doctrine/doctrine-bundle": "^2.11",
+        "doctrine/doctrine-bundle": "^2.11 || ^3.1",
         "doctrine/mongodb-odm": "^2.10",
         "doctrine/mongodb-odm-bundle": "^5.0",
         "doctrine/orm": "^2.17 || ^3.0",
@@ -219,5 +219,6 @@
     "type": "library",
     "repositories": [
         {"type": "vcs", "url": "https://github.com/soyuka/phpunit"}
-    ]
+    ],
+    "minimum-stability": "dev"
 }

src/Doctrine/Odm/composer.json

@@ -33,7 +33,7 @@
         "symfony/type-info": "^7.3 || ^8.0"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "^2.11",
+        "doctrine/doctrine-bundle": "^2.11 || ^3.1",
         "doctrine/mongodb-odm-bundle": "^5.0",
         "phpspec/prophecy-phpunit": "^2.2",
         "phpunit/phpunit": "11.5.x-dev",

src/Doctrine/Orm/Tests/config.yml

@@ -11,7 +11,6 @@ doctrine:
         controller_resolver: 
             enabled: false
             auto_mapping: false
-        enable_lazy_ghost_objects: true
         mappings:
             ApiPlatform\Doctrine\Orm\Tests\Fixtures\Entity:
                 type: attribute

src/Doctrine/Orm/composer.json

@@ -31,7 +31,7 @@
         "symfony/type-info": "^7.3 || ^8.0"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "^2.11",
+        "doctrine/doctrine-bundle": "^2.11 || ^3.1",
         "phpspec/prophecy-phpunit": "^2.2",
         "phpunit/phpunit": "11.5.x-dev",
         "ramsey/uuid": "^4.7",

src/Hydra/State/JsonStreamerProvider.php

@@ -42,12 +42,12 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $data = $this->jsonStreamReader->read($request->getContent(true), Type::object($operation->getClass()));
         $context['request']->attributes->set('deserialized', true);
 
-        if (\PHP_VERSION_ID > 80400) {
-            $refl = new \ReflectionClass($data);
-            if ($refl->isUninitializedLazyObject($data)) {
-                $refl->initializeLazyObject($data);
-            }
-        }
+        // if (\PHP_VERSION_ID > 80400) {
+        //     $refl = new \ReflectionClass($data);
+        //     if ($refl->isUninitializedLazyObject($data)) {
+        //         $refl->initializeLazyObject($data);
+        //     }
+        // }
 
         return $data;
     }

tests/Fixtures/app/AppKernel.php

@@ -26,6 +26,7 @@
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\Bundle\MongoDBBundle\Command\TailCursorDoctrineODMCommand;
 use Doctrine\Bundle\MongoDBBundle\DoctrineMongoDBBundle;
+use Doctrine\Bundle\DoctrineBundle\Command\Proxy\ValidateSchemaCommand;
 use FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
@@ -44,6 +45,7 @@
 use Symfony\Component\Security\Core\Authorization\Strategy\AccessDecisionStrategyInterface;
 use Symfony\Component\Security\Core\User\User as SymfonyCoreUser;
 use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\PropertyInfo\Type;
 
 /**
  * AppKernel for tests.
@@ -160,6 +162,12 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
             ];
         }
 
+        // SF 8.1 removed configuration
+        if (!class_exists(Type::class)) {
+            unset($config['annotations']);
+            $c->setParameter('.json_streamer.lazy_ghosts_dir', __DIR__ . '/cache/json_streamer_lazy_ghost');
+        }
+
         $c->prependExtensionConfig('framework', $config);
 
         $alg = class_exists(NativePasswordHasher::class, false) || class_exists('Symfony\Component\Security\Core\Encoder\NativePasswordEncoder') ? 'auto' : 'bcrypt';
@@ -281,11 +289,19 @@ class_exists(NativePasswordHasher::class) ? 'password_hashers' : 'encoders' => [
         if (defined(ConnectionFactory::class.'::DEFAULT_SCHEME_MAP')) {
             $c->prependExtensionConfig('doctrine', [
                 'orm' => [
-                    'report_fields_where_declared' => true,
                     'controller_resolver' => ['auto_mapping' => false],
-                    'enable_lazy_ghost_objects' => true,
                 ],
             ]);
+
+            if (class_exists(ValidateSchemaCommand::class)) {
+                $c->prependExtensionConfig('doctrine', [
+                    'orm' => [
+                        'auto_generate_proxy_classes' => '%kernel.debug%',
+                        'report_fields_where_declared' => true,
+                        'enable_lazy_ghost_objects' => true,
+                    ],
+                ]);
+            }
         }
 
         $loader->load(__DIR__.'/config/config_swagger.php');

tests/Fixtures/app/config/config_common.yml

@@ -13,7 +13,6 @@ doctrine:
             symfony_uuid: Symfony\Bridge\Doctrine\Types\UuidType
 
     orm:
-        auto_generate_proxy_classes: '%kernel.debug%'
         mappings:
             TestBundle:
                 type: 'attribute'