Merge tag '2.4.8'

Hotfix release 2.4.8

This fixes:
- Fix deprecated BE navigation
- Fix target for links in CE and FE-models
- Fix priority für own BE MenuBuilder
- Fix generate widget for internal attributes

Author: zonky2

src/CoreBundle/Contao/Hooks/AbstractContentElementAndModuleCallback.php

@@ -556,7 +556,7 @@ private function renderEditButton(string $caption, string $title, UrlBuilder $ur
         );
 
         return sprintf(
-            '<a href="%s" title="%s" style="padding-left:3px">%s</a>',
+            '<a href="%s" title="%s" target="_blank" style="padding-left:3px">%s</a>',
             $url->getUrl(),
             $title,
             $icon

src/CoreBundle/EventListener/BackendNavigationListener.php

@@ -280,14 +280,11 @@ private function updateCollapsedState(ItemInterface $metaModelsNode): void
         $sessionBag  = $this->requestStack->getSession()->getBag('contao_backend');
         $status      = ($sessionBag instanceof AttributeBagInterface) ? $sessionBag->get('backend_modules') : [];
         $isCollapsed = ($status[$nodeName] ?? 1) < 1;
-        $path        = $this->router->generate('contao_backend');
 
         $metaModelsNode
             ->setLinkAttribute('class', 'group-' . $nodeName)
-            ->setLinkAttribute(
-                'onclick',
-                "return AjaxRequest.toggleNavigation(this, '" . $nodeName . "', '" . $path . "')"
-            )
+            ->setLinkAttribute('data-action', 'contao--toggle-navigation#toggle:prevent')
+            ->setLinkAttribute('data-contao--toggle-navigation-category-param', $nodeName)
             ->setLinkAttribute('aria-controls', $nodeName)
             ->setChildrenAttribute('id', $nodeName)
             ->setLinkAttribute(

src/CoreBundle/EventListener/DcGeneral/Breadcrumb/BreadcrumbDcaSettingConditionListener.php

@@ -111,7 +111,7 @@ private function getConditionAttribute($settingId)
         } else {
             $title = StringUtil::deserialize($setting->legendtitle, true);
             // @deprecated usage of TL_LANGUAGE - remove for Contao 5.0.
-            return ($title[LocaleUtil::formatAsLocale($GLOBALS['TL_LANGUAGE'])] ?? current($title));
+            return ($title[LocaleUtil::formatAsLocale($GLOBALS['TL_LANGUAGE'])] ?? (string) current($title));
         }
 
         return 'unknown ' . $setting->dcatype;

src/CoreBundle/EventListener/DcGeneral/DefinitionBuilder/PropertyDefinitionBuilder.php

@@ -27,6 +27,7 @@
 use ContaoCommunityAlliance\DcGeneral\DataDefinition\Definition\Properties\PropertyInterface;
 use ContaoCommunityAlliance\DcGeneral\DataDefinition\Definition\PropertiesDefinitionInterface;
 use MetaModels\Attribute\IAttribute;
+use MetaModels\Attribute\IInternal;
 use MetaModels\Attribute\ITranslated;
 use MetaModels\DcGeneral\DataDefinition\IMetaModelDataDefinition;
 use MetaModels\DcGeneral\Events\MetaModel\BuildAttributeEvent;
@@ -122,7 +123,7 @@ protected function build(IMetaModelDataDefinition $container)
         }
 
         foreach ($metaModel->getAttributes() as $attribute) {
-            if (!isset($properties[$attribute->get('id')])) {
+            if ($attribute instanceof IInternal || !isset($properties[$attribute->get('id')])) {
                 continue;
             }
             $this->buildProperty(

src/CoreBundle/Resources/config/listeners.yml

@@ -82,7 +82,7 @@ services:
             - '@security.token_storage'
             - '@router'
         tags:
-            - { name: kernel.event_listener }
+            - { name: kernel.event_listener, priority: -100 }
 
     MetaModels\CoreBundle\EventListener\DoctrineSchemaListener:
       arguments:

src/FrontendIntegration/FrontendFilter.php

@@ -634,11 +634,7 @@ private function getBaseParameters(array $values): array
             return [];
         }
 
-        if (null === ($filterSetting = $this->objFilterConfig->getFilterCollection())) {
-            throw new RuntimeException(
-                'Error: no filter object defined, call setFilterSettings() before setFilterParameters().'
-            );
-        }
+        $filterSetting = $this->objFilterConfig->getFilterCollection();
 
         $presetNames     = $filterSetting->getParameters();
         $filterParamKeys = \array_keys($filterSetting->getParameterFilterNames());

src/FrontendIntegration/MetaModelHybrid.php

@@ -41,12 +41,13 @@
 /**
  * Base implementation of a MetaModel Hybrid element.
  *
- * @property string $id                       The id of the element.
- * @property string $name                     The module name to use (if type is module).
- * @property string $metamodel                The id of the MetaModel to use.
- * @property string $metamodel_filtering      The id of the MetaModel filter setting to use.
- * @property string $metamodel_rendersettings The id of the MetaModel render setting to use.
- * @property bool   $metamodel_sort_override  The flag to override sorting.
+ * @property string       $id                       The id of the element.
+ * @property string       $name                     The module name to use (if type is module).
+ * @property string       $metamodel                The id of the MetaModel to use.
+ * @property string       $metamodel_filtering      The id of the MetaModel filter setting to use.
+ * @property string       $metamodel_rendersettings The id of the MetaModel render setting to use.
+ * @property bool         $metamodel_sort_override  The flag to override sorting.
+ * @property list<string> $cssID                    The CSS id and classes.
  *
  * @psalm-type TDatabaseResult=object{
  *   cssID: string,
@@ -155,7 +156,7 @@ protected function getConnection()
      * Create a new instance.
      *
      * @param Result|TDatabaseResult $objElement The object from the database.
-     * @param string                             $strColumn  The column the element is displayed within.
+     * @param string                 $strColumn  The column the element is displayed within.
      */
     public function __construct($objElement, $strColumn = 'main')
     {
@@ -165,6 +166,7 @@ public function __construct($objElement, $strColumn = 'main')
         $this->arrData = \method_exists($objElement, 'row') ? $objElement->row() : (array) $objElement;
 
         // Get CSS ID and headline from the parent element (!).
+        /** @psalm-suppress PropertyTypeCoercion */
         $this->cssID      = StringUtil::deserialize($objElement->cssID, true);
         $this->typePrefix = $objElement->typePrefix ?? '';
         $this->strKey     = $objElement->type;

src/Widgets/SubDcaWidget.php

@@ -97,7 +97,7 @@ class SubDcaWidget extends Widget
     /**
      * The prepared widgets.
      *
-     * @var array
+     * @var list<list<Widget>>
      */
     protected $arrWidgets = [];
 
@@ -567,9 +567,9 @@ protected function buildOptions()
         $options = [];
         foreach ($this->arrWidgets as $widgetRow) {
             $columns = [];
-            foreach ((array) $widgetRow as $widget) {
-                /** @var Widget $widget */
-                $rawValign = (string) ($widget->valign ?? '');
+            foreach ($widgetRow as $widget) {
+                /** @psalm-suppress UndefinedMagicPropertyFetch */
+                $rawValign = ((string) $widget->valign) ?: '';
                 $valign    = ($rawValign !== '' ? ' valign="' . $rawValign . '"' : '');
                 $rawClass = $widget->class;
                 $class    = ($rawClass !== '' ? ' class="' . $rawClass . '"' : '');