Allow Symfony 8

composer.json

@@ -14,29 +14,30 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "symfony/framework-bundle": "^6.0|^7.0",
-        "symfony/translation": "^6.0|^7.0",
-        "symfony/form": "^6.0|^7.0",
-        "symfony/mime": "^6.0|^7.0",
-        "symfony/twig-bundle": "^6.0|^7.0",
+        "symfony/framework-bundle": "^6.0|^7.0|^8.0",
+        "symfony/translation": "^6.0|^7.0|^8.0",
+        "symfony/form": "^6.0|^7.0|^8.0",
+        "symfony/mime": "^6.0|^7.0|^8.0",
+        "symfony/twig-bundle": "^6.0|^7.0|^8.0",
         "twig/extra-bundle": "^3.6",
         "twig/intl-extra": "^3.6",
-        "symfony/validator": "^6.0|^7.0"
+        "symfony/validator": "^6.0|^7.0|^8.0"
     },
     "require-dev": {
         "roave/security-advisories": "dev-latest",
         "friendsofphp/php-cs-fixer": "^3.49",
         "kubawerlos/php-cs-fixer-custom-fixers": "^3.11",
         "symfony/maker-bundle": "^1.48",
-        "symfony/security-core": "^6.2|^7.0",
+        "symfony/security-core": "^6.2|^7.0|^8.0",
         "phpoffice/phpspreadsheet": "^1.28",
-        "doctrine/orm": "^2.15",
-        "doctrine/doctrine-bundle": "^2.9",
+        "doctrine/orm": "^2.15|^3.0",
+        "doctrine/doctrine-bundle": "^2.9|^3.0",
         "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^10.4",
         "dg/bypass-finals": "dev-master",
         "openspout/openspout": "^4.23",
-        "symfony/http-foundation": "^6.0|^7.0"
+        "symfony/http-foundation": "^6.0|^7.0|^8.0",
+        "symfony/var-exporter": "^6.4|^7.0|^8.0"
     },
     "autoload": {
         "psr-4": {

src/DataCollector/DataTableDataCollector.php

@@ -36,11 +36,19 @@ public function __construct(
         }
     }
 
-    public function __sleep(): array
+    /**
+     * @return array<string, mixed>
+     */
+    public function __serialize(): array
     {
         $this->data = $this->cloneVar($this->data)->withMaxDepth($this->maxDepth);
 
-        return parent::__sleep();
+        if (method_exists(parent::class, '__serialize')) {
+            return parent::__serialize();
+        }
+
+        // Symfony 7: __serialize() does not exist yet, replicate __sleep() behavior
+        return ['data' => $this->data];
     }
 
     public static function getTemplate(): ?string

src/Request/HttpFoundationRequestHandler.php

@@ -48,7 +48,7 @@ private function filter(DataTableInterface $dataTable, Request $request): void
 
         $form = $dataTable->createFiltrationFormBuilder()->getForm();
 
-        if ($data = $request->get($form->getName())) {
+        if ($data = $this->getRequestParameter($request, $form->getName())) {
             $form->submit($data);
         }
 
@@ -105,7 +105,7 @@ private function personalize(DataTableInterface $dataTable, Request $request): v
 
         $form = $dataTable->createPersonalizationFormBuilder()->getForm();
 
-        if ($data = $request->get($form->getName())) {
+        if ($data = $this->getRequestParameter($request, $form->getName())) {
             $form->submit($data);
         }
 
@@ -122,7 +122,7 @@ private function export(DataTableInterface $dataTable, Request $request): void
 
         $form = $dataTable->createExportFormBuilder()->getForm();
 
-        if ($data = $request->get($form->getName())) {
+        if ($data = $this->getRequestParameter($request, $form->getName())) {
             $form->submit($data);
         }
 
@@ -131,6 +131,19 @@ private function export(DataTableInterface $dataTable, Request $request): void
         }
     }
 
+    private function getRequestParameter(Request $request, string $name): mixed
+    {
+        if ($request->query->has($name)) {
+            return $request->query->all()[$name];
+        }
+
+        if ($request->request->has($name)) {
+            return $request->request->all()[$name];
+        }
+
+        return null;
+    }
+
     private function extractQueryParameter(Request $request, string $path): mixed
     {
         return $this->propertyAccessor->getValue($request->query->all(), $path);

tests/ReflectionTrait.php

@@ -8,16 +8,11 @@ trait ReflectionTrait
 {
     private function getPrivatePropertyValue(object $object, string $property): mixed
     {
-        $reflection = new \ReflectionProperty($object, $property);
-        $reflection->setAccessible(true);
-
-        return $reflection->getValue($object);
+        return (new \ReflectionProperty($object, $property))->getValue($object);
     }
 
     private function setPrivatePropertyValue(object $object, string $property, mixed $value): void
     {
-        $reflection = new \ReflectionProperty($object, $property);
-        $reflection->setAccessible(true);
-        $reflection->setValue($object, $value);
+        (new \ReflectionProperty($object, $property))->setValue($object, $value);
     }
 }

tests/Unit/Bridge/Doctrine/Orm/Filter/DoctrineOrmFilterHandlerTest.php

@@ -60,8 +60,10 @@ public function testItAppliesExpression(): void
         ($queryBuilder = $this->createQueryBuilderMock())
             ->expects($this->once())
             ->method('andWhere')
-            ->willReturnCallback(function (mixed $expression) {
+            ->willReturnCallback(function (mixed $expression) use (&$queryBuilder) {
                 $this->assertEquals('expression', $expression);
+
+                return $queryBuilder;
             });
 
         $this->query->method('getQueryBuilder')->willReturn($queryBuilder);
@@ -74,26 +76,30 @@ public function testItSetsParameterWithoutTypeSpecified(): void
         ($queryBuilder = $this->createQueryBuilderMock())
             ->expects($this->once())
             ->method('setParameter')
-            ->willReturnCallback(function ($name, $value, $type) {
+            ->willReturnCallback(function ($name, $value, $type) use (&$queryBuilder) {
                 $this->assertEquals('foo', $name);
                 $this->assertEquals('bar', $value);
                 $this->assertNull($type);
+
+                return $queryBuilder;
             });
 
         $this->query->method('getQueryBuilder')->willReturn($queryBuilder);
 
         $this->createHandler(parameters: [new Parameter('foo', 'bar')])->handle($this->query, $this->data, $this->filter);
     }
 
-    public function testItSetsParameterWithTypeSpecified()
+    public function testItSetsParameterWithTypeSpecified(): void
     {
         ($queryBuilder = $this->createQueryBuilderMock())
             ->expects($this->once())
             ->method('setParameter')
-            ->willReturnCallback(function ($name, $value, $type) {
+            ->willReturnCallback(function ($name, $value, $type) use (&$queryBuilder) {
                 $this->assertEquals('foo', $name);
                 $this->assertEquals('bar', $value);
                 $this->assertEquals('date_immutable', $type);
+
+                return $queryBuilder;
             });
 
         $this->query->method('getQueryBuilder')->willReturn($queryBuilder);

tests/Unit/Bridge/Doctrine/Orm/Fixtures/TestEntityManagerFactory.php

@@ -21,6 +21,10 @@ public static function create(): EntityManagerInterface
 
         $config = ORMSetup::createAttributeMetadataConfiguration([], true);
 
+        if (PHP_VERSION_ID >= 80400 && method_exists($config, 'enableNativeLazyObjects')) {
+            $config->enableNativeLazyObjects(true);
+        }
+
         $connection = DriverManager::getConnection([
             'driver' => 'pdo_sqlite',
             'memory' => true,