Merge tag '2.4.1'

Hotfix release 2.4.1

- Fix tree picker at parent view

Author: stefanheimes

src/BaseConfigRegistry.php

@@ -148,6 +148,8 @@ private function addParentFilter(ModelIdInterface $idParent, ConfigInterface $co
      * @param ModelIdInterface|null $parentId The parent to use.
      *
      * @return ConfigInterface
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function buildBaseConfig(?ModelIdInterface $parentId): ConfigInterface
     {
@@ -165,7 +167,7 @@ private function buildBaseConfig(?ModelIdInterface $parentId): ConfigInterface
         $additional = $definition->getBasicDefinition()->getAdditionalFilter();
 
         // Custom filter common for all modes.
-        if (\is_array($additional)) {
+        if (\is_array($additional) && [] !== $additional) {
             $config->setFilter($additional);
         }
 
@@ -184,10 +186,11 @@ private function buildBaseConfig(?ModelIdInterface $parentId): ConfigInterface
             if (null === $input) {
                 throw new DcGeneralRuntimeException('Input provider not set.');
             }
-            $pid        = $input->getParameter('pid');
-            $pidDetails = ModelId::fromSerialized($pid);
-
-            $this->addParentFilter($pidDetails, $config);
+            $pid = $input->getParameter('pid');
+            if (null !== $pid) {
+                $pidDetails = ModelId::fromSerialized($pid);
+                $this->addParentFilter($pidDetails, $config);
+            }
         }
 
         return $config;

src/Contao/View/Contao2BackendView/TreePicker.php

@@ -1433,7 +1433,17 @@ public function formatModel(ModelInterface $model, $treeMode = true)
         $arguments = [];
         foreach ($formatter->getPropertyNames() as $propertyName) {
             if ($properties->hasProperty($propertyName)) {
-                $arguments[$propertyName] = (string) $model->getProperty($propertyName);
+                $propertyValue            = $model->getProperty($propertyName);
+                /** @psalm-suppress RedundantCast */
+                $arguments[$propertyName] = match (true) {
+                    \is_bool($propertyValue),
+                    \is_int($propertyValue),
+                    \is_float($propertyValue),
+                    \is_string($propertyValue),
+                    => (string) $propertyValue,
+
+                    default => '-'
+                };
             } else {
                 $arguments[$propertyName] = '-';
             }
@@ -1490,7 +1500,7 @@ private function prepareLabelWithDisplayedProperties(
             $labelList[] = [
                 'colspan' => 1,
                 'class'   => 'tl_file_list col_' . $j . (($propertyName === $firstSorting) ? ' ordered_by' : ''),
-                'content' => ('' !== $arguments[$propertyName]) ? $arguments[$propertyName] : '-'
+                'content' => ('' !== ($arguments[$propertyName] ?? '')) ? $arguments[$propertyName] : '-'
             ];
         }
     }