[Bug]: versions 500 error when field collection is removed (pimcore#1…

…3957) * [Bug]: versions 500 error when field collection is removed * Fix PhpStan
michalananapps · Jan 3, 2023 · 0afd723 · 0afd723
1 parent 1b3878f
commit 0afd723
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/object/fieldcollection.js b/bundles/AdminBundle/Resources/public/js/pimcore/object/fieldcollection.js
@@ -189,7 +189,7 @@ pimcore.object.fieldcollection = Class.create({
 
     addFieldComplete: function (button, value, object) {
 
-        var isValidName = /^[a-zA-Z]+$/;
+        var isValidName = /^[a-zA-Z][a-zA-Z0-9]*$/;
 
         if (button == "ok" && value.length > 2 && isValidName.test(value) && !in_arrayi(value, this.forbiddenNames)) {
             Ext.Ajax.request({

diff --git a/models/DataObject/Fieldcollection.php b/models/DataObject/Fieldcollection.php
@@ -15,6 +15,7 @@
 
 namespace Pimcore\Model\DataObject;
 
+use Pimcore\Logger;
 use Pimcore\Model;
 use Pimcore\Model\DataObject;
 use Pimcore\Model\Element\DirtyIndicatorInterface;
@@ -33,7 +34,7 @@ class Fieldcollection extends Model\AbstractModel implements \Iterator, DirtyInd
     /**
      * @internal
      *
-     * @var TItem[]
+     * @var array<TItem|\__PHP_Incomplete_Class>
      */
     protected $items = [];
 
@@ -366,4 +367,16 @@ public function loadLazyData()
             }
         }
     }
+
+    public function __wakeup()
+    {
+        if (is_array($this->items)) {
+            foreach ($this->items as $key => $item) {
+                if ($item instanceof \__PHP_Incomplete_Class) {
+                    unset($this->items[$key]);
+                    Logger::error('fieldcollection item ' . $key . ' does not exist anymore');
+                }
+            }
+        }
+    }
 }
diff --git a/models/DataObject/Objectbrick.php b/models/DataObject/Objectbrick.php
@@ -319,8 +319,6 @@ public function __sleep(): array
 
     public function __wakeup()
     {
-        $brickGetter = null;
-
         // for backwards compatibility
         if ($this->object) {
             $this->objectId = $this->object->getId();
@@ -339,7 +337,7 @@ public function __wakeup()
             foreach ($this->items as $key => $item) {
                 if ($item instanceof \__PHP_Incomplete_Class) {
                     unset($this->items[$key]);
-                    Logger::error('brick ' . $brickGetter . ' does not exist anymore');
+                    Logger::error('brick item ' . $key . ' does not exist anymore');
                 }
             }
         }