fix(dependency-injection):: map Doctrine type ‘tuuid’ to itself instead of ‘guid’ and fix PHPStan issues

Author: CreativeNative

README.md

@@ -68,6 +68,21 @@ tmi_translation:
     # disabled_firewalls: ['main']       # Optional: disable filter for specific firewalls
 ```
 
+### Doctrine DBAL Custom Type - TuuidType
+
+To use the `TuuidType` in your Symfony project, you must register it in your Doctrine configuration:
+
+```yaml
+# config/packages/doctrine.yaml
+doctrine:
+    dbal:
+        types:
+            tuuid: Tmi\TranslationBundle\Doctrine\Type\TuuidType
+```
+This ensures that Doctrine recognizes the tuuid type and avoids errors like:
+```pgsql
+Unknown column type "tuuid" requested. Any Doctrine type that you use has to be registered with \Doctrine\DBAL\Types\Type::addType(). 
+```
 ## 🚀 Quick Start
 
 ### Make your entity translatable

src/DependencyInjection/TmiTranslationExtension.php

@@ -30,18 +30,19 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->setParameter($rootName, $config);
         $this->setConfigAsParameters($container, $config, $rootName);
 
-        // Register Doctrine Type for Tuuid if not already registered
+        // Register Doctrine Type for Tuuid
         if (!Type::hasType(TuuidType::NAME)) {
+            // In DBAL >3 you can't easily unregister, so we skip
             // @codeCoverageIgnoreStart
             Type::addType(TuuidType::NAME, TuuidType::class);
             // @codeCoverageIgnoreEnd
         }
 
-        // Safely map 'tuuid' to 'guid' for all platforms
+        // Safely map 'tuuid' to 'tuuid' for all platforms
         if ($container->has('doctrine.dbal.default_connection')) {
             $connection = $container->get('doctrine.dbal.default_connection');
-            $platform = $connection->getDatabasePlatform();
-            $platform->registerDoctrineTypeMapping('tuuid', 'guid');
+            $platform   = $connection->getDatabasePlatform();
+            $platform->registerDoctrineTypeMapping('tuuid', 'tuuid');
         }
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));

src/Translation/EntityTranslator.php

@@ -88,7 +88,7 @@ public function processTranslation(TranslationArgs $args): mixed
             $cacheKey = null;
 
             $tuuid = $entity->getTuuid();
-            if ($tuuid instanceof Tuuid && !empty($tuuid->getValue())) {
+            if ($tuuid instanceof Tuuid && '' !== $tuuid->getValue()) {
                 $cacheKey = $tuuid->getValue().':'.$locale;
             }
 
@@ -246,7 +246,7 @@ private function warmupTranslations(array $entities, string $locale): void
 
         /** @var class-string<TranslatableInterface> $class */
         foreach ($byClass as $class => $tuuids) {
-            if (empty($tuuids)) {
+            if (!is_array($tuuids) || 0 === count($tuuids)) {
                 // @codeCoverageIgnoreStart
                 continue;
                 // @codeCoverageIgnoreEnd

src/Translation/Handlers/BidirectionalManyToManyHandler.php

@@ -105,9 +105,9 @@ public function handleEmptyOnTranslate(TranslationArgs $args): Collection
 
         $newOwner = $args->getTranslatedParent();
 
-        $prop = $args->getProperty() ?? ($newOwner ? $this->discoverProperty($newOwner, $collection) : null);
+        $prop = $args->getProperty() ?? (null !== $newOwner ? $this->discoverProperty($newOwner, $collection) : null);
 
-        if ($newOwner && $prop) {
+        if (null !== $newOwner && $prop) {
             try {
                 $prop->setValue($newOwner, new ArrayCollection());
             } catch (\Throwable) {
@@ -130,7 +130,7 @@ public function translate(TranslationArgs $args): Collection
         }
 
         $newOwner = $args->getTranslatedParent();
-        $prop     = $args->getProperty() ?? ($newOwner ? $this->discoverProperty($newOwner, $collection) : null);
+        $prop     = $args->getProperty() ?? (null !== $newOwner ? $this->discoverProperty($newOwner, $collection) : null);
 
         if (null === $newOwner || null === $prop) {
             return new ArrayCollection($collection->toArray());

src/Translation/Handlers/BidirectionalManyToOneHandler.php

@@ -45,7 +45,7 @@ public function supports(TranslationArgs $args): bool
         }
 
         $attributes = $property->getAttributes(ManyToOne::class);
-        if (empty($attributes)) {
+        if (0 === count($attributes)) {
             return false;
         }
 

src/Translation/Handlers/BidirectionalOneToManyHandler.php

@@ -49,7 +49,7 @@ public function supports(TranslationArgs $args): bool
         }
 
         $attributes = $property->getAttributes(OneToMany::class);
-        if (empty($attributes)) {
+        if (0 === count($attributes)) {
             return false;
         }
 
@@ -88,7 +88,7 @@ public function translate(TranslationArgs $args): Collection
         $property         = $args->getProperty();
 
         // Guard: must have both property and translated parent
-        if (!$translatedParent || !$property) {
+        if (null === $translatedParent || null === $property) {
             return $children; // nothing to translate → return original
         }
 

src/Translation/Handlers/BidirectionalOneToOneHandler.php

@@ -39,7 +39,7 @@ public function supports(TranslationArgs $args): bool
         }
 
         $attributes = $property->getAttributes(OneToOne::class);
-        if (empty($attributes)) {
+        if (0 === count($attributes)) {
             return false;
         }
 

src/Translation/Handlers/EmbeddedHandler.php

@@ -89,12 +89,15 @@ public function handleEmptyOnTranslate(TranslationArgs $args): mixed
             // Only clear properties marked as #[EmptyOnTranslate]
             if ($this->attributeHelper->isEmptyOnTranslate($prop)) {
                 $setter = 'set'.ucfirst($prop->getName());
+
                 if (method_exists($clone, $setter)) {
-                    $clone->$setter(null);
+                    $callable = \Closure::fromCallable([$clone, $setter]);
+                    $callable(null);
                 } else {
-                    // fallback in case no setter exists
+                    // Fallback: set value via ReflectionProperty
                     $prop->setValue($clone, null);
                 }
+
                 $changed = true;
             }
         }

src/Translation/Handlers/UnidirectionalManyToManyHandler.php

@@ -66,7 +66,7 @@ public function handleSharedAmongstTranslations(TranslationArgs $args): Collecti
 
         // Check for SharedAmongstTranslations attribute
         $sharedAttrs = $prop->getAttributes(SharedAmongstTranslations::class);
-        if (!empty($sharedAttrs)) {
+        if (count($sharedAttrs) > 0) {
             throw new \RuntimeException(sprintf('SharedAmongstTranslations is not allowed on unidirectional ManyToMany associations. Property "%s" of class "%s" is invalid.', $prop->getName(), $args->getDataToBeTranslated()::class));
         }
 

tests/DependencyInjection/TmiTranslationExtensionTest.php

@@ -5,39 +5,17 @@
 namespace Tmi\TranslationBundle\Test\DependencyInjection;
 
 use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Exception\TypesException;
 use Doctrine\DBAL\Types\Type;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Tmi\TranslationBundle\DependencyInjection\TmiTranslationExtension;
 use Tmi\TranslationBundle\Doctrine\Type\TuuidType;
 use Tmi\TranslationBundle\EventSubscriber\LocaleFilterConfigurator;
 use Tmi\TranslationBundle\Test\IntegrationTestCase;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Doctrine\DBAL\Platforms\AbstractPlatform;
 
 final class TmiTranslationExtensionTest extends IntegrationTestCase
 {
-    private function createContainerBuilderFromKernel(): ContainerBuilder
-    {
-        $containerBuilder = new ContainerBuilder();
-
-        // Pull parameters from the booted kernel container if available
-        if (self::$container === null) {
-            self::bootKernel();
-            self::$container = method_exists(self::class, 'getContainer')
-                ? self::getContainer()
-                : self::$kernel->getContainer();
-        }
-
-        if (self::$container !== null) {
-            foreach (self::$container->getParameterBag()->all() as $key => $value) {
-                $containerBuilder->setParameter($key, $value);
-            }
-        }
-
-        return $containerBuilder;
-    }
-
-
     /**
      * @throws Exception
      * @throws TypesException
@@ -47,10 +25,10 @@ public function testLoadRegistersServices(): void
         $containerBuilder = $this->createContainerBuilderFromKernel();
 
         $extension = new TmiTranslationExtension();
-        $config = [
+        $config    = [
             [
-                'locales' => ['en_US', 'de_DE', 'it_IT'],
-                'default_locale' => 'en_US',
+                'locales'            => ['en_US', 'de_DE', 'it_IT'],
+                'default_locale'     => 'en_US',
                 'disabled_firewalls' => ['main'],
             ],
         ];
@@ -65,7 +43,7 @@ public function testLoadRegistersServices(): void
     public function testPrependDoesNothing(): void
     {
         $containerBuilder = $this->createContainerBuilderFromKernel();
-        $extension = new TmiTranslationExtension();
+        $extension        = new TmiTranslationExtension();
         $extension->prepend($containerBuilder);
 
         $this->assertInstanceOf(ContainerBuilder::class, $containerBuilder);
@@ -84,7 +62,7 @@ public function testTuuidTypeIsRegistered(): void
         }
 
         $containerBuilder = $this->createContainerBuilderFromKernel();
-        $extension = new TmiTranslationExtension();
+        $extension        = new TmiTranslationExtension();
         $extension->load([['locales' => ['en_US', 'de_DE'], 'default_locale' => 'en_US']], $containerBuilder);
 
         $this->assertTrue(Type::hasType(TuuidType::NAME));
@@ -102,12 +80,18 @@ public function testTuuidTypeMapping(): void
         // Create a fake DBAL platform stub
         $platformStub = $this->createMock(AbstractPlatform::class);
         $platformStub->method('registerDoctrineTypeMapping')
-            ->with('tuuid', 'guid');
+            ->with('tuuid', 'tuuid');
 
         // Create a fake connection stub
         $connectionStub = new readonly class($platformStub) {
-            public function __construct(private AbstractPlatform $platform) {}
-            public function getDatabasePlatform(): AbstractPlatform { return $this->platform; }
+            public function __construct(private AbstractPlatform $platform)
+            {
+            }
+
+            public function getDatabasePlatform(): AbstractPlatform
+            {
+                return $this->platform;
+            }
         };
 
         // Register the fake connection in the container
@@ -120,4 +104,25 @@ public function getDatabasePlatform(): AbstractPlatform { return $this->platform
         $this->assertTrue(Type::hasType(TuuidType::NAME), 'TuuidType should be registered');
         $this->assertInstanceOf(TuuidType::class, Type::getType(TuuidType::NAME));
     }
+
+    private function createContainerBuilderFromKernel(): ContainerBuilder
+    {
+        $containerBuilder = new ContainerBuilder();
+
+        // Pull parameters from the booted kernel container if available
+        if (null === self::$container) {
+            self::bootKernel();
+            self::$container = method_exists(self::class, 'getContainer')
+                ? self::getContainer()
+                : self::$kernel->getContainer();
+        }
+
+        if (null !== self::$container) {
+            foreach (self::$container->getParameterBag()->all() as $key => $value) {
+                $containerBuilder->setParameter($key, $value);
+            }
+        }
+
+        return $containerBuilder;
+    }
 }