do not call configureOptions on __set_state

pimcore · Jan 10, 2025 · 5b6fc90 · 5b6fc90
1 parent 7866852
commit 5b6fc90
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 14 deletions.
diff --git a/src/Pimcore/Model/DataObject/ClassDefinition/Data/TargetGroup.php b/src/Pimcore/Model/DataObject/ClassDefinition/Data/TargetGroup.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 /**
@@ -10,8 +11,8 @@
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ * @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ * @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
 namespace Pimcore\Model\DataObject\ClassDefinition\Data;
@@ -28,8 +29,11 @@ class TargetGroup extends Model\DataObject\ClassDefinition\Data\Select
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
-    public function getDataFromResource(mixed $data, Dataobject\Concrete $object = null, array $params = []): null|string|int
-    {
+    public function getDataFromResource(
+        mixed $data,
+        Dataobject\Concrete $object = null,
+        array $params = []
+    ): null|string|int {
         if (!empty($data)) {
             try {
                 $this->checkValidity($data, true, $params);
@@ -46,8 +50,12 @@ public function getDataFromResource(mixed $data, Dataobject\Concrete $object = n
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
-    public function getDataForResource(mixed $data, DataObject\Concrete $object = null, array $params = []): null|string|int
-    {
+    public function getDataForResource(
+        mixed $data,
+        DataObject\Concrete $object = null,
+        array $params = []
+    ): null|string|int {
+        $this->init();
         if (!empty($data)) {
             try {
                 $this->checkValidity($data, true, $params);
@@ -75,7 +83,7 @@ public function configureOptions(): void
         foreach ($targetGroups as $targetGroup) {
             $options[] = [
                 'value' => $targetGroup->getId(),
-                'key' => $targetGroup->getName(),
+                'key'   => $targetGroup->getName(),
             ];
         }
 
@@ -100,8 +108,7 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
     public static function __set_state(array $data): static
     {
         $obj = parent::__set_state($data);
-        $options = $obj->getOptions();
-        if (\Pimcore::inAdmin() || empty($options)) {
+        if (\Pimcore::inAdmin()) {
             $obj->configureOptions();
         }
 
@@ -129,4 +136,24 @@ public function getFieldType(): string
     {
         return 'targetGroup';
     }
+
+    public function __wakeup(): void
+    {
+        $this->init();
+    }
+
+    /**
+     * @return $this
+     * @internal
+     *
+     */
+    private function init(): static
+    {
+        $options = $this->getOptions();
+        if (empty($options)) {
+            $this->configureOptions();
+        }
+
+        return $this;
+    }
 }
diff --git a/src/Pimcore/Model/DataObject/ClassDefinition/Data/TargetGroupMultiselect.php b/src/Pimcore/Model/DataObject/ClassDefinition/Data/TargetGroupMultiselect.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 /**
@@ -10,8 +11,8 @@
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ * @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ * @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
 namespace Pimcore\Model\DataObject\ClassDefinition\Data;
@@ -38,7 +39,7 @@ public function configureOptions(): void
         foreach ($targetGroups as $targetGroup) {
             $options[] = [
                 'value' => $targetGroup->getId(),
-                'key' => $targetGroup->getName(),
+                'key'   => $targetGroup->getName(),
             ];
         }
 
@@ -48,8 +49,7 @@ public function configureOptions(): void
     public static function __set_state(array $data): static
     {
         $obj = parent::__set_state($data);
-        $options = $obj->getOptions();
-        if (\Pimcore::inAdmin() || empty($options)) {
+        if (\Pimcore::inAdmin()) {
             $obj->configureOptions();
         }
 
@@ -77,4 +77,24 @@ public function getFieldType(): string
     {
         return 'targetGroupMultiselect';
     }
+
+    public function __wakeup(): void
+    {
+        $this->init();
+    }
+
+    /**
+     * @return $this
+     * @internal
+     *
+     */
+    private function init(): static
+    {
+        $options = $this->getOptions();
+        if (empty($options)) {
+            $this->configureOptions();
+        }
+
+        return $this;
+    }
 }