Merge tag '2.0.8'

Maintenance release

Fixes:
- Use collectDirectChildrenOf() for paste button
  See contao-community-alliance/dc-general#442.
- Fix slicing bug in MetaModel::getIdsFromFilter
  The method `MetaModel::getIdsFromFilter` lost support for offset and
  limit when we introduced the id cache. The functionality has been
  restored.

Author: discordier

src/MetaModels/DcGeneral/Events/Table/InputScreenCondition/Subscriber.php

@@ -33,7 +33,9 @@
 use ContaoCommunityAlliance\DcGeneral\Contao\View\Contao2BackendView\Event\ModelToLabelEvent;
 use ContaoCommunityAlliance\DcGeneral\Contao\View\Contao2BackendView\Event\ManipulateWidgetEvent;
 use ContaoCommunityAlliance\DcGeneral\Controller\ModelCollector;
+use ContaoCommunityAlliance\DcGeneral\Controller\RelationshipManager;
 use ContaoCommunityAlliance\DcGeneral\Data\ModelId;
+use ContaoCommunityAlliance\DcGeneral\Data\ModelInterface;
 use ContaoCommunityAlliance\DcGeneral\EnvironmentInterface;
 use ContaoCommunityAlliance\DcGeneral\Factory\DcGeneralFactory;
 use ContaoCommunityAlliance\Translator\TranslatorInterface;
@@ -210,9 +212,6 @@ public function handleModelToLabel(ModelToLabelEvent $event)
      * @param GetPasteButtonEvent $event The event.
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.Superglobals)
-     * @SuppressWarnings(PHPMD.CamelCaseVariableName)
      */
     public function generatePasteButton(GetPasteButtonEvent $event)
     {
@@ -234,18 +233,19 @@ public function generatePasteButton(GetPasteButtonEvent $event)
             return;
         }
 
-        $flags = $GLOBALS['METAMODELS']['inputscreen_conditions'][$model->getProperty('type')];
         // If setting does not support children, omit them.
-        if ($model->getId() &&
-            (!$flags['nestingAllowed'])
-        ) {
+        $collector = new ModelCollector($environment);
+        if ($model->getId() && !$this->acceptsAnotherChild($model, $collector)) {
             $event->setPasteIntoDisabled(true);
-            return;
         }
 
-        $collector = new ModelCollector($environment);
-        if (isset($flags['maxChildren']) && count($collector->collectChildrenOf($model)) > $flags['maxChildren']) {
-            $event->setPasteIntoDisabled(true);
+        $definition    = $environment->getDataDefinition();
+        $mode          = $definition->getBasicDefinition()->getMode();
+        $relationships = new RelationshipManager($definition->getModelRelationshipDefinition(), $mode);
+        if (!$relationships->isRoot($model)
+            && ($parent = $collector->searchParentOf($model))
+            && !$this->acceptsAnotherChild($parent, $collector)) {
+            $event->setPasteAfterDisabled(true);
         }
     }
 
@@ -488,6 +488,33 @@ public function encodeValueValue(EncodePropertyValueFromWidgetEvent $event)
         }
     }
 
+    /**
+     * Test if a model accepts another child.
+     *
+     * @param ModelInterface $model     The model that shall be checked.
+     * @param ModelCollector $collector The collector to use.
+     *
+     * @return bool
+     *
+     * @SuppressWarnings(PHPMD.Superglobals)
+     * @SuppressWarnings(PHPMD.CamelCaseVariableName)
+     */
+    private function acceptsAnotherChild(ModelInterface $model, ModelCollector $collector)
+    {
+        $conditionType = $model->getProperty('type');
+        $flags         = $GLOBALS['METAMODELS']['inputscreen_conditions'][$conditionType];
+        if (!$flags['nestingAllowed']) {
+            return false;
+        }
+
+        if (isset($flags['maxChildren'])
+            && count($collector->collectDirectChildrenOf($model)) > $flags['maxChildren']) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * Obtain the values of a property within a dc-general instance.
      *

src/MetaModels/MetaModel.php

@@ -729,10 +729,16 @@ public function getIdsFromFilter($objFilter, $strSortBy = '', $intOffset = 0, $i
                 // Build the right key for the cache.
                 $sortKey = \sprintf('%s-%s', $strSortBy, \strtolower($strSortOrder));
                 // Used the cached ID list, and make a list of wanted ID's with the sorting of the cache.
-                $cacheResult = array_intersect((array) $this->existingIds[$sortKey], $arrFilteredIds);
+                if (!isset($this->existingIds[$sortKey])) {
+                    $this->existingIds[$sortKey] = [];
+                }
+                $cacheResult = array_intersect($this->existingIds[$sortKey], $arrFilteredIds);
                 // Check if we have all ID's or if we have one missing, now we are using the order of the MM Filter.
                 if (array_intersect($arrFilteredIds, $cacheResult) === $arrFilteredIds) {
-                    return $cacheResult;
+                    if ($intOffset > 0 || $intLimit > 0) {
+                        return array_values(array_slice($cacheResult, $intOffset, $intLimit ?: null));
+                    }
+                    return array_values($cacheResult);
                 }
 
                 // Merge the already known and the new one.