Merge branch '7.1' into 7.2

neos · Jan 21, 2022 · 7dfa9cc · 7dfa9cc
2 parents d53d114 + 18a9246
commit 7dfa9cc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/Neos.Flow/Classes/ObjectManagement/Proxy/ObjectSerializationTrait.php b/Neos.Flow/Classes/ObjectManagement/Proxy/ObjectSerializationTrait.php
@@ -131,6 +131,7 @@ private function Flow_searchForEntitiesAndStoreIdentifierArray($path, $propertyV
                 'identifier' => $identifier,
                 'entityPath' => $path
             ];
+            $this->$originalPropertyName = Arrays::setValueByPath($this->$originalPropertyName, $path, null);
         }
     }
 

diff --git a/Neos.Flow/Tests/Functional/Persistence/PersistenceTest.php b/Neos.Flow/Tests/Functional/Persistence/PersistenceTest.php
@@ -184,11 +184,6 @@ public function persistedEntitiesLyingInArraysAreNotSerializedButReferencedByThe
         $this->persistenceManager->persistAll();
 
         $serializedData = serialize($testEntityWithArrayProperty);
-        // the original object should never change by serialization its "public" properties
-        $this->assertEquals(
-            $testEntityWithArrayProperty->getArrayProperty()['some']['nestedArray']['key'],
-            $testEntityLyingInsideTheArray
-        );
 
         $testEntityLyingInsideTheArray->setName('Neos');
         $this->persistenceManager->persistAll();