Merge branch 'develop' of github.com:roadiz/skeleton into develop

Author: ambroisemaupate

composer_dev.json.dist

@@ -9,6 +9,7 @@
         "ext-ctype": "*",
         "ext-iconv": "*",
         "ext-json": "*",
+        "liip/monitor-bundle": "^2.22",
         "nelmio/cors-bundle": "^2.4",
         "roadiz/cms-pack": "dev-develop",
         "sentry/sentry-symfony": "^4.13",

src/GeneratedEntity/NSMenu.php

@@ -13,9 +13,9 @@
 use Symfony\Component\Serializer\Annotation as SymfonySerializer;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Doctrine\ORM\Mapping as ORM;
-use ApiPlatform\Core\Annotation\ApiFilter;
-use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter as OrmFilter;
-use ApiPlatform\Core\Serializer\Filter\PropertyFilter;
+use ApiPlatform\Metadata\ApiFilter;
+use ApiPlatform\Doctrine\Orm\Filter as OrmFilter;
+use ApiPlatform\Serializer\Filter\PropertyFilter;
 
 /**
  * DO NOT EDIT

src/GeneratedEntity/NSMenuLink.php

@@ -13,9 +13,9 @@
 use Symfony\Component\Serializer\Annotation as SymfonySerializer;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Doctrine\ORM\Mapping as ORM;
-use ApiPlatform\Core\Annotation\ApiFilter;
-use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter as OrmFilter;
-use ApiPlatform\Core\Serializer\Filter\PropertyFilter;
+use ApiPlatform\Metadata\ApiFilter;
+use ApiPlatform\Doctrine\Orm\Filter as OrmFilter;
+use ApiPlatform\Serializer\Filter\PropertyFilter;
 
 /**
  * DO NOT EDIT
@@ -35,6 +35,7 @@ class NSMenuLink extends \RZ\Roadiz\CoreBundle\Entity\NodesSources
     #[
         SymfonySerializer\SerializedName(serializedName: "linkExternalUrl"),
         SymfonySerializer\Groups(["nodes_sources", "nodes_sources_default"]),
+        \ApiPlatform\Metadata\ApiProperty(description: "URL externe"),
         SymfonySerializer\MaxDepth(2),
         Gedmo\Versioned,
         ORM\Column(
@@ -76,13 +77,15 @@ public function setLinkExternalUrl(?string $linkExternalUrl): static
      * linkInternalReferenceSources NodesSources direct field buffer.
      * (Virtual field, this var is a buffer)
      *
+     * Node reference (internal link).
      * Default values: Page
      * @var \RZ\Roadiz\CoreBundle\Entity\NodesSources[]|null
      */
     #[
         Serializer\Exclude,
         SymfonySerializer\SerializedName(serializedName: "linkInternalReference"),
         SymfonySerializer\Groups(["nodes_sources", "nodes_sources_default", "nodes_sources_nodes"]),
+        \ApiPlatform\Metadata\ApiProperty(description: "Node reference (internal link)"),
         SymfonySerializer\MaxDepth(2)
     ]
     private ?array $linkInternalReferenceSources = null;
@@ -100,16 +103,12 @@ public function setLinkExternalUrl(?string $linkExternalUrl): static
     public function getLinkInternalReferenceSources(): array
     {
         if (null === $this->linkInternalReferenceSources) {
-            if (
-                null !== $this->objectManager &&
-                null !== $this->getNode() &&
-                null !== $this->getNode()->getNodeType()
-            ) {
+            if (null !== $this->objectManager) {
                 $this->linkInternalReferenceSources = $this->objectManager
                     ->getRepository(\RZ\Roadiz\CoreBundle\Entity\NodesSources::class)
-                    ->findByNodesSourcesAndFieldAndTranslation(
+                    ->findByNodesSourcesAndFieldNameAndTranslation(
                         $this,
-                        $this->getNode()->getNodeType()->getFieldByName("link_internal_reference")
+                        'link_internal_reference'
                     );
             } else {
                 $this->linkInternalReferenceSources = [];

src/GeneratedEntity/Repository/NSMenuLinkRepository.php

@@ -11,7 +11,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use RZ\Roadiz\CoreBundle\Preview\PreviewResolverInterface;
 use RZ\Roadiz\CoreBundle\SearchEngine\NodeSourceSearchHandlerInterface;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**

src/GeneratedEntity/Repository/NSMenuRepository.php

@@ -11,7 +11,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use RZ\Roadiz\CoreBundle\Preview\PreviewResolverInterface;
 use RZ\Roadiz\CoreBundle\SearchEngine\NodeSourceSearchHandlerInterface;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**

src/Resources/node-types/Menu.json

@@ -4,6 +4,7 @@
     "display_name": "Menu",
     "visible": true,
     "publishable": false,
+    "attributable": false,
     "reachable": false,
     "hiding_nodes": false,
     "hiding_non_reachable_nodes": false,
@@ -15,7 +16,6 @@
             "default_values": "Page, Menu, MenuLink",
             "type": 16,
             "expanded": false,
-            "node_type_name": "Menu",
             "universal": false,
             "exclude_from_search": false,
             "excluded_from_serialization": false,

src/Resources/node-types/MenuLink.json

@@ -4,6 +4,7 @@
     "display_name": "Lien du menu",
     "visible": false,
     "publishable": false,
+    "attributable": false,
     "reachable": false,
     "hiding_nodes": false,
     "hiding_non_reachable_nodes": false,
@@ -14,7 +15,6 @@
             "label": "URL externe",
             "type": 0,
             "expanded": false,
-            "node_type_name": "MenuLink",
             "universal": false,
             "exclude_from_search": true,
             "excluded_from_serialization": false,
@@ -28,7 +28,6 @@
             "default_values": "Page",
             "type": 13,
             "expanded": false,
-            "node_type_name": "MenuLink",
             "universal": true,
             "exclude_from_search": false,
             "excluded_from_serialization": false,