Fix for symfony 8 (#504)

* Make it work with Symfony 8

* Backward compability

* Whitespace

---------

Co-authored-by: Jonas De Keukelaere <jonas@sumocoders.be>

Author: bartmcleod

DependencyInjection/Compiler/RegisterMappingPass.php

@@ -33,45 +33,45 @@ public function process(ContainerBuilder $container): void
             // Models now use PHP attributes, so we need to use AttributeDriver
             // Create attribute driver if it doesn't exist (fallback if Extension didn't create it)
             $attributeDriverId = 'lexik_translation.orm.metadata.attribute';
-            
+
             // Ensure attribute driver exists - create it if Extension didn't create it
             if (!$container->hasDefinition($attributeDriverId)) {
                 // Calculate bundle path using ReflectionClass
                 $bundleReflection = new \ReflectionClass(\Lexik\Bundle\TranslationBundle\LexikTranslationBundle::class);
                 $bundleDir = dirname($bundleReflection->getFileName());
                 $modelPath = $bundleDir . '/Model';
-                
+
                 // Try to get realpath
                 $realModelPath = realpath($modelPath);
                 if ($realModelPath) {
                     $modelPath = $realModelPath;
                 }
-                
+
                 // Create AttributeDriver service
                 $driverDefinition = new Definition(AttributeDriver::class, [
                     [$modelPath]
                 ]);
                 $driverDefinition->setPublic(false);
                 $container->setDefinition($attributeDriverId, $driverDefinition);
             }
-            
+
             // Register attribute driver for models namespace
             // IMPORTANT: We need to check if it's already registered to avoid duplicates
             $ormDriver = $container->getDefinition($ormDriverId);
             $methodCalls = $ormDriver->getMethodCalls();
-            
+
             // Check if attribute driver is already registered
             $attributeDriverRegistered = false;
             foreach ($methodCalls as $call) {
-                if ($call[0] === 'addDriver' && 
-                    isset($call[1][0]) && 
+                if ($call[0] === 'addDriver' &&
+                    isset($call[1][0]) &&
                     $call[1][0] instanceof Reference &&
                     (string)$call[1][0] === $attributeDriverId) {
                     $attributeDriverRegistered = true;
                     break;
                 }
             }
-            
+
             // Register XML driver for Entity namespace FIRST (entities use XML mapping)
             // This must be registered before Model namespace to ensure entities are recognized
             // Create XML driver for entities if it doesn't exist
@@ -81,14 +81,18 @@ public function process(ContainerBuilder $container): void
                 $bundleReflection = new \ReflectionClass(\Lexik\Bundle\TranslationBundle\LexikTranslationBundle::class);
                 $bundleDir = dirname($bundleReflection->getFileName());
                 $doctrinePath = $bundleDir . '/Resources/config/doctrine';
-                
+
                 $realDoctrinePath = realpath($doctrinePath);
                 if ($realDoctrinePath) {
                     $doctrinePath = $realDoctrinePath;
                 }
-                
-                // Create XML driver for entities using the same class as the model XML driver
-                $xmlDriverClass = $container->getParameter('doctrine.orm.metadata.xml.class');
+
+                // Create XML driver for entities using SimplifiedXmlDriver
+                if (class_exists(SimplifiedXmlDriver::class)) {
+                    $xmlDriverClass = SimplifiedXmlDriver::class;
+                } else {
+                    $xmlDriverClass = $container->getParameter('doctrine.orm.metadata.xml.class');
+                }
                 $entityDriverDefinition = new Definition($xmlDriverClass, [
                     [$doctrinePath => 'Lexik\Bundle\TranslationBundle\Entity'],
                     SimplifiedXmlDriver::DEFAULT_FILE_EXTENSION,
@@ -97,18 +101,18 @@ public function process(ContainerBuilder $container): void
                 $entityDriverDefinition->setPublic(false);
                 $container->setDefinition($entityXmlDriverId, $entityDriverDefinition);
             }
-            
+
             // Register XML driver for Entity namespace FIRST
             $entityDriverRegistered = false;
             foreach ($methodCalls as $call) {
-                if ($call[0] === 'addDriver' && 
-                    isset($call[1][1]) && 
+                if ($call[0] === 'addDriver' &&
+                    isset($call[1][1]) &&
                     $call[1][1] === 'Lexik\Bundle\TranslationBundle\Entity') {
                     $entityDriverRegistered = true;
                     break;
                 }
             }
-            
+
             if (!$entityDriverRegistered && $container->hasDefinition($entityXmlDriverId)) {
                 // Insert at the beginning to ensure Entity namespace is processed first
                 $newMethodCalls = [[
@@ -121,15 +125,15 @@ public function process(ContainerBuilder $container): void
                 $ormDriver->setMethodCalls($newMethodCalls);
                 $methodCalls = $newMethodCalls; // Update for next checks
             }
-            
+
             // Register attribute driver if not already registered
             if (!$attributeDriverRegistered && $container->hasDefinition($attributeDriverId)) {
                 // Remove any existing registration for the Model namespace (XML driver)
                 $newMethodCalls = [];
                 foreach ($methodCalls as $call) {
                     // Skip XML driver registration for Model namespace
-                    if ($call[0] === 'addDriver' && 
-                        isset($call[1][1]) && 
+                    if ($call[0] === 'addDriver' &&
+                        isset($call[1][1]) &&
                         $call[1][1] === 'Lexik\Bundle\TranslationBundle\Model' &&
                         isset($call[1][0]) &&
                         $call[1][0] instanceof Reference &&
@@ -139,13 +143,13 @@ public function process(ContainerBuilder $container): void
                     }
                     $newMethodCalls[] = $call;
                 }
-                
+
                 // Add attribute driver for Model namespace
                 $newMethodCalls[] = [
                     'addDriver',
                     [new Reference($attributeDriverId), 'Lexik\Bundle\TranslationBundle\Model']
                 ];
-                
+
                 // Update method calls
                 $ormDriver->setMethodCalls($newMethodCalls);
             } elseif (!$container->hasDefinition($attributeDriverId) && $container->hasDefinition('lexik_translation.orm.metadata.xml')) {

DependencyInjection/LexikTranslationExtension.php

@@ -124,7 +124,12 @@ protected function buildTranslationStorageDefinition(ContainerBuilder $container
             $args = [new Reference('doctrine'), $objectManager ?? 'default'];
 
             // Create XML driver for backward compatibility
-            $this->createDoctrineMappingDriver($container, 'lexik_translation.orm.metadata.xml', '%doctrine.orm.metadata.xml.class%');
+            if (class_exists(SimplifiedXmlDriver::class)) {
+                $xmlDriverClass = SimplifiedXmlDriver::class;
+            } else {
+                $xmlDriverClass = $container->getParameter('doctrine.orm.metadata.xml.class');
+            }
+            $this->createDoctrineMappingDriver($container, 'lexik_translation.orm.metadata.xml', $xmlDriverClass);
 
             // Create attribute driver for models (MappedSuperclass) that now use PHP attributes
             $this->createDoctrineAttributeDriver($container, 'lexik_translation.orm.metadata.attribute');
@@ -144,8 +149,8 @@ protected function buildTranslationStorageDefinition(ContainerBuilder $container
         }
 
         $args[] = [
-            'trans_unit'  => new Parameter(sprintf('lexik_translation.%s.trans_unit.class', $storage)), 
-            'translation' => new Parameter(sprintf('lexik_translation.%s.translation.class', $storage)), 
+            'trans_unit'  => new Parameter(sprintf('lexik_translation.%s.trans_unit.class', $storage)),
+            'translation' => new Parameter(sprintf('lexik_translation.%s.translation.class', $storage)),
             'file'        => new Parameter(sprintf('lexik_translation.%s.file.class', $storage))
         ];
 

Makefile

@@ -7,7 +7,7 @@ DOCKER_RUN = docker compose run --rm lexik_translation
 help:
 	@echo "LexikTranslationBundle - Available commands:"
 	@echo ""
-	@echo "  make up           Start services in the background"
+	@echo "  make up          Start services in the background"
 	@echo "  make ensure-up   Start services and install dependencies (composer)"
 	@echo "  make down        Stop and remove containers"
 	@echo "  make build       Build Docker images"

Tests/Unit/Translation/TranslatorTest.php

@@ -36,13 +36,13 @@ public function testAddDatabaseResources(): void
         $expected = [
             'de' => [
                 ['database', 'DB', 'superTranslations']
-            ], 
+            ],
             'en' => [
-                ['database', 'DB', 'messages'], 
+                ['database', 'DB', 'messages'],
                 ['database', 'DB', 'superTranslations']
-            ], 
+            ],
             'fr' => [
-                ['database', 'DB', 'messages'], 
+                ['database', 'DB', 'messages'],
                 ['database', 'DB', 'superTranslations'],
             ]
         ];
@@ -140,10 +140,10 @@ protected function createTranslator($em, $cacheDir): TranslatorMock
         ];
 
         return new TranslatorMock(
-            container: $container, 
-            formatter: new MessageFormatter(), 
-            defaultLocale: 'en', 
-            loaderIds: $loaderIds, 
+            container: $container,
+            formatter: new MessageFormatter(),
+            defaultLocale: 'en',
+            loaderIds: $loaderIds,
             options: $options
         );
     }
@@ -170,9 +170,9 @@ protected function createFakeCacheFiles($cacheDir): void
 
 class TranslatorMock extends Translator
 {
-    public $dbResources = [];
+    public array $dbResources = [];
     public array $options = [
-        'cache_dir' => '', 
+        'cache_dir' => '',
         'debug' => false,
         'resource_files' => [],
         'cache_vary' => [],
@@ -197,4 +197,4 @@ public function addResource(string $format, mixed $resource, string $locale, ?st
 
         parent::addResource($format, $resource, $locale, $domain);
     }
-}
+}

Tests/Unit/Util/DataGrid/DataGridRequestHandlerTest.php

@@ -133,7 +133,6 @@ private function getReflectionMethod($name)
     {
         $class = new \ReflectionClass(DataGridRequestHandler::class);
         $method = $class->getMethod($name);
-        $method->setAccessible(true);
 
         return $method;
     }