Merge branch hotfix/v2.3.20

roadiz · Jul 13, 2024 · 5bf316c · 5bf316c
1 parent 3e8d4dd
commit 5bf316c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/config/services.yaml b/config/services.yaml
@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.3.19'
+    roadiz_core.cms_version: '2.3.20'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"

diff --git a/src/Doctrine/EventSubscriber/NodesSourcesInheritanceSubscriber.php b/src/Doctrine/EventSubscriber/NodesSourcesInheritanceSubscriber.php
@@ -9,6 +9,7 @@
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
 use Doctrine\ORM\Events;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Psr\Log\LoggerInterface;
 use RZ\Roadiz\Contracts\NodeType\NodeTypeFieldInterface;
 use RZ\Roadiz\CoreBundle\Bag\NodeTypes;
 use RZ\Roadiz\CoreBundle\DependencyInjection\Configuration;
@@ -19,7 +20,8 @@ final class NodesSourcesInheritanceSubscriber implements EventSubscriber
 {
     public function __construct(
         private readonly NodeTypes $nodeTypes,
-        private readonly string $inheritanceType
+        private readonly string $inheritanceType,
+        private readonly LoggerInterface $logger
     ) {
     }
 
@@ -59,7 +61,15 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
                 $nodeTypes = $this->nodeTypes->all();
                 $map = [];
                 foreach ($nodeTypes as $type) {
-                    $map[\mb_strtolower($type->getName())] = $type->getSourceEntityFullQualifiedClassName();
+                    if (\class_exists($type->getSourceEntityFullQualifiedClassName())) {
+                        $map[\mb_strtolower($type->getName())] = $type->getSourceEntityFullQualifiedClassName();
+                    } else {
+                        $this->logger->critical(sprintf(
+                            '"%s" node-type is registered in database but source entity class "%s" does not exist.',
+                            $type->getName(),
+                            $type->getSourceEntityFullQualifiedClassName()
+                        ));
+                    }
                 }
                 $metadata->setDiscriminatorMap($map);