Merge branch 'hotfix/fix_runtime_exc_filter_collection' into 'release…

…/2.3.0' Fix runtime exception at filter collection See merge request metamodels/core!341
MetaModels · Sep 25, 2024 · 2d1daf7 · 2d1daf7
2 parents 5c04c2f + ad1092f
commit 2d1daf7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/CoreBundle/Resources/config/dc-general/table/tl_dcasetting.yml b/src/CoreBundle/Resources/config/dc-general/table/tl_dcasetting.yml
@@ -5,6 +5,7 @@ services:
       - "@database_connection"
       - "@metamodels.factory"
       - "@router"
+      - "@request_stack"
     tags:
       - name: kernel.event_listener
         event: dc-general.view.contao2backend.get-global-button

diff --git a/src/CoreBundle/Resources/config/dc-general/table/tl_metamodel_rendersetting.yml b/src/CoreBundle/Resources/config/dc-general/table/tl_metamodel_rendersetting.yml
@@ -5,6 +5,7 @@ services:
             - "@database_connection"
             - "@metamodels.factory"
             - "@router"
+            - "@request_stack"
         tags:
             - name: kernel.event_listener
               event: dc-general.view.contao2backend.get-global-button

diff --git a/src/Filter/Setting/Collection.php b/src/Filter/Setting/Collection.php
@@ -55,9 +55,9 @@ class Collection implements ICollection
     /**
      * The attached MetaModel.
      *
-     * @var IMetaModel
+     * @var IMetaModel|null
      */
-    protected $metaModel;
+    protected $metaModel = null;
 
     /**
      * Create a new instance.
@@ -100,6 +100,10 @@ public function setMetaModel($metaModel): self
      */
     public function getMetaModel()
     {
+        if (null === $this->metaModel) {
+            throw new \RuntimeException('Meta model not set');
+        }
+
         return $this->metaModel;
     }