Merge branch '2.x' into 'master'

* Add missing assocation_many_to_one_owning and assocation_many_to_one_unidirectional blocks

Author: hlecorche

src/EntityGenerator/EntityGenerator.php

@@ -22,8 +22,12 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\EmbeddedClassMapping;
 use Doctrine\ORM\Mapping\FieldMapping;
-use Doctrine\ORM\Mapping\InverseSideMapping;
-use Doctrine\ORM\Mapping\OwningSideMapping;
+use Doctrine\ORM\Mapping\ManyToManyInverseSideMapping;
+use Doctrine\ORM\Mapping\ManyToManyOwningSideMapping;
+use Doctrine\ORM\Mapping\ManyToOneAssociationMapping;
+use Doctrine\ORM\Mapping\OneToManyAssociationMapping;
+use Doctrine\ORM\Mapping\OneToOneInverseSideMapping;
+use Doctrine\ORM\Mapping\OneToOneOwningSideMapping;
 use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\DoctrineEntitiesGeneratorBundle\Attribute\GenerateEntityTemplate;
 use Ecommit\DoctrineEntitiesGeneratorBundle\Entity\EntityInitializerInterface;
@@ -314,53 +318,69 @@ protected function addEmbedded(GenerateEntityRequest $request, string $fieldName
 
     protected function addAssociation(GenerateEntityRequest $request, AssociationMapping $associationMapping): void
     {
-        if ($associationMapping->type() & ClassMetadata::TO_ONE && $associationMapping instanceof InverseSideMapping) {
-            $this->addAssociationToOne(
-                $request,
-                $associationMapping,
-                'assocation_one_to_one_reverse',
-                $this->buildMethodName(self::TYPE_SET, $associationMapping->mappedBy)
-            );
-        } elseif ($associationMapping->type() & ClassMetadata::TO_ONE && $associationMapping instanceof OwningSideMapping) {
-            $this->addAssociationToOne(
-                $request,
-                $associationMapping,
-                'assocation_one_to_one_owning',
-                null
-            );
-        } elseif ($associationMapping->type() & ClassMetadata::TO_ONE) {
-            $this->addAssociationToOne(
-                $request,
-                $associationMapping,
-                'assocation_one_to_one_unidirectional',
-                null
-            );
+        if ($associationMapping->type() & ClassMetadata::TO_ONE) {
+            if ($associationMapping instanceof OneToOneInverseSideMapping) {
+                $this->addAssociationToOne(
+                    $request,
+                    $associationMapping,
+                    'assocation_one_to_one_reverse',
+                    $this->buildMethodName(self::TYPE_SET, $associationMapping->mappedBy)
+                );
+            } elseif ($associationMapping instanceof OneToOneOwningSideMapping && $associationMapping->inversedBy) {
+                $this->addAssociationToOne(
+                    $request,
+                    $associationMapping,
+                    'assocation_one_to_one_owning',
+                    null
+                );
+            } elseif ($associationMapping instanceof OneToOneOwningSideMapping) {
+                $this->addAssociationToOne(
+                    $request,
+                    $associationMapping,
+                    'assocation_one_to_one_unidirectional',
+                    null
+                );
+            } elseif ($associationMapping instanceof ManyToOneAssociationMapping && $associationMapping->inversedBy) {
+                $this->addAssociationToOne(
+                    $request,
+                    $associationMapping,
+                    'assocation_many_to_one_owning',
+                    null
+                );
+            } elseif ($associationMapping instanceof ManyToOneAssociationMapping) {
+                $this->addAssociationToOne(
+                    $request,
+                    $associationMapping,
+                    'assocation_many_to_one_unidirectional',
+                    null
+                );
+            }
         } elseif ($associationMapping->type() & ClassMetadata::TO_MANY) {
-            if ($associationMapping->type() & ClassMetadata::ONE_TO_MANY && $associationMapping instanceof InverseSideMapping) {
+            if ($associationMapping instanceof OneToManyAssociationMapping) {
                 $this->addAssociationToMany(
                     $request,
                     $associationMapping,
                     'assocation_one_to_many_reverse',
                     $this->buildMethodName(self::TYPE_SET, $associationMapping->mappedBy),
                     $this->buildMethodName(self::TYPE_SET, $associationMapping->mappedBy)
                 );
-            } elseif ($associationMapping->type() & ClassMetadata::MANY_TO_MANY && $associationMapping instanceof InverseSideMapping) {
+            } elseif ($associationMapping instanceof ManyToManyInverseSideMapping) {
                 $this->addAssociationToMany(
                     $request,
                     $associationMapping,
                     'assocation_many_to_many_reverse',
                     $this->buildMethodName(self::TYPE_ADD, $associationMapping->mappedBy),
                     $this->buildMethodName(self::TYPE_REMOVE, $associationMapping->mappedBy)
                 );
-            } elseif ($associationMapping->type() & ClassMetadata::MANY_TO_MANY && $associationMapping instanceof OwningSideMapping) {
+            } elseif ($associationMapping instanceof ManyToManyOwningSideMapping && $associationMapping->inversedBy) {
                 $this->addAssociationToMany(
                     $request,
                     $associationMapping,
                     'assocation_many_to_many_owning',
                     null,
                     null
                 );
-            } elseif ($associationMapping->type() & ClassMetadata::MANY_TO_MANY) {
+            } elseif ($associationMapping instanceof ManyToManyOwningSideMapping) {
                 $this->addAssociationToMany(
                     $request,
                     $associationMapping,

templates/Theme/base.php.twig

@@ -130,6 +130,14 @@
     }
 {% endblock %}
 
+{%- block assocation_many_to_one_owning_set -%}
+    {{ block('assocation_one_to_one_unidirectional_set') }}
+{%- endblock -%}
+
+{%- block assocation_many_to_one_unidirectional_set -%}
+    {{ block('assocation_one_to_one_unidirectional_set') }}
+{%- endblock -%}
+
 {# Associations To Many #}
 
 {% block assocation_to_many_get %}