bug #474 Resource alias, always return 2 array items (Prometee, lchru…

…sciel) This PR was merged into the 1.9 branch. Discussion ---------- | Q | A | --------------- | ----- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | fixes #473 | License | MIT This PR fix #473 Commits ------- 4e3d317 Always return 2 array items bbb7304 Fix psalm errors 6cfc3cf [Test] Covering bugged case with spec to ensure that resource name may contain dots
Sylius · Aug 12, 2022 · 08f94b4 · 08f94b4
2 parents c19cf42 + 6cfc3cf
commit 08f94b4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/src/Bundle/EventListener/ORMMappedSuperClassSubscriber.php b/src/Bundle/EventListener/ORMMappedSuperClassSubscriber.php
@@ -78,8 +78,6 @@ private function setAssociationMappings(ClassMetadataInfo $metadata, Configurati
 
             if ($parentMetadata->isMappedSuperclass) {
                 foreach ($parentMetadata->getAssociationMappings() as $key => $value) {
-                    Assert::integer($value['type']);
-
                     if ($this->isRelation($value['type']) && !isset($metadata->associationMappings[$key])) {
                         $metadata->associationMappings[$key] = $value;
                     }
@@ -96,8 +94,6 @@ private function unsetAssociationMappings(ClassMetadataInfo $metadata): void
         }
 
         foreach ($metadata->getAssociationMappings() as $key => $value) {
-            Assert::integer($value['type']);
-
             if ($this->isRelation($value['type'])) {
                 unset($metadata->associationMappings[$key]);
             }

diff --git a/src/Bundle/EventListener/ORMTranslatableListener.php b/src/Bundle/EventListener/ORMTranslatableListener.php
@@ -71,7 +71,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
 
     public function postLoad(LifecycleEventArgs $args): void
     {
-        $entity = $args->getEntity();
+        $entity = $args->getObject();
 
         if (!$entity instanceof TranslatableInterface) {
             return;

diff --git a/src/Component/Metadata/Metadata.php b/src/Component/Metadata/Metadata.php
@@ -151,6 +151,6 @@ private static function parseAlias(string $alias): array
             throw new \InvalidArgumentException(sprintf('Invalid alias "%s" supplied, it should conform to the following format "<applicationName>.<name>".', $alias));
         }
 
-        return explode('.', $alias);
+        return explode('.', $alias, 2);
     }
 }
diff --git a/src/Component/spec/Metadata/MetadataSpec.php b/src/Component/spec/Metadata/MetadataSpec.php
@@ -47,6 +47,29 @@ function it_has_alias(): void
         $this->getAlias()->shouldReturn('app.product');
     }
 
+    function it_allows_to_have_alias_with_dot_in_name(): void
+    {
+        $this->beConstructedThrough('fromAliasAndConfiguration', [
+            'app.product.with.dots',
+            [
+                'driver' => 'doctrine/orm',
+                'templates' => 'AppBundle:Resource',
+                'classes' => [
+                    'model' => 'AppBundle\Model\Resource',
+                    'form' => [
+                        'default' => 'AppBundle\Form\Type\ResourceType',
+                        'choice' => 'AppBundle\Form\Type\ResourceChoiceType',
+                        'autocomplete' => 'AppBundle\Type\ResourceAutocompleteType',
+                    ],
+                ],
+            ],
+        ]);
+
+        $this->getAlias()->shouldReturn('app.product.with.dots');
+        $this->getApplicationName()->shouldReturn('app');
+        $this->getName()->shouldReturn('product.with.dots');
+    }
+
     function it_has_application_name(): void
     {
         $this->getApplicationName()->shouldReturn('app');