Merge branch 'hotfix/v2.1.9'

roadiz · Apr 11, 2023 · 6c78448 · 6c78448
2 parents 71b5b26 + 8eaceaf
commit 6c78448
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [v2.1.9](https://github.com/roadiz/core-bundle-dev-app/compare/v2.1.8...v2.1.9) (2023-04-11)
+
+
+### Bug Fixes
+
+* `JoinDataTransformer` must always transform to an array, even single objects ([e17b804](https://github.com/roadiz/core-bundle-dev-app/commit/e17b804baf73ca9d827b07322a0163a952b3e5c0))
+
 ## [v2.1.8](https://github.com/roadiz/core-bundle-dev-app/compare/v2.1.7...v2.1.8) (2023-04-06)
 
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '3.7'
 
 services:
     db_test:
@@ -136,18 +136,28 @@ services:
             DEFAULT_GATEWAY: ${DEFAULT_GATEWAY}
 
     worker:
-        extends: app
+        extends:
+            service: app
         deploy:
             replicas: 1
         entrypoint: ["php", "/var/www/html/bin/console", "messenger:consume", "async", "--time-limit=60"]
         restart: unless-stopped
+        depends_on:
+            - db
+            - solr
+            - redis
 
     cron:
-        extends: app
+        extends:
+            service: app
         # https://github.com/dubiousjim/dcron/issues/13#issuecomment-1406937781
         init: true
         entrypoint: ["crond", "-f", "-L", "15"]
         restart: unless-stopped
+        depends_on:
+            - db
+            - solr
+            - redis
 
     nginx:
         image: roadiz/nginx-alpine:latest

diff --git a/lib/RoadizCoreBundle/config/services.yaml b/lib/RoadizCoreBundle/config/services.yaml
@@ -22,7 +22,7 @@ services:
         autowire: true      # Automatically injects dependencies in your services.
         autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
         bind:
-            $cmsVersion: '2.1.8'
+            $cmsVersion: '2.1.9'
             $appVersion: '%roadiz_core.app_version%'
             $cmsVersionPrefix: 'main'
             $staticDomain: '%roadiz_core.static_domain_name%'

diff --git a/lib/RoadizCoreBundle/src/Form/DataTransformer/JoinDataTransformer.php b/lib/RoadizCoreBundle/src/Form/DataTransformer/JoinDataTransformer.php
@@ -38,9 +38,9 @@ public function __construct(
 
     /**
      * @param mixed $value
-     * @return mixed
+     * @return array JoinDataTransformer must always return an array for view data.
      */
-    public function transform(mixed $value): mixed
+    public function transform(mixed $value): array
     {
         /*
          * If model is already an PersistableInterface
@@ -49,8 +49,8 @@ public function transform(mixed $value): mixed
             !empty($value) &&
             $value instanceof PersistableInterface
         ) {
-            return $value->getId();
-        } elseif (!empty($value) && is_array($value)) {
+            return [$value->getId()];
+        } elseif (!empty($value) && is_iterable($value)) {
             /*
              * If model is a collection of AbstractEntity
              */
@@ -62,14 +62,14 @@ public function transform(mixed $value): mixed
             }
             return $idArray;
         } elseif (!empty($value)) {
-            return $value;
+            return [$value];
         }
-        return '';
+        return [];
     }
 
     /**
      * @param mixed $value
-     * @return mixed
+     * @return array|object|null
      */
     public function reverseTransform(mixed $value): mixed
     {

diff --git a/src/GeneratedEntity/NSPage.php b/src/GeneratedEntity/NSPage.php
@@ -1113,6 +1113,58 @@ public function setLayout(?string $layout): static
     }
 
 
+    /**
+     * Main user.
+     * Default values: # Entity class name
+     *     classname: \RZ\Roadiz\CoreBundle\Entity\User
+     *     # Displayable is the method used to display entity name
+     *     displayable: getUsername
+     *     # Same as Displayable but for a secondary information
+     *     alt_displayable: getEmail
+     *     # Same as Displayable but for a secondary information
+     *     thumbnail: ~
+     *     # Searchable entity fields
+     *     searchable:
+     *         - username
+     *         - email
+     *     # This order will only be used for explorer
+     *     orderBy:
+     *         - field: email
+     *           direction: ASC
+     * @var \RZ\Roadiz\CoreBundle\Entity\User|null
+     */
+    #[
+        SymfonySerializer\SerializedName(serializedName: "mainUser"),
+        SymfonySerializer\Groups(["nodes_sources", "nodes_sources_default"]),
+        SymfonySerializer\MaxDepth(2),
+        ORM\ManyToOne(targetEntity: \RZ\Roadiz\CoreBundle\Entity\User::class),
+        ORM\JoinColumn(name: "main_user_id", referencedColumnName: "id", onDelete: "SET NULL"),
+        ApiFilter(OrmFilter\SearchFilter::class, strategy: "exact"),
+        Serializer\Groups(["nodes_sources", "nodes_sources_default"]),
+        Serializer\MaxDepth(2)
+    ]
+    private ?\RZ\Roadiz\CoreBundle\Entity\User $mainUser = null;
+
+    /**
+     * @return \RZ\Roadiz\CoreBundle\Entity\User|null
+     */
+    public function getMainUser(): ?\RZ\Roadiz\CoreBundle\Entity\User
+    {
+        return $this->mainUser;
+    }
+
+    /**
+     * @param \RZ\Roadiz\CoreBundle\Entity\User|null $mainUser
+     * @return $this
+     */
+    public function setMainUser(?\RZ\Roadiz\CoreBundle\Entity\User $mainUser = null): static
+    {
+        $this->mainUser = $mainUser;
+
+        return $this;
+    }
+
+
     public function __construct(\RZ\Roadiz\CoreBundle\Entity\Node $node, \RZ\Roadiz\CoreBundle\Entity\Translation $translation)
     {
         parent::__construct($node, $translation);

diff --git a/src/Resources/node-types/Page.json b/src/Resources/node-types/Page.json
@@ -316,6 +316,20 @@
             "excluded_from_serialization": false,
             "indexed": true,
             "visible": true
+        },
+        {
+            "position": 23.0,
+            "name": "main_user",
+            "label": "Main user",
+            "default_values": "# Entity class name\r\nclassname: \\RZ\\Roadiz\\CoreBundle\\Entity\\User\r\n# Displayable is the method used to display entity name\r\ndisplayable: getUsername\r\n# Same as Displayable but for a secondary information\r\nalt_displayable: getEmail\r\n# Same as Displayable but for a secondary information\r\nthumbnail: ~\r\n# Searchable entity fields\r\nsearchable:\r\n    - username\r\n    - email\r\n# This order will only be used for explorer\r\norderBy:\r\n    - field: email\r\n      direction: ASC",
+            "type": 28,
+            "expanded": false,
+            "node_type_name": "Page",
+            "universal": false,
+            "exclude_from_search": false,
+            "excluded_from_serialization": false,
+            "indexed": false,
+            "visible": true
         }
     ],
     "default_ttl": 0,