Merge tag v2.4.7 into develop

Author: roadiz-ci

config/services.yaml

@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.4.6'
+    roadiz_core.cms_version: '2.4.7'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"

src/EventSubscriber/CloudflareCacheEventSubscriber.php

@@ -40,10 +40,10 @@ public static function getSubscribedEvents(): array
 
     protected function supportConfig(): bool
     {
-        return null !== $this->reverseProxyCacheLocator->getCloudflareProxyCache() &&
-           (
-               null !== $this->reverseProxyCacheLocator->getCloudflareProxyCache()->getBearer() ||
-               null !== $this->reverseProxyCacheLocator->getCloudflareProxyCache()->getEmail()
+        return null !== $this->reverseProxyCacheLocator->getCloudflareProxyCache()
+           && (
+               null !== $this->reverseProxyCacheLocator->getCloudflareProxyCache()->getBearer()
+               || null !== $this->reverseProxyCacheLocator->getCloudflareProxyCache()->getEmail()
            );
     }
 

src/Explorer/Event/ExplorerEntityListEvent.php

@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace RZ\Roadiz\CoreBundle\Explorer\Event;
+
+use RZ\Roadiz\Core\AbstractEntities\PersistableInterface;
+use Symfony\Contracts\EventDispatcher\Event;
+
+class ExplorerEntityListEvent extends Event
+{
+    /**
+     * @param class-string<PersistableInterface> $entityName
+     */
+    public function __construct(
+        private string $entityName,
+        private array $criteria = [],
+        private array $ordering = [],
+    ) {
+    }
+
+    /**
+     * @return class-string<PersistableInterface>
+     */
+    public function getEntityName(): string
+    {
+        return $this->entityName;
+    }
+
+    /**
+     * @param class-string<PersistableInterface> $entityName
+     */
+    public function setEntityName(string $entityName): ExplorerEntityListEvent
+    {
+        $this->entityName = $entityName;
+
+        return $this;
+    }
+
+    public function getCriteria(): array
+    {
+        return $this->criteria;
+    }
+
+    public function setCriteria(array $criteria): ExplorerEntityListEvent
+    {
+        $this->criteria = $criteria;
+
+        return $this;
+    }
+
+    public function getOrdering(): array
+    {
+        return $this->ordering;
+    }
+
+    public function setOrdering(array $ordering): ExplorerEntityListEvent
+    {
+        $this->ordering = $ordering;
+
+        return $this;
+    }
+}

src/Explorer/EventSubscriber/NodeExplorerEntityListEventSubscriber.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace RZ\Roadiz\CoreBundle\Explorer\EventSubscriber;
+
+use RZ\Roadiz\CoreBundle\Entity\Node;
+use RZ\Roadiz\CoreBundle\Entity\NodeType;
+use RZ\Roadiz\CoreBundle\Explorer\Event\ExplorerEntityListEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+final class NodeExplorerEntityListEventSubscriber implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            ExplorerEntityListEvent::class => ['onNodeExplorerEntityList', 100],
+        ];
+    }
+
+    public function onNodeExplorerEntityList(ExplorerEntityListEvent $event): void
+    {
+        $entity = $event->getEntityName();
+
+        if (Node::class !== $entity) {
+            return;
+        }
+
+        $criteria = $event->getCriteria();
+        $ordering = $event->getOrdering();
+
+        if (
+            !isset($criteria['nodeType'])
+            || 1 !== count($criteria['nodeType'])
+            || !$criteria['nodeType'][0] instanceof NodeType
+        ) {
+            return;
+        }
+
+        $event->setEntityName($criteria['nodeType'][0]->getSourceEntityFullQualifiedClassName());
+        unset($criteria['nodeType']);
+        $nodeFields = ['position', 'visible', 'locked', 'status', 'nodeName', 'createdAt', 'updatedAt'];
+
+        // Prefix all criteria array keys names with "node." and recompose criteria array
+        $event->setCriteria(array_combine(
+            array_map(function ($key) use ($nodeFields) {
+                if (in_array($key, $nodeFields)) {
+                    return 'node.'.$key;
+                }
+
+                return $key;
+            }, array_keys($criteria)),
+            array_values($criteria)
+        ));
+        $event->setOrdering(array_combine(
+            array_map(function ($key) use ($nodeFields) {
+                if (in_array($key, $nodeFields)) {
+                    return 'node.'.$key;
+                }
+
+                return $key;
+            }, array_keys($ordering)),
+            array_values($ordering)
+        ));
+    }
+}