feat: improve nullable detection and code structure

- Use PHP typehints instead of Column attribute for nullable detection
- Support nullable embeddables and other Doctrine mapping types
- Refactor AttributeHelper to eliminate duplicate code
- Add doctrine/doctrine-bundle ^3.0 support in composer.json

Author: CreativeNative

composer.json

@@ -23,7 +23,7 @@
     ],
     "require": {
         "php": ">=8.4",
-        "doctrine/doctrine-bundle": "^2.18.1",
+        "doctrine/doctrine-bundle": "^2.18 || ^3.0",
         "doctrine/orm": "^3.5.7",
         "symfony/framework-bundle": "^7.3 || ^8.0",
         "symfony/security-bundle": "^7.3 || ^8.0",

src/Utils/AttributeHelper.php

@@ -4,96 +4,104 @@
 
 namespace Tmi\TranslationBundle\Utils;
 
-use Doctrine\ORM\Mapping\Column;
-use Doctrine\ORM\Mapping\Embedded;
-use Doctrine\ORM\Mapping\Id;
-use Doctrine\ORM\Mapping\ManyToMany;
-use Doctrine\ORM\Mapping\ManyToOne;
-use Doctrine\ORM\Mapping\OneToMany;
-use Doctrine\ORM\Mapping\OneToOne;
-use Tmi\TranslationBundle\Doctrine\Attribute\EmptyOnTranslate;
-use Tmi\TranslationBundle\Doctrine\Attribute\SharedAmongstTranslations;
+use Doctrine\ORM\Mapping as ORM;
+use Tmi\TranslationBundle\Doctrine\Attribute as TranslationAttribute;
 
 class AttributeHelper
 {
+    private const array DOCTRINE_ATTRIBUTES = [
+        'isEmbedded'   => ORM\Embedded::class,
+        'isOneToOne'   => ORM\OneToOne::class,
+        'isId'         => ORM\Id::class,
+        'isManyToOne'  => ORM\ManyToOne::class,
+        'isOneToMany'  => ORM\OneToMany::class,
+        'isManyToMany' => ORM\ManyToMany::class,
+    ];
+
+    private const array TRANSLATION_ATTRIBUTES = [
+        'isSharedAmongstTranslations' => TranslationAttribute\SharedAmongstTranslations::class,
+        'isEmptyOnTranslate'          => TranslationAttribute\EmptyOnTranslate::class,
+    ];
+
     /**
      * Defines if the property is embedded.
      */
     public function isEmbedded(\ReflectionProperty $property): bool
     {
-        return [] !== $property->getAttributes(Embedded::class, \ReflectionAttribute::IS_INSTANCEOF);
+        return $this->hasAttribute($property, self::DOCTRINE_ATTRIBUTES[__FUNCTION__]);
     }
 
     /**
      * Defines if the property is to be shared amongst parents' translations.
      */
     public function isSharedAmongstTranslations(\ReflectionProperty $property): bool
     {
-        return [] !== $property->getAttributes(SharedAmongstTranslations::class, \ReflectionAttribute::IS_INSTANCEOF);
+        return $this->hasAttribute($property, self::TRANSLATION_ATTRIBUTES[__FUNCTION__]);
     }
 
     /**
      * Defines if the property should be emptied on translate.
      */
     public function isEmptyOnTranslate(\ReflectionProperty $property): bool
     {
-        return [] !== $property->getAttributes(EmptyOnTranslate::class, \ReflectionAttribute::IS_INSTANCEOF);
+        return $this->hasAttribute($property, self::TRANSLATION_ATTRIBUTES[__FUNCTION__]);
     }
 
     /**
      * Defines if the property is a OneToOne relation.
      */
     public function isOneToOne(\ReflectionProperty $property): bool
     {
-        return [] !== $property->getAttributes(OneToOne::class, \ReflectionAttribute::IS_INSTANCEOF);
+        return $this->hasAttribute($property, self::DOCTRINE_ATTRIBUTES[__FUNCTION__]);
     }
 
     /**
      * Defines if the property is an ID.
      */
     public function isId(\ReflectionProperty $property): bool
     {
-        return [] !== $property->getAttributes(Id::class, \ReflectionAttribute::IS_INSTANCEOF);
+        return $this->hasAttribute($property, self::DOCTRINE_ATTRIBUTES[__FUNCTION__]);
     }
 
     /**
      * Defines if the property is a ManyToOne relation.
      */
     public function isManyToOne(\ReflectionProperty $property): bool
     {
-        return [] !== $property->getAttributes(ManyToOne::class, \ReflectionAttribute::IS_INSTANCEOF);
+        return $this->hasAttribute($property, self::DOCTRINE_ATTRIBUTES[__FUNCTION__]);
     }
 
     /**
-     * Defines if the property is a ManyToOne relation.
+     * Defines if the property is a OneToMany relation.
      */
     public function isOneToMany(\ReflectionProperty $property): bool
     {
-        return [] !== $property->getAttributes(OneToMany::class, \ReflectionAttribute::IS_INSTANCEOF);
+        return $this->hasAttribute($property, self::DOCTRINE_ATTRIBUTES[__FUNCTION__]);
     }
 
     /**
      * Defines if the property is a ManyToMany relation.
      */
     public function isManyToMany(\ReflectionProperty $property): bool
     {
-        return [] !== $property->getAttributes(ManyToMany::class, \ReflectionAttribute::IS_INSTANCEOF);
+        return $this->hasAttribute($property, self::DOCTRINE_ATTRIBUTES[__FUNCTION__]);
     }
 
     /**
      * Defines if the property can be null.
      */
     public function isNullable(\ReflectionProperty $property): bool
     {
-        $ra = $property->getAttributes(Column::class, \ReflectionAttribute::IS_INSTANCEOF);
-
-        if (0 < count($ra)) {
-            $ra   = reset($ra);
-            $args = $ra->getArguments();
+        $type = $property->getType();
 
-            return array_key_exists('nullable', $args) && true === $args['nullable'];
-        }
+        return $type && $type->allowsNull();
+    }
 
-        return true;
+    /**
+     * Generic attribute check with consistent configuration.
+     */
+    private function hasAttribute(\ReflectionProperty $property, string $attributeClass): bool
+    {
+        return [] !== $property->getAttributes($attributeClass, \ReflectionAttribute::IS_INSTANCEOF);
     }
 }

tests/Fixtures/Entity/CanNotBeNull.php

@@ -22,7 +22,7 @@ final class CanNotBeNull implements TranslatableInterface
 
     #[EmptyOnTranslate]
     #[ORM\Column(type: Types::STRING, nullable: false)]
-    private string|null $emptyNotNullable = null;
+    private string $emptyNotNullable;
 
     public function getId(): int|null
     {

tests/TestKernel.php

@@ -47,10 +47,9 @@ public function configureContainer(ContainerConfigurator $container): void
                 'charset' => 'utf8',
             ],
             'orm' => [
-                'auto_generate_proxy_classes' => true,
-                'naming_strategy'             => 'doctrine.orm.naming_strategy.underscore_number_aware',
-                'auto_mapping'                => true,
-                'mappings'                    => [
+                'naming_strategy' => 'doctrine.orm.naming_strategy.underscore_number_aware',
+                'auto_mapping'    => true,
+                'mappings'        => [
                     'TestBundle' => [
                         'type'   => 'attribute',
                         'dir'    => '%kernel.project_dir%/tests/Fixtures/Entity',

tests/Translation/Handlers/DoctrineObjectHandlerTest.php

@@ -7,13 +7,14 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
+use PHPUnit\Framework\Attributes\CoversClass;
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Tmi\TranslationBundle\Test\Translation\UnitTestCase;
 use Tmi\TranslationBundle\Translation\Args\TranslationArgs;
 use Tmi\TranslationBundle\Translation\Handlers\DoctrineObjectHandler;
 
-#[\PHPUnit\Framework\Attributes\CoversClass(DoctrineObjectHandler::class)]
+#[CoversClass(DoctrineObjectHandler::class)]
 final class DoctrineObjectHandlerTest extends UnitTestCase
 {
     private DoctrineObjectHandler $handler;